]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
ARM: imx: Fix CONFIG_BOOTCOUNT_ALTBOOTCMD duplication on Data Modul i.MX8M eDM SBC
authorMarek Vasut <marex@denx.de>
Fri, 21 Feb 2025 17:07:17 +0000 (18:07 +0100)
committerFabio Estevam <festevam@gmail.com>
Thu, 27 Feb 2025 12:59:29 +0000 (09:59 -0300)
Deduplicate the config files again, move CONFIG_BOOTCOUNT_ALTBOOTCMD
into common imx8m_data_modul.config .

Fixes: 940135eea5df ("Kconfig: Move CONFIG_BOOTCOUNT_ALTBOOTCMD to Kconfig")
Signed-off-by: Marek Vasut <marex@denx.de>
configs/imx8m_data_modul.config
configs/imx8mm_data_modul_edm_sbc_defconfig
configs/imx8mp_data_modul_edm_sbc_defconfig

index 2164c75491537826d2bda0c906fd8f1565d99011..37e11e518a8b84059c17d5b40d90470ee224a79a 100644 (file)
@@ -13,6 +13,7 @@ CONFIG_ARCH_MISC_INIT=y
 CONFIG_ARM=y
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_BOOTCOMMAND="run dmo_update_env ; load ${devtype} ${devnum}:${devpart} ${loadaddr} boot/fitImage && source ${loadaddr}:bootscr-boot.cmd ; reset"
+CONFIG_BOOTCOUNT_ALTBOOTCMD="run bootcmd"
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_CLK_COMPOSITE_CCF=y
index ef1d73c2f73941077d350c9393ac8e3232288dcd..66cb1331ded06b5a9673e0625aa6e4986c70db4d 100644 (file)
@@ -37,4 +37,3 @@ CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_HOST=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
 CONFIG_SYS_LOAD_ADDR=0x60000000
-CONFIG_BOOTCOUNT_ALTBOOTCMD="run bootcmd"
index 5024c093b99dcb8e8455ab60857657d4fca74167..ea8109bf04964a8ad0c619893b2338505f40ff7c 100644 (file)
@@ -52,4 +52,3 @@ CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_XHCI_DWC3_OF_SIMPLE=y
 CONFIG_USB_XHCI_HCD=y
-CONFIG_BOOTCOUNT_ALTBOOTCMD="run bootcmd"