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 '2022-04-01-Kconfig-migrations-and-cleanups' into next
[platform/kernel/u-boot.git]
/
include
/
configs
/
dh_imx6.h
diff --git
a/include/configs/dh_imx6.h
b/include/configs/dh_imx6.h
index
0198126
..
3d3fab5
100644
(file)
--- a/
include/configs/dh_imx6.h
+++ b/
include/configs/dh_imx6.h
@@
-27,23
+27,12
@@
/* Miscellaneous configurable options */
/* Miscellaneous configurable options */
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN (4 * SZ_1M)
-
/* Bootcounter */
#define CONFIG_SYS_BOOTCOUNT_BE
/* FEC ethernet */
#define IMX_FEC_BASE ENET_BASE_ADDR
/* Bootcounter */
#define CONFIG_SYS_BOOTCOUNT_BE
/* FEC ethernet */
#define IMX_FEC_BASE ENET_BASE_ADDR
-#define CONFIG_FEC_XCV_TYPE RMII
-#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 0
-#define CONFIG_ARP_TIMEOUT 200UL
+#define CONFIG_FEC_MXC_PHYADDR 7
/* MMC Configs */
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
/* MMC Configs */
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
@@
-72,16
+61,6
@@
#endif
#endif
#endif
#endif
-/* Watchdog */
-#if defined(CONFIG_SPL_BUILD)
-#undef CONFIG_WDT
-#undef CONFIG_WATCHDOG
-#define CONFIG_HW_WATCHDOG
-#endif
-
-#define CONFIG_LOADADDR 0x12000000
-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-
#ifndef CONFIG_SPL_BUILD
#define CONFIG_EXTRA_ENV_SETTINGS \
"console=ttymxc0,115200\0" \
#ifndef CONFIG_SPL_BUILD
#define CONFIG_EXTRA_ENV_SETTINGS \
"console=ttymxc0,115200\0" \
@@
-93,10
+72,12
@@
"ramdisk_addr_r=0x18000000\0" \
"scriptaddr=0x14000000\0" \
"fdtfile=imx6q-dhcom-pdk2.dtb\0"\
"ramdisk_addr_r=0x18000000\0" \
"scriptaddr=0x14000000\0" \
"fdtfile=imx6q-dhcom-pdk2.dtb\0"\
+ "update_sf=" /* Erase SPI NOR and install U-Boot from SD */ \
+ "load mmc 0:1 ${loadaddr} /boot/u-boot-with-spl.imx && "\
+ "sf probe && sf erase 0x0 0xa0000 && " \
+ "sf write ${loadaddr} 0x400 ${filesize}\0" \
BOOTENV
BOOTENV
-#define CONFIG_BOOTCOMMAND "run distro_bootcmd"
-
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \
func(MMC, mmc, 2) \
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \
func(MMC, mmc, 2) \