Merge branch '2019-11-23-master-imports'

- More travis job splits
- Assorted build clean-ups
- Correct optimization flags for some ARMv6 platforms

7 files changed, 46 insertions, 35 deletions

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 44a76eb..cad8eea 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 f6aec96..5da046c 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"
@@ -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"
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 5384981..60af7e3 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
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 6fcc66a..c2641bc 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
 )};
diff --git a/scripts/dtc/pylibfdt/.gitignore b/scripts/dtc/pylibfdt/.gitignore
index 033f23d..3a51200 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__
diff --git a/tools/buildman/control.py b/tools/buildman/control.py
index 216012d..c55a65d 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])
diff --git a/tools/moveconfig.py b/tools/moveconfig.py
index e2ff4cf..36160a3 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)