Merge branch '2019-11-12-migrate-SYS_REDUNDAND_ENVIRONMENT'

[oweals/u-boot.git] / include / configs / kp_imx53.h

diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h
index d09608df35e6340d1e2ab3bc02f6197309469193..ff564b27ec832b83b3dff2a482fa954cfbac12c6 100644 (file)
--- a/include/configs/kp_imx53.h
+++ b/include/configs/kp_imx53.h
@@ -16,7 +16,6 @@
 #define CONFIG_SYS_MALLOC_LEN          (32 * SZ_1M)
 
 /* USB Configs */
-#define CONFIG_USB_EHCI_MX5
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS   0
 
@@ -42,8 +41,10 @@
        "addinitrd=setenv bootargs ${bootargs} rdinit=${rdinit} ${debug} \0" \
        "upd_image=st.4k\0" \
        "uboot_file=u-boot.imx\0" \
-       "updargs=setenv bootargs console=${console} ${smp}"\
-              "rdinit=${rdinit} ${debug} ${displayargs}\0" \
+       "updargs=setenv bootargs console=${console} ${smp} ${displayargs}\0" \
+       "initrd_ram_dev=/dev/ram\0" \
+       "addswupdate=setenv bootargs ${bootargs} root=${initrd_ram_dev} rw\0" \
+       "addkeys=setenv bootargs ${bootargs} di=${dig_in} key1=${key1}\0" \
        "loadusb=usb start; " \
               "fatload usb 0 ${loadaddr} ${upd_image}\0" \
        "up=if tftp ${loadaddr} ${uboot_file}; then " \
@@ -60,6 +61,9 @@
        "usbupd=echo Booting update from usb ...; " \
               "setenv bootargs; " \
               "run updargs; " \
+              "run addinitrd; " \
+              "run addswupdate; " \
+              "run addkeys; " \
               "run loadusb; " \
               "bootm ${loadaddr}#${fit_config}\0" \
        BOOTENV
@@ -95,7 +99,6 @@
 /* environment organization */
 #define CONFIG_ENV_OFFSET      (SZ_1M)
 #define CONFIG_ENV_SIZE        (SZ_8K)
-#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
 #define CONFIG_ENV_OFFSET_REDUND        (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
 #define CONFIG_SYS_MMC_ENV_DEV 0