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 f312ffb..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
 
@@ -55,8 +55,6 @@
 
 #define CFG_SYS_DDRCDR_VALUE   (DDRCDR_DHC_EN | DDRCDR_ODT | DDRCDR_Q_DRN)
 
-#undef CONFIG_NEVER_ASSERT_ODT_TO_CPU  /* Never assert ODT to internal IOs */
-
 /*
  * Manually set up DDR parameters
  */
@@ -142,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}
@@ -151,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} }
@@ -177,7 +177,6 @@
 #define CFG_SYS_PCIE2_IO_PHYS  0xD8000000
 
 #ifdef CONFIG_MMC
-#define CONFIG_FSL_ESDHC_PIN_MUX
 #define CFG_SYS_FSL_ESDHC_ADDR CFG_SYS_MPC83xx_ESDHC_ADDR
 #endif
 
@@ -196,16 +195,10 @@
  * Environment Configuration
  */
 
-#define CONFIG_NETDEV          "eth1"
-
-#define CONFIG_HOSTNAME                "mpc837x_rdb"
-#define CONFIG_ROOTPATH                "/nfsroot"
-                               /* U-Boot image on TFTP server */
-#define CONFIG_UBOOTPATH       "u-boot.bin"
-#define CONFIG_FDTFILE         "mpc8379_rdb.dtb"
+#define FDTFILE                        "mpc8379_rdb.dtb"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
-       "netdev=" CONFIG_NETDEV "\0"                            \
+#define CFG_EXTRA_ENV_SETTINGS \
+       "netdev=eth1\0"                         \
        "uboot=" CONFIG_UBOOTPATH "\0"                                  \
        "tftpflash=tftp $loadaddr $uboot;"                              \
                "protect off " __stringify(CONFIG_TEXT_BASE)    \
@@ -219,7 +212,7 @@
                "cmp.b $loadaddr " __stringify(CONFIG_TEXT_BASE)        \
                        " $filesize\0"  \
        "fdtaddr=780000\0"                                              \
-       "fdtfile=" CONFIG_FDTFILE "\0"                                  \
+       "fdtfile=" FDTFILE "\0"                                 \
        "ramdiskaddr=1000000\0"                                         \
        "ramdiskfile=rootfs.ext2.gz.uboot\0"                            \
        "console=ttyS0\0"                                               \