From 56d35f2ed4926bf70f7dd42ced9d1e87f3656f68 Mon Sep 17 00:00:00 2001 From: Heiko Schocher Date: Thu, 21 Nov 2019 06:50:12 +0100 Subject: [PATCH 1/7] travis: move orangepi to vendor job move orangepi builds into a new job, and exclude orangepi builds from sunxi and rockchip jobs. Signed-off-by: Heiko Schocher Reviewed-by: Tom Rini --- .travis.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f6aec967708..d973aaa653b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -236,16 +236,16 @@ matrix: - BUILDMAN="sun7i" - name: "buildman 64bit sun8i" env: - - BUILDMAN="sun8i&aarch64" + - BUILDMAN="sun8i&aarch64 -x orangepi" - name: "buildman 32bit sun8i" env: - - BUILDMAN="sun8i&armv7" + - BUILDMAN="sun8i&armv7 -x orangepi" - name: "buildman sun9i" env: - BUILDMAN="sun9i" - name: "buildman sun50i" env: - - BUILDMAN="sun50i" + - BUILDMAN="sun50i -x orangepi" - name: "buildman catch-all ARM" env: - BUILDMAN="arm -x arm11,arm7,arm9,aarch64,at91,bcm,freescale,kirkwood,mvebu,siemens,tegra,uniphier,mx,samsung,sunxi,am33xx,omap,rockchip,toradex,socfpga,k2,k3,zynq" @@ -314,6 +314,9 @@ matrix: - name: "buildman omap" env: - BUILDMAN="omap" + - name: "buildman orangepi" + env: + - BUILDMAN="orangepi" - name: "buildman uniphier" env: - BUILDMAN="uniphier" @@ -322,7 +325,7 @@ matrix: - BUILDMAN="aarch64 -x bcm,k3,tegra,ls1,ls2,mvebu,uniphier,sunxi,samsung,rockchip,versal,zynq" - name: "buildman rockchip" env: - - BUILDMAN="rockchip" + - BUILDMAN="rockchip -x orangepi" - name: "buildman sh" env: - BUILDMAN="sh -x arm" From af7716250454566f1cdb48aa70b7458665693964 Mon Sep 17 00:00:00 2001 From: Heiko Schocher Date: Fri, 22 Nov 2019 11:17:29 +0100 Subject: [PATCH 2/7] travis: rework NXP layerscape jobs remove from NXP arm32 all layerscape boards and build them instead in already existing layerscape jobs (which now not only build aarch64 boards) Signed-off-by: Heiko Schocher --- .azure-pipelines.yml | 26 +++++++++++++------------- .travis.yml | 28 ++++++++++++++-------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 44a76ebb09b..cad8eea87bc 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -312,19 +312,19 @@ jobs: arm_bcm: BUILDMAN: "bcm -x mips" nxp_arm32: - BUILDMAN: "freescale -x powerpc,m68k,aarch64" - nxp_aarch64_ls101x: - BUILDMAN: "freescale&aarch64&ls101" - nxp_aarch64_ls102x: - BUILDMAN: "freescale&aarch64&ls102" - nxp_aarch64_ls104x: - BUILDMAN: "freescale&aarch64&ls104" - nxp_aarch64_ls108x: - BUILDMAN: "freescale&aarch64&ls108" - nxp_aarch64_ls20xx: - BUILDMAN: "freescale&aarch64&ls20" - nxp_aarch64_lx216x: - BUILDMAN: "freescale&aarch64&lx216" + BUILDMAN: "freescale -x powerpc,m68k,aarch64,ls101,ls102,ls104,ls108,ls20,lx216" + nxp_ls101x: + BUILDMAN: "freescale&ls101" + nxp_ls102x: + BUILDMAN: "freescale&ls102" + nxp_ls104x: + BUILDMAN: "freescale&ls104" + nxp_ls108x: + BUILDMAN: "freescale&ls108" + nxp_ls20xx: + BUILDMAN: "freescale&ls20" + nxp_lx216x: + BUILDMAN: "freescale&lx216" imx6: BUILDMAN: "mx6 -x boundary,engicam,freescale,technexion,toradex" imx: diff --git a/.travis.yml b/.travis.yml index d973aaa653b..5da046ca7ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -183,27 +183,27 @@ matrix: - name: "buildman ARM bcm" env: - BUILDMAN="bcm -x mips" - - name: "buildman NXP ARM32" + - name: "buildman NXP ARM32 (catch-all)" env: - - BUILDMAN="freescale -x powerpc,m68k,aarch64" - - name: "buildman NXP AArch64 LS101x" + - BUILDMAN="freescale -x powerpc,m68k,aarch64,ls101,ls102,ls104,ls108,ls20,lx216" + - name: "buildman NXP LS101x" env: - - BUILDMAN="freescale&aarch64&ls101" - - name: "buildman NXP AArch64 LS102x" + - BUILDMAN="freescale&ls101" + - name: "buildman NXP LS102x" env: - - BUILDMAN="freescale&aarch64&ls102" - - name: "buildman NXP AArch64 LS104x" + - BUILDMAN="freescale&ls102" + - name: "buildman NXP LS104x" env: - - BUILDMAN="freescale&aarch64&ls104" - - name: "buildman NXP AArch64 LS108x" + - BUILDMAN="freescale&ls104" + - name: "buildman NXP LS108x" env: - - BUILDMAN="freescale&aarch64&ls108" - - name: "buildman NXP AArch64 LS20xx" + - BUILDMAN="freescale&ls108" + - name: "buildman NXP LS20xx" env: - - BUILDMAN="freescale&aarch64&ls20" - - name: "buildman NXP AArch64 LX216x" + - BUILDMAN="freescale&ls20" + - name: "buildman NXP LX216x" env: - - BUILDMAN="freescale&aarch64&lx216" + - BUILDMAN="freescale&lx216" - name: "buildman i.MX6 tqc" env: - BUILDMAN="mx6&tqc" From 66b3ccc8f7d82afc568e66092aa7630428ad7750 Mon Sep 17 00:00:00 2001 From: James Byrne Date: Thu, 21 Nov 2019 14:32:46 +0000 Subject: [PATCH 3/7] tools: checkpatch: Restore 'debug' and 'printf' to logFunctions list The 'debug' and 'printf' functions were previously added to the list of logFunctions in commit 0cab42110dbf ("checkpatch.pl: Add 'debug' to the list of logFunctions") and commit 397bfd4642c1 ("checkpatch.pl: Add 'printf' to logFunctions") but these additions were lost when newer versions of checkpatch were pulled in from the upstream Linux kernel version. This restores them so that you don't end up in a situation where checkpatch will give a warning for "quoted string split across lines" which you cannot fix without getting a warning for "line over 80 characters" instead. Signed-off-by: James Byrne --- scripts/checkpatch.pl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 6fcc66afb08..c2641bc995e 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -464,6 +464,8 @@ our $logFunctions = qr{(?x: TP_printk| WARN(?:_RATELIMIT|_ONCE|)| panic| + debug| + printf| MODULE_[A-Z_]+| seq_vprintf|seq_printf|seq_puts )}; From 02b5670e65ae28d01dd8883968a2feddb77095b2 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sun, 10 Nov 2019 21:19:37 -0500 Subject: [PATCH 4/7] moveconfig.py: Fix more Python3 UTF issues With the move to using Python 3 for real, we encounter two different issues. First, the file include/video_font_data.h includes at least one UTF-16 character. Given that it does not include any CONFIG symbols it is easiest to just ignore this file. Next, we encounter similar problems with some dts/dtsi files that come from Linux. In this case it's easiest to simply ignore all dts/dtsi files as there will not be CONFIG symbols for us to migrate in them. Cc: Masahiro Yamada Signed-off-by: Tom Rini --- tools/moveconfig.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/moveconfig.py b/tools/moveconfig.py index e2ff4cfc88b..36160a39772 100755 --- a/tools/moveconfig.py +++ b/tools/moveconfig.py @@ -667,8 +667,11 @@ def cleanup_headers(configs, options): if dirpath == os.path.join('include', 'generated'): continue for filename in filenames: - if not fnmatch.fnmatch(filename, '*~'): + if not filename.endswith(('~', '.dts', '.dtsi')): header_path = os.path.join(dirpath, filename) + # This file contains UTF-16 data and no CONFIG symbols + if header_path == 'include/video_font_data.h': + continue cleanup_one_header(header_path, patterns, options) cleanup_empty_blocks(header_path, options) From 163b7641f8d039ecf84abb8ac1ed9eff655c14e4 Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Wed, 13 Nov 2019 14:42:41 +0100 Subject: [PATCH 5/7] scripts: dtc: ignore files generated generated by python Add __pycache__ to ignored files and extend the rule for _libfdt to also include generated shared objects (e.g. _libfdt.cpython-37m-x86_64-linux-gnu.so). Signed-off-by: Bartosz Golaszewski --- scripts/dtc/pylibfdt/.gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/dtc/pylibfdt/.gitignore b/scripts/dtc/pylibfdt/.gitignore index 033f23dfddb..3a512001c9d 100644 --- a/scripts/dtc/pylibfdt/.gitignore +++ b/scripts/dtc/pylibfdt/.gitignore @@ -1,4 +1,5 @@ -/_libfdt.so +/_libfdt.* /libfdt.py /libfdt.pyc /libfdt_wrap.c +/__pycache__ From 70f681398521c2ec2a75f612c04c506a0696c3b9 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 19 Nov 2019 15:14:33 -0500 Subject: [PATCH 6/7] buildman: Fix problem with non-existent output directories Now that we have buildman telling genboards.cfg to use an output directory we need to ensure that it exists. Cc: Bin Meng Cc: Simon Glass Fixes: bc750bca1246 ("tools: buildman: Honor output directory when generating boards.cfg") Signed-off-by: Tom Rini Reviewed-by: Bin Meng --- tools/buildman/control.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/buildman/control.py b/tools/buildman/control.py index 216012d0016..c55a65d0c30 100644 --- a/tools/buildman/control.py +++ b/tools/buildman/control.py @@ -201,6 +201,8 @@ def DoBuildman(options, args, toolchains=None, make_func=None, boards=None, # Work out what subset of the boards we are building if not boards: + if not os.path.exists(options.output_dir): + os.makedirs(options.output_dir) board_file = os.path.join(options.output_dir, 'boards.cfg') genboardscfg = os.path.join(options.git, 'tools/genboardscfg.py') status = subprocess.call([genboardscfg, '-o', board_file]) From 16540d07fd62f97838950578008301f1639f33fb Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Sat, 23 Nov 2019 09:14:54 +0100 Subject: [PATCH 7/7] arm: fix -march for ARM11 In GCC 9 support for the Armv5 and Armv5E architectures (which have no known implementations) has been removed, cf. https://gcc.gnu.org/gcc-9/changes.html ARM11 is an armv6 implementation. So change the architecture flag for the compiler to armv6 for ARM11. Suggested-by: Fabio Estevam Signed-off-by: Heinrich Schuchardt Reviewed-by: Fabio Estevam --- arch/arm/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 5384981c175..60af7e31990 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -12,8 +12,8 @@ arch-$(CONFIG_CPU_ARM926EJS) =-march=armv5te arch-$(CONFIG_CPU_ARM946ES) =-march=armv5te arch-$(CONFIG_CPU_SA1100) =-march=armv4 arch-$(CONFIG_CPU_PXA) = -arch-$(CONFIG_CPU_ARM1136) =-march=armv5 -arch-$(CONFIG_CPU_ARM1176) =-march=armv5t +arch-$(CONFIG_CPU_ARM1136) =-march=armv6 +arch-$(CONFIG_CPU_ARM1176) =-march=armv6 arch-$(CONFIG_CPU_V7A) =$(call cc-option, -march=armv7-a, \ $(call cc-option, -march=armv7)) arch-$(CONFIG_CPU_V7M) =-march=armv7-m