Merge git://git.denx.de/u-boot-dm

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

diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index 1b5fc2e..11cb535 100644 (file)
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -19,12 +19,6 @@
 
 #define CONFIG_SUPPORT_RAW_INITRD
 
-/* MMU Definitions */
-#define CONFIG_SYS_CACHELINE_SIZE      64
-
-#define CONFIG_IDENT_STRING            " vexpress_aemv8a"
-#define CONFIG_BOOTP_VCI_STRING                "U-Boot.armv8.vexpress_aemv8a"
-
 /* Link Definitions */
 #if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \
        defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM)
@@ -121,7 +115,6 @@
 #endif
 
 /* PL011 Serial Configuration */
-#define CONFIG_BAUDRATE                        115200
 #define CONFIG_CONS_INDEX              0
 #define CONFIG_PL01X_SERIAL
 #define CONFIG_PL011_SERIAL
@@ -131,14 +124,7 @@
 #define CONFIG_PL011_CLOCK             24000000
 #endif
 
-/* Command line configuration */
-#define CONFIG_MENU
 /*#define CONFIG_MENU_SHOW*/
-#define CONFIG_CMD_BOOTI
-#define CONFIG_CMD_UNZIP
-#define CONFIG_CMD_PXE
-#define CONFIG_CMD_ENV
-#define CONFIG_DOS_PARTITION
 
 /* BOOTP options */
 #define CONFIG_BOOTP_BOOTFILESIZE
@@ -146,7 +132,6 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 #define CONFIG_BOOTP_PXE
-#define CONFIG_BOOTP_PXE_CLIENTARCH    0x100
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LOAD_ADDR           (V2M_BASE + 0x10000000)
@@ -218,7 +203,6 @@
                                "fi ; " \
                                "booti ${kernel_addr} ${initrd_param} ${fdt_addr}"
 
-#define CONFIG_BOOTDELAY               1
 
 #elif CONFIG_TARGET_VEXPRESS64_BASE_FVP
 #define CONFIG_EXTRA_ENV_SETTINGS      \
@@ -243,7 +227,6 @@
                                "fdt chosen ${initrd_addr} ${initrd_end}; " \
                                "booti $kernel_addr - $fdt_addr"
 
-#define CONFIG_BOOTDELAY               1
 
 #elif CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM
 #define CONFIG_EXTRA_ENV_SETTINGS      \
@@ -262,7 +245,6 @@
 
 #define CONFIG_BOOTCOMMAND     "booti $kernel_addr $initrd_addr $fdt_addr"
 
-#define CONFIG_BOOTDELAY               1
 
 #endif