From 162529c806dcf7e185fcda115834efa52ab138fb Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 28 Nov 2017 16:38:00 -0200 Subject: u-boot-fslc: Upgrade to 2017.11-based fork This includes following changes on top of 2017.11 tag: ca0c3f3fac configs: icore-rqs: Enable falcon mode c39e5ad9ad engicam: imx6q: Return mmc dev 0 for icore 7953884755 i.MX6: engicam: Add imx6q/imx6ul boards for existing boards 924ac4a9ac board: icore-rqs: Fix mmc get env device 1caace2d74 i.MX6UL: icore: Add SPL_OF_CONTROL support 655f153b7c pinctrl: imx6ul: Fix pinctrl data overlapped with DT area 735b8429cf i.MX6Q: icore: Add SPL_OF_CONTROL support e2aee01772 i.MX6Q: icorem6: Move spl load fit to common/spl 7265424b4b i.MX6: engicam: Move set_fdt_file to common 676484d0f5 mx6sxsabresd: Use PARTUUID to specify the rootfs location c685436fb6 imx: Remove boolean parameter from wdog powerdown function dfd399d4b2 imx: Also clear powerdown enable bit for WDOG3 on i.MX6ULL 21e5b103ee mx6ull: Fix WDOG3 base address 28a06c12ca envtools: make sure version/timestamp header file are available 5a3afcb579 mx6sabreauto: Remove unneeded SPL selection a80c8e3c7a mx6: Select MX6QDL option via Kconfig 7c9d795887 mx53: Add Board support for GE PPD a7dbf3c3a4 board: ge: make VPD code common fd7ab796b5 rtc: add support for s35392a efc51f73e3 bootcount: add support for bootcounter on EXT filesystem 8b0c1c4d23 arm: mx5: Add more register definitions 29e5e9df46 pwm: imx: Enable PWM support on i.MX53 02cc3e8037 ext4: recover from filesystem corruption when reading 4c530ec27c imx: mxc_i2c: tweak the i2c transfer method 87d4563bbd Revert "wandboard: Remove unnecessary delay" 913c93d432 pico-imx6ul: Use FS_GENERIC load command bd7c72d0e2 pico-imx6ul: Add function to create gpt partitions 1bd87551eb pico-imx6ul: Define partition layout in the environment 6d2499a223 pico-imx6ul: Add boot and rootfs dfu_alt_info 114501165b pico-imx6ul: Use PARTUUID to specify the rootfs location 9a6f8019f6 pico-imx6ul: Move dfu_alt_info to CONFIG_DFU_ENV_SETTINGS variable 0b20df36bc mx25pdk: Change root to use a single partition layout 2dcd3eeeff pico-imx7d: Enable booting from single partition d6008b2e1a pico-imx7d: Replace fatload command 7fe81082a3 pico-imx7d: Add support for secure boot f960fe77df mx6sabre_common: Place video related settings in common code f4998c99d4 mx6sabre_common: Dynamically change the video output c3e252e8ca mx6sabresd: Enable video interfaces in bootargs c94a211847 mx6sabresd: Use LDO dtb file until LDO bypass support is added 3abd094faf mx6slevk: Use LDO dtb file until LDO bypass support is added Signed-off-by: Otavio Salvador --- recipes-bsp/u-boot/u-boot-fslc-common_2017.09.inc | 16 -------- recipes-bsp/u-boot/u-boot-fslc-common_2017.11.inc | 16 ++++++++ recipes-bsp/u-boot/u-boot-fslc-fw-utils_2017.09.bb | 46 ---------------------- recipes-bsp/u-boot/u-boot-fslc-fw-utils_2017.11.bb | 46 ++++++++++++++++++++++ recipes-bsp/u-boot/u-boot-fslc-mxsboot_2017.09.bb | 30 -------------- recipes-bsp/u-boot/u-boot-fslc-mxsboot_2017.11.bb | 30 ++++++++++++++ recipes-bsp/u-boot/u-boot-fslc_2017.09.bb | 21 ---------- recipes-bsp/u-boot/u-boot-fslc_2017.11.bb | 21 ++++++++++ 8 files changed, 113 insertions(+), 113 deletions(-) delete mode 100644 recipes-bsp/u-boot/u-boot-fslc-common_2017.09.inc create mode 100644 recipes-bsp/u-boot/u-boot-fslc-common_2017.11.inc delete mode 100644 recipes-bsp/u-boot/u-boot-fslc-fw-utils_2017.09.bb create mode 100644 recipes-bsp/u-boot/u-boot-fslc-fw-utils_2017.11.bb delete mode 100644 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2017.09.bb create mode 100644 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2017.11.bb delete mode 100644 recipes-bsp/u-boot/u-boot-fslc_2017.09.bb create mode 100644 recipes-bsp/u-boot/u-boot-fslc_2017.11.bb diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2017.09.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2017.09.inc deleted file mode 100644 index 1b404d9c..00000000 --- a/recipes-bsp/u-boot/u-boot-fslc-common_2017.09.inc +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (C) 2012-2017 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=a2c678cfd4a4d97135585cad908541c6" - -SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}" - -SRCREV = "a6a15fedd1a529936b0a46ade1d776740dbef70f" -SRCBRANCH = "2017.09+fslc" - -PV = "v2017.09+git${SRCPV}" - -S = "${WORKDIR}/git" diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2017.11.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2017.11.inc new file mode 100644 index 00000000..73faaabc --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-fslc-common_2017.11.inc @@ -0,0 +1,16 @@ +# Copyright (C) 2012-2017 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=a2c678cfd4a4d97135585cad908541c6" + +SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}" + +SRCREV = "ca0c3f3fac33bcb1c26ed399fdd89838a3bd5914" +SRCBRANCH = "2017.11+fslc" + +PV = "v2017.11+git${SRCPV}" + +S = "${WORKDIR}/git" diff --git a/recipes-bsp/u-boot/u-boot-fslc-fw-utils_2017.09.bb b/recipes-bsp/u-boot/u-boot-fslc-fw-utils_2017.09.bb deleted file mode 100644 index 7c2864ed..00000000 --- a/recipes-bsp/u-boot/u-boot-fslc-fw-utils_2017.09.bb +++ /dev/null @@ -1,46 +0,0 @@ -require recipes-bsp/u-boot/u-boot.inc -require u-boot-fslc-common_${PV}.inc - -SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" - -DEPENDS_append = " 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 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 - - 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} -} - -RPROVIDES_${PN} += "u-boot-fw-utils" - -PACKAGE_ARCH = "${MACHINE_ARCH}" -BBCLASSEXTEND = "cross" diff --git a/recipes-bsp/u-boot/u-boot-fslc-fw-utils_2017.11.bb b/recipes-bsp/u-boot/u-boot-fslc-fw-utils_2017.11.bb new file mode 100644 index 00000000..7c2864ed --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-fslc-fw-utils_2017.11.bb @@ -0,0 +1,46 @@ +require recipes-bsp/u-boot/u-boot.inc +require u-boot-fslc-common_${PV}.inc + +SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" + +DEPENDS_append = " 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 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 + + 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} +} + +RPROVIDES_${PN} += "u-boot-fw-utils" + +PACKAGE_ARCH = "${MACHINE_ARCH}" +BBCLASSEXTEND = "cross" diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2017.09.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2017.09.bb deleted file mode 100644 index 533bfbf6..00000000 --- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2017.09.bb +++ /dev/null @@ -1,30 +0,0 @@ -require u-boot-fslc-common_${PV}.inc - -DESCRIPTION = "U-boot bootloader mxsboot tool" -SECTION = "bootloader" - -DEPENDS = "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_2017.11.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2017.11.bb new file mode 100644 index 00000000..533bfbf6 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2017.11.bb @@ -0,0 +1,30 @@ +require u-boot-fslc-common_${PV}.inc + +DESCRIPTION = "U-boot bootloader mxsboot tool" +SECTION = "bootloader" + +DEPENDS = "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_2017.09.bb b/recipes-bsp/u-boot/u-boot-fslc_2017.09.bb deleted file mode 100644 index 5659e16c..00000000 --- a/recipes-bsp/u-boot/u-boot-fslc_2017.09.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" - -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_2017.11.bb b/recipes-bsp/u-boot/u-boot-fslc_2017.11.bb new file mode 100644 index 00000000..5659e16c --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-fslc_2017.11.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" + +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