ARM: vexpress_ca9x4: Reintroduce board in order to use with QEMU.

[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..46565db 100644 (file)
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -108,12 +108,8 @@
 
 /* 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)
@@ -162,29 +158,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" \