From d1e80b515e475c2b2aedbc73db7c361907fbc894 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 15 Sep 2018 11:00:05 -0300 Subject: u-boot-fslc: Upgrade to 2018.09-based fork This updates the fork to current 2018.09 release and apply following changes on top: 62f2841dc4 pico-imx6ul: Add instructions for booting in Falcon mode a803c01c03 pico-imx6ul: Add Falcon mode support 3e5f58a2a4 wandboard: README: Include the mx6qp variant in the list 28b8458749 imx: imx6ull: fix pinmux input_val for uart5 rx pin 1bc802f9cc pico-imx6ul: Remove CONFIG_FSL_USDHC from .h cc97092f7c pico-imx6ul: Add new pico-hobbit config 11aaa94cd8 pico-imx6ul: Sync README with pico-imx7d 52723c960f pico-imx6ul: Improve default DFU settings c90fa9c1a2 pico-imx6ul: Add bootmenu to choose the baseboard 2141bc7952 pico-imx6ul: Sync defconfig with new changes 9ff1d5305d pico-imx6ul: Update the README file 2b0e81461c pico-imx6ul: Add support for the 512MB module e45ab0b309 pico-imx6ul: Add bmode support ad3c1b13d8 pico-imx6ul: Add fastboot support fa2c10bbac pico-imx6ul: Convert to SPL b143e3f027 pico-imx6ul: Convert to distro config a9c45f15b2 mx6sabre_common: Allow the videoargs to be passed to bootargs b584b845b1 mx25pdk: Change root to use a single partition layout 146e490814 mx6sabre_common: Dynamically change the video output a278950282 mx6sabresd: Enable video interfaces in bootargs 77cac8a16e mx6sabresd: Use LDO dtb file until LDO bypass support is added be4d1c4100 mx6slevk: Use LDO dtb file until LDO bypass support is added Signed-off-by: Otavio Salvador --- recipes-bsp/u-boot/u-boot-fslc-common_2018.07.inc | 16 -------- recipes-bsp/u-boot/u-boot-fslc-common_2018.09.inc | 16 ++++++++ recipes-bsp/u-boot/u-boot-fslc-fw-utils_2018.07.bb | 45 ---------------------- recipes-bsp/u-boot/u-boot-fslc-fw-utils_2018.09.bb | 45 ++++++++++++++++++++++ recipes-bsp/u-boot/u-boot-fslc-mxsboot_2018.07.bb | 30 --------------- recipes-bsp/u-boot/u-boot-fslc-mxsboot_2018.09.bb | 30 +++++++++++++++ recipes-bsp/u-boot/u-boot-fslc_2018.07.bb | 21 ---------- recipes-bsp/u-boot/u-boot-fslc_2018.09.bb | 21 ++++++++++ 8 files changed, 112 insertions(+), 112 deletions(-) delete mode 100644 recipes-bsp/u-boot/u-boot-fslc-common_2018.07.inc create mode 100644 recipes-bsp/u-boot/u-boot-fslc-common_2018.09.inc delete mode 100644 recipes-bsp/u-boot/u-boot-fslc-fw-utils_2018.07.bb create mode 100644 recipes-bsp/u-boot/u-boot-fslc-fw-utils_2018.09.bb delete mode 100644 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2018.07.bb create mode 100644 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2018.09.bb delete mode 100644 recipes-bsp/u-boot/u-boot-fslc_2018.07.bb create mode 100644 recipes-bsp/u-boot/u-boot-fslc_2018.09.bb diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2018.07.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2018.07.inc deleted file mode 100644 index 50e680eb..00000000 --- a/recipes-bsp/u-boot/u-boot-fslc-common_2018.07.inc +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (C) 2012-2018 O.S. Systems Software LTDA. -# Released under the MIT license (see COPYING.MIT for the terms) - -inherit fsl-u-boot-localversion - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" - -SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}" - -SRCREV = "1e13b91af7b492d97bdf613680e43605e562a562" -SRCBRANCH = "2018.07+fslc" - -PV = "v2018.07+git${SRCPV}" - -S = "${WORKDIR}/git" diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2018.09.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2018.09.inc new file mode 100644 index 00000000..aaefd67f --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-fslc-common_2018.09.inc @@ -0,0 +1,16 @@ +# Copyright (C) 2012-2018 O.S. Systems Software LTDA. +# Released under the MIT license (see COPYING.MIT for the terms) + +inherit fsl-u-boot-localversion + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" + +SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}" + +SRCREV = "62f2841dc4c272d627b8691e10d5878537968a62" +SRCBRANCH = "2018.09+fslc" + +PV = "v2018.09+git${SRCPV}" + +S = "${WORKDIR}/git" diff --git a/recipes-bsp/u-boot/u-boot-fslc-fw-utils_2018.07.bb b/recipes-bsp/u-boot/u-boot-fslc-fw-utils_2018.07.bb deleted file mode 100644 index abcb5013..00000000 --- a/recipes-bsp/u-boot/u-boot-fslc-fw-utils_2018.07.bb +++ /dev/null @@ -1,45 +0,0 @@ -require u-boot-fslc-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 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 - - if [ -e ${WORKDIR}/fw_env.config ]; then - install -m 0644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config - else - install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config - fi -} - -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} -} - -PROVIDES += "u-boot-fw-utils" -RPROVIDES_${PN} += "u-boot-fw-utils" - -PACKAGE_ARCH = "${MACHINE_ARCH}" -BBCLASSEXTEND = "cross" diff --git a/recipes-bsp/u-boot/u-boot-fslc-fw-utils_2018.09.bb b/recipes-bsp/u-boot/u-boot-fslc-fw-utils_2018.09.bb new file mode 100644 index 00000000..abcb5013 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-fslc-fw-utils_2018.09.bb @@ -0,0 +1,45 @@ +require u-boot-fslc-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 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 + + if [ -e ${WORKDIR}/fw_env.config ]; then + install -m 0644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config + else + install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config + fi +} + +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} +} + +PROVIDES += "u-boot-fw-utils" +RPROVIDES_${PN} += "u-boot-fw-utils" + +PACKAGE_ARCH = "${MACHINE_ARCH}" +BBCLASSEXTEND = "cross" diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2018.07.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2018.07.bb deleted file mode 100644 index ed32a274..00000000 --- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2018.07.bb +++ /dev/null @@ -1,30 +0,0 @@ -require u-boot-fslc-common_${PV}.inc - -DESCRIPTION = "U-boot bootloader mxsboot tool" -SECTION = "bootloader" - -DEPENDS = "dtc openssl" - -PROVIDES = "u-boot-mxsboot" - -EXTRA_OEMAKE_class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y' -EXTRA_OEMAKE_class-native = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y' -EXTRA_OEMAKE_class-nativesdk = 'CROSS_COMPILE="${HOST_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y' - -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 -Dm 0755 tools/mxsboot ${D}${bindir}/uboot-mxsboot - ln -sf uboot-mxsboot ${D}${bindir}/mxsboot -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2018.09.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2018.09.bb new file mode 100644 index 00000000..ed32a274 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2018.09.bb @@ -0,0 +1,30 @@ +require u-boot-fslc-common_${PV}.inc + +DESCRIPTION = "U-boot bootloader mxsboot tool" +SECTION = "bootloader" + +DEPENDS = "dtc openssl" + +PROVIDES = "u-boot-mxsboot" + +EXTRA_OEMAKE_class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y' +EXTRA_OEMAKE_class-native = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y' +EXTRA_OEMAKE_class-nativesdk = 'CROSS_COMPILE="${HOST_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y' + +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 -Dm 0755 tools/mxsboot ${D}${bindir}/uboot-mxsboot + ln -sf uboot-mxsboot ${D}${bindir}/mxsboot +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-bsp/u-boot/u-boot-fslc_2018.07.bb b/recipes-bsp/u-boot/u-boot-fslc_2018.07.bb deleted file mode 100644 index 6c391ad3..00000000 --- a/recipes-bsp/u-boot/u-boot-fslc_2018.07.bb +++ /dev/null @@ -1,21 +0,0 @@ -require recipes-bsp/u-boot/u-boot.inc -require u-boot-fslc-common_${PV}.inc - -DESCRIPTION = "U-Boot based on mainline U-Boot used by FSL Community BSP in \ -order to provide support for some backported features and fixes, or because it \ -was submitted for revision and it takes some time to become part of a stable \ -version, or because it is not applicable for upstreaming." - -DEPENDS_append = " dtc-native bison-native" - -PROVIDES += "u-boot" - -# FIXME: Allow linking of 'tools' binaries with native libraries -# used for generating the boot logo and other tools used -# during the build process. -EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \ - HOSTLDFLAGS="${BUILD_LDFLAGS}" \ - HOSTSTRIP=true' - -PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(mxs|mx5|mx6|mx7|vf|use-mainline-bsp)" diff --git a/recipes-bsp/u-boot/u-boot-fslc_2018.09.bb b/recipes-bsp/u-boot/u-boot-fslc_2018.09.bb new file mode 100644 index 00000000..6c391ad3 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-fslc_2018.09.bb @@ -0,0 +1,21 @@ +require recipes-bsp/u-boot/u-boot.inc +require u-boot-fslc-common_${PV}.inc + +DESCRIPTION = "U-Boot based on mainline U-Boot used by FSL Community BSP in \ +order to provide support for some backported features and fixes, or because it \ +was submitted for revision and it takes some time to become part of a stable \ +version, or because it is not applicable for upstreaming." + +DEPENDS_append = " dtc-native bison-native" + +PROVIDES += "u-boot" + +# FIXME: Allow linking of 'tools' binaries with native libraries +# used for generating the boot logo and other tools used +# during the build process. +EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \ + HOSTLDFLAGS="${BUILD_LDFLAGS}" \ + HOSTSTRIP=true' + +PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE = "(mxs|mx5|mx6|mx7|vf|use-mainline-bsp)" -- cgit v1.2.3-54-g00ecf