From 7964ef28bdeea65fc1fd3eaef1c71560bc3ca488 Mon Sep 17 00:00:00 2001 From: Trevor Woerner Date: Fri, 30 Aug 2019 14:02:35 -0400 Subject: [PATCH] U-Boot: switch to upstream Use the upstream U-Boot and simply bbappend the changes that are needed. U-Boot 2018.09 no longer builds against master. Signed-off-by: Trevor Woerner --- .../{u-boot_2018.09.bb => u-boot_%.bbappend} | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) rename recipes-bsp/u-boot/{u-boot_2018.09.bb => u-boot_%.bbappend} (69%) diff --git a/recipes-bsp/u-boot/u-boot_2018.09.bb b/recipes-bsp/u-boot/u-boot_%.bbappend similarity index 69% rename from recipes-bsp/u-boot/u-boot_2018.09.bb rename to recipes-bsp/u-boot/u-boot_%.bbappend index 6e3440c..9305d77 100644 --- a/recipes-bsp/u-boot/u-boot_2018.09.bb +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -1,13 +1,8 @@ -DESCRIPTION="Upstream's U-boot configured for sunxi devices" - -require recipes-bsp/u-boot/u-boot.inc +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" DEPENDS += " bc-native dtc-native swig-native python3-native flex-native bison-native " DEPENDS_append_sun50i = " atf-sunxi " -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" - COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)" DEFAULT_PREFERENCE_sun4i="1" @@ -16,18 +11,11 @@ DEFAULT_PREFERENCE_sun7i="1" DEFAULT_PREFERENCE_sun8i="1" DEFAULT_PREFERENCE_sun50i="1" -SRC_URI = "git://git.denx.de/u-boot.git;branch=master \ +SRC_URI += " \ file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \ file://boot.cmd \ " -SRCREV = "f88b6facb87dc4a52f1630eb9d858c0f54c6628e" - -PV = "v2018.09+git${SRCPV}" -PE = "2" - -S = "${WORKDIR}/git" - UBOOT_ENV_SUFFIX = "scr" UBOOT_ENV = "boot"