From 595f36bea841321e4e670ed22765aa37e7bf2c66 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 18 Nov 2016 11:18:58 +0100 Subject: u-boot: Update to v2016.11 release Upgrade U-Boot to the latest version. (From OE-Core rev: 34f1d3824fd45cd0bb28b3cbc33907cfd885f841) Signed-off-by: Marek Vasut Cc: Richard Purdie Cc: Denys Dmytriyenko Cc: Ross Burton Signed-off-by: Richard Purdie --- .../u-boot/u-boot-common_2016.09.01.inc | 14 --------- meta/recipes-bsp/u-boot/u-boot-common_2016.11.inc | 14 +++++++++ .../u-boot/u-boot-fw-utils_2016.09.01.bb | 34 ---------------------- meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.11.bb | 34 ++++++++++++++++++++++ .../u-boot/u-boot-mkimage_2016.09.01.bb | 27 ----------------- meta/recipes-bsp/u-boot/u-boot-mkimage_2016.11.bb | 27 +++++++++++++++++ meta/recipes-bsp/u-boot/u-boot_2016.09.01.bb | 4 --- meta/recipes-bsp/u-boot/u-boot_2016.11.bb | 4 +++ 8 files changed, 79 insertions(+), 79 deletions(-) delete mode 100644 meta/recipes-bsp/u-boot/u-boot-common_2016.09.01.inc create mode 100644 meta/recipes-bsp/u-boot/u-boot-common_2016.11.inc delete mode 100644 meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.09.01.bb create mode 100644 meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.11.bb delete mode 100644 meta/recipes-bsp/u-boot/u-boot-mkimage_2016.09.01.bb create mode 100644 meta/recipes-bsp/u-boot/u-boot-mkimage_2016.11.bb delete mode 100644 meta/recipes-bsp/u-boot/u-boot_2016.09.01.bb create mode 100644 meta/recipes-bsp/u-boot/u-boot_2016.11.bb (limited to 'meta') diff --git a/meta/recipes-bsp/u-boot/u-boot-common_2016.09.01.inc b/meta/recipes-bsp/u-boot/u-boot-common_2016.09.01.inc deleted file mode 100644 index f706a6bdc4..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-common_2016.09.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 = "f3363c060497515ca8b71451cb56f3ec0abacaa9" - -SRC_URI = "git://git.denx.de/u-boot.git;branch=u-boot-2016.09.y" - -S = "${WORKDIR}/git" diff --git a/meta/recipes-bsp/u-boot/u-boot-common_2016.11.inc b/meta/recipes-bsp/u-boot/u-boot-common_2016.11.inc new file mode 100644 index 0000000000..84adc1c56a --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot-common_2016.11.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 = "29e0cfb4f77f7aa369136302cee14a91e22dca71" + +SRC_URI = "git://git.denx.de/u-boot.git" + +S = "${WORKDIR}/git" diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.09.01.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.09.01.bb deleted file mode 100644 index f56862cb27..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.09.01.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}" 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_2016.11.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.11.bb new file mode 100644 index 0000000000..f56862cb27 --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.11.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}" 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_2016.09.01.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.09.01.bb deleted file mode 100644 index 66edae812f..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.09.01.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}" 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 = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_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_2016.11.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.11.bb new file mode 100644 index 0000000000..66edae812f --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.11.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}" 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 = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_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_2016.09.01.bb b/meta/recipes-bsp/u-boot/u-boot_2016.09.01.bb deleted file mode 100644 index dabe709df0..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot_2016.09.01.bb +++ /dev/null @@ -1,4 +0,0 @@ -require u-boot-common_${PV}.inc -require u-boot.inc - -DEPENDS += "dtc-native" diff --git a/meta/recipes-bsp/u-boot/u-boot_2016.11.bb b/meta/recipes-bsp/u-boot/u-boot_2016.11.bb new file mode 100644 index 0000000000..dabe709df0 --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot_2016.11.bb @@ -0,0 +1,4 @@ +require u-boot-common_${PV}.inc +require u-boot.inc + +DEPENDS += "dtc-native" -- cgit v1.2.3-54-g00ecf