Merge branch '2021-12-27-CONFIG-migrations' into next

[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..91d50bc 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,7 +121,6 @@
 #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