Merge https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[platform/kernel/u-boot.git] / include / configs / apalis_imx6.h

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 8f526da..0e81ef9 100644 (file)
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -67,10 +67,6 @@
 
 /* Framebuffer and LCD */
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#define CONFIG_VIDEO_BMP_RLE8
-#define CONFIG_SPLASH_SCREEN
-#define CONFIG_SPLASH_SCREEN_ALIGN
-#define CONFIG_BMP_16BPP
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_IMX_HDMI
@@ -137,7 +133,7 @@
 #endif
 #define CONFIG_EXTRA_ENV_SETTINGS \
        BOOTENV \
-       "bootcmd=setenv fdtfile ${fdt_file}; run distro_bootcmd ; " \
+       "bootcmd=run distro_bootcmd ; " \
                "usb start ; " \
                "setenv stdout serial,vidconsole; " \
                "setenv stdin serial,usbkbd\0" \
@@ -145,6 +141,7 @@
        "console=ttymxc0\0" \
        "defargs=enable_wait_mode=off vmalloc=400M\0" \
        "fdt_file=" FDT_FILE "\0" \
+       "fdtfile=" FDT_FILE "\0" \
        "fdt_fixup=;\0" \
        MEM_LAYOUT_ENV_SETTINGS \
        NFS_BOOTCMD \
@@ -191,12 +188,4 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-/* environment organization */
-
-#if defined(CONFIG_ENV_IS_IN_MMC)
-/* Environment in eMMC, before config block at the end of 1st "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                1
-#endif
-
 #endif /* __CONFIG_H */