From 13a2a3f90d5cd75c528ffcd19d36686f952acfe6 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 18 Mar 2016 15:39:34 -0300 Subject: u-boot: Upgrade to 2016.03 release The 2016.03 release has been announced in March 14th. This incorporates a lot of bug fixes and improvements which are useful for any new embedded development. Along with the upgrade of U-Boot and its related recipes, this patch also drops the AM335x environment fix which has been merged into the release. (From OE-Core rev: 15130f7bad0f0a1894c34bbb34a547722552c69e) Signed-off-by: Otavio Salvador Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.01.bb | 49 ---------------------- meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.03.bb | 49 ++++++++++++++++++++++ meta/recipes-bsp/u-boot/u-boot-mkimage_2016.01.bb | 32 -------------- meta/recipes-bsp/u-boot/u-boot-mkimage_2016.03.bb | 32 ++++++++++++++ meta/recipes-bsp/u-boot/u-boot.inc | 5 +-- .../0001-am335x_evm.h-unsed-CONFIG_BOOTDELAY.patch | 34 --------------- meta/recipes-bsp/u-boot/u-boot_2016.01.bb | 10 ----- meta/recipes-bsp/u-boot/u-boot_2016.03.bb | 10 +++++ 8 files changed, 93 insertions(+), 128 deletions(-) delete mode 100644 meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.01.bb create mode 100644 meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.03.bb delete mode 100644 meta/recipes-bsp/u-boot/u-boot-mkimage_2016.01.bb create mode 100644 meta/recipes-bsp/u-boot/u-boot-mkimage_2016.03.bb delete mode 100644 meta/recipes-bsp/u-boot/u-boot/0001-am335x_evm.h-unsed-CONFIG_BOOTDELAY.patch delete mode 100644 meta/recipes-bsp/u-boot/u-boot_2016.01.bb create mode 100644 meta/recipes-bsp/u-boot/u-boot_2016.03.bb (limited to 'meta/recipes-bsp') diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.01.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.01.bb deleted file mode 100644 index 30b7c7a980..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.01.bb +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95" -SECTION = "bootloader" -DEPENDS = "mtd-utils" - -# This revision corresponds to the tag "v2016.01" -# We use the revision in order to avoid having to fetch it from the -# repo during parse -SRCREV = "fa85e826c16b9ce1ad302a57e9c4b24db0d8b930" - -PV = "v2016.01+git${SRCPV}" - -SRC_URI = "git://git.denx.de/u-boot.git;branch=master" - -S = "${WORKDIR}/git" - -INSANE_SKIP_${PN} = "already-stripped" -EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${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_PREPROCESS_FUNCS_class-cross = "uboot_fw_utils_cross" -uboot_fw_utils_cross() { - sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross} -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" -BBCLASSEXTEND = "cross" diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.03.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.03.bb new file mode 100644 index 0000000000..dfda5c1d30 --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.03.bb @@ -0,0 +1,49 @@ +SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" +SECTION = "bootloader" +DEPENDS = "mtd-utils" + +# This revision corresponds to the tag "v2016.03" +# We use the revision in order to avoid having to fetch it from the +# repo during parse +SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa" + +PV = "v2016.03+git${SRCPV}" + +SRC_URI = "git://git.denx.de/u-boot.git;branch=master" + +S = "${WORKDIR}/git" + +INSANE_SKIP_${PN} = "already-stripped" +EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${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_PREPROCESS_FUNCS_class-cross = "uboot_fw_utils_cross" +uboot_fw_utils_cross() { + sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross} +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" +BBCLASSEXTEND = "cross" diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.01.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.01.bb deleted file mode 100644 index 5d163a8af4..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.01.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "U-Boot bootloader image creation tool" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95" -SECTION = "bootloader" - -DEPENDS = "openssl" - -# This revision corresponds to the tag "v2016.01" -# We use the revision in order to avoid having to fetch it from the -# repo during parse -SRCREV = "fa85e826c16b9ce1ad302a57e9c4b24db0d8b930" - -PV = "v2016.01+git${SRCPV}" - -SRC_URI = "git://git.denx.de/u-boot.git;branch=master" - -S = "${WORKDIR}/git" - -EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" STRIP=true V=1' - -do_compile () { - oe_runmake sandbox_defconfig - 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_2016.03.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.03.bb new file mode 100644 index 0000000000..d5921a0443 --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.03.bb @@ -0,0 +1,32 @@ +SUMMARY = "U-Boot bootloader image creation tool" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" +SECTION = "bootloader" + +DEPENDS = "openssl" + +# This revision corresponds to the tag "v2016.03" +# We use the revision in order to avoid having to fetch it from the +# repo during parse +SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa" + +PV = "v2016.03+git${SRCPV}" + +SRC_URI = "git://git.denx.de/u-boot.git;branch=master" + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" STRIP=true V=1' + +do_compile () { + oe_runmake sandbox_defconfig + 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.inc b/meta/recipes-bsp/u-boot/u-boot.inc index ac8f338bd8..48be71d2ef 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -4,10 +4,9 @@ SECTION = "bootloaders" PROVIDES = "virtual/bootloader" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" -SRC_URI = "git://git.denx.de/u-boot.git;branch=master \ - file://0001-am335x_evm.h-unsed-CONFIG_BOOTDELAY.patch" +SRC_URI = "git://git.denx.de/u-boot.git;branch=master" S = "${WORKDIR}/git" diff --git a/meta/recipes-bsp/u-boot/u-boot/0001-am335x_evm.h-unsed-CONFIG_BOOTDELAY.patch b/meta/recipes-bsp/u-boot/u-boot/0001-am335x_evm.h-unsed-CONFIG_BOOTDELAY.patch deleted file mode 100644 index 70c87c4cfd..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot/0001-am335x_evm.h-unsed-CONFIG_BOOTDELAY.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7205442e621db54ea06c3bca2d793e1ae2214f9c Mon Sep 17 00:00:00 2001 -From: Tom Rini -Date: Thu, 10 Dec 2015 16:46:01 -0500 -Subject: [PATCH] am335x_evm.h: unsed CONFIG_BOOTDELAY - -Now that ti_armv7_common.h uses config_distro_defaults.h we don't need -to include it again and then undef CONFIG_BOOTDELAY - -Signed-off-by: Tom Rini - -Upstream-Status: Backport - ---- - include/configs/am335x_evm.h | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h -index c51db8c..cf6a606 100644 ---- a/include/configs/am335x_evm.h -+++ b/include/configs/am335x_evm.h -@@ -18,10 +18,6 @@ - - #include - --/* Don't override the distro default bootdelay */ --#undef CONFIG_BOOTDELAY --#include -- - #ifndef CONFIG_SPL_BUILD - #ifndef CONFIG_FIT - # define CONFIG_FIT --- -2.7.0 - diff --git a/meta/recipes-bsp/u-boot/u-boot_2016.01.bb b/meta/recipes-bsp/u-boot/u-boot_2016.01.bb deleted file mode 100644 index d5c11811f4..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot_2016.01.bb +++ /dev/null @@ -1,10 +0,0 @@ -require u-boot.inc - -DEPENDS += "dtc-native" - -# This revision corresponds to the tag "v2016.01" -# We use the revision in order to avoid having to fetch it from the -# repo during parse -SRCREV = "fa85e826c16b9ce1ad302a57e9c4b24db0d8b930" - -PV = "v2016.01+git${SRCPV}" diff --git a/meta/recipes-bsp/u-boot/u-boot_2016.03.bb b/meta/recipes-bsp/u-boot/u-boot_2016.03.bb new file mode 100644 index 0000000000..836b0ce03e --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot_2016.03.bb @@ -0,0 +1,10 @@ +require u-boot.inc + +DEPENDS += "dtc-native" + +# This revision corresponds to the tag "v2016.03" +# We use the revision in order to avoid having to fetch it from the +# repo during parse +SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa" + +PV = "v2016.03+git${SRCPV}" -- cgit v1.2.3-54-g00ecf