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
m68k: Stop using CONFIG_SYS_GBL_DATA_OFFSET
[platform/kernel/u-boot.git]
/
include
/
configs
/
imx7-cm.h
diff --git
a/include/configs/imx7-cm.h
b/include/configs/imx7-cm.h
index
4a0050b
..
2d9f8bb
100644
(file)
--- a/
include/configs/imx7-cm.h
+++ b/
include/configs/imx7-cm.h
@@
-12,8
+12,6
@@
#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR
#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR
-#define CONFIG_ETHPRIME "FEC"
-
#undef CONFIG_SYS_AUTOLOAD
#undef CONFIG_EXTRA_ENV_SETTINGS
#undef CONFIG_SYS_AUTOLOAD
#undef CONFIG_EXTRA_ENV_SETTINGS
@@
-32,8
+30,8
@@
"fdt_file=imx7-cm.dtb\0" \
"fdt_addr=0x83000000\0" \
"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
"fdt_file=imx7-cm.dtb\0" \
"fdt_addr=0x83000000\0" \
"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
- "mmcpart=
" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "
\0" \
- "mmcroot=
" CONFIG_MMCROOT "
rootwait rw\0" \
+ "mmcpart=
1
\0" \
+ "mmcroot=
/dev/mmcblk0p2
rootwait rw\0" \
"mmcargs=setenv bootargs console=${console},${baudrate} " \
"root=${mmcroot}\0" \
"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
"mmcargs=setenv bootargs console=${console},${baudrate} " \
"root=${mmcroot}\0" \
"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
@@
-85,8
+83,6
@@
#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR
#define CONFIG_SYS_FSL_USDHC_NUM 2
#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR
#define CONFIG_SYS_FSL_USDHC_NUM 2
-#define CONFIG_SYS_MMC_IMG_LOAD_PART 1
-#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 */
/* USB Configs */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
/* USB Configs */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)