diff options
Diffstat (limited to 'poky/meta/recipes-bsp/u-boot')
-rw-r--r-- | poky/meta/recipes-bsp/u-boot/u-boot-common.inc | 2 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/u-boot/u-boot-tools_2020.07.bb (renamed from poky/meta/recipes-bsp/u-boot/u-boot-tools_2020.04.bb) | 0 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/u-boot/u-boot.inc | 12 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/u-boot/u-boot_2020.07.bb (renamed from poky/meta/recipes-bsp/u-boot/u-boot_2020.04.bb) | 0 |
4 files changed, 2 insertions, 12 deletions
diff --git a/poky/meta/recipes-bsp/u-boot/u-boot-common.inc b/poky/meta/recipes-bsp/u-boot/u-boot-common.inc index f4790532b4..9199bbfe0b 100644 --- a/poky/meta/recipes-bsp/u-boot/u-boot-common.inc +++ b/poky/meta/recipes-bsp/u-boot/u-boot-common.inc @@ -12,7 +12,7 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "1079ec0a77c3fda510f07860b2549c47f3a46c21" +SRCREV = "2f5fbb5b39f7b67044dda5c35e4a4b31685a3109" SRC_URI = "git://git.denx.de/u-boot.git \ " diff --git a/poky/meta/recipes-bsp/u-boot/u-boot-tools_2020.04.bb b/poky/meta/recipes-bsp/u-boot/u-boot-tools_2020.07.bb index 7eaf721ca8..7eaf721ca8 100644 --- a/poky/meta/recipes-bsp/u-boot/u-boot-tools_2020.04.bb +++ b/poky/meta/recipes-bsp/u-boot/u-boot-tools_2020.07.bb diff --git a/poky/meta/recipes-bsp/u-boot/u-boot.inc b/poky/meta/recipes-bsp/u-boot/u-boot.inc index c91da02959..251178db33 100644 --- a/poky/meta/recipes-bsp/u-boot/u-boot.inc +++ b/poky/meta/recipes-bsp/u-boot/u-boot.inc @@ -70,16 +70,6 @@ UBOOT_EXTLINUX_INSTALL_DIR ?= "/boot/extlinux" UBOOT_EXTLINUX_CONF_NAME ?= "extlinux.conf" UBOOT_EXTLINUX_SYMLINK ?= "${UBOOT_EXTLINUX_CONF_NAME}-${MACHINE}-${PR}" -# returns all the elements from the src uri that are .cfg files -def find_cfgs(d): - sources=src_patches(d, True) - sources_list=[] - for s in sources: - if s.endswith('.cfg'): - sources_list.append(s) - - return sources_list - do_configure () { if [ -n "${UBOOT_CONFIG}" ]; then unset i j @@ -89,7 +79,7 @@ do_configure () { j=$(expr $j + 1); if [ $j -eq $i ]; then oe_runmake -C ${S} O=${B}/${config} ${config} - if [ test -n "${@' '.join(find_cfgs(d))}" ]; then + if [ -n "${@' '.join(find_cfgs(d))}" ]; then merge_config.sh -m -O ${B}/${config} ${B}/${config}/.config ${@" ".join(find_cfgs(d))} oe_runmake -C ${S} O=${B}/${config} oldconfig fi diff --git a/poky/meta/recipes-bsp/u-boot/u-boot_2020.04.bb b/poky/meta/recipes-bsp/u-boot/u-boot_2020.07.bb index 02d67c0db2..02d67c0db2 100644 --- a/poky/meta/recipes-bsp/u-boot/u-boot_2020.04.bb +++ b/poky/meta/recipes-bsp/u-boot/u-boot_2020.07.bb |