Merge tag 'efi-2019-07-rc5-3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[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 7260f80..56b3c75 100644 (file)
--- a/include/configs/imx6-engicam.h
+++ b/include/configs/imx6-engicam.h
@@ -56,6 +56,7 @@
        "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 recoveryboot\0"\
        "fitboot=echo Booting FIT image from mmc ...; " \
                "run mmcargs; " \
                "bootm ${loadaddr}\0" \
@@ -97,7 +98,12 @@
                "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"
 
@@ -117,7 +123,6 @@
 #endif
 
 /* Physical Memory Map */
-#define CONFIG_NR_DRAM_BANKS           1
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
@@ -164,8 +169,6 @@
 #  define CONFIG_FEC_MXC_PHYADDR       0
 #  define CONFIG_FEC_XCV_TYPE          RMII
 # endif
-
-# define CONFIG_MII
 #endif
 
 /* Falcon Mode */