u-boot-variscite: upgrade 2015.04 -> 2017.03
PATCH 1/4 u-boot-variscite: upgrade 2015.04 -> 2017.03
* Licence
have no idea what changed in the license file README. For
plausibility a grep here on checksum a2c678cfd4a4d97135585cad908541c6 unveiled:
recipes-bsp/u-boot/u-boot-boundary-common_2017.07.inc
recipes-bsp/u-boot/u-boot-toradex.inc
recipes-bsp/u-boot/u-boot-boundary-common_2017.03.imx8m.inc
All these set license to GPLv2+ - so we should be fine.* Fix-the-compile-issue-under-gcc6.patch
Later versions of u-boot support a version independent gcc header file making the patch obsolete
* COMPATIBLE_MACHINE
resrict to imx6qdl-variscite-som
---
.../Fix-the-compile-issue-under-gcc6.patch | 92 ----------------------
...cite_2015.04.bb => u-boot-variscite_2017.03.bb} | 9 +--
2 files changed, 4 insertions(+), 97 deletions(-)
delete mode 100644 recipes-bsp/u-boot/u-boot-variscite-2015.04/Fix-the-compile-issue-under-gcc6.patch
rename recipes-bsp/u-boot/{u-boot-variscite_2015.04.bb => u-boot-variscite_2017.03.bb} (53%)recipes-bsp/u-boot/u-boot-variscite-2015.04/Fix-the-compile-issue-under-gcc6.patch deleted +0 -92
@@ -1,92 +0,0 @@ -From 5d39bd421fc093e2c852316080538cef85a9e1a0 Mon Sep 17 00:00:00 2001 -From: yocto <[email protected]> -Date: Thu, 2 Jun 2016 00:18:33 -0500 -Subject: [PATCH] Fix the compile issue under gcc6 - -Fix the following build error: -| .../include/linux/compiler-gcc.h:106:30: fatal error: linux/compiler-gcc6.h: No such file or directory -| #include gcc_header(__GNUC__) - -Signed-off-by: Zhenhua Luo <[email protected]> - -Upstream-Status: Pending ---- - include/linux/compiler-gcc6.h | 66 +++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 66 insertions(+) - create mode 100644 include/linux/compiler-gcc6.h - -diff --git a/include/linux/compiler-gcc6.h b/include/linux/compiler-gcc6.h -new file mode 100644 -index 0000000..cdd1cc2 ---- /dev/null -+++ b/include/linux/compiler-gcc6.h -@@ -0,0 +1,66 @@ -+#ifndef __LINUX_COMPILER_H -+#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead." -+#endif -+ -+#define __used __attribute__((__used__)) -+#define __must_check __attribute__((warn_unused_result)) -+#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) -+ -+/* Mark functions as cold. gcc will assume any path leading to a call -+ to them will be unlikely. This means a lot of manual unlikely()s -+ are unnecessary now for any paths leading to the usual suspects -+ like BUG(), printk(), panic() etc. [but let's keep them for now for -+ older compilers] -+ -+ Early snapshots of gcc 4.3 don't support this and we can't detect this -+ in the preprocessor, but we can live with this because they're unreleased. -+ Maketime probing would be overkill here. -+ -+ gcc also has a __attribute__((__hot__)) to move hot functions into -+ a special section, but I don't see any sense in this right now in -+ the kernel context */ -+#define __cold __attribute__((__cold__)) -+ -+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) -+ -+#ifndef __CHECKER__ -+# define __compiletime_warning(message) __attribute__((warning(message))) -+# define __compiletime_error(message) __attribute__((error(message))) -+#endif /* __CHECKER__ */ -+ -+/* -+ * Mark a position in code as unreachable. This can be used to -+ * suppress control flow warnings after asm blocks that transfer -+ * control elsewhere. -+ * -+ * Early snapshots of gcc 4.5 don't support this and we can't detect -+ * this in the preprocessor, but we can live with this because they're -+ * unreleased. Really, we need to have autoconf for the kernel. -+ */ -+#define unreachable() __builtin_unreachable() -+ -+/* Mark a function definition as prohibited from being cloned. */ -+#define __noclone __attribute__((__noclone__)) -+ -+/* -+ * Tell the optimizer that something else uses this function or variable. -+ */ -+#define __visible __attribute__((externally_visible)) -+ -+/* -+ * GCC 'asm goto' miscompiles certain code sequences: -+ * -+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 -+ * -+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. -+ * Fixed in GCC 4.8.2 and later versions. -+ * -+ * (asm goto is automatically volatile - the naming reflects this.) -+ */ -+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) -+ -+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP -+#define __HAVE_BUILTIN_BSWAP32__ -+#define __HAVE_BUILTIN_BSWAP64__ -+#define __HAVE_BUILTIN_BSWAP16__ -+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ --- -2.5.0 -
recipes-bsp/u-boot/u-boot-variscite_2017.03.bb renamed from recipes-bsp/u-boot/u-boot-variscite_2015.04.bb +4 -5
@@ -2,19 +2,18 @@ require recipes-bsp/u-boot/u-boot.inc SUMMARY = "U-Boot for Variscite i.MX6Q/DL VAR-SOM-MX6" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919" -COMPATIBLE_MACHINE = "(mxs|mx6)" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" +COMPATIBLE_MACHINE = "(imx6qdl-variscite-som)" PROVIDES += "u-boot" SPL_BINARY = "SPL" -SRCREV = "d4b69fe88b20223acf36e4c36ea464cd5a866ab2" -SRCBRANCH = "imx_v2015.04_4.1.15_1.1.0_ga_var01" +SRCREV = "3b5f889cb501c9fbe44c750c657dcd9ea4875176" +SRCBRANCH = "imx_v2017.03_4.9.11_1.0.0_ga_var01" SRC_URI = "\ git://github.com/varigit/uboot-imx.git;protocol=git;branch=${SRCBRANCH} \ - file://Fix-the-compile-issue-under-gcc6.patch \ " S = "${WORKDIR}/git"
Signature · 1 line
2.14.4
PATCH 2/4 imx6qdl-variscite-som:set linux-fslc as preferred for use-mainline-bsp override
--- conf/machine/imx6qdl-variscite-som.conf | 1 + 1 file changed, 1 insertion(+)
conf/machine/imx6qdl-variscite-som.conf +1 -0
@@ -10,6 +10,7 @@ require conf/machine/include/imx-base.inc require conf/machine/include/tune-cortexa9.inc PREFERRED_PROVIDER_virtual/kernel = "linux-variscite" +PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc" KERNEL_DEVICETREE = " \ imx6dl-var-som-cap.dtb \
Signature · 1 line
2.14.4
PATCH 3/4 imx6qdl-variscite-som: Add support for use-mainline-bsp/linux-fslc
In reply to Andreas MüllerTested:
* HDMI
* MMC
* eMMC (mounted)
* NAND (kernel log - no partitions)
* RTC
* USB-Host
* Ethernet
* WiFi
* Bluetooth
* serial console
Open:
* HDMI sound
* Onboard sound (ALSA looks good has no phones connected yet)
* User-Button
* USB-OTG
Cannot test:
* CAN
Additional comments:
1. The way, the dt-files are copied into the kernel sources is not state of the art. But since this is some work in progress it makes my worklow a lot easier.
2. My target is to send dt-files to mainline kernel but they are not yet ready for that 'environment'. Once done I'll send backports to meta-fslc and 1. can go.
--- conf/machine/imx6qdl-variscite-som.conf | 5 + .../linux/linux-fslc/imx6q-var-som-vsc.dts | 144 +++++ .../linux/linux-fslc/imx6qdl-var-som.dtsi | 626 +++++++++++++++++++++ recipes-kernel/linux/linux-fslc_%.bbappend | 11 + 4 files changed, 786 insertions(+) create mode 100644 recipes-kernel/linux/linux-fslc/imx6q-var-som-vsc.dts create mode 100644 recipes-kernel/linux/linux-fslc/imx6qdl-var-som.dtsi
conf/machine/imx6qdl-variscite-som.conf +5 -0
@@ -24,6 +24,10 @@ KERNEL_DEVICETREE = " \ imx6q-var-som-vsc.dtb \ " +KERNEL_DEVICETREE_use-mainline-bsp = " \ + imx6q-var-som-vsc.dtb \ +" + KERNEL_IMAGETYPE = "uImage" UBOOT_SPL_BUILD = "yes"
@@ -33,6 +37,7 @@ WKS_FILE = "imx-uboot-spl-bootpart.wks" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-variscite" PREFERRED_PROVIDER_u-boot = "u-boot-variscite" +UBOOT_ENTRYPOINT_use-mainline-bsp = "0x10008000" UBOOT_CONFIG ??= "nand sd" UBOOT_CONFIG[sd] = "mx6var_som_sd_config,sdcard"
recipes-kernel/linux/linux-fslc/imx6q-var-som-vsc.dts new file +144 -0
144 lines not on this page · raw message
recipes-kernel/linux/linux-fslc/imx6qdl-var-som.dtsi new file +626 -0
626 lines not on this page · raw message
recipes-kernel/linux/linux-fslc_%.bbappend +11 -0
@@ -1,2 +1,13 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + COMPATIBLE_MACHINE_imx6sl-warp = "(.)" COMPATIBLE_MACHINE_imx6dl-riotboard = "(.)" + +SRC_URI_append_imx6qdl-variscite-som_use-mainline-bsp = " \ + file://imx6qdl-var-som.dtsi \ + file://imx6q-var-som-vsc.dts \ +" + +do_configure_prepend() { + cp ${WORKDIR}/imx6*-var*.dts* ${S}/arch/arm/boot/dts +}
Signature · 1 line
2.14.4
Re: [3rdparty][PATCH 3/4] imx6qdl-variscite-som: Add support for use-mainline-bsp/linux-fslc
Quoted 27 lines · Andreas Müller
Tested:
* HDMI
* MMC
* eMMC (mounted)
* NAND (kernel log - no partitions)
* RTC
* USB-Host
* Ethernet
* WiFi
* Bluetooth
* serial consoleOpen:
* HDMI sound
* Onboard sound (ALSA looks good has no phones connected yet)
* User-Button
* USB-OTGCannot test:
* CAN
Additional comments:
Quoted 7 lines
1. The way, the dt-files are copied into the kernel sources is not state of the art. But since this is some work in progress it makes my worklow a lot easier.
2. My target is to send dt-files to mainline kernel but they are not yet ready for that 'environment'. Once done I'll send backports to meta-fslc and 1. can go.Signed-off-by Andreas Müller <[email protected]>
You could instead of adding them verbose here, send them for our linux-fslc fork and keep improving it until it is ready for upstream submission. What do you think?
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750
Re: [3rdparty][PATCH 3/4] imx6qdl-variscite-som: Add support for use-mainline-bsp/linux-fslc
Quoted 34 lines · Otavio Salvador
Quoted 33 lines · Andreas Müller
Tested:
* HDMI
* MMC
* eMMC (mounted)
* NAND (kernel log - no partitions)
* RTC
* USB-Host
* Ethernet
* WiFi
* Bluetooth
* serial consoleOpen:
* HDMI sound
* Onboard sound (ALSA looks good has no phones connected yet)
* User-Button
* USB-OTGCannot test:
* CAN
Additional comments:
1. The way, the dt-files are copied into the kernel sources is not state of the art. But since this is some work in progress it makes my worklow a lot easier.
2. My target is to send dt-files to mainline kernel but they are not yet ready for that 'environment'. Once done I'll send backports to meta-fslc and 1. can go.
Quoted 6 lines
Quoted 1 line
Signed-off-by Andreas Müller <[email protected]>You could instead of adding them verbose here, send them for our linux-fslc fork and keep improving it until it is ready for upstream submission. What do you think?
Oi Otavio,
Honestly: I would like to go this way first because:
* it is WIP - and there are known bugs (e.g USB-Host has to move to 'Open')
* working on linux-fslc is more effort for me - and I am under massive pressure really (from all the product-or-whatever-managers and shiny-teeth-sales-people)
* have not seen much community in this corner area
Since we (our company) decided to go 'mainline kernel/graphic-stack' way, chances are very high that I'll continue work on this :)
And promised: Once ironed out I'll send patches to linux -fslc and later -mainline.
Regards
Andreas
Re: [3rdparty][PATCH 3/4] imx6qdl-variscite-som: Add support for use-mainline-bsp/linux-fslc
Quoted 17 lines · Andreas Müller
Quoted 5 lines · Otavio Salvador
On Fri, Sep 14, 2018 at 7:05 AM Andreas Müller <[email protected]> wrote:
You could instead of adding them verbose here, send them for our linux-fslc fork and keep improving it until it is ready for upstream submission. What do you think?Oi Otavio,
Honestly: I would like to go this way first because:
* it is WIP - and there are known bugs (e.g USB-Host has to move to 'Open')
* working on linux-fslc is more effort for me - and I am under massive pressure really (from all the product-or-whatever-managers and shiny-teeth-sales-people)
* have not seen much community in this corner area
Quoted 5 lines
Since we (our company) decided to go 'mainline
kernel/graphic-stack' way, chances are very high that I'll continue work on this :)And promised: Once ironed out I'll send patches to linux -fslc and later -mainline.
All right. So please send it together with your v2 patches and I apply it.
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750
PATCH 4/4 imx6qdl-variscite-som: select DEFAULTTUNE= "cortexa9thf-neon"
In reply to Andreas MüllerIt is mx6 default but gets lost for use-mainline-bsp override.
--- conf/machine/imx6qdl-variscite-som.conf | 1 + 1 file changed, 1 insertion(+)
conf/machine/imx6qdl-variscite-som.conf +1 -0
@@ -6,6 +6,7 @@ MACHINEOVERRIDES =. "mx6:mx6q:mx6dl:" +DEFAULTTUNE= "cortexa9thf-neon" require conf/machine/include/imx-base.inc require conf/machine/include/tune-cortexa9.inc
Signature · 1 line
2.14.4
Re: [3rdparty][PATCH 4/4] imx6qdl-variscite-som: select DEFAULTTUNE= "cortexa9thf-neon"
Quoted 4 lines · Andreas Müller
It is mx6 default but gets lost for use-mainline-bsp override.
Signed-off-by Andreas Müller <[email protected]>
I've been using it but did not saw problems. Could you give more detailed information?
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750
Re: [3rdparty][PATCH 4/4] imx6qdl-variscite-som: select DEFAULTTUNE= "cortexa9thf-neon"
Quoted 9 lines · Otavio Salvador
Quoted 4 lines · Andreas Müller
It is mx6 default but gets lost for use-mainline-bsp override.
Signed-off-by Andreas Müller <[email protected]>I've been using it but did not saw problems. Could you give more detailed information?
See meta-freescale :
conf/machine/include/imx-base.inc:
MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \
mx6 \
mx6q \
mx6dl \
mx6sx \
mx6sl \
mx6sll \
mx6ul \
mx6ull \...
and
machine-overrides-extender.bbclass
All mx6.. overrides are are filtered which is usually fine but not for
DEFAULTTUNE: it builds armv7hf-neon.
Andreas
Re: [3rdparty][PATCH 4/4] imx6qdl-variscite-som: select DEFAULTTUNE= "cortexa9thf-neon"
Quoted 24 lines · Andreas Müller
Quoted 9 lines · Otavio Salvador
Quoted 4 lines · Andreas Müller
It is mx6 default but gets lost for use-mainline-bsp override.
Signed-off-by Andreas Müller <[email protected]>I've been using it but did not saw problems. Could you give more detailed information?
See meta-freescale :
conf/machine/include/imx-base.inc:MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \ mx6 \ mx6q \ mx6dl \ mx6sx \ mx6sl \ mx6sll \ mx6ul \ mx6ull \
Quoted 7 lines
...
and
machine-overrides-extender.bbclassAll mx6.. overrides are are filtered which is usually fine but not for
DEFAULTTUNE: it builds armv7hf-neon.
Oh ... I never noticed it because our company's distro builds it for armv7h as well.
I wonder if we should or not set it somehow globally. Of course, machine changing it is fine, as far it can be overriden by distro.
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750
Re: [3rdparty][PATCH 4/4] imx6qdl-variscite-som: select DEFAULTTUNE= "cortexa9thf-neon"
Quoted 4 lines · Otavio Salvador
I wonder if we should or not set it somehow globally. Of course, machine changing it is fine, as far it can be overriden by distro.
Hi Otavio,
will send out V2 soon using '?=' so whatever wants to override can do it. Hard pinning was wrong - thanks for the pointer.
Andreas