diff options
author | Tom Rini <trini@konsulko.com> | 2022-06-29 09:54:02 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-06-29 10:11:21 -0400 |
commit | 5c873269fc374674e5e8aad65ab4ed45b1fe9f65 (patch) | |
tree | 5b2860d103a7f70abfd4534e10bdb53539cf18b5 /include/configs/verdin-imx8mm.h | |
parent | d61c11b8c894fad517677dc51ee82d1eade39c01 (diff) | |
parent | 613c326581fd96b55dd21e3a6d23e844e896832b (diff) | |
download | u-boot-5c873269fc374674e5e8aad65ab4ed45b1fe9f65.tar.gz |
Merge branch '2022-06-28-Kconfig-migrations' into next
- Convert a large number of CONFIG symbols to Kconfig. Of note is a
large chunk of USB symbols (and dead code removal), ensuring all
SPL/TPL/VPL symbols have an appropriate dependency, largely (but not
entirely) removing the testing of CONFIG_SPL_BUILD in board headers,
and allowing CONFIG_EXTRA_ENV_TEXT and CONFIG_EXTRA_ENV_SETTINGS to
co-exist as this facilities migration of many platforms.
Diffstat (limited to 'include/configs/verdin-imx8mm.h')
-rw-r--r-- | include/configs/verdin-imx8mm.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h index 19c16df488..6d77df09fb 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -28,15 +28,11 @@ "scriptaddr=0x46000000\0" /* Enable Distro Boot */ -#ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 0) \ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> -#else -#define BOOTENV -#endif /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -75,8 +71,6 @@ #define CONFIG_FEC_MXC_PHYADDR 7 /* USB Configs */ -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #endif /* __VERDIN_IMX8MM_H */ |