From df61422d3852b96d084749c0b287ea074f7e48bf Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 19 Jan 2018 18:45:02 +0100 Subject: u-boot: Upgrade to 2018.01 release This upgrades the U-Boot from 2017.11 to 2018.01 release and drops patches accepted upstream. Signed-off-by: Marek Vasut Cc: Otavio Salvador Cc: Ross Burton Cc: Richard Purdie Signed-off-by: Richard Purdie --- .../u-boot/files/10m50-update-device-tree.patch | 28 --------------- .../u-boot/files/v2017.11-fw-utils-build-fix.patch | 41 ---------------------- meta/recipes-bsp/u-boot/u-boot-common_2017.11.inc | 18 ---------- meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc | 16 +++++++++ meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.11.bb | 34 ------------------ meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.01.bb | 34 ++++++++++++++++++ meta/recipes-bsp/u-boot/u-boot-mkimage_2017.11.bb | 27 -------------- meta/recipes-bsp/u-boot/u-boot-mkimage_2018.01.bb | 27 ++++++++++++++ meta/recipes-bsp/u-boot/u-boot_2017.11.bb | 4 --- meta/recipes-bsp/u-boot/u-boot_2018.01.bb | 4 +++ 10 files changed, 81 insertions(+), 152 deletions(-) delete mode 100644 meta/recipes-bsp/u-boot/files/10m50-update-device-tree.patch delete mode 100644 meta/recipes-bsp/u-boot/files/v2017.11-fw-utils-build-fix.patch delete mode 100644 meta/recipes-bsp/u-boot/u-boot-common_2017.11.inc create mode 100644 meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc delete mode 100644 meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.11.bb create mode 100644 meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.01.bb delete mode 100644 meta/recipes-bsp/u-boot/u-boot-mkimage_2017.11.bb create mode 100644 meta/recipes-bsp/u-boot/u-boot-mkimage_2018.01.bb delete mode 100644 meta/recipes-bsp/u-boot/u-boot_2017.11.bb create mode 100644 meta/recipes-bsp/u-boot/u-boot_2018.01.bb (limited to 'meta/recipes-bsp') diff --git a/meta/recipes-bsp/u-boot/files/10m50-update-device-tree.patch b/meta/recipes-bsp/u-boot/files/10m50-update-device-tree.patch deleted file mode 100644 index 841953cd10..0000000000 --- a/meta/recipes-bsp/u-boot/files/10m50-update-device-tree.patch +++ /dev/null @@ -1,28 +0,0 @@ -Nios II for MAX10 10m50 board requires update to -its device tree to enable CPU driver during -u-boot pre-relocation. This patch tag the CPU -with dm-pre-reloc flag. - -Upstream-Status: Submitted - -Signed-off-by: Gan, Yau Wai - ---- - arch/nios2/dts/10m50_devboard.dts | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/nios2/dts/10m50_devboard.dts b/arch/nios2/dts/10m50_devboard.dts -index 05eac30..461ae68 100644 ---- a/arch/nios2/dts/10m50_devboard.dts -+++ b/arch/nios2/dts/10m50_devboard.dts -@@ -19,6 +19,7 @@ - #size-cells = <0>; - - cpu: cpu@0 { -+ u-boot,dm-pre-reloc; - device_type = "cpu"; - compatible = "altr,nios2-1.1"; - reg = <0x00000000>; --- -2.7.4 - diff --git a/meta/recipes-bsp/u-boot/files/v2017.11-fw-utils-build-fix.patch b/meta/recipes-bsp/u-boot/files/v2017.11-fw-utils-build-fix.patch deleted file mode 100644 index bd6e4a572f..0000000000 --- a/meta/recipes-bsp/u-boot/files/v2017.11-fw-utils-build-fix.patch +++ /dev/null @@ -1,41 +0,0 @@ -From ded84f90a1066eef5f34daa4539273de64f7b811 Mon Sep 17 00:00:00 2001 -From: Stefan Agner -Date: Tue, 14 Nov 2017 15:47:18 +0100 -Subject: [PATCH 1/1] envtools: make sure version/timestamp header file are - available - -With commit 84d46e7e8948 ("tools: env: allow to print U-Boot version") -the fw_env utilities need the version.h header file. Building only -the envtools in a pristine build directory will fail due to missing -header files. - -Make sure the header files are a dependency of the envtools target. - -Fixes: 84d46e7e8948 ("tools: env: allow to print U-Boot version") -Signed-off-by: Stefan Agner -Tested-by: Peter Robinson -Reviewed-by: Simon Glass - -Upstream-Status: Backport [http://git.denx.de/?p=u-boot.git;a=commit;h=ded84f90a1066eef5f34daa4539273de64f7b811] - -Signed-off-by: Kristian Amlie ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 61fd973..f8c66a2 100644 ---- a/Makefile -+++ b/Makefile -@@ -1447,7 +1447,7 @@ checkarmreloc: u-boot - false; \ - fi - --envtools: scripts_basic -+envtools: scripts_basic $(version_h) $(timestamp_h) - $(Q)$(MAKE) $(build)=tools/env - - tools-only: scripts_basic $(version_h) $(timestamp_h) --- -2.7.4 - diff --git a/meta/recipes-bsp/u-boot/u-boot-common_2017.11.inc b/meta/recipes-bsp/u-boot/u-boot-common_2017.11.inc deleted file mode 100644 index 65f1228043..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-common_2017.11.inc +++ /dev/null @@ -1,18 +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 = "c253573f3e269fd9a24ee6684d87dd91106018a5" - -SRC_URI = "git://git.denx.de/u-boot.git \ - file://MPC8315ERDB-enable-DHCP.patch \ - file://10m50-update-device-tree.patch \ - file://v2017.11-fw-utils-build-fix.patch \ -" - -S = "${WORKDIR}/git" diff --git a/meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc b/meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc new file mode 100644 index 0000000000..d2073ea0c7 --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc @@ -0,0 +1,16 @@ +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 = "f3dd87e0b98999a78e500e8c6d2b063ebadf535a" + +SRC_URI = "git://git.denx.de/u-boot.git \ + file://MPC8315ERDB-enable-DHCP.patch \ +" + +S = "${WORKDIR}/git" diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.11.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.11.bb deleted file mode 100644 index 02887a138a..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.11.bb +++ /dev/null @@ -1,34 +0,0 @@ -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 = 'HOSTCC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' - -inherit uboot-config - -do_compile () { - oe_runmake ${UBOOT_MACHINE} - oe_runmake envtools -} - -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_2018.01.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.01.bb new file mode 100644 index 0000000000..02887a138a --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.01.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 = 'HOSTCC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' + +inherit uboot-config + +do_compile () { + oe_runmake ${UBOOT_MACHINE} + oe_runmake envtools +} + +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.11.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.11.bb deleted file mode 100644 index f1fc564492..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.11.bb +++ /dev/null @@ -1,27 +0,0 @@ -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-mkimage_2018.01.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.01.bb new file mode 100644 index 0000000000..f1fc564492 --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.01.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.11.bb b/meta/recipes-bsp/u-boot/u-boot_2017.11.bb deleted file mode 100644 index 37c21dcaa3..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot_2017.11.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_2018.01.bb b/meta/recipes-bsp/u-boot/u-boot_2018.01.bb new file mode 100644 index 0000000000..37c21dcaa3 --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot_2018.01.bb @@ -0,0 +1,4 @@ +require u-boot-common_${PV}.inc +require u-boot.inc + +DEPENDS += "bc-native dtc-native" -- cgit 1.2.3-korg