summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2023-12-12 16:32:30 -0500
committerTom Rini <[email protected]>2023-12-12 16:33:57 -0500
commit20d0464300c25db673cfb5e4539aa3767606d151 (patch)
tree8a9f582d93f73910b8475682effc4a2f38c8d7fd /include
parent65eed687729c28431d38c6c9174da4d878fb107f (diff)
parent29e31c549d41e9cc9af5b7d675d3208e6436717b (diff)
Merge tag 'u-boot-imx-20231212' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
- Fix emmc detection on colibri_imx7 - Fix DDR configuration on tqma6 to improve Ethernet performance - Fix aliases and chosen nodes indentation on imx7s-warp - Convert pico-imx6ul to DM_SERIAL - Convert pico-pi-imx7d to watchdog driver model to fix 'reset' command - Select CONFIG_NET_RANDOM_ETHADDR on imx8mp_evk to fix networking on older boards - Add USBH_EN gpio hog to fix USB host interface not working on some Apalis Toradex carrier boards with Apalis iMX8 SoM - Add PCI fixup for GW73xx-F+ - Fix broken EEPROM read on imx8mn-var-som
Diffstat (limited to 'include')
-rw-r--r--include/configs/colibri_imx7.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 03f8ed14787..7a9f4afe7d1 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -101,7 +101,6 @@
UBI_BOOTCMD
#elif defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC)
#define MODULE_EXTRA_ENV_SETTINGS \
- "variant=-emmc\0" \
EMMC_ANDROID_BOOTCMD
#endif