Merge tag 'u-boot-amlogic-20230417' of https://source.denx.de/u-boot/custodians/u...

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

diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h
index 719b701..d806d7d 100644 (file)
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -10,14 +10,14 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE           UART1_BASE
+#define CFG_MXC_UART_BASE              UART1_BASE
 
 /* MMC Configuration */
 #define CFG_SYS_FSL_ESDHC_ADDR USDHC3_BASE_ADDR
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS           0
+#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS              0
 
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
@@ -38,7 +38,7 @@
        "bootmenu_3=Boot using PICO-Nymph baseboard=" \
                "setenv baseboard nymph; saveenv; run base_boot\0" \
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        "console=ttymxc0\0" \
        "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
        BOOTMENU_ENV \
@@ -98,6 +98,6 @@
 /* Environment organization */
 
 /* Ethernet Configuration */
-#define CONFIG_FEC_MXC_PHYADDR         1
+#define CFG_FEC_MXC_PHYADDR            1
 
 #endif                        /* __CONFIG_H * */