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 ee56eb6..3d3fab5 100644 (file)
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -32,10 +32,7 @@
 
 /* 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
@@ -64,13 +61,6 @@
 #endif
 #endif
 
-/* Watchdog */
-#if defined(CONFIG_SPL_BUILD)
-#undef CONFIG_WDT
-#undef CONFIG_WATCHDOG
-#define CONFIG_HW_WATCHDOG
-#endif
-
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_EXTRA_ENV_SETTINGS      \
        "console=ttymxc0,115200\0"      \
@@ -82,10 +72,12 @@
        "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
 
-#define CONFIG_BOOTCOMMAND             "run distro_bootcmd"
-
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 0) \
        func(MMC, mmc, 2) \