From e85889c0872ad8fb44aad28a06039bbde9dbca0b Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Wed, 24 May 2017 22:44:41 +0200 Subject: u-boot: Update to 2017.05 release Upgrade U-Boot to the latest version. Since the latest version has the default gcc patch in it, drop it. (From OE-Core rev: 241cd21f70a537d23147a7e7b367bfc49fda1ac5) Signed-off-by: Marek Vasut Cc: Denys Dmytriyenko Cc: Richard Purdie Cc: Ross Burton Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-bsp/u-boot/files/default-gcc.patch | 39 ---------------------- meta/recipes-bsp/u-boot/u-boot-common_2017.01.inc | 14 -------- meta/recipes-bsp/u-boot/u-boot-common_2017.05.inc | 14 ++++++++ meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.01.bb | 36 -------------------- meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.05.bb | 34 +++++++++++++++++++ meta/recipes-bsp/u-boot/u-boot-mkimage_2017.01.bb | 29 ---------------- meta/recipes-bsp/u-boot/u-boot-mkimage_2017.05.bb | 27 +++++++++++++++ meta/recipes-bsp/u-boot/u-boot_2017.01.bb | 4 --- meta/recipes-bsp/u-boot/u-boot_2017.05.bb | 4 +++ 9 files changed, 79 insertions(+), 122 deletions(-) delete mode 100644 meta/recipes-bsp/u-boot/files/default-gcc.patch delete mode 100644 meta/recipes-bsp/u-boot/u-boot-common_2017.01.inc create mode 100644 meta/recipes-bsp/u-boot/u-boot-common_2017.05.inc delete mode 100644 meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.01.bb create mode 100644 meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.05.bb delete mode 100644 meta/recipes-bsp/u-boot/u-boot-mkimage_2017.01.bb create mode 100644 meta/recipes-bsp/u-boot/u-boot-mkimage_2017.05.bb delete mode 100644 meta/recipes-bsp/u-boot/u-boot_2017.01.bb create mode 100644 meta/recipes-bsp/u-boot/u-boot_2017.05.bb (limited to 'meta/recipes-bsp/u-boot') diff --git a/meta/recipes-bsp/u-boot/files/default-gcc.patch b/meta/recipes-bsp/u-boot/files/default-gcc.patch deleted file mode 100644 index 04184df8b3..0000000000 --- a/meta/recipes-bsp/u-boot/files/default-gcc.patch +++ /dev/null @@ -1,39 +0,0 @@ -OE needs to be able to change the default compiler. If we pass in HOSTCC -through the make command, it overwrites not only this setting but also the -setting in tools/Makefile wrapped in ifneq ($(CROSS_BUILD_TOOLS),) which -breaks the build. - -We therefore use override to ensure the value of HOSTCC is overwritten when -needed. - -RP: Updated the patch to the version being submitted to upstream u-boot - -Upstream-Status: Submitted [emailed to Masahiro Yamada for discussion] -RP 2017/3/11 - -Index: git/tools/Makefile -=================================================================== ---- git.orig/tools/Makefile -+++ git/tools/Makefile -@@ -262,7 +262,7 @@ $(LICENSE_H): $(obj)/bin2header $(srctre - subdir- += env - - ifneq ($(CROSS_BUILD_TOOLS),) --HOSTCC = $(CC) -+override HOSTCC = $(CC) - - quiet_cmd_crosstools_strip = STRIP $^ - cmd_crosstools_strip = $(STRIP) $^; touch $@ -Index: git/tools/env/Makefile -=================================================================== ---- git.orig/tools/env/Makefile -+++ git/tools/env/Makefile -@@ -8,7 +8,7 @@ - # fw_printenv is supposed to run on the target system, which means it should be - # built with cross tools. Although it may look weird, we only replace "HOSTCC" - # with "CC" here for the maximum code reuse of scripts/Makefile.host. --HOSTCC = $(CC) -+override HOSTCC = $(CC) - - # Compile for a hosted environment on the target - HOST_EXTRACFLAGS = $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \ diff --git a/meta/recipes-bsp/u-boot/u-boot-common_2017.01.inc b/meta/recipes-bsp/u-boot/u-boot-common_2017.01.inc deleted file mode 100644 index df24c853dd..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-common_2017.01.inc +++ /dev/null @@ -1,14 +0,0 @@ -HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome" -SECTION = "bootloaders" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" -PE = "1" - -# We use the revision in order to avoid having to fetch it from the -# repo during parse -SRCREV = "a705ebc81b7f91bbd0ef7c634284208342901149" - -SRC_URI = "git://git.denx.de/u-boot.git" - -S = "${WORKDIR}/git" diff --git a/meta/recipes-bsp/u-boot/u-boot-common_2017.05.inc b/meta/recipes-bsp/u-boot/u-boot-common_2017.05.inc new file mode 100644 index 0000000000..3719aee52d --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot-common_2017.05.inc @@ -0,0 +1,14 @@ +HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome" +SECTION = "bootloaders" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" +PE = "1" + +# We use the revision in order to avoid having to fetch it from the +# repo during parse +SRCREV = "64c4ffa9fa223f7ae8640f9c8f3044bfa0e3bfda" + +SRC_URI = "git://git.denx.de/u-boot.git" + +S = "${WORKDIR}/git" diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.01.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.01.bb deleted file mode 100644 index 26314990b9..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.01.bb +++ /dev/null @@ -1,36 +0,0 @@ -require u-boot-common_${PV}.inc - -SRC_URI += "file://default-gcc.patch" - -SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" -DEPENDS = "mtd-utils" - -INSANE_SKIP_${PN} = "already-stripped" -EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" V=1' -EXTRA_OEMAKE_class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' - -inherit uboot-config - -do_compile () { - oe_runmake ${UBOOT_MACHINE} - oe_runmake env -} - -do_install () { - install -d ${D}${base_sbindir} - install -d ${D}${sysconfdir} - install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv - install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv - install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config -} - -do_install_class-cross () { - install -d ${D}${bindir_cross} - install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv - install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv -} - -SYSROOT_DIRS_append_class-cross = " ${bindir_cross}" - -PACKAGE_ARCH = "${MACHINE_ARCH}" -BBCLASSEXTEND = "cross" diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.05.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.05.bb new file mode 100644 index 0000000000..c2e8f0fb84 --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.05.bb @@ -0,0 +1,34 @@ +require u-boot-common_${PV}.inc + +SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" +DEPENDS = "mtd-utils" + +INSANE_SKIP_${PN} = "already-stripped" +EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" V=1' +EXTRA_OEMAKE_class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' + +inherit uboot-config + +do_compile () { + oe_runmake ${UBOOT_MACHINE} + oe_runmake env +} + +do_install () { + install -d ${D}${base_sbindir} + install -d ${D}${sysconfdir} + install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv + install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv + install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config +} + +do_install_class-cross () { + install -d ${D}${bindir_cross} + install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv + install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv +} + +SYSROOT_DIRS_append_class-cross = " ${bindir_cross}" + +PACKAGE_ARCH = "${MACHINE_ARCH}" +BBCLASSEXTEND = "cross" diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.01.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.01.bb deleted file mode 100644 index de999e7cd5..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.01.bb +++ /dev/null @@ -1,29 +0,0 @@ -require u-boot-common_${PV}.inc - -SRC_URI += "file://default-gcc.patch" - -SUMMARY = "U-Boot bootloader image creation tool" -DEPENDS = "openssl" - -EXTRA_OEMAKE_class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1' -EXTRA_OEMAKE_class-native = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1' -EXTRA_OEMAKE_class-nativesdk = 'CROSS_COMPILE="${HOST_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1' - -do_compile () { - oe_runmake sandbox_defconfig - - # Disable CONFIG_CMD_LICENSE, license.h is not used by tools and - # generating it requires bin2header tool, which for target build - # is built with target tools and thus cannot be executed on host. - sed -i "s/CONFIG_CMD_LICENSE=.*/# CONFIG_CMD_LICENSE is not set/" .config - - oe_runmake cross_tools NO_SDL=1 -} - -do_install () { - install -d ${D}${bindir} - install -m 0755 tools/mkimage ${D}${bindir}/uboot-mkimage - ln -sf uboot-mkimage ${D}${bindir}/mkimage -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.05.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.05.bb new file mode 100644 index 0000000000..f1fc564492 --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.05.bb @@ -0,0 +1,27 @@ +require u-boot-common_${PV}.inc + +SUMMARY = "U-Boot bootloader image creation tool" +DEPENDS = "openssl" + +EXTRA_OEMAKE_class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1' +EXTRA_OEMAKE_class-native = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1' +EXTRA_OEMAKE_class-nativesdk = 'CROSS_COMPILE="${HOST_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1' + +do_compile () { + oe_runmake sandbox_defconfig + + # Disable CONFIG_CMD_LICENSE, license.h is not used by tools and + # generating it requires bin2header tool, which for target build + # is built with target tools and thus cannot be executed on host. + sed -i "s/CONFIG_CMD_LICENSE=.*/# CONFIG_CMD_LICENSE is not set/" .config + + oe_runmake cross_tools NO_SDL=1 +} + +do_install () { + install -d ${D}${bindir} + install -m 0755 tools/mkimage ${D}${bindir}/uboot-mkimage + ln -sf uboot-mkimage ${D}${bindir}/mkimage +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-bsp/u-boot/u-boot_2017.01.bb b/meta/recipes-bsp/u-boot/u-boot_2017.01.bb deleted file mode 100644 index 37c21dcaa3..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot_2017.01.bb +++ /dev/null @@ -1,4 +0,0 @@ -require u-boot-common_${PV}.inc -require u-boot.inc - -DEPENDS += "bc-native dtc-native" diff --git a/meta/recipes-bsp/u-boot/u-boot_2017.05.bb b/meta/recipes-bsp/u-boot/u-boot_2017.05.bb new file mode 100644 index 0000000000..37c21dcaa3 --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot_2017.05.bb @@ -0,0 +1,4 @@ +require u-boot-common_${PV}.inc +require u-boot.inc + +DEPENDS += "bc-native dtc-native" -- cgit v1.2.3-54-g00ecf