Prepare v2023.10

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

diff --git a/include/configs/pdu001.h b/include/configs/pdu001.h
index 7ab6a89..80b14b0 100644 (file)
--- a/include/configs/pdu001.h
+++ b/include/configs/pdu001.h
@@ -32,8 +32,7 @@
        #define CONSOLE_DEV "ttyO5"
 #endif
 
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        DEFAULT_LINUX_BOOT_ENV \
        "fdtfile=am335x-pdu001.dtb\0" \
        "bootfile=zImage\0" \
@@ -49,14 +48,13 @@
                        "reset;" \
                "fi;" \
        "\0"
-#endif
 
 /* NS16550 Configuration */
-#define CONFIG_SYS_NS16550_COM1        UART0_BASE
-#define CONFIG_SYS_NS16550_COM2        UART1_BASE
-#define CONFIG_SYS_NS16550_COM3        UART2_BASE
-#define CONFIG_SYS_NS16550_COM4        UART3_BASE
-#define CONFIG_SYS_NS16550_COM5        UART4_BASE
-#define CONFIG_SYS_NS16550_COM6        UART5_BASE
+#define CFG_SYS_NS16550_COM1   UART0_BASE
+#define CFG_SYS_NS16550_COM2   UART1_BASE
+#define CFG_SYS_NS16550_COM3   UART2_BASE
+#define CFG_SYS_NS16550_COM4   UART3_BASE
+#define CFG_SYS_NS16550_COM5   UART4_BASE
+#define CFG_SYS_NS16550_COM6   UART5_BASE
 
 #endif /* ! __CONFIG_PDU001_H */