Merge branch 'master' into next

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

diff --git a/include/configs/msc_sm2s_imx8mp.h b/include/configs/msc_sm2s_imx8mp.h
index ef2111c..c1c1fd5 100644 (file)
--- a/include/configs/msc_sm2s_imx8mp.h
+++ b/include/configs/msc_sm2s_imx8mp.h
@@ -17,7 +17,7 @@
 #define CFG_SYS_UBOOT_BASE     (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_MXC_PHYADDR          1
+#define CFG_FEC_MXC_PHYADDR          1
 #define PHY_ANEG_TIMEOUT 20000
 #endif
 
@@ -55,7 +55,7 @@
 #define PHYS_SDRAM_2                   0xc0000000
 #define PHYS_SDRAM_2_SIZE              0x0
 
-#define CONFIG_MXC_UART_BASE           UART2_BASE_ADDR
+#define CFG_MXC_UART_BASE              UART2_BASE_ADDR
 
 #define CFG_SYS_FSL_USDHC_NUM  2
 #define CFG_SYS_FSL_ESDHC_ADDR 0