Merge branch 'master_sh/gen4/mmcfix' of https://source.denx.de/u-boot/custodians...

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

diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index 0ebff26..e995776 100644 (file)
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -14,40 +14,21 @@
 
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-
-#define CONFIG_SYS_FSL_CLK
-
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN          (32 * 1024 * 1024)
-
-#define CONFIG_REVISION_TAG
-
-#define CONFIG_MXC_UART_BASE UART2_BASE
-
-#define CONFIG_FPGA_COUNT 1
+#define CFG_MXC_UART_BASE UART2_BASE
 
 /* MMC Configs */
-#define CONFIG_SYS_FSL_ESDHC_ADDR      0
-#define CONFIG_SYS_FSL_ESDHC_NUM       2
+#define CFG_SYS_FSL_ESDHC_ADDR 0
 
 /* bootz: zImage/initrd.img support */
 
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORT    1
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
-
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
+#define CFG_MXC_USB_PORT       1
+#define CFG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS      0
 
 /* Command definition */
 
-#define CONFIG_LOADADDR                0x70010000      /* loadaddr env var */
-
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 0) \
        func(MMC, mmc, 1) \
@@ -56,7 +37,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        "fdt_addr_r=0x75000000\0" \
        "pxefile_addr_r=0x73000000\0" \
        "scriptaddr=0x74000000\0" \
@@ -70,15 +51,7 @@
        "fdtfile=imx53-cx9020.dtb\0" \
        BOOTENV
 
-#define CONFIG_ARP_TIMEOUT     200UL
-
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_CBSIZE              512     /* Console I/O Buffer Size */
-
-#define CONFIG_SYS_MEMTEST_START       0x70000000
-#define CONFIG_SYS_MEMTEST_END         0x70010000
-
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 
 /* Physical Memory Map */
 #define PHYS_SDRAM_1                   CSD0_BASE_ADDR
@@ -87,19 +60,10 @@
 #define PHYS_SDRAM_2_SIZE              (gd->bd->bi_dram[1].size)
 #define PHYS_SDRAM_SIZE                        (gd->ram_size)
 
-#define CONFIG_SYS_SDRAM_BASE          (PHYS_SDRAM_1)
-#define CONFIG_SYS_INIT_RAM_ADDR       (IRAM_BASE_ADDR)
-#define CONFIG_SYS_INIT_RAM_SIZE       (IRAM_SIZE)
-
-#define CONFIG_SYS_INIT_SP_OFFSET \
-       (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_ADDR \
-       (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
+#define CFG_SYS_SDRAM_BASE             (PHYS_SDRAM_1)
+#define CFG_SYS_INIT_RAM_ADDR  (IRAM_BASE_ADDR)
+#define CFG_SYS_INIT_RAM_SIZE  (IRAM_SIZE)
 
 /* environment organization */
-#define CONFIG_SYS_MMC_ENV_DEV 0
-
-/* Framebuffer and LCD */
-#define CONFIG_IMX_VIDEO_SKIP
 
 #endif /* __CONFIG_H */