Prepare v2023.10

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

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index fad1615..3967cc2 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -42,8 +42,8 @@
 #ifdef CONFIG_VSC7385_ENET
 
 /* The flash address and size of the VSC7385 firmware image */
-#define CONFIG_VSC7385_IMAGE           0xFE7FE000
-#define CONFIG_VSC7385_IMAGE_SIZE      8192
+#define CFG_VSC7385_IMAGE              0xFE7FE000
+#define CFG_VSC7385_IMAGE_SIZE 8192
 
 #endif
 
@@ -140,7 +140,9 @@
 /*
  * Serial Port
  */
+#if !CONFIG_IS_ENABLED(DM_SERIAL) && !CONFIG_IS_ENABLED(DM_CLK)
 #define CFG_SYS_NS16550_CLK            get_bus_freq(0)
+#endif
 
 #define CFG_SYS_BAUDRATE_TABLE \
                {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 115200}
@@ -149,8 +151,8 @@
 #define CFG_SYS_NS16550_COM2   (CONFIG_SYS_IMMR+0x4600)
 
 /* SERDES */
-#define CONFIG_FSL_SERDES1     0xe3000
-#define CONFIG_FSL_SERDES2     0xe3100
+#define CFG_FSL_SERDES1        0xe3000
+#define CFG_FSL_SERDES2        0xe3100
 
 /* I2C */
 #define CFG_SYS_I2C_NOPROBES           { {0, 0x51} }