global: Convert CONFIG_LOADADDR to CONFIG_SYS_LOADADDR

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

diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h
index 080eec4..6973007 100644 (file)
--- a/include/configs/kp_imx53.h
+++ b/include/configs/kp_imx53.h
@@ -15,29 +15,12 @@
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (32 * SZ_1M)
 
-/* MMC Configs */
-#define CONFIG_FSL_ESDHC
-#define CONFIG_SYS_FSL_ESDHC_ADDR      0
-#define CONFIG_SYS_FSL_ESDHC_NUM       1
-
-/* Eth Configs */
-
 /* USB Configs */
-#define CONFIG_USB_EHCI_MX5
-#define CONFIG_MXC_USB_PORT    1
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS   0
 
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
-#define CONFIG_SYS_EEPROM_BUS_NUM 1
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
-
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-
 /* Command definition */
-#define CONFIG_LOADADDR                0x72000000      /* loadaddr env var */
+#define CONFIG_SYS_LOAD_ADDR           0x72000000      /* loadaddr env var */
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=ttymxc1,115200\0"      \
@@ -50,8 +33,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 " \
@@ -59,7 +44,7 @@
               "setexpr blkc ${blkc} + 1; " \
               "mmc write ${loadaddr} 0x2 ${blkc}" \
        "; fi\0"          \
-       "upwic=setenv wic_file kp-image-kp${boardsoc}${boardtype}.wic; "\
+       "upwic=setenv wic_file kp-image-kp${boardsoc}.wic; "\
               "if tftp ${loadaddr} ${wic_file}; then " \
               "setexpr blkc ${filesize} / 0x200; " \
               "setexpr blkc ${blkc} + 1; " \
@@ -68,6 +53,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
@@ -84,7 +72,6 @@
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_CBSIZE              512     /* Console I/O Buffer Size */
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 
 /* Physical Memory Map */
 #define PHYS_SDRAM_1                   CSD0_BASE_ADDR
@@ -101,11 +88,5 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* 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
 
 #endif                         /* __CONFIG_H_ */