Merge tag 'next-20220328' of https://source.denx.de/u-boot/custodians/u-boot-video...

[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 46565db..4b958b4 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
@@ -109,8 +109,6 @@
 /* Board info register */
 #define SYS_ID                         V2M_SYSREGS
 
-#define CONFIG_SYS_L2CACHE_OFF         1
-
 #define SCTL_BASE                      V2M_SYSCTL
 #define VEXPRESS_FLASHPROG_FLVPPEN     (1 << 0)
 
@@ -123,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)
 
@@ -179,7 +173,6 @@
 /* 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