common: Drop linux/stringify.h from common header

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

diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h
index 571852d..72ae89c 100644 (file)
--- a/include/configs/imx6-engicam.h
+++ b/include/configs/imx6-engicam.h
@@ -10,13 +10,13 @@
 #define __IMX6_ENGICAM_CONFIG_H
 
 #include <linux/sizes.h>
+#include <linux/stringify.h>
 #include "mx6_common.h"
 
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (16 * SZ_1M)
 
 /* Total Size of Environment Sector */
-#define CONFIG_ENV_SIZE                        SZ_128K
 
 /* Allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
@@ -25,11 +25,7 @@
 #ifndef CONFIG_ENV_IS_NOWHERE
 /* Environment in MMC */
 # if defined(CONFIG_ENV_IS_IN_MMC)
-#  define CONFIG_ENV_OFFSET            0x100000
 /* Environment in NAND */
-# elif defined(CONFIG_ENV_IS_IN_NAND)
-#  define CONFIG_ENV_OFFSET            0x400000
-#  define CONFIG_ENV_SECT_SIZE         CONFIG_ENV_SIZE
 # endif
 #endif
 
@@ -37,36 +33,27 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
        "splashpos=m,m\0" \
+       "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \
        "image=uImage\0" \
        "fit_image=fit.itb\0" \
        "fdt_high=0xffffffff\0" \
        "fdt_addr=" FDT_ADDR "\0" \
        "boot_fdt=try\0" \
        "mmcpart=1\0" \
-       "recovery_device=0\0" \
-       "recovery_part=2\0" \
-       "recovery_root=/dev/mmcblk0p2 rootwait rw\0" \
        "nandroot=ubi0:rootfs rootfstype=ubifs\0" \
        "mmcautodetect=yes\0" \
        "mmcargs=setenv bootargs console=${console},${baudrate} " \
                "root=${mmcroot}\0" \
-       "recovery_mmcargs= setenv bootargs console=${console},${baudrate} "\
-               "root=${recovery_root}\0" \
        "ubiargs=setenv bootargs console=${console},${baudrate} " \
                "ubi.mtd=5 root=${nandroot} ${mtdparts}\0" \
        "loadbootscript=" \
                "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
        "bootscript=echo Running bootscript from mmc ...; " \
                "source\0" \
-       "recovery_loadimage=ext2load mmc ${recovery_device}:${recovery_part} ${loadaddr} ${image}\0" \
-       "recovery_loadfdt=ext2load mmc ${recovery_device}:${recovery_part} ${fdt_addr} ${fdt_file}\0" \
        "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
        "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
        "loadfit=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${fit_image}\0" \
-       "altbootcmd=run recovery_boot\0"\
-       "recovery_boot=echo Recovery Boot from mmc ...; " \
-               "run recovery_loadimage ; run recovery_loadfdt; run recovery_mmcargs; "\
-               "bootm ${loadaddr} - ${fdt_addr}\0" \
+       "altbootcmd=run recoveryboot\0"\
        "fitboot=echo Booting FIT image from mmc ...; " \
                "run mmcargs; " \
                "bootm ${loadaddr}\0" \
@@ -108,13 +95,16 @@
                "run ubiargs; " \
                "nand read ${loadaddr} kernel 0x800000; " \
                "nand read ${fdt_addr} dtb 0x100000; " \
-               "bootm ${loadaddr} - ${fdt_addr}\0"
+               "bootm ${loadaddr} - ${fdt_addr}\0" \
+       "recoveryboot=if test ${modeboot} = mmcboot; then " \
+                       "run mmcboot; " \
+               "else " \
+                       "run nandboot; " \
+               "fi\0"
 
 #define CONFIG_BOOTCOMMAND             "run $modeboot"
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_MEMTEST_START       0x80000000
-#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + 0x8000000)
 
 #define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
@@ -165,17 +155,6 @@
 /* MTD device */
 #endif
 
-/* Ethernet */
-#ifdef CONFIG_FEC_MXC
-# ifdef CONFIG_TARGET_MX6Q_ICORE_RQS
-#  define CONFIG_FEC_MXC_PHYADDR       3
-#  define CONFIG_FEC_XCV_TYPE          RGMII
-# else
-#  define CONFIG_FEC_MXC_PHYADDR       0
-#  define CONFIG_FEC_XCV_TYPE          RMII
-# endif
-#endif
-
 /* Falcon Mode */
 #ifdef CONFIG_SPL_OS_BOOT
 # define CONFIG_SPL_FS_LOAD_ARGS_NAME  "args"