From c1d680326cabd10d0940827e8dfdc884f67b1e9a Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Mon, 9 Apr 2018 01:02:23 +0200 Subject: u-boot: Upgrade to 2018.03 release This upgrades the U-Boot from 2018.01 to 2018.03 release and drops patches accepted upstream, getting the patch count to zero. Signed-off-by: Marek Vasut Cc: Otavio Salvador Cc: Ross Burton Cc: Richard Purdie Signed-off-by: Ross Burton --- .../u-boot/files/MPC8315ERDB-enable-DHCP.patch | 19 ------------ meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc | 16 ---------- meta/recipes-bsp/u-boot/u-boot-common_2018.03.inc | 14 +++++++++ meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.01.bb | 34 ---------------------- meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.03.bb | 34 ++++++++++++++++++++++ meta/recipes-bsp/u-boot/u-boot-mkimage_2018.01.bb | 29 ------------------ meta/recipes-bsp/u-boot/u-boot-mkimage_2018.03.bb | 29 ++++++++++++++++++ meta/recipes-bsp/u-boot/u-boot_2018.01.bb | 4 --- meta/recipes-bsp/u-boot/u-boot_2018.03.bb | 4 +++ 9 files changed, 81 insertions(+), 102 deletions(-) delete mode 100644 meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch delete mode 100644 meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc create mode 100644 meta/recipes-bsp/u-boot/u-boot-common_2018.03.inc delete mode 100644 meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.01.bb create mode 100644 meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.03.bb delete mode 100644 meta/recipes-bsp/u-boot/u-boot-mkimage_2018.01.bb create mode 100644 meta/recipes-bsp/u-boot/u-boot-mkimage_2018.03.bb delete mode 100644 meta/recipes-bsp/u-boot/u-boot_2018.01.bb create mode 100644 meta/recipes-bsp/u-boot/u-boot_2018.03.bb (limited to 'meta/recipes-bsp') diff --git a/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch b/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch deleted file mode 100644 index ecaa1796a4..0000000000 --- a/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch +++ /dev/null @@ -1,19 +0,0 @@ -Enabled dhcp client functionality for Yocto reference -hardware MPC8315E-RDB. - -Upstream-Status: Pending - -Signed-off-by: Ed Bartosh - -Index: git/configs/MPC8315ERDB_defconfig -=================================================================== ---- git.orig/configs/MPC8315ERDB_defconfig -+++ git/configs/MPC8315ERDB_defconfig -@@ -12,6 +12,7 @@ CONFIG_CMD_PCI=y - CONFIG_CMD_SATA=y - CONFIG_CMD_USB=y - # CONFIG_CMD_SETEXPR is not set -+CONFIG_CMD_DHCP=y - CONFIG_CMD_MII=y - CONFIG_CMD_PING=y - CONFIG_CMD_DATE=y 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 deleted file mode 100644 index d2073ea0c7..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc +++ /dev/null @@ -1,16 +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 = "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-common_2018.03.inc b/meta/recipes-bsp/u-boot/u-boot-common_2018.03.inc new file mode 100644 index 0000000000..8ffae365a9 --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot-common_2018.03.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 = "f95ab1fb6e37f0601f397091bb011edf7a98b890" + +SRC_URI = "git://git.denx.de/u-boot.git" + +S = "${WORKDIR}/git" 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 deleted file mode 100644 index 02887a138a..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.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}" 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.03.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.03.bb new file mode 100644 index 0000000000..02887a138a --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.03.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_2018.01.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.01.bb deleted file mode 100644 index 1c008be96e..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.01.bb +++ /dev/null @@ -1,29 +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 -} - -RDEPENDS_${PN} += "dtc" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.03.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.03.bb new file mode 100644 index 0000000000..1c008be96e --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.03.bb @@ -0,0 +1,29 @@ +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 +} + +RDEPENDS_${PN} += "dtc" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-bsp/u-boot/u-boot_2018.01.bb b/meta/recipes-bsp/u-boot/u-boot_2018.01.bb deleted file mode 100644 index 37c21dcaa3..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot_2018.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_2018.03.bb b/meta/recipes-bsp/u-boot/u-boot_2018.03.bb new file mode 100644 index 0000000000..37c21dcaa3 --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot_2018.03.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