From 37ed870fa6925f3bff33ab893e9c6977babeb17c Mon Sep 17 00:00:00 2001 From: "andrii.davydenko" Date: Fri, 19 Aug 2022 17:07:03 +0300 Subject: [MTX-4566][GP-1689] Manufacturing: Atmel based devices - process improvement Add SDMFG variable instead of BB_USE_SD --- recipes-bsp/u-boot/u-boot.inc | 7 +++++-- recipes-bsp/u-boot/u-boot_2016.09.01.bb | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'recipes-bsp/u-boot') diff --git a/recipes-bsp/u-boot/u-boot.inc b/recipes-bsp/u-boot/u-boot.inc index e4e534a..cba40c9 100644 --- a/recipes-bsp/u-boot/u-boot.inc +++ b/recipes-bsp/u-boot/u-boot.inc @@ -6,6 +6,9 @@ PROVIDES = "virtual/bootloader" # New U-Boot with suppressed version. PR="m5" +# Add a '-sd' suffix to the PR for SDMFG builds +PR .= "${@oe.utils.conditional("SDMFG", "", "", "-sd", d)}" + LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" @@ -85,8 +88,8 @@ do_patch_append () { except TypeError: bb.fatal("PR is missing from recipe") f.write(PR + os.linesep) - SDCARD = d.getVar("BB_USE_SD",True) - if (SDCARD == 1): + SDCARD = d.getVar("SDMFG",True) + if (SDCARD != ""): try: S = d.getVar("S",True) except TypeError: diff --git a/recipes-bsp/u-boot/u-boot_2016.09.01.bb b/recipes-bsp/u-boot/u-boot_2016.09.01.bb index 300bcab..2d7ba27 100644 --- a/recipes-bsp/u-boot/u-boot_2016.09.01.bb +++ b/recipes-bsp/u-boot/u-boot_2016.09.01.bb @@ -3,8 +3,8 @@ require u-boot.inc DEPENDS += "dtc-native" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-2016.09.01:" -CONFIG_PATCH = "${@oe.utils.conditional('BB_USE_SD', '1', 'file://config-sd.patch', 'file://config-n.patch', d)}" -MTCDT_PATCH = "${@oe.utils.conditional('BB_USE_SD', '1', 'file://mtcdt-sd.patch', 'file://mtcdt-n.patch', d)}" +CONFIG_PATCH = "${@oe.utils.conditional('SDMFG', '', 'file://config-n.patch', 'file://config-sd.patch', d)}" +MTCDT_PATCH = "${@oe.utils.conditional('SDMFG', '', 'file://mtcdt-n.patch', 'file://mtcdt-sd.patch', d)}" # file://mtpwd.path SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \ -- cgit v1.2.3