Merge tag 'u-boot-at91-2023.04-a' of https://source.denx.de/u-boot/custodians/u-boot...

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

diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h
index 402f83c..6c61b3f 100644 (file)
--- a/include/configs/imx6dl-mamoj.h
+++ b/include/configs/imx6dl-mamoj.h
@@ -20,7 +20,7 @@
 /* Environment in MMC */
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS      \
+#define CFG_EXTRA_ENV_SETTINGS \
        "scriptaddr=0x14000000\0"       \
        "fdt_addr_r=0x13000000\0"       \
        "kernel_addr_r=0x10008000\0"    \
@@ -35,16 +35,16 @@
 #include <config_distro_bootcmd.h>
 
 /* UART */
-#define CONFIG_MXC_UART_BASE           UART3_BASE
+#define CFG_MXC_UART_BASE              UART3_BASE
 
 /* MMC */
 
 /* Ethernet */
-#define CONFIG_FEC_MXC_PHYADDR         1
+#define CFG_FEC_MXC_PHYADDR            1
 
 /* USB */
-#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
 
 /* Falcon */