Convert CONFIG_ENV_IS_IN_MMC/NAND/UBI and NOWHERE to Kconfig

[u-boot] / include / configs / mx53cx9020.h

diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index 6656f1306c4f6138615afb2ac841f1dc424b0ef9..4137592d4c6acaf8859183871909368683c268bb 100644 (file)
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -36,10 +36,7 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_ESDHC_NUM       2
 
-#define CONFIG_GENERIC_MMC
-
 /* bootz: zImage/initrd.img support */
-#define CONFIG_DOS_PARTITION
 
 /* Eth Configs */
 #define CONFIG_MII
@@ -48,7 +45,6 @@
 #define CONFIG_FEC_MXC_PHYADDR 0x1F
 
 /* USB Configs */
-#define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_MX5
 #define CONFIG_USB_STORAGE
 #define CONFIG_USB_HOST_ETHER
@@ -62,7 +58,6 @@
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX              1
-#define CONFIG_BAUDRATE                        115200
 
 /* Command definition */
 #define CONFIG_SUPPORT_RAW_INITRD
@@ -71,8 +66,9 @@
 #define CONFIG_SYS_TEXT_BASE    0x77800000
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
-       "fdt_addr=0x71ff0000\0" \
-       "rdaddr=0x72000000\0" \
+       "fdt_addr_r=0x71ff0000\0" \
+       "pxefile_addr_r=0x73000000\0" \
+       "ramdisk_addr_r=0x72000000\0" \
        "console=ttymxc1,115200\0" \
        "uenv=/boot/uEnv.txt\0" \
        "optargs=\0" \
@@ -86,10 +82,11 @@
                "rootfstype=${mmcrootfstype} " \
                "${cmdline}\0" \
        "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
-       "loadrd=load mmc ${bootpart} ${rdaddr} ${bootdir}/${rdfile};" \
+       "loadpxe=dhcp;setenv kernel_addr_r ${loadaddr};pxe get;pxe boot;\0" \
+       "loadrd=load mmc ${bootpart} ${ramdisk_addr_r} ${bootdir}/${rdfile};" \
                "setenv rdsize ${filesize}\0" \
        "loadfdt=echo loading ${fdt_path} ...;" \
-               "load mmc ${bootpart} ${fdt_addr} ${fdt_path}\0" \
+               "load mmc ${bootpart} ${fdt_addr_r} ${fdt_path}\0" \
        "mmcboot=mmc dev ${mmcdev}; " \
                "if mmc rescan; then " \
                        "echo SD/MMC found on device ${mmcdev};" \
@@ -133,8 +130,11 @@
                        "fi;" \
                        "run mmcargs;" \
                        "echo debug: [${bootargs}] ... ;" \
-                       "echo debug: [bootz ${loadaddr} - ${fdt_addr}] ... ;" \
-                       "bootz ${loadaddr} - ${fdt_addr}; " \
+                       "echo debug: [bootz ${loadaddr} - ${fdt_addr_r}];" \
+                       "bootz ${loadaddr} - ${fdt_addr_r}; " \
+               "else " \
+                       "echo loading from dhcp ...; " \
+                       "run loadpxe; " \
                "fi;\0"
 
 #define CONFIG_BOOTCOMMAND \
@@ -174,12 +174,9 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-/* FLASH and environment organization */
-#define CONFIG_SYS_NO_FLASH
-
+/* environment organization */
 #define CONFIG_ENV_OFFSET      (6 * 64 * 1024)
 #define CONFIG_ENV_SIZE        (8 * 1024)
-#define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV 0
 
 /* Framebuffer and LCD */