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 9c7c9084536065281d2b0945da6da7acde01e6c3..ff564b27ec832b83b3dff2a482fa954cfbac12c6 100644 (file)
--- a/include/configs/kp_imx53.h
+++ b/include/configs/kp_imx53.h
@@ -44,6 +44,7 @@
        "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 " \
@@ -62,6 +63,7 @@
               "run updargs; " \
               "run addinitrd; " \
               "run addswupdate; " \
+              "run addkeys; " \
               "run loadusb; " \
               "bootm ${loadaddr}#${fit_config}\0" \
        BOOTENV
@@ -97,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