Merge pull request #290 from Freescale/backport-286-to-kirkstone

[Backport kirkstone] nitrogen8m: remove 3g UBOOT_CONFIG
This commit is contained in:
Otavio Salvador 2023-12-05 11:11:06 -03:00 committed by GitHub
commit 9e94b64bdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -31,10 +31,9 @@ PREFERRED_PROVIDER_imx-atf ??= "imx-atf-boundary"
SPL_BINARY = "spl/u-boot-spl.bin"
UBOOT_SUFFIX = "bin"
UBOOT_CONFIG ??= "2g 2gr0 3g 4g som_2g som_2gr0 som_4g som_sd_2g som_sd_4g"
UBOOT_CONFIG ??= "2g 2gr0 4g som_2g som_2gr0 som_4g som_sd_2g som_sd_4g"
UBOOT_CONFIG[2g] = "${MACHINE}_2g_defconfig,sdcard"
UBOOT_CONFIG[2gr0] = "${MACHINE}_2gr0_defconfig,sdcard"
UBOOT_CONFIG[3g] = "${MACHINE}_3g_defconfig,sdcard"
UBOOT_CONFIG[4g] = "${MACHINE}_4g_defconfig,sdcard"
UBOOT_CONFIG[som_2g] = "${MACHINE}_som_2g_defconfig,sdcard"
UBOOT_CONFIG[som_2gr0] = "${MACHINE}_som_2gr0_defconfig,sdcard"
@ -56,7 +55,6 @@ IMAGE_BOOT_FILES:append = " \
upgrade.scr-${MACHINE};upgrade.scr \
flash.bin-${MACHINE}-2g;u-boot.${MACHINE}_2g \
flash.bin-${MACHINE}-2gr0;u-boot.${MACHINE}_2gr0 \
flash.bin-${MACHINE}-3g;u-boot.${MACHINE}_3g \
flash.bin-${MACHINE}-4g;u-boot.${MACHINE}_4g \
flash.bin-${MACHINE}-som_2g;u-boot.${MACHINE}_som_2g \
flash.bin-${MACHINE}-som_2gr0;u-boot.${MACHINE}_som_2gr0 \