projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
cfe926c
..
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 CFG_SYS_UBOOT_BASE (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
#if defined(CONFIG_CMD_NET)
-#define C
ONFI
G_FEC_MXC_PHYADDR 1
+#define C
F
G_FEC_MXC_PHYADDR 1
#define PHY_ANEG_TIMEOUT 20000
#endif
#define PHY_ANEG_TIMEOUT 20000
#endif
@@
-30,7
+30,7
@@
#endif
/* Initial environment variables */
#endif
/* Initial environment variables */
-#define C
ONFIG_EXTRA_ENV_SETTINGS
\
+#define C
FG_EXTRA_ENV_SETTINGS
\
BOOTENV \
"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
BOOTENV \
"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
@@
-55,7
+55,7
@@
#define PHYS_SDRAM_2 0xc0000000
#define PHYS_SDRAM_2_SIZE 0x0
#define PHYS_SDRAM_2 0xc0000000
#define PHYS_SDRAM_2_SIZE 0x0
-#define C
ONFIG_MXC_UART_BASE
UART2_BASE_ADDR
+#define C
FG_MXC_UART_BASE
UART2_BASE_ADDR
#define CFG_SYS_FSL_USDHC_NUM 2
#define CFG_SYS_FSL_ESDHC_ADDR 0
#define CFG_SYS_FSL_USDHC_NUM 2
#define CFG_SYS_FSL_ESDHC_ADDR 0