From 022d9c66729e9e3b6fa41bcdf77d1c0dd016e88f Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 8 Nov 2017 16:54:02 +0100 Subject: [PATCH] u-boot-toradex: update to 2016.11, update to toradex bsp 2.7.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For the i.MX6 based modules move to boot with SPL to setup the DDR RAM. Add use-mainline-bsp to compatible machine to allow building this U-Boot also when 'use-mainline-bsp' is built. (In which case the e.g. mx6 override is dropped) License: changed by the following upstream commits, all of which do not affect our configurations. 0f4d2f8e79 License: Add the Open Font License (ttf fonts) 40a39e875c SPDX: add X11 SPDX-License-Identifier (preparation for dual licensed device trees) 4dcd9a65d4 Licenses: fix a typo in README changes to non NXP boards not in list initial commits for colibri-imx6ull and colibri-imx7-emmc not in list 69cc681 lib/bch.c: modify algorithm for all writebcb users 595c178 mtd: nand: mxs_nand: support chips without ONFI/JEDEC parameter page d5efded apalis/colibri_imx6: fix white space cd255bc colibri_imx7: get rid of environment in mmc option ca92211 colibri_imx7: clean-up config header file ae968c6 apalis/colibri: fix and synchronize mount options 4370811 colibri_imx7: improve DDR3 timing 7e64e5f toradex: remove ISO partition support 16d2bc5 disk: part: align buffer so it can be used with DMA enabled drivers 84fe4a7 MLK-13140 ARM: imx: update REFTOP_VBGADJ according to fuse setting 1d86d85 MLK-13124 ARM: imx: update the REFTOP_VBGADJ setting 756bc8f imx6ull: cherry-pick remaining stuff from 05922b0 ab546ab MLK-12766 net: fec: do not access reserved register for i.MX6ULL 09983d0 MLK-12486-1: switch to use setup_gpmi_io_clk for i.MX6UL 6d6a643 MLK-12883 usb: limit USB_MAX_XFER_BLK to 256 4e1c703 tdx-cfg-block: add new sku's 6bd94c8 colibri_imx7: remove unused config option ab71667 colibri_imx7.h: do not deploy nand torture cmd 341064e net: Use packed structures for networking c0d5002 configs: apalis-tk1: Use ext4 file system by default 51b53b4 colibri-vf: sync the board info message 3e72538 toradex: common: unify behaviour when config block is missing 3ef2146 colibri_imx6: use SDP if USB serial downloader has been used 4fcacc1 apalis_imx6: use SDP if USB serial downloader has been used 80c3bd6 imx_common: detect USB serial downloader reliably 0d06911 imx: add macro to detect whether USB has been initialized a2e77a6 colibri_imx7: use SDP if USB serial downloader has been used e05589d imx: imx7: detect USB serial download protocol boot mode 3f4cddb imx: imx7: make get_boot_device available for board files 23b5f7c colibri_imx7: carve out PMD aligned amount of memory 47ac8bf toradex: configblock: add an -y parameter to 'cfgblock create’ cb3d672 configs: apalis_imx6: Use ext4 file system by default 615de72 configs: colibri_imx6: Use ext4 file system by default Signed-off-by: Max Krummenacher Signed-off-by: Otavio Salvador --- recipes-bsp/u-boot/u-boot-toradex.inc | 11 +++-------- recipes-bsp/u-boot/u-boot-toradex_2015.04.bb | 7 ------- recipes-bsp/u-boot/u-boot-toradex_2016.11.bb | 8 ++++++++ 3 files changed, 11 insertions(+), 15 deletions(-) delete mode 100644 recipes-bsp/u-boot/u-boot-toradex_2015.04.bb create mode 100644 recipes-bsp/u-boot/u-boot-toradex_2016.11.bb diff --git a/recipes-bsp/u-boot/u-boot-toradex.inc b/recipes-bsp/u-boot/u-boot-toradex.inc index 57ae547..9d3261f 100644 --- a/recipes-bsp/u-boot/u-boot-toradex.inc +++ b/recipes-bsp/u-boot/u-boot-toradex.inc @@ -8,7 +8,9 @@ inherit fsl-u-boot-localversion SUMMARY = "U-Boot bootloader with support for Toradex Computer on Modules" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" + +DEPENDS += "dtc-native" PROVIDES += "u-boot" @@ -16,11 +18,4 @@ SRC_URI = "git://git.toradex.com/u-boot-toradex.git;branch=${SRCBRANCH}" S = "${WORKDIR}/git" -# 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}" diff --git a/recipes-bsp/u-boot/u-boot-toradex_2015.04.bb b/recipes-bsp/u-boot/u-boot-toradex_2015.04.bb deleted file mode 100644 index a70173a..0000000 --- a/recipes-bsp/u-boot/u-boot-toradex_2015.04.bb +++ /dev/null @@ -1,7 +0,0 @@ -include u-boot-toradex.inc - -PV = "v2015.04-v2.6b2.1+git${SRCPV}" - -SRCREV = "90a974d34aaa85d5ce69f83067928592c5389990" -SRCBRANCH = "2015.04-toradex" -COMPATIBLE_MACHINE = "(mx6|mx7|vf)" diff --git a/recipes-bsp/u-boot/u-boot-toradex_2016.11.bb b/recipes-bsp/u-boot/u-boot-toradex_2016.11.bb new file mode 100644 index 0000000..d279c6f --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-toradex_2016.11.bb @@ -0,0 +1,8 @@ +require recipes-bsp/u-boot/u-boot-toradex.inc + +LOCALVERSION = "-2.7.4" +PV_append = "+git${SRCPV}" + +SRCREV = "1b121c6ab548a9af0a27876e9eaa0c654c1dc3e1" +SRCBRANCH = "2016.11-toradex" +COMPATIBLE_MACHINE = "(mx6|mx7|vf|use-mainline-bsp)"