Convert CONFIG_ESDHC_DETECT_QUIRK to Kconfig

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

diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index d7d98cd..ff7307f 100644 (file)
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -15,7 +15,7 @@
  * Definitions copied from linux kernel:
  * arch/arm/mach-vexpress/include/mach/motherboard.h
  */
-#ifdef CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP
+#ifdef VEXPRESS_ORIGINAL_MEMORY_MAP
 /* CS register bases for the original memory map. */
 #define V2M_PA_CS0             0x40000000
 #define V2M_PA_CS1             0x44000000
@@ -108,12 +108,6 @@
 
 /* Board info register */
 #define SYS_ID                         V2M_SYSREGS
-#define CONFIG_REVISION_TAG            1
-
-#define CONFIG_CMDLINE_TAG             1       /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS       1
-#define CONFIG_SYS_L2CACHE_OFF         1
-#define CONFIG_INITRD_TAG              1
 
 #define SCTL_BASE                      V2M_SYSCTL
 #define VEXPRESS_FLASHPROG_FLVPPEN     (1 << 0)
@@ -127,15 +121,11 @@
 #define CONFIG_PL01x_PORTS             {(void *)CONFIG_SYS_SERIAL0, \
                                         (void *)CONFIG_SYS_SERIAL1}
 
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_SYS_SERIAL0             V2M_UART0
 #define CONFIG_SYS_SERIAL1             V2M_UART1
 
 #define CONFIG_SYS_MMC_MAX_BLK_COUNT   127
 
-/* BOOTP options */
-#define CONFIG_BOOTP_BOOTFILESIZE
-
 /* Miscellaneous configurable options */
 #define LINUX_BOOT_PARAM_ADDR          (V2M_BASE + 0x2000)
 
@@ -149,10 +139,6 @@
 /* additions for new relocation code */
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
 #define CONFIG_SYS_INIT_RAM_SIZE               0x1000
-#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_SDRAM_BASE + \
-                                        CONFIG_SYS_INIT_RAM_SIZE - \
-                                        GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_ADDR                CONFIG_SYS_GBL_DATA_OFFSET
 
 /* Basic environment settings */
 #define BOOT_TARGET_DEVICES(func) \
@@ -162,29 +148,10 @@
         func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>
 
-#ifdef CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP
-#define CONFIG_PLATFORM_ENV_SETTINGS \
-               "loadaddr=0x80008000\0" \
-               "ramdisk_addr_r=0x61000000\0" \
-               "kernel_addr=0x44100000\0" \
-               "ramdisk_addr=0x44800000\0" \
-               "maxramdisk=0x1800000\0" \
-               "pxefile_addr_r=0x88000000\0" \
-               "scriptaddr=0x88000000\0" \
-               "kernel_addr_r=0x80008000\0"
-#elif defined(CONFIG_VEXPRESS_EXTENDED_MEMORY_MAP)
-#define CONFIG_PLATFORM_ENV_SETTINGS \
-               "loadaddr=0xa0008000\0" \
-               "ramdisk_addr_r=0x81000000\0" \
-               "kernel_addr=0x0c100000\0" \
-               "ramdisk_addr=0x0c800000\0" \
-               "maxramdisk=0x1800000\0" \
-               "pxefile_addr_r=0xa8000000\0" \
-               "scriptaddr=0xa8000000\0" \
-               "kernel_addr_r=0xa0008000\0"
-#endif
 #define CONFIG_EXTRA_ENV_SETTINGS \
-               CONFIG_PLATFORM_ENV_SETTINGS \
+                "kernel_addr_r=0x60100000\0" \
+                "fdt_addr_r=0x60000000\0" \
+                "bootargs=console=tty0 console=ttyAMA0,38400n8\0" \
                 BOOTENV \
                "console=ttyAMA0,38400n8\0" \
                "dram=1024M\0" \
@@ -202,10 +169,8 @@
 /* FLASH and environment organization */
 #define PHYS_FLASH_SIZE                        0x04000000      /* 64MB */
 #define CONFIG_SYS_FLASH_SIZE          0x04000000
-#define CONFIG_SYS_MAX_FLASH_BANKS     2
 #define CONFIG_SYS_FLASH_BASE0         V2M_NOR0
 #define CONFIG_SYS_FLASH_BASE1         V2M_NOR1
-#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_FLASH_BASE0
 
 /* Timeout values in ticks */
 #define CONFIG_SYS_FLASH_ERASE_TOUT    (2 * CONFIG_SYS_HZ) /* Erase Timeout */
@@ -228,7 +193,4 @@
 #define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH_BASE0, \
                                          CONFIG_SYS_FLASH_BASE1 }
 
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE              512     /* Console I/O Buffer Size */
-
 #endif /* VEXPRESS_COMMON_H */