Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / board / logicpd / imx6 / imx6logic.c

diff --git a/board/logicpd/imx6/imx6logic.c b/board/logicpd/imx6/imx6logic.c
index 55767996a085b85b98c9a8835e1e86583aca4fe6..1f3e378ffc899f9f7f0a59c3656d81564229841b 100644 (file)
--- a/board/logicpd/imx6/imx6logic.c
+++ b/board/logicpd/imx6/imx6logic.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <miiphy.h>
+#include <input.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <asm/io.h>
@@ -22,8 +23,8 @@
 #include <asm/arch/mxc_hdmi.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -173,11 +174,11 @@ int board_init(void)
 
 int board_late_init(void)
 {
-       setenv("board_name", "imx6logic");
+       env_set("board_name", "imx6logic");
 
        if (is_mx6dq()) {
-               setenv("board_rev", "MX6DQ");
-               setenv("fdt_file", "imx6q-logicpd.dtb");
+               env_set("board_rev", "MX6DQ");
+               env_set("fdt_file", "imx6q-logicpd.dtb");
        }
 
        return 0;