efi_loader: new functions to print loaded image information

[u-boot] / board / udoo / udoo.c

diff --git a/board/udoo/udoo.c b/board/udoo/udoo.c
index eb7ab657ec620a2b85f6a663f9ea90bf22deaba1..562f0d863e02c443fd4adfff5ddc9aaad1247783 100644 (file)
--- a/board/udoo/udoo.c
+++ b/board/udoo/udoo.c
@@ -13,8 +13,8 @@
 #include <asm/arch/mx6-pins.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/sata.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/sata.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <asm/arch/crm_regs.h>
@@ -244,9 +244,8 @@ int board_init(void)
        /* address of boot parameters */
        gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
-#ifdef CONFIG_CMD_SATA
-       if (is_cpu_type(MXC_CPU_MX6Q))
-               setup_sata();
+#ifdef CONFIG_SATA
+       setup_sata();
 #endif
        return 0;
 }
@@ -255,9 +254,9 @@ int board_late_init(void)
 {
 #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
        if (is_cpu_type(MXC_CPU_MX6Q))
-               setenv("board_rev", "MX6Q");
+               env_set("board_rev", "MX6Q");
        else
-               setenv("board_rev", "MX6DL");
+               env_set("board_rev", "MX6DL");
 #endif
        return 0;
 }