Update for 2018.08.1

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

.flake8

@@ -2,4 +2,4 @@
 exclude=
     # copied from the kernel sources
     utils/diffconfig
-max-line-length=80
+max-line-length=132

.gitlab-ci.yml

@@ -6,13 +6,24 @@
 
 image: buildroot/base:20180318.1724
 
-.check_base:
-    except:
-        - /^.*-.*_defconfig$/
-        - /^.*-tests\..*$/
+.defconfig_script: &defconfig_script
+    - echo 'Configure Buildroot'
+    - make ${CI_JOB_NAME}
+    - echo 'Build buildroot'
+    - |
+        make > >(tee build.log |grep '>>>') 2>&1 || {
+            echo 'Failed build last output'
+            tail -200 build.log
+            exit 1
+        }
+
+check-gitlab-ci.yml:
+    script:
+        - mv .gitlab-ci.yml .gitlab-ci.yml.orig
+        - make .gitlab-ci.yml
+        - diff -u .gitlab-ci.yml.orig .gitlab-ci.yml
 
 check-DEVELOPERS:
-    extends: .check_base
     # get-developers should print just "No action specified"; if it prints
     # anything else, it's a parse error.
     # The initial ! is removed by YAML so we need to quote it.
@@ -20,77 +31,43 @@ check-DEVELOPERS:
         - "! utils/get-developers | grep -v 'No action specified'"
 
 check-flake8:
-    extends: .check_base
     before_script:
         # Help flake8 to find the Python files without .py extension.
         - find * -type f -name '*.py' > files.txt
         - find * -type f -print0 | xargs -0 file | grep 'Python script' | cut -d':' -f1 >> files.txt
         - sort -u files.txt | tee files.processed
     script:
-        - python -m flake8 --statistics --count --max-line-length=132 $(cat files.processed)
+        - python -m flake8 --statistics --count $(cat files.processed)
     after_script:
         - wc -l files.processed
 
-check-gitlab-ci.yml:
-    extends: .check_base
-    script:
-        - mv .gitlab-ci.yml .gitlab-ci.yml.orig
-        - make .gitlab-ci.yml
-        - diff -u .gitlab-ci.yml.orig .gitlab-ci.yml
-
 check-package:
-    extends: .check_base
     script:
-        - make check-package
+        - find . -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' \)
+            -exec ./utils/check-package {} +
 
-.defconfig_base:
-    script:
-        - echo "Configure Buildroot for ${DEFCONFIG_NAME}"
-        - make ${DEFCONFIG_NAME}
-        - echo 'Build buildroot'
-        - |
-            make > >(tee build.log |grep '>>>') 2>&1 || {
-                echo 'Failed build last output'
-                tail -200 build.log
-                exit 1
-            }
-    artifacts:
-        when: always
-        expire_in: 2 weeks
-        paths:
-            - .config
-            - build.log
-            - output/images/
-            - output/build/build-time.log
-            - output/build/packages-file-list.txt
-            - output/build/*/.config
-
-.defconfig:
-    extends: .defconfig_base
+.defconfig: &defconfig
     # Running the defconfigs for every push is too much, so limit to
     # explicit triggers through the API.
     only:
         - triggers
         - tags
-        - /-defconfigs$/
-    before_script:
-        - DEFCONFIG_NAME=${CI_JOB_NAME}
+    script: *defconfig_script
+    artifacts:
+        when: always
+        expire_in: 2 weeks
+        paths:
+            - build.log
+            - output/images/
+            - output/build/build-time.log
+            - output/build/packages-file-list.txt
 
-one-defconfig:
-    extends: .defconfig_base
-    only:
-        - /^.*-.*_defconfig$/
-    before_script:
-        - DEFCONFIG_NAME=$(echo ${CI_COMMIT_REF_NAME} | sed -e 's,^.*-,,g')
-
-.runtime_test_base:
+.runtime_test: &runtime_test
     # Keep build directories so the rootfs can be an artifact of the job. The
     # runner will clean up those files for us.
     # Multiply every emulator timeout by 10 to avoid sporadic failures in
     # elastic runners.
-    script:
-        - echo "Starting runtime test ${TEST_CASE_NAME}"
-        - ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${TEST_CASE_NAME}
+    script: ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${CI_JOB_NAME}
     artifacts:
         when: always
         expire_in: 2 weeks
@@ -98,374 +75,239 @@ one-defconfig:
             - test-output/*.log
             - test-output/*/.config
             - test-output/*/images/*
-
-.runtime_test:
-    extends: .runtime_test_base
-    # Running the runtime tests for every push is too much, so limit to
-    # explicit triggers through the API.
-    only:
-        - triggers
-        - tags
-        - /-runtime-tests$/
-    before_script:
-        - TEST_CASE_NAME=${CI_JOB_NAME}
-
-one-runtime_test:
-    extends: .runtime_test_base
-    only:
-        - /^.*-tests\..*$/
-    before_script:
-        - TEST_CASE_NAME=$(echo ${CI_COMMIT_REF_NAME} | sed -e 's,^.*-,,g')
-aarch64_efi_defconfig: { extends: .defconfig }
-acmesystems_aria_g25_128mb_defconfig: { extends: .defconfig }
-acmesystems_aria_g25_256mb_defconfig: { extends: .defconfig }
-acmesystems_arietta_g25_128mb_defconfig: { extends: .defconfig }
-acmesystems_arietta_g25_256mb_defconfig: { extends: .defconfig }
-amarula_a64_relic_defconfig: { extends: .defconfig }
-amarula_vyasa_rk3288_defconfig: { extends: .defconfig }
-andes_ae3xx_defconfig: { extends: .defconfig }
-arcturus_ucls1012a_defconfig: { extends: .defconfig }
-arcturus_ucp1020_defconfig: { extends: .defconfig }
-arm_foundationv8_defconfig: { extends: .defconfig }
-arm_juno_defconfig: { extends: .defconfig }
-armadeus_apf27_defconfig: { extends: .defconfig }
-armadeus_apf28_defconfig: { extends: .defconfig }
-armadeus_apf51_defconfig: { extends: .defconfig }
-asus_tinker_rk3288_defconfig: { extends: .defconfig }
-at91sam9260eknf_defconfig: { extends: .defconfig }
-at91sam9g20dfc_defconfig: { extends: .defconfig }
-at91sam9g45m10ek_defconfig: { extends: .defconfig }
-at91sam9rlek_defconfig: { extends: .defconfig }
-at91sam9x5ek_defconfig: { extends: .defconfig }
-at91sam9x5ek_dev_defconfig: { extends: .defconfig }
-at91sam9x5ek_mmc_defconfig: { extends: .defconfig }
-at91sam9x5ek_mmc_dev_defconfig: { extends: .defconfig }
-atmel_sama5d27_som1_ek_mmc_dev_defconfig: { extends: .defconfig }
-atmel_sama5d2_xplained_mmc_defconfig: { extends: .defconfig }
-atmel_sama5d2_xplained_mmc_dev_defconfig: { extends: .defconfig }
-atmel_sama5d3_xplained_defconfig: { extends: .defconfig }
-atmel_sama5d3_xplained_dev_defconfig: { extends: .defconfig }
-atmel_sama5d3_xplained_mmc_defconfig: { extends: .defconfig }
-atmel_sama5d3_xplained_mmc_dev_defconfig: { extends: .defconfig }
-atmel_sama5d3xek_defconfig: { extends: .defconfig }
-atmel_sama5d4_xplained_defconfig: { extends: .defconfig }
-atmel_sama5d4_xplained_dev_defconfig: { extends: .defconfig }
-atmel_sama5d4_xplained_mmc_defconfig: { extends: .defconfig }
-atmel_sama5d4_xplained_mmc_dev_defconfig: { extends: .defconfig }
-bananapi_m1_defconfig: { extends: .defconfig }
-bananapi_m2_plus_defconfig: { extends: .defconfig }
-bananapi_m2_ultra_defconfig: { extends: .defconfig }
-bananapi_m64_defconfig: { extends: .defconfig }
-bananapro_defconfig: { extends: .defconfig }
-beagleboardx15_defconfig: { extends: .defconfig }
-beaglebone_defconfig: { extends: .defconfig }
-beaglebone_qt5_defconfig: { extends: .defconfig }
-chromebook_snow_defconfig: { extends: .defconfig }
-ci20_defconfig: { extends: .defconfig }
-csky_gx6605s_defconfig: { extends: .defconfig }
-cubieboard2_defconfig: { extends: .defconfig }
-engicam_imx6qdl_icore_defconfig: { extends: .defconfig }
-engicam_imx6qdl_icore_qt5_defconfig: { extends: .defconfig }
-engicam_imx6qdl_icore_rqs_defconfig: { extends: .defconfig }
-engicam_imx6ul_geam_defconfig: { extends: .defconfig }
-engicam_imx6ul_isiot_defconfig: { extends: .defconfig }
-freescale_imx28evk_defconfig: { extends: .defconfig }
-freescale_imx6dlsabreauto_defconfig: { extends: .defconfig }
-freescale_imx6dlsabresd_defconfig: { extends: .defconfig }
-freescale_imx6qsabreauto_defconfig: { extends: .defconfig }
-freescale_imx6qsabresd_defconfig: { extends: .defconfig }
-freescale_imx6sxsabresd_defconfig: { extends: .defconfig }
-freescale_imx7dsabresd_defconfig: { extends: .defconfig }
-freescale_imx8mmevk_defconfig: { extends: .defconfig }
-freescale_imx8mqevk_defconfig: { extends: .defconfig }
-freescale_imx8qxpmek_defconfig: { extends: .defconfig }
-freescale_p1025twr_defconfig: { extends: .defconfig }
-freescale_t1040d4rdb_defconfig: { extends: .defconfig }
-freescale_t2080_qds_rdb_defconfig: { extends: .defconfig }
-friendlyarm_nanopi_a64_defconfig: { extends: .defconfig }
-friendlyarm_nanopi_neo2_defconfig: { extends: .defconfig }
-galileo_defconfig: { extends: .defconfig }
-grinn_chiliboard_defconfig: { extends: .defconfig }
-grinn_liteboard_defconfig: { extends: .defconfig }
-hifive_unleashed_defconfig: { extends: .defconfig }
-imx23evk_defconfig: { extends: .defconfig }
-imx6-sabreauto_defconfig: { extends: .defconfig }
-imx6-sabresd_defconfig: { extends: .defconfig }
-imx6-sabresd_qt5_defconfig: { extends: .defconfig }
-imx6slevk_defconfig: { extends: .defconfig }
-imx6sx-sdb_defconfig: { extends: .defconfig }
-imx6ulevk_defconfig: { extends: .defconfig }
-imx6ulpico_defconfig: { extends: .defconfig }
-imx7d-sdb_defconfig: { extends: .defconfig }
-imx7dpico_defconfig: { extends: .defconfig }
-imx8mmpico_defconfig: { extends: .defconfig }
-imx8mpico_defconfig: { extends: .defconfig }
-lego_ev3_defconfig: { extends: .defconfig }
-licheepi_zero_defconfig: { extends: .defconfig }
-linksprite_pcduino_defconfig: { extends: .defconfig }
-minnowboard_max-graphical_defconfig: { extends: .defconfig }
-minnowboard_max_defconfig: { extends: .defconfig }
-mx25pdk_defconfig: { extends: .defconfig }
-mx51evk_defconfig: { extends: .defconfig }
-mx53loco_defconfig: { extends: .defconfig }
-mx6cubox_defconfig: { extends: .defconfig }
-mx6sx_udoo_neo_defconfig: { extends: .defconfig }
-mx6udoo_defconfig: { extends: .defconfig }
-nanopi_m1_defconfig: { extends: .defconfig }
-nanopi_m1_plus_defconfig: { extends: .defconfig }
-nanopi_neo_defconfig: { extends: .defconfig }
-nexbox_a95x_defconfig: { extends: .defconfig }
-nitrogen6sx_defconfig: { extends: .defconfig }
-nitrogen6x_defconfig: { extends: .defconfig }
-nitrogen7_defconfig: { extends: .defconfig }
-nitrogen8m_defconfig: { extends: .defconfig }
-odroidxu4_defconfig: { extends: .defconfig }
-olimex_a10_olinuxino_lime_defconfig: { extends: .defconfig }
-olimex_a13_olinuxino_defconfig: { extends: .defconfig }
-olimex_a20_olinuxino_lime2_defconfig: { extends: .defconfig }
-olimex_a20_olinuxino_lime_defconfig: { extends: .defconfig }
-olimex_a20_olinuxino_micro_defconfig: { extends: .defconfig }
-olimex_a33_olinuxino_defconfig: { extends: .defconfig }
-olimex_a64_olinuxino_defconfig: { extends: .defconfig }
-olimex_imx233_olinuxino_defconfig: { extends: .defconfig }
-openblocks_a6_defconfig: { extends: .defconfig }
-orangepi_lite2_defconfig: { extends: .defconfig }
-orangepi_lite_defconfig: { extends: .defconfig }
-orangepi_one_defconfig: { extends: .defconfig }
-orangepi_one_plus_defconfig: { extends: .defconfig }
-orangepi_pc2_defconfig: { extends: .defconfig }
-orangepi_pc_defconfig: { extends: .defconfig }
-orangepi_pc_plus_defconfig: { extends: .defconfig }
-orangepi_plus_defconfig: { extends: .defconfig }
-orangepi_prime_defconfig: { extends: .defconfig }
-orangepi_r1_defconfig: { extends: .defconfig }
-orangepi_win_defconfig: { extends: .defconfig }
-orangepi_zero_defconfig: { extends: .defconfig }
-orangepi_zero_plus2_defconfig: { extends: .defconfig }
-pandaboard_defconfig: { extends: .defconfig }
-pc_x86_64_bios_defconfig: { extends: .defconfig }
-pc_x86_64_efi_defconfig: { extends: .defconfig }
-pine64_defconfig: { extends: .defconfig }
-pine64_sopine_defconfig: { extends: .defconfig }
-qemu_aarch64_virt_defconfig: { extends: .defconfig }
-qemu_arm_versatile_defconfig: { extends: .defconfig }
-qemu_arm_versatile_nommu_defconfig: { extends: .defconfig }
-qemu_arm_vexpress_defconfig: { extends: .defconfig }
-qemu_csky610_virt_defconfig: { extends: .defconfig }
-qemu_csky807_virt_defconfig: { extends: .defconfig }
-qemu_csky810_virt_defconfig: { extends: .defconfig }
-qemu_csky860_virt_defconfig: { extends: .defconfig }
-qemu_m68k_mcf5208_defconfig: { extends: .defconfig }
-qemu_m68k_q800_defconfig: { extends: .defconfig }
-qemu_microblazebe_mmu_defconfig: { extends: .defconfig }
-qemu_microblazeel_mmu_defconfig: { extends: .defconfig }
-qemu_mips32r2_malta_defconfig: { extends: .defconfig }
-qemu_mips32r2el_malta_defconfig: { extends: .defconfig }
-qemu_mips32r6_malta_defconfig: { extends: .defconfig }
-qemu_mips32r6el_malta_defconfig: { extends: .defconfig }
-qemu_mips64_malta_defconfig: { extends: .defconfig }
-qemu_mips64el_malta_defconfig: { extends: .defconfig }
-qemu_mips64r6_malta_defconfig: { extends: .defconfig }
-qemu_mips64r6el_malta_defconfig: { extends: .defconfig }
-qemu_nios2_10m50_defconfig: { extends: .defconfig }
-qemu_or1k_defconfig: { extends: .defconfig }
-qemu_ppc64_e5500_defconfig: { extends: .defconfig }
-qemu_ppc64_pseries_defconfig: { extends: .defconfig }
-qemu_ppc64le_pseries_defconfig: { extends: .defconfig }
-qemu_ppc_g3beige_defconfig: { extends: .defconfig }
-qemu_ppc_mac99_defconfig: { extends: .defconfig }
-qemu_ppc_mpc8544ds_defconfig: { extends: .defconfig }
-qemu_ppc_virtex_ml507_defconfig: { extends: .defconfig }
-qemu_riscv32_virt_defconfig: { extends: .defconfig }
-qemu_riscv64_virt_defconfig: { extends: .defconfig }
-qemu_sh4_r2d_defconfig: { extends: .defconfig }
-qemu_sh4eb_r2d_defconfig: { extends: .defconfig }
-qemu_sparc64_sun4u_defconfig: { extends: .defconfig }
-qemu_sparc_ss10_defconfig: { extends: .defconfig }
-qemu_x86_64_defconfig: { extends: .defconfig }
-qemu_x86_defconfig: { extends: .defconfig }
-qemu_xtensa_lx60_defconfig: { extends: .defconfig }
-qemu_xtensa_lx60_nommu_defconfig: { extends: .defconfig }
-raspberrypi0_defconfig: { extends: .defconfig }
-raspberrypi0w_defconfig: { extends: .defconfig }
-raspberrypi2_defconfig: { extends: .defconfig }
-raspberrypi3_64_defconfig: { extends: .defconfig }
-raspberrypi3_defconfig: { extends: .defconfig }
-raspberrypi3_qt5we_defconfig: { extends: .defconfig }
-raspberrypi4_defconfig: { extends: .defconfig }
-raspberrypi_defconfig: { extends: .defconfig }
-riotboard_defconfig: { extends: .defconfig }
-rock64_defconfig: { extends: .defconfig }
-roseapplepi_defconfig: { extends: .defconfig }
-s6lx9_microboard_defconfig: { extends: .defconfig }
-sheevaplug_defconfig: { extends: .defconfig }
-snps_aarch64_vdk_defconfig: { extends: .defconfig }
-snps_arc700_axs101_defconfig: { extends: .defconfig }
-snps_archs38_axs103_defconfig: { extends: .defconfig }
-snps_archs38_haps_defconfig: { extends: .defconfig }
-snps_archs38_hsdk_defconfig: { extends: .defconfig }
-snps_archs38_vdk_defconfig: { extends: .defconfig }
-socrates_cyclone5_defconfig: { extends: .defconfig }
-solidrun_clearfog_defconfig: { extends: .defconfig }
-solidrun_clearfog_gt_8k_defconfig: { extends: .defconfig }
-solidrun_macchiatobin_mainline_defconfig: { extends: .defconfig }
-solidrun_macchiatobin_marvell_defconfig: { extends: .defconfig }
-stm32f429_disco_defconfig: { extends: .defconfig }
-stm32f469_disco_defconfig: { extends: .defconfig }
-toradex_apalis_imx6_defconfig: { extends: .defconfig }
-ts4900_defconfig: { extends: .defconfig }
-ts5500_defconfig: { extends: .defconfig }
-ts7680_defconfig: { extends: .defconfig }
-wandboard_defconfig: { extends: .defconfig }
-warp7_defconfig: { extends: .defconfig }
-warpboard_defconfig: { extends: .defconfig }
-zynq_microzed_defconfig: { extends: .defconfig }
-zynq_zc706_defconfig: { extends: .defconfig }
-zynq_zed_defconfig: { extends: .defconfig }
-zynqmp_zcu106_defconfig: { extends: .defconfig }
-tests.boot.test_atf.TestATFAllwinner: { extends: .runtime_test }
-tests.boot.test_atf.TestATFMarvell: { extends: .runtime_test }
-tests.boot.test_atf.TestATFVexpress: { extends: .runtime_test }
-tests.core.test_file_capabilities.TestFileCapabilities: { extends: .runtime_test }
-tests.core.test_hardening.TestFortifyConserv: { extends: .runtime_test }
-tests.core.test_hardening.TestFortifyNone: { extends: .runtime_test }
-tests.core.test_hardening.TestRelro: { extends: .runtime_test }
-tests.core.test_hardening.TestRelroPartial: { extends: .runtime_test }
-tests.core.test_hardening.TestSspNone: { extends: .runtime_test }
-tests.core.test_hardening.TestSspStrong: { extends: .runtime_test }
-tests.core.test_post_scripts.TestPostScripts: { extends: .runtime_test }
-tests.core.test_rootfs_overlay.TestRootfsOverlay: { extends: .runtime_test }
-tests.core.test_timezone.TestGlibcAllTimezone: { extends: .runtime_test }
-tests.core.test_timezone.TestGlibcNonDefaultLimitedTimezone: { extends: .runtime_test }
-tests.core.test_timezone.TestNoTimezone: { extends: .runtime_test }
-tests.download.test_git.TestGitHash: { extends: .runtime_test }
-tests.download.test_git.TestGitRefs: { extends: .runtime_test }
-tests.fs.test_ext.TestExt2: { extends: .runtime_test }
-tests.fs.test_ext.TestExt2r1: { extends: .runtime_test }
-tests.fs.test_ext.TestExt3: { extends: .runtime_test }
-tests.fs.test_ext.TestExt4: { extends: .runtime_test }
-tests.fs.test_f2fs.TestF2FS: { extends: .runtime_test }
-tests.fs.test_iso9660.TestIso9660Grub2External: { extends: .runtime_test }
-tests.fs.test_iso9660.TestIso9660Grub2ExternalCompress: { extends: .runtime_test }
-tests.fs.test_iso9660.TestIso9660Grub2Internal: { extends: .runtime_test }
-tests.fs.test_iso9660.TestIso9660SyslinuxExternal: { extends: .runtime_test }
-tests.fs.test_iso9660.TestIso9660SyslinuxExternalCompress: { extends: .runtime_test }
-tests.fs.test_iso9660.TestIso9660SyslinuxInternal: { extends: .runtime_test }
-tests.fs.test_jffs2.TestJffs2: { extends: .runtime_test }
-tests.fs.test_squashfs.TestSquashfs: { extends: .runtime_test }
-tests.fs.test_ubi.TestUbi: { extends: .runtime_test }
-tests.fs.test_yaffs2.TestYaffs2: { extends: .runtime_test }
-tests.init.test_busybox.TestInitSystemBusyboxRo: { extends: .runtime_test }
-tests.init.test_busybox.TestInitSystemBusyboxRoNet: { extends: .runtime_test }
-tests.init.test_busybox.TestInitSystemBusyboxRw: { extends: .runtime_test }
-tests.init.test_busybox.TestInitSystemBusyboxRwNet: { extends: .runtime_test }
-tests.init.test_none.TestInitSystemNone: { extends: .runtime_test }
-tests.init.test_systemd.TestInitSystemSystemdRoFull: { extends: .runtime_test }
-tests.init.test_systemd.TestInitSystemSystemdRoIfupdown: { extends: .runtime_test }
-tests.init.test_systemd.TestInitSystemSystemdRoNetworkd: { extends: .runtime_test }
-tests.init.test_systemd.TestInitSystemSystemdRwFull: { extends: .runtime_test }
-tests.init.test_systemd.TestInitSystemSystemdRwIfupdown: { extends: .runtime_test }
-tests.init.test_systemd.TestInitSystemSystemdRwNetworkd: { extends: .runtime_test }
-tests.package.test_atop.TestAtop: { extends: .runtime_test }
-tests.package.test_docker_compose.TestDockerCompose: { extends: .runtime_test }
-tests.package.test_dropbear.TestDropbear: { extends: .runtime_test }
-tests.package.test_glxinfo.TestGlxinfo: { extends: .runtime_test }
-tests.package.test_ipython.TestIPythonPy3: { extends: .runtime_test }
-tests.package.test_lpeg.TestLuaLPeg: { extends: .runtime_test }
-tests.package.test_lpeg.TestLuajitLPeg: { extends: .runtime_test }
-tests.package.test_lsqlite3.TestLuaLsqlite3: { extends: .runtime_test }
-tests.package.test_lsqlite3.TestLuajitLsqlite3: { extends: .runtime_test }
-tests.package.test_lua.TestLua: { extends: .runtime_test }
-tests.package.test_lua.TestLuajit: { extends: .runtime_test }
-tests.package.test_lua_curl.TestLuaLuacURL: { extends: .runtime_test }
-tests.package.test_lua_curl.TestLuajitLuacURL: { extends: .runtime_test }
-tests.package.test_lua_http.TestLuaHttp: { extends: .runtime_test }
-tests.package.test_lua_http.TestLuajitHttp: { extends: .runtime_test }
-tests.package.test_lua_utf8.TestLuaUtf8: { extends: .runtime_test }
-tests.package.test_lua_utf8.TestLuajitUtf8: { extends: .runtime_test }
-tests.package.test_luaexpat.TestLuaLuaExpat: { extends: .runtime_test }
-tests.package.test_luaexpat.TestLuajitLuaExpat: { extends: .runtime_test }
-tests.package.test_luafilesystem.TestLuaLuaFileSystem: { extends: .runtime_test }
-tests.package.test_luafilesystem.TestLuajitLuaFileSystem: { extends: .runtime_test }
-tests.package.test_luaossl.TestLuaLuaossl: { extends: .runtime_test }
-tests.package.test_luaossl.TestLuajitLuaossl: { extends: .runtime_test }
-tests.package.test_luaposix.TestLuaLuaPosix: { extends: .runtime_test }
-tests.package.test_luaposix.TestLuajitLuaPosix: { extends: .runtime_test }
-tests.package.test_luasec.TestLuaLuaSec: { extends: .runtime_test }
-tests.package.test_luasec.TestLuajitLuaSec: { extends: .runtime_test }
-tests.package.test_luasocket.TestLuaLuaSocket: { extends: .runtime_test }
-tests.package.test_luasocket.TestLuajitLuaSocket: { extends: .runtime_test }
-tests.package.test_luasyslog.TestLuaLuasyslog: { extends: .runtime_test }
-tests.package.test_luasyslog.TestLuajitLuasyslog: { extends: .runtime_test }
-tests.package.test_openjdk.TestOpenJdk: { extends: .runtime_test }
-tests.package.test_perl.TestPerl: { extends: .runtime_test }
-tests.package.test_perl_class_load.TestPerlClassLoad: { extends: .runtime_test }
-tests.package.test_perl_dbd_mysql.TestPerlDBDmysql: { extends: .runtime_test }
-tests.package.test_perl_encode_detect.TestPerlEncodeDetect: { extends: .runtime_test }
-tests.package.test_perl_gdgraph.TestPerlGDGraph: { extends: .runtime_test }
-tests.package.test_perl_io_socket_multicast.TestPerlIOSocketMulticast: { extends: .runtime_test }
-tests.package.test_perl_io_socket_ssl.TestPerlIOSocketSSL: { extends: .runtime_test }
-tests.package.test_perl_libwww_perl.TestPerllibwwwperl: { extends: .runtime_test }
-tests.package.test_perl_mail_dkim.TestPerlMailDKIM: { extends: .runtime_test }
-tests.package.test_perl_x10.TestPerlX10: { extends: .runtime_test }
-tests.package.test_perl_xml_libxml.TestPerlXMLLibXML: { extends: .runtime_test }
-tests.package.test_prosody.TestProsodyLua51: { extends: .runtime_test }
-tests.package.test_prosody.TestProsodyLuajit: { extends: .runtime_test }
-tests.package.test_python.TestPython2: { extends: .runtime_test }
-tests.package.test_python.TestPython3: { extends: .runtime_test }
-tests.package.test_python_argh.TestPythonPy2Argh: { extends: .runtime_test }
-tests.package.test_python_argh.TestPythonPy3Argh: { extends: .runtime_test }
-tests.package.test_python_attrs.TestPythonPy2Attrs: { extends: .runtime_test }
-tests.package.test_python_attrs.TestPythonPy3Attrs: { extends: .runtime_test }
-tests.package.test_python_autobahn.TestPythonPy2Autobahn: { extends: .runtime_test }
-tests.package.test_python_autobahn.TestPythonPy3Autobahn: { extends: .runtime_test }
-tests.package.test_python_automat.TestPythonPy2Automat: { extends: .runtime_test }
-tests.package.test_python_automat.TestPythonPy3Automat: { extends: .runtime_test }
-tests.package.test_python_bitstring.TestPythonPy2Bitstring: { extends: .runtime_test }
-tests.package.test_python_bitstring.TestPythonPy3Bitstring: { extends: .runtime_test }
-tests.package.test_python_cbor.TestPythonPy2Cbor: { extends: .runtime_test }
-tests.package.test_python_cbor.TestPythonPy3Cbor: { extends: .runtime_test }
-tests.package.test_python_click.TestPythonPy2Click: { extends: .runtime_test }
-tests.package.test_python_click.TestPythonPy3Click: { extends: .runtime_test }
-tests.package.test_python_constantly.TestPythonPy2Constantly: { extends: .runtime_test }
-tests.package.test_python_constantly.TestPythonPy3Constantly: { extends: .runtime_test }
-tests.package.test_python_crossbar.TestPythonPy3Crossbar: { extends: .runtime_test }
-tests.package.test_python_cryptography.TestPythonPy2Cryptography: { extends: .runtime_test }
-tests.package.test_python_cryptography.TestPythonPy3Cryptography: { extends: .runtime_test }
-tests.package.test_python_incremental.TestPythonPy2Incremental: { extends: .runtime_test }
-tests.package.test_python_incremental.TestPythonPy3Incremental: { extends: .runtime_test }
-tests.package.test_python_passlib.TestPythonPy2Passlib: { extends: .runtime_test }
-tests.package.test_python_passlib.TestPythonPy3Passlib: { extends: .runtime_test }
-tests.package.test_python_pexpect.TestPythonPy2Pexpect: { extends: .runtime_test }
-tests.package.test_python_pexpect.TestPythonPy3Pexpect: { extends: .runtime_test }
-tests.package.test_python_pynacl.TestPythonPy2Pynacl: { extends: .runtime_test }
-tests.package.test_python_pynacl.TestPythonPy3Pynacl: { extends: .runtime_test }
-tests.package.test_python_pyyaml.TestPythonPy2Pyyaml: { extends: .runtime_test }
-tests.package.test_python_pyyaml.TestPythonPy3Pyyaml: { extends: .runtime_test }
-tests.package.test_python_service_identity.TestPythonPy2ServiceIdentity: { extends: .runtime_test }
-tests.package.test_python_service_identity.TestPythonPy3ServiceIdentity: { extends: .runtime_test }
-tests.package.test_python_subprocess32.TestPythonPy2Subprocess32: { extends: .runtime_test }
-tests.package.test_python_treq.TestPythonPy2Treq: { extends: .runtime_test }
-tests.package.test_python_treq.TestPythonPy3Treq: { extends: .runtime_test }
-tests.package.test_python_twisted.TestPythonPy2Twisted: { extends: .runtime_test }
-tests.package.test_python_twisted.TestPythonPy3Twisted: { extends: .runtime_test }
-tests.package.test_python_txaio.TestPythonPy2Txaio: { extends: .runtime_test }
-tests.package.test_python_txaio.TestPythonPy3Txaio: { extends: .runtime_test }
-tests.package.test_python_txtorcon.TestPythonPy2Txtorcon: { extends: .runtime_test }
-tests.package.test_python_txtorcon.TestPythonPy3Txtorcon: { extends: .runtime_test }
-tests.package.test_python_ubjson.TestPythonPy2Ubjson: { extends: .runtime_test }
-tests.package.test_python_ubjson.TestPythonPy3Ubjson: { extends: .runtime_test }
-tests.package.test_rings.TestLuaRings: { extends: .runtime_test }
-tests.package.test_rings.TestLuajitRings: { extends: .runtime_test }
-tests.package.test_rust.TestRust: { extends: .runtime_test }
-tests.package.test_rust.TestRustBin: { extends: .runtime_test }
-tests.package.test_syslog_ng.TestSyslogNg: { extends: .runtime_test }
-tests.toolchain.test_external.TestExternalToolchainBuildrootMusl: { extends: .runtime_test }
-tests.toolchain.test_external.TestExternalToolchainBuildrootuClibc: { extends: .runtime_test }
-tests.toolchain.test_external.TestExternalToolchainCCache: { extends: .runtime_test }
-tests.toolchain.test_external.TestExternalToolchainCtngMusl: { extends: .runtime_test }
-tests.toolchain.test_external.TestExternalToolchainLinaroArm: { extends: .runtime_test }
-tests.toolchain.test_external.TestExternalToolchainSourceryArmv4: { extends: .runtime_test }
-tests.toolchain.test_external.TestExternalToolchainSourceryArmv5: { extends: .runtime_test }
-tests.toolchain.test_external.TestExternalToolchainSourceryArmv7: { extends: .runtime_test }
-tests.utils.test_check_package.TestCheckPackage: { extends: .runtime_test }
+acmesystems_aria_g25_128mb_defconfig: *defconfig
+acmesystems_aria_g25_256mb_defconfig: *defconfig
+acmesystems_arietta_g25_128mb_defconfig: *defconfig
+acmesystems_arietta_g25_256mb_defconfig: *defconfig
+amarula_vyasa_rk3288_defconfig: *defconfig
+arcturus_ucls1012a_defconfig: *defconfig
+arcturus_ucp1020_defconfig: *defconfig
+arm_foundationv8_defconfig: *defconfig
+arm_juno_defconfig: *defconfig
+armadeus_apf27_defconfig: *defconfig
+armadeus_apf28_defconfig: *defconfig
+armadeus_apf51_defconfig: *defconfig
+asus_tinker_rk3288_defconfig: *defconfig
+at91sam9260eknf_defconfig: *defconfig
+at91sam9g20dfc_defconfig: *defconfig
+at91sam9g45m10ek_defconfig: *defconfig
+at91sam9rlek_defconfig: *defconfig
+at91sam9x5ek_defconfig: *defconfig
+at91sam9x5ek_dev_defconfig: *defconfig
+at91sam9x5ek_mmc_defconfig: *defconfig
+at91sam9x5ek_mmc_dev_defconfig: *defconfig
+atmel_sama5d27_som1_ek_mmc_dev_defconfig: *defconfig
+atmel_sama5d2_xplained_mmc_defconfig: *defconfig
+atmel_sama5d2_xplained_mmc_dev_defconfig: *defconfig
+atmel_sama5d3_xplained_defconfig: *defconfig
+atmel_sama5d3_xplained_dev_defconfig: *defconfig
+atmel_sama5d3_xplained_mmc_defconfig: *defconfig
+atmel_sama5d3_xplained_mmc_dev_defconfig: *defconfig
+atmel_sama5d3xek_defconfig: *defconfig
+atmel_sama5d4_xplained_defconfig: *defconfig
+atmel_sama5d4_xplained_dev_defconfig: *defconfig
+atmel_sama5d4_xplained_mmc_defconfig: *defconfig
+atmel_sama5d4_xplained_mmc_dev_defconfig: *defconfig
+bananapi_m1_defconfig: *defconfig
+bananapi_m2_plus_defconfig: *defconfig
+bananapi_m64_defconfig: *defconfig
+bananapro_defconfig: *defconfig
+beagleboardx15_defconfig: *defconfig
+beaglebone_defconfig: *defconfig
+beaglebone_qt5_defconfig: *defconfig
+chromebook_snow_defconfig: *defconfig
+ci20_defconfig: *defconfig
+csky_gx6605s_defconfig: *defconfig
+cubieboard2_defconfig: *defconfig
+engicam_imx6qdl_icore_defconfig: *defconfig
+engicam_imx6qdl_icore_qt5_defconfig: *defconfig
+engicam_imx6qdl_icore_rqs_defconfig: *defconfig
+engicam_imx6ul_geam_defconfig: *defconfig
+engicam_imx6ul_isiot_defconfig: *defconfig
+freescale_imx28evk_defconfig: *defconfig
+freescale_imx6dlsabreauto_defconfig: *defconfig
+freescale_imx6dlsabresd_defconfig: *defconfig
+freescale_imx6qsabreauto_defconfig: *defconfig
+freescale_imx6qsabresd_defconfig: *defconfig
+freescale_imx6sxsabresd_defconfig: *defconfig
+freescale_imx7dsabresd_defconfig: *defconfig
+freescale_imx8mqevk_defconfig: *defconfig
+freescale_p1025twr_defconfig: *defconfig
+freescale_t1040d4rdb_defconfig: *defconfig
+friendlyarm_nanopi_a64_defconfig: *defconfig
+friendlyarm_nanopi_neo2_defconfig: *defconfig
+galileo_defconfig: *defconfig
+grinn_chiliboard_defconfig: *defconfig
+grinn_liteboard_defconfig: *defconfig
+imx23evk_defconfig: *defconfig
+imx6-sabreauto_defconfig: *defconfig
+imx6-sabresd_defconfig: *defconfig
+imx6-sabresd_qt5_defconfig: *defconfig
+imx6slevk_defconfig: *defconfig
+imx6sx-sdb_defconfig: *defconfig
+imx6ulevk_defconfig: *defconfig
+imx6ulpico_defconfig: *defconfig
+imx7d-sdb_defconfig: *defconfig
+imx7dpico_defconfig: *defconfig
+lego_ev3_defconfig: *defconfig
+linksprite_pcduino_defconfig: *defconfig
+minnowboard_max-graphical_defconfig: *defconfig
+minnowboard_max_defconfig: *defconfig
+mx25pdk_defconfig: *defconfig
+mx51evk_defconfig: *defconfig
+mx53loco_defconfig: *defconfig
+mx6cubox_defconfig: *defconfig
+mx6sx_udoo_neo_defconfig: *defconfig
+mx6udoo_defconfig: *defconfig
+nanopi_m1_defconfig: *defconfig
+nanopi_m1_plus_defconfig: *defconfig
+nanopi_neo_defconfig: *defconfig
+nexbox_a95x_defconfig: *defconfig
+nitrogen6sx_defconfig: *defconfig
+nitrogen6x_defconfig: *defconfig
+nitrogen7_defconfig: *defconfig
+nitrogen8m_defconfig: *defconfig
+odroidc2_defconfig: *defconfig
+olimex_a10_olinuxino_lime_defconfig: *defconfig
+olimex_a13_olinuxino_defconfig: *defconfig
+olimex_a20_olinuxino_lime2_defconfig: *defconfig
+olimex_a20_olinuxino_lime_defconfig: *defconfig
+olimex_a20_olinuxino_lime_mali_defconfig: *defconfig
+olimex_a20_olinuxino_micro_defconfig: *defconfig
+olimex_a64_olinuxino_defconfig: *defconfig
+olimex_imx233_olinuxino_defconfig: *defconfig
+openblocks_a6_defconfig: *defconfig
+orangepi_lite_defconfig: *defconfig
+orangepi_one_defconfig: *defconfig
+orangepi_pc2_defconfig: *defconfig
+orangepi_pc_defconfig: *defconfig
+orangepi_pc_plus_defconfig: *defconfig
+orangepi_plus_defconfig: *defconfig
+orangepi_prime_defconfig: *defconfig
+orangepi_win_defconfig: *defconfig
+orangepi_zero_defconfig: *defconfig
+orangepi_zero_plus2_defconfig: *defconfig
+pandaboard_defconfig: *defconfig
+pc_x86_64_bios_defconfig: *defconfig
+pc_x86_64_efi_defconfig: *defconfig
+pine64_defconfig: *defconfig
+pine64_sopine_defconfig: *defconfig
+qemu_aarch64_virt_defconfig: *defconfig
+qemu_arm_versatile_defconfig: *defconfig
+qemu_arm_versatile_nommu_defconfig: *defconfig
+qemu_arm_vexpress_defconfig: *defconfig
+qemu_m68k_mcf5208_defconfig: *defconfig
+qemu_m68k_q800_defconfig: *defconfig
+qemu_microblazebe_mmu_defconfig: *defconfig
+qemu_microblazeel_mmu_defconfig: *defconfig
+qemu_mips32r2_malta_defconfig: *defconfig
+qemu_mips32r2el_malta_defconfig: *defconfig
+qemu_mips32r6_malta_defconfig: *defconfig
+qemu_mips32r6el_malta_defconfig: *defconfig
+qemu_mips64_malta_defconfig: *defconfig
+qemu_mips64el_malta_defconfig: *defconfig
+qemu_mips64r6_malta_defconfig: *defconfig
+qemu_mips64r6el_malta_defconfig: *defconfig
+qemu_nios2_10m50_defconfig: *defconfig
+qemu_or1k_defconfig: *defconfig
+qemu_ppc64_e5500_defconfig: *defconfig
+qemu_ppc64_pseries_defconfig: *defconfig
+qemu_ppc64le_pseries_defconfig: *defconfig
+qemu_ppc_g3beige_defconfig: *defconfig
+qemu_ppc_mpc8544ds_defconfig: *defconfig
+qemu_ppc_virtex_ml507_defconfig: *defconfig
+qemu_sh4_r2d_defconfig: *defconfig
+qemu_sh4eb_r2d_defconfig: *defconfig
+qemu_sparc64_sun4u_defconfig: *defconfig
+qemu_sparc_ss10_defconfig: *defconfig
+qemu_x86_64_defconfig: *defconfig
+qemu_x86_defconfig: *defconfig
+qemu_xtensa_lx60_defconfig: *defconfig
+qemu_xtensa_lx60_nommu_defconfig: *defconfig
+raspberrypi0_defconfig: *defconfig
+raspberrypi0w_defconfig: *defconfig
+raspberrypi2_defconfig: *defconfig
+raspberrypi3_64_defconfig: *defconfig
+raspberrypi3_defconfig: *defconfig
+raspberrypi3_qt5we_defconfig: *defconfig
+raspberrypi_defconfig: *defconfig
+roseapplepi_defconfig: *defconfig
+s6lx9_microboard_defconfig: *defconfig
+sheevaplug_defconfig: *defconfig
+snps_aarch64_vdk_defconfig: *defconfig
+snps_arc700_axs101_defconfig: *defconfig
+snps_archs38_axs103_defconfig: *defconfig
+snps_archs38_haps_defconfig: *defconfig
+snps_archs38_hsdk_defconfig: *defconfig
+snps_archs38_vdk_defconfig: *defconfig
+socrates_cyclone5_defconfig: *defconfig
+solidrun_clearfog_defconfig: *defconfig
+solidrun_macchiatobin_mainline_defconfig: *defconfig
+solidrun_macchiatobin_marvell_defconfig: *defconfig
+stm32f429_disco_defconfig: *defconfig
+stm32f469_disco_defconfig: *defconfig
+toradex_apalis_imx6_defconfig: *defconfig
+ts4800_defconfig: *defconfig
+ts4900_defconfig: *defconfig
+ts5500_defconfig: *defconfig
+ts7680_defconfig: *defconfig
+wandboard_defconfig: *defconfig
+warp7_defconfig: *defconfig
+warpboard_defconfig: *defconfig
+zynq_microzed_defconfig: *defconfig
+zynq_zc706_defconfig: *defconfig
+zynq_zed_defconfig: *defconfig
+zynq_zybo_defconfig: *defconfig
+zynqmp_zcu106_defconfig: *defconfig
+tests.boot.test_atf.TestATFAllwinner: *runtime_test
+tests.boot.test_atf.TestATFMarvell: *runtime_test
+tests.boot.test_atf.TestATFVexpress: *runtime_test
+tests.core.test_file_capabilities.TestFileCapabilities: *runtime_test
+tests.core.test_post_scripts.TestPostScripts: *runtime_test
+tests.core.test_rootfs_overlay.TestRootfsOverlay: *runtime_test
+tests.core.test_timezone.TestGlibcAllTimezone: *runtime_test
+tests.core.test_timezone.TestGlibcNonDefaultLimitedTimezone: *runtime_test
+tests.core.test_timezone.TestNoTimezone: *runtime_test
+tests.fs.test_ext.TestExt2: *runtime_test
+tests.fs.test_ext.TestExt2r1: *runtime_test
+tests.fs.test_ext.TestExt3: *runtime_test
+tests.fs.test_ext.TestExt4: *runtime_test
+tests.fs.test_iso9660.TestIso9660Grub2External: *runtime_test
+tests.fs.test_iso9660.TestIso9660Grub2ExternalCompress: *runtime_test
+tests.fs.test_iso9660.TestIso9660Grub2Internal: *runtime_test
+tests.fs.test_iso9660.TestIso9660SyslinuxExternal: *runtime_test
+tests.fs.test_iso9660.TestIso9660SyslinuxExternalCompress: *runtime_test
+tests.fs.test_iso9660.TestIso9660SyslinuxInternal: *runtime_test
+tests.fs.test_jffs2.TestJffs2: *runtime_test
+tests.fs.test_squashfs.TestSquashfs: *runtime_test
+tests.fs.test_ubi.TestUbi: *runtime_test
+tests.fs.test_yaffs2.TestYaffs2: *runtime_test
+tests.init.test_busybox.TestInitSystemBusyboxRo: *runtime_test
+tests.init.test_busybox.TestInitSystemBusyboxRoNet: *runtime_test
+tests.init.test_busybox.TestInitSystemBusyboxRw: *runtime_test
+tests.init.test_busybox.TestInitSystemBusyboxRwNet: *runtime_test
+tests.init.test_none.TestInitSystemNone: *runtime_test
+tests.init.test_systemd.TestInitSystemSystemdRoFull: *runtime_test
+tests.init.test_systemd.TestInitSystemSystemdRoIfupdown: *runtime_test
+tests.init.test_systemd.TestInitSystemSystemdRoNetworkd: *runtime_test
+tests.init.test_systemd.TestInitSystemSystemdRwFull: *runtime_test
+tests.init.test_systemd.TestInitSystemSystemdRwIfupdown: *runtime_test
+tests.init.test_systemd.TestInitSystemSystemdRwNetworkd: *runtime_test
+tests.package.test_dropbear.TestDropbear: *runtime_test
+tests.package.test_ipython.TestIPythonPy2: *runtime_test
+tests.package.test_ipython.TestIPythonPy3: *runtime_test
+tests.package.test_python.TestPython2: *runtime_test
+tests.package.test_python.TestPython3: *runtime_test
+tests.package.test_python_cryptography.TestPythonPy2Cryptography: *runtime_test
+tests.package.test_python_cryptography.TestPythonPy3Cryptography: *runtime_test
+tests.package.test_rust.TestRust: *runtime_test
+tests.package.test_rust.TestRustBin: *runtime_test
+tests.package.test_syslog_ng.TestSyslogNg: *runtime_test
+tests.toolchain.test_external.TestExternalToolchainBuildrootMusl: *runtime_test
+tests.toolchain.test_external.TestExternalToolchainBuildrootuClibc: *runtime_test
+tests.toolchain.test_external.TestExternalToolchainCCache: *runtime_test
+tests.toolchain.test_external.TestExternalToolchainCtngMusl: *runtime_test
+tests.toolchain.test_external.TestExternalToolchainLinaroArm: *runtime_test
+tests.toolchain.test_external.TestExternalToolchainSourceryArmv4: *runtime_test
+tests.toolchain.test_external.TestExternalToolchainSourceryArmv5: *runtime_test
+tests.toolchain.test_external.TestExternalToolchainSourceryArmv7: *runtime_test

.gitlab-ci.yml.in

@@ -6,13 +6,24 @@
 
 image: buildroot/base:20180318.1724
 
-.check_base:
-    except:
-        - /^.*-.*_defconfig$/
-        - /^.*-tests\..*$/
+.defconfig_script: &defconfig_script
+    - echo 'Configure Buildroot'
+    - make ${CI_JOB_NAME}
+    - echo 'Build buildroot'
+    - |
+        make > >(tee build.log |grep '>>>') 2>&1 || {
+            echo 'Failed build last output'
+            tail -200 build.log
+            exit 1
+        }
+
+check-gitlab-ci.yml:
+    script:
+        - mv .gitlab-ci.yml .gitlab-ci.yml.orig
+        - make .gitlab-ci.yml
+        - diff -u .gitlab-ci.yml.orig .gitlab-ci.yml
 
 check-DEVELOPERS:
-    extends: .check_base
     # get-developers should print just "No action specified"; if it prints
     # anything else, it's a parse error.
     # The initial ! is removed by YAML so we need to quote it.
@@ -20,77 +31,43 @@ check-DEVELOPERS:
         - "! utils/get-developers | grep -v 'No action specified'"
 
 check-flake8:
-    extends: .check_base
     before_script:
         # Help flake8 to find the Python files without .py extension.
         - find * -type f -name '*.py' > files.txt
         - find * -type f -print0 | xargs -0 file | grep 'Python script' | cut -d':' -f1 >> files.txt
         - sort -u files.txt | tee files.processed
     script:
-        - python -m flake8 --statistics --count --max-line-length=132 $(cat files.processed)
+        - python -m flake8 --statistics --count $(cat files.processed)
     after_script:
         - wc -l files.processed
 
-check-gitlab-ci.yml:
-    extends: .check_base
-    script:
-        - mv .gitlab-ci.yml .gitlab-ci.yml.orig
-        - make .gitlab-ci.yml
-        - diff -u .gitlab-ci.yml.orig .gitlab-ci.yml
-
 check-package:
-    extends: .check_base
     script:
-        - make check-package
+        - find . -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' \)
+            -exec ./utils/check-package {} +
 
-.defconfig_base:
-    script:
-        - echo "Configure Buildroot for ${DEFCONFIG_NAME}"
-        - make ${DEFCONFIG_NAME}
-        - echo 'Build buildroot'
-        - |
-            make > >(tee build.log |grep '>>>') 2>&1 || {
-                echo 'Failed build last output'
-                tail -200 build.log
-                exit 1
-            }
-    artifacts:
-        when: always
-        expire_in: 2 weeks
-        paths:
-            - .config
-            - build.log
-            - output/images/
-            - output/build/build-time.log
-            - output/build/packages-file-list.txt
-            - output/build/*/.config
-
-.defconfig:
-    extends: .defconfig_base
+.defconfig: &defconfig
     # Running the defconfigs for every push is too much, so limit to
     # explicit triggers through the API.
     only:
         - triggers
         - tags
-        - /-defconfigs$/
-    before_script:
-        - DEFCONFIG_NAME=${CI_JOB_NAME}
+    script: *defconfig_script
+    artifacts:
+        when: always
+        expire_in: 2 weeks
+        paths:
+            - build.log
+            - output/images/
+            - output/build/build-time.log
+            - output/build/packages-file-list.txt
 
-one-defconfig:
-    extends: .defconfig_base
-    only:
-        - /^.*-.*_defconfig$/
-    before_script:
-        - DEFCONFIG_NAME=$(echo ${CI_COMMIT_REF_NAME} | sed -e 's,^.*-,,g')
-
-.runtime_test_base:
+.runtime_test: &runtime_test
     # Keep build directories so the rootfs can be an artifact of the job. The
     # runner will clean up those files for us.
     # Multiply every emulator timeout by 10 to avoid sporadic failures in
     # elastic runners.
-    script:
-        - echo "Starting runtime test ${TEST_CASE_NAME}"
-        - ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${TEST_CASE_NAME}
+    script: ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${CI_JOB_NAME}
     artifacts:
         when: always
         expire_in: 2 weeks
@@ -98,21 +75,3 @@ one-defconfig:
             - test-output/*.log
             - test-output/*/.config
             - test-output/*/images/*
-
-.runtime_test:
-    extends: .runtime_test_base
-    # Running the runtime tests for every push is too much, so limit to
-    # explicit triggers through the API.
-    only:
-        - triggers
-        - tags
-        - /-runtime-tests$/
-    before_script:
-        - TEST_CASE_NAME=${CI_JOB_NAME}
-
-one-runtime_test:
-    extends: .runtime_test_base
-    only:
-        - /^.*-tests\..*$/
-    before_script:
-        - TEST_CASE_NAME=$(echo ${CI_COMMIT_REF_NAME} | sed -e 's,^.*-,,g')

Config.in

@@ -14,12 +14,9 @@ config BR2_HOSTARCH
 	string
 	option env="HOSTARCH"
 
-config BR2_BASE_DIR
+config BR2_BUILD_DIR
 	string
-	option env="BASE_DIR"
-
-# br2-external paths definitions
-source "$BR2_BASE_DIR/.br2-external.in.paths"
+	option env="BUILD_DIR"
 
 # Hidden config symbols for packages to check system gcc version
 config BR2_HOST_GCC_VERSION
@@ -70,9 +67,6 @@ config BR2_HOST_GCC_AT_LEAST_8
 	default y if BR2_HOST_GCC_VERSION = "8"
 	select BR2_HOST_GCC_AT_LEAST_7
 
-# When adding new entries above, be sure to update
-# the HOSTCC_MAX_VERSION variable in the Makefile.
-
 # Hidden boolean selected by packages in need of Java in order to build
 # (example: kodi)
 config BR2_NEEDS_HOST_JAVA
@@ -139,6 +133,10 @@ config BR2_SCP
 	string "Secure copy (scp) command"
 	default "scp"
 
+config BR2_SSH
+	string "Secure shell (ssh) command"
+	default "ssh"
+
 config BR2_HG
 	string "Mercurial (hg) command"
 	default "hg"
@@ -680,18 +678,6 @@ config BR2_COMPILER_PARANOID_UNSAFE_PATH
 	  and external toolchain backends (through the toolchain
 	  wrapper).
 
-config BR2_FORCE_HOST_BUILD
-	bool "Force the building of host dependencies"
-	help
-	  Build all available host dependencies, even if they are
-	  already installed on the system.
-
-	  This option can be used to ensure that the download cache of
-	  source archives for packages remain consistent between
-	  different build hosts.
-
-	  This option will increase build time.
-
 config BR2_REPRODUCIBLE
 	bool "Make the build reproducible (experimental)"
 	# SOURCE_DATE_EPOCH support in toolchain-wrapper requires GCC 4.4
@@ -715,18 +701,6 @@ endmenu
 
 comment "Security Hardening Options"
 
-config BR2_PIC_PIE
-	bool "Build code with PIC/PIE"
-	depends on BR2_SHARED_LIBS
-	depends on BR2_TOOLCHAIN_SUPPORTS_PIE
-	help
-	  Generate Position-Independent Code (PIC) and link
-	  Position-Independent Executables (PIE).
-
-comment "PIC/PIE needs a toolchain w/ PIE"
-	depends on BR2_SHARED_LIBS
-	depends on !BR2_TOOLCHAIN_SUPPORTS_PIE
-
 choice
 	bool "Stack Smashing Protection"
 	default BR2_SSP_ALL if BR2_ENABLE_SSP # legacy
@@ -761,14 +735,14 @@ config BR2_SSP_REGULAR
 
 config BR2_SSP_STRONG
 	bool "-fstack-protector-strong"
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
 	help
 	  Like -fstack-protector but includes additional functions to be
 	  protected - those that have local array definitions, or have
 	  references to local frame addresses.
 
-	  -fstack-protector-strong officially appeared in gcc 4.9, but
-	  some vendors have backported -fstack-protector-strong to older
-	  versions of gcc.
+comment "Stack Smashing Protection strong needs a toolchain w/ gcc >= 4.9"
+	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
 
 config BR2_SSP_ALL
 	bool "-fstack-protector-all"
@@ -779,12 +753,6 @@ config BR2_SSP_ALL
 
 endchoice
 
-config BR2_SSP_OPTION
-	string
-	default "-fstack-protector"        if BR2_SSP_REGULAR
-	default "-fstack-protector-strong" if BR2_SSP_STRONG
-	default "-fstack-protector-all"    if BR2_SSP_ALL
-
 comment "Stack Smashing Protection needs a toolchain w/ SSP"
 	depends on !BR2_TOOLCHAIN_HAS_SSP
 
@@ -809,16 +777,11 @@ config BR2_RELRO_PARTIAL
 
 config BR2_RELRO_FULL
 	bool "Full"
-	depends on BR2_TOOLCHAIN_SUPPORTS_PIE
-	select BR2_PIC_PIE
 	help
 	  This option includes the partial configuration, but also marks
 	  the GOT as read-only at the cost of initialization time during
 	  program loading, i.e every time an executable is started.
 
-comment "RELRO Full needs a toolchain w/ PIE"
-	depends on !BR2_TOOLCHAIN_SUPPORTS_PIE
-
 endchoice
 
 comment "RELocation Read Only (RELRO) needs shared libraries"
@@ -846,8 +809,6 @@ config BR2_FORTIFY_SOURCE_NONE
 
 config BR2_FORTIFY_SOURCE_1
 	bool "Conservative"
-	# gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61164
-	depends on !BR2_TOOLCHAIN_BUILDROOT || BR2_TOOLCHAIN_GCC_AT_LEAST_6
 	help
 	  This option sets _FORTIFY_SOURCE to 1 and only introduces
 	  checks that shouldn't change the behavior of conforming
@@ -855,8 +816,6 @@ config BR2_FORTIFY_SOURCE_1
 
 config BR2_FORTIFY_SOURCE_2
 	bool "Aggressive"
-	# gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61164
-	depends on !BR2_TOOLCHAIN_BUILDROOT || BR2_TOOLCHAIN_GCC_AT_LEAST_6
 	help
 	  This option sets _FORTIFY_SOURCES to 2 and some more
 	  checking is added, but some conforming programs might fail.
@@ -885,5 +844,4 @@ source "package/Config.in.host"
 
 source "Config.in.legacy"
 
-# br2-external menus definitions
-source "$BR2_BASE_DIR/.br2-external.in.menus"
+source "$BR2_BUILD_DIR/.br2-external.in"

Config.in.legacy

@@ -142,464 +142,9 @@ comment "unpredictable ways.                                 "
 comment "----------------------------------------------------"
 endif
 
-###############################################################################
-
-comment "Legacy options removed in 2019.08"
-
-config BR2_TARGET_TS4800_MBRBOOT
-	bool "ts4800-mbrboot package was removed"
-	select BR2_LEGACY
-	help
-	  The defconfig for the TS4800 platform has been removed, so
-	  the ts4800-mbrboot package, containing the boot code for
-	  this specific platform has been removed as welL.
-
-config BR2_PACKAGE_LIBAMCODEC
-	bool "liamcodec package was removed"
-	select BR2_LEGACY
-	help
-	  Support for odroidc2 based systems was removed, making the
-	  libamcodec package useless.
-
-config BR2_PACKAGE_ODROID_SCRIPTS
-	bool "odroid-scripts package was removed"
-	select BR2_LEGACY
-	help
-	  Support for odroidc2 based systems was removed, making the
-	  odroid-scripts package useless.
-
-config BR2_PACKAGE_ODROID_MALI
-	bool "odroid-mali package was removed"
-	select BR2_LEGACY
-	help
-	  Support for odroidc2 based systems was removed, making the
-	  odroid-mali package useless.
-
-config BR2_PACKAGE_KODI_PLATFORM_AML
-	bool "Kodi AMLogic support was removed"
-	select BR2_LEGACY
-	help
-	  Support for AMLogic was removed due to the removal of the
-	  odroidc2 defconfig.
-
-config BR2_GCC_VERSION_6_X
-	bool "gcc 6.x support removed"
-	select BR2_LEGACY
-	help
-	  Support for gcc version 6.x has been removed. The current
-	  default version (8.x or later) has been selected instead.
-
-config BR2_GCC_VERSION_4_9_X
-	bool "gcc 4.9.x support removed"
-	select BR2_LEGACY
-	help
-	  Support for gcc version 4.9.x has been removed. The current
-	  default version (8.x or later) has been selected instead.
-
-config BR2_GDB_VERSION_7_12
-	bool "gdb 7.12.x has been removed"
-	select BR2_LEGACY
-	help
-	  The 7.12.x version of gdb has been removed. Use a newer
-	  version instead.
-
-config BR2_PACKAGE_XAPP_MKFONTDIR
-	bool "mkfontdir is now included in xapp_mkfontscale"
-	select BR2_PACKAGE_XAPP_MKFONTSCALE
-	select BR2_LEGACY
-	help
-	  xapp_mkfontscale now includes the mkfontdir script previously
-	  distributed separately for compatibility with older X11
-	  versions.
-
-config BR2_GDB_VERSION_8_0
-	bool "gdb 8.0.x has been removed"
-	select BR2_LEGACY
-	help
-	  The 8.0.x version of gdb has been removed. Use a newer
-	  version instead.
-
-config BR2_KERNEL_HEADERS_4_20
-	bool "kernel headers version 4.20.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 4.20.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_KERNEL_HEADERS_5_0
-	bool "kernel headers version 5.0.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 5.0.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-comment "Legacy options removed in 2019.05"
-
-config BR2_CSKY_DSP
-	bool "C-SKY DSP support removed"
-	select BR2_LEGACY
-	help
-	  C-SKY DSP instruction support for ck810 / ck807 was removed,
-	  as it was no longer supported in C-SKY gcc. Perhaps the VDSP
-	  instructions should be used instead, using the BR2_CSKY_VDSP
-	  option.
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR
-	bool "compositor moved to gst1-plugins-base"
-	select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_COMPOSITOR
-	select BR2_LEGACY
-	help
-	  The gst1-plugins-bad compositor plugin has moved
-	  to gst1-plugins-base.
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IQA
-	bool "gst-plugins-bad IQA option was removed"
-	select BR2_LEGACY
-	help
-	  The gst1-plugins-bad IQA option was removed.
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENCV
-	bool "gst-plugins-bad opencv option was removed"
-	select BR2_LEGACY
-	help
-	  The gst1-plugins-bad opencv option was removed because
-	  buildroot does not have the opencv_contrib package which
-	  is required for the bgsegm module which gst1-plugins-bad
-	  now requires along with opencv3.
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_STEREO
-	bool "stereo was merged into audiofx in gst1-plugins-good"
-	select BR2_LEGACY
-	select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOFX
-	help
-	  The gst1-plugins-bad stereo plugin has merged with the
-	  gst1-plugins-base audiofx plugin.
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VCD
-	bool "gst-plugins-bad vcd plugin was removed."
-	select BR2_LEGACY
-	help
-	  The gst1-plugins-bad vcd plugin was removed.
-
-config BR2_PACKAGE_LUNIT
-	bool "lunit package removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_LUA_LUNITX
-	help
-	  The lunit package was removed in favor of its fork lunitx,
-	  which supports all versions of Lua.
-
-config BR2_PACKAGE_FFMPEG_FFSERVER
-	bool "ffmpeg ffserver removed"
-	select BR2_LEGACY
-	help
-	  On July 10th, 2016, ffserver program has been dropped.
-
-config BR2_PACKAGE_LIBUMP
-	bool "libump package removed"
-	select BR2_LEGACY
-	help
-	  The libump package was removed, it was only used as a
-	  dependency of sunxi-mali, which itself was removed.
-
-config BR2_PACKAGE_SUNXI_MALI
-	bool "sunxi-mali package removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_SUNXI_MALI_MAINLINE
-	help
-	  The sunxi-mali package was removed, as the
-	  sunxi-mali-mainline package replaces it for mainline
-	  kernels on Allwinner platforms.
-
-config BR2_BINUTILS_VERSION_2_29_X
-	bool "binutils version 2.29 support removed"
-	select BR2_LEGACY
-	help
-	  Support for binutils version 2.29 has been removed. The
-	  current default version (2.31 or later) has been selected
-	  instead.
-
-config BR2_BINUTILS_VERSION_2_28_X
-	bool "binutils version 2.28 support removed"
-	select BR2_LEGACY
-	help
-	  Support for binutils version 2.28 has been removed. The
-	  current default version (2.31 or later) has been selected
-	  instead.
-
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_APEXSINK
-	bool "gst-plugins-bad apexsink option removed"
-	select BR2_LEGACY
-	help
-	  The gst-plugins-bad apexsink option was removed.
-
-comment "Legacy options removed in 2019.02"
-
-config BR2_PACKAGE_QT
-	bool "qt package removed"
-	select BR2_LEGACY
-	help
-	  The qt package was removed.
-
-config BR2_PACKAGE_QTUIO
-	bool "qtuio package removed"
-	select BR2_LEGACY
-	help
-	  The qtuio package was removed.
-
-config BR2_PACKAGE_PINENTRY_QT4
-	bool "pinentry-qt4 option removed"
-	select BR2_LEGACY
-	help
-	  The pinentry-qt4 option was removed.
-
-config BR2_PACKAGE_POPPLER_QT
-	bool "poppler qt option removed"
-	select BR2_LEGACY
-	help
-	  The poppler qt option was removed.
-
-config BR2_PACKAGE_OPENCV3_WITH_QT
-	bool "opencv3 qt backend option removed"
-	select BR2_LEGACY
-	help
-	  The opencv3 qt backend option was removed.
-
-config BR2_PACKAGE_OPENCV_WITH_QT
-	bool "opencv qt backend option removed"
-	select BR2_LEGACY
-	help
-	  The opencv qt backend option was removed.
-
-config BR2_PACKAGE_AMD_CATALYST_CCCLE
-	bool "catalyst control center option removed"
-	select BR2_LEGACY
-	help
-	  The AMD Catalyst Control Center option was removed.
-
-config BR2_PACKAGE_SDL_QTOPIA
-	bool "sdl qtopia video driver option removed"
-	select BR2_LEGACY
-	help
-	  The SDL QTopia video driver option was removed.
-
-config BR2_PACKAGE_PYTHON_PYQT
-	bool "python-pyqt package removed"
-	select BR2_LEGACY
-	help
-	  The python-pyqt package was removed. Consider python-pyqt5
-	  instead.
-
-config BR2_PACKAGE_GNURADIO_QTGUI
-	bool "gnuradio gr-qtgui option removed"
-	select BR2_LEGACY
-	help
-	  The gr-qtgui option was removed.
-
-config BR2_PACKAGE_LUACRYPTO
-	bool "luacrypto package removed"
-	select BR2_LEGACY
-	help
-	  The luacrypto package was removed. Consider luaossl instead.
-
-config BR2_PACKAGE_TN5250
-	bool "tn5250 package removed"
-	select BR2_LEGACY
-	help
-	  The tn5250 package was removed.
-
-config BR2_PACKAGE_BOOST_SIGNALS
-	bool "Boost signals removed"
-	select BR2_LEGACY
-	help
-	  Its removal was announced in boost 1.68 and its deprecation
-	  was announced in 1.54. Users are encouraged to use Signals2
-	  instead.
-
-config BR2_PACKAGE_FFTW_PRECISION_SINGLE
-	bool "single"
-	select BR2_LEGACY
-	select BR2_PACKAGE_FFTW_SINGLE
-	help
-	  This option has been removed in favor of
-	  BR2_PACKAGE_FFTW_SINGLE.
-
-config BR2_PACKAGE_FFTW_PRECISION_DOUBLE
-	bool "double"
-	select BR2_LEGACY
-	select BR2_PACKAGE_FFTW_DOUBLE
-	help
-	  This option has been removed in favor of
-	  BR2_PACKAGE_FFTW_DOUBLE.
-
-config BR2_PACKAGE_FFTW_PRECISION_LONG_DOUBLE
-	bool "long double"
-	depends on !(BR2_TOOLCHAIN_BUILDROOT_UCLIBC && \
-		(BR2_arm || BR2_mips || BR2_mipsel))
-	select BR2_LEGACY
-	select BR2_PACKAGE_FFTW_LONG_DOUBLE
-	help
-	  This option has been removed in favor of
-	  BR2_PACKAGE_FFTW_LONG_DOUBLE.
-
-config BR2_PACKAGE_FFTW_PRECISION_QUAD
-	bool "quad"
-	depends on (BR2_i386 || BR2_x86_64) && BR2_USE_WCHAR
-	select BR2_LEGACY
-	select BR2_PACKAGE_FFTW_QUAD
-	help
-	  This option has been removed in favor of
-	  BR2_PACKAGE_FFTW_QUAD.
-
-config BR2_PACKAGE_LUA_5_2
-	bool "Lua 5.2.x version removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_LUA_5_3
-	help
-	  The Lua 5.2.x version was removed.
-
-config BR2_TARGET_GENERIC_PASSWD_MD5
-	bool "target passwd md5 format support has been removed"
-	select BR2_LEGACY
-	help
-	  The default has been moved to SHA256 and all C libraries
-	  now support that method by default
-
-comment "Legacy options removed in 2018.11"
-
-config BR2_TARGET_XLOADER
-	bool "xloader has been removed"
-	select BR2_LEGACY
-	help
-	  The package has been removed as u-boot SPL provides
-	  similar functionality
-
-config BR2_PACKAGE_TIDSP_BINARIES
-	bool "tidsp-binaries package removed"
-	select BR2_LEGACY
-	help
-	  The tidsp-binaries package was removed.
-
-config BR2_PACKAGE_DSP_TOOLS
-	bool "dsp-tools package removed"
-	select BR2_LEGACY
-	help
-	  The dsp-tools package was removed.
-
-config BR2_PACKAGE_GST_DSP
-	bool "gst-dsp package removed"
-	select BR2_LEGACY
-	help
-	  The gst-dsp package was removed.
-
-config BR2_PACKAGE_BOOTUTILS
-	bool "bootutils package removed"
-	select BR2_LEGACY
-	help
-	  The bootutils package was removed.
-
-config BR2_PACKAGE_EXPEDITE
-	bool "expedite package has been removed"
-	select BR2_LEGACY
-	help
-	  expedite is not actively maintained anymore.
-	  https://sourceforge.net/p/enlightenment/mailman/message/36428571
-
-config BR2_PACKAGE_MESA3D_OPENGL_TEXTURE_FLOAT
-	bool "mesa3d opengl texture float option removed"
-	select BR2_LEGACY
-	help
-	  mesa3d now unconditionally enables floating-point textures,
-	  as the corresponding patent has expired.
-
-config BR2_KERNEL_HEADERS_4_10
-	bool "kernel headers version 4.10.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 4.10.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_KERNEL_HEADERS_4_11
-	bool "kernel headers version 4.11.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 4.11.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_KERNEL_HEADERS_4_12
-	bool "kernel headers version 4.12.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 4.12.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_KERNEL_HEADERS_4_13
-	bool "kernel headers version 4.13.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 4.13.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_KERNEL_HEADERS_4_15
-	bool "kernel headers version 4.15.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 4.15.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_KERNEL_HEADERS_4_17
-	bool "kernel headers version 4.17.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 4.17.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_PACKAGE_LIBNFTNL_XML
-	bool "libnftl no longer supports XML output"
-	select BR2_LEGACY
-	help
-	  libnftnl removed integration with libmxml.
-
-config BR2_KERNEL_HEADERS_3_2
-	bool "kernel headers version 3.2.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 3.2.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_KERNEL_HEADERS_4_1
-	bool "kernel headers version 4.1.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 4.1.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_KERNEL_HEADERS_4_16
-	bool "kernel headers version 4.16.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 4.16.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_KERNEL_HEADERS_4_18
-	bool "kernel headers version 4.18.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 4.18.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
 ###############################################################################
 comment "Legacy options removed in 2018.08"
 
-config BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT
-	bool "docker-engine static client option renamed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_DOCKER_CLI_STATIC
-	help
-	  BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT has been renamed to
-	  BR2_PACKAGE_DOCKER_CLI_STATIC, following the package split of
-	  docker-engine and docker-cli.
-
 config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19
 	bool "Modular X.org server was updated to version 1.20.0"
 	select BR2_LEGACY
@@ -1515,24 +1060,33 @@ comment "Legacy options removed in 2018.02"
 
 config BR2_KERNEL_HEADERS_3_4
 	bool "kernel headers version 3.4.x are no longer supported"
+	select BR2_KERNEL_HEADERS_4_1
 	select BR2_LEGACY
 	help
 	  Version 3.4.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
+	  maintained upstream and are now removed. As an alternative,
+	  version 4.1.x of the headers have been automatically
+	  selected in your configuration.
 
 config BR2_KERNEL_HEADERS_3_10
 	bool "kernel headers version 3.10.x are no longer supported"
+	select BR2_KERNEL_HEADERS_4_1
 	select BR2_LEGACY
 	help
 	  Version 3.10.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
+	  maintained upstream and are now removed. As an alternative,
+	  version 4.1.x of the headers have been automatically
+	  selected in your configuration.
 
 config BR2_KERNEL_HEADERS_3_12
 	bool "kernel headers version 3.12.x are no longer supported"
+	select BR2_KERNEL_HEADERS_4_1
 	select BR2_LEGACY
 	help
 	  Version 3.12.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
+	  maintained upstream and are now removed. As an alternative,
+	  version 4.1.x of the headers have been automatically
+	  selected in your configuration.
 
 config BR2_BINUTILS_VERSION_2_27_X
 	bool "binutils version 2.27 support removed"
@@ -1834,6 +1388,16 @@ config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MAD
 	bool "mad (*.mp3 audio) removed"
 	select BR2_LEGACY
 
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTC
+	bool "gst1-plugins-bad webrtc renamed to webrtcdsp"
+	select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTCDSP
+	select BR2_LEGACY
+	help
+	  The WebRTC plugin in GStreamer 1.x has always been named
+	  webrtcdsp, but was wrongly introduced in Buildroot under the
+	  name webrtc. Therefore, we have renamed the option to match
+	  the actual name of the GStreamer plugin.
+
 config BR2_STRIP_none
 	bool "Strip command 'none' has been removed"
 	select BR2_LEGACY
@@ -2073,17 +1637,23 @@ config BR2_PACKAGE_GMOCK
 
 config BR2_KERNEL_HEADERS_4_8
 	bool "kernel headers version 4.8.x are no longer supported"
+	select BR2_KERNEL_HEADERS_4_4
 	select BR2_LEGACY
 	help
 	  Version 4.8.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
+	  maintained upstream and are now removed. As an alternative,
+	  version 4.4.x of the headers have been automatically
+	  selected in your configuration.
 
 config BR2_KERNEL_HEADERS_3_18
 	bool "kernel headers version 3.18.x are no longer supported"
+	select BR2_KERNEL_HEADERS_3_12
 	select BR2_LEGACY
 	help
 	  Version 3.18.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
+	  maintained upstream and are now removed. As an alternative,
+	  version 3.12.x of the headers have been automatically
+	  selected in your configuration.
 
 config BR2_GLIBC_VERSION_2_22
 	bool "glibc 2.22 removed"
@@ -2106,31 +1676,43 @@ config BR2_PACKAGE_PERL_DB_FILE
 
 config BR2_KERNEL_HEADERS_4_7
 	bool "kernel headers version 4.7.x are no longer supported"
+	select BR2_KERNEL_HEADERS_4_4
 	select BR2_LEGACY
 	help
 	  Version 4.7.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
+	  maintained upstream and are now removed. As an alternative,
+	  version 4.4.x of the headers have been automatically
+	  selected in your configuration.
 
 config BR2_KERNEL_HEADERS_4_6
 	bool "kernel headers version 4.6.x are no longer supported"
+	select BR2_KERNEL_HEADERS_4_4
 	select BR2_LEGACY
 	help
 	  Version 4.6.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
+	  maintained upstream and are now removed. As an alternative,
+	  version 4.4.x of the headers have been automatically
+	  selected in your configuration.
 
 config BR2_KERNEL_HEADERS_4_5
 	bool "kernel headers version 4.5.x are no longer supported"
+	select BR2_KERNEL_HEADERS_4_4
 	select BR2_LEGACY
 	help
 	  Version 4.5.x of the Linux kernel headers are no longer
-	   maintained upstream and are now removed.
+	   maintained upstream and are now removed. As an alternative,
+	   version 4.4.x of the headers have been automatically
+	   selected in your configuration.
 
 config BR2_KERNEL_HEADERS_3_14
 	bool "kernel headers version 3.14.x are no longer supported"
+	select BR2_KERNEL_HEADERS_3_12
 	select BR2_LEGACY
 	  help
 	  Version 3.14.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
+	  maintained upstream and are now removed. As an alternative,
+	  version 3.12.x of the headers have been automatically
+	  selected in your configuration.
 
 config BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS
 	bool "musl-cross 1.1.12 toolchain removed"
@@ -2259,17 +1841,23 @@ config BR2_PACKAGE_SSTRIP
 
 config BR2_KERNEL_HEADERS_4_3
 	bool "kernel headers version 4.3.x are no longer supported"
+	select BR2_KERNEL_HEADERS_4_1
 	select BR2_LEGACY
 	help
 	  Version 4.3.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
+	  maintained upstream and are now removed. As an alternative,
+	  version 4.1.x of the headers have been automatically
+	  selected in your configuration.
 
 config BR2_KERNEL_HEADERS_4_2
 	bool "kernel headers version 4.2.x are no longer supported"
+	select BR2_KERNEL_HEADERS_4_1
 	select BR2_LEGACY
 	help
 	  Version 4.2.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
+	  maintained upstream and are now removed. As an alternative,
+	  version 4.1.x of the headers have been automatically
+	  selected in your configuration.
 
 config BR2_PACKAGE_KODI_ADDON_XVDR
 	bool "kodi-addon-xvdr removed"
@@ -2344,18 +1932,24 @@ config BR2_GCC_VERSION_4_8_ARC
 
 config BR2_KERNEL_HEADERS_4_0
 	bool "kernel headers version 4.0.x are no longer supported"
+	select BR2_KERNEL_HEADERS_3_12
 	select BR2_LEGACY
 	help
 	  Version 4.0.x of the Linux kernel headers have been deprecated
 	  for more than four buildroot releases and are now removed.
+	  As an alternative, version 3.12.x of the headers have been
+	  automatically selected in your configuration.
 
 config BR2_KERNEL_HEADERS_3_19
 	bool "kernel headers version 3.19.x are no longer supported"
+	select BR2_KERNEL_HEADERS_3_12
 	select BR2_LEGACY
 	help
 	  Version 3.19.x of the Linux kernel headers have been
 	  deprecated for more than four buildroot releases and are now
 	  removed.
+	  As an alternative, version 3.12.x of the headers have been
+	  automatically selected in your configuration.
 
 config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS
 	bool "libevas-generic-loaders package removed"
@@ -2568,11 +2162,14 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_VOID
 
 config BR2_KERNEL_HEADERS_3_17
 	bool "kernel headers version 3.17.x are no longer supported"
+	select BR2_KERNEL_HEADERS_3_12
 	select BR2_LEGACY
 	help
 	  Version 3.17.x of the Linux kernel headers have been
 	  deprecated for more than four buildroot releases and are now
 	  removed.
+	  As an alternative, version 3.12.x of the headers have been
+	  automatically selected in your configuration.
 
 config BR2_GDB_VERSION_7_7
 	bool "gdb 7.7 has been removed"
@@ -2713,11 +2310,14 @@ config BR2_PACKAGE_CUPS_PDFTOPS
 
 config BR2_KERNEL_HEADERS_3_16
 	bool "kernel headers version 3.16.x are no longer supported"
+	select BR2_KERNEL_HEADERS_3_12
 	select BR2_LEGACY
 	help
 	  Version 3.16.x of the Linux kernel headers have been
 	  deprecated for more than four buildroot releases and are now
 	  removed.
+	  As an alternative, version 3.12.x of the headers have been
+	  automatically selected in your configuration.
 
 config BR2_PACKAGE_PYTHON_PYXML
 	bool "python-pyxml package has been removed"
@@ -2918,34 +2518,46 @@ config BR2_PACKAGE_BLACKBOX
 
 config BR2_KERNEL_HEADERS_3_0
 	bool "kernel headers version 3.0.x are no longer supported"
+	select BR2_KERNEL_HEADERS_3_2
 	select BR2_LEGACY
 	help
 	  Version 3.0.x of the Linux kernel headers have been deprecated
 	  for more than four buildroot releases and are now removed.
+	  As an alternative, version 3.2.x of the headers have been
+	  automatically selected in your configuration.
 
 config BR2_KERNEL_HEADERS_3_11
 	bool "kernel headers version 3.11.x are no longer supported"
+	select BR2_KERNEL_HEADERS_3_10
 	select BR2_LEGACY
 	help
 	  Version 3.11.x of the Linux kernel headers have been
 	  deprecated for more than four buildroot releases and are now
 	  removed.
+	  As an alternative, version 3.10.x of the headers have been
+	  automatically selected in your configuration.
 
 config BR2_KERNEL_HEADERS_3_13
 	bool "kernel headers version 3.13.x are no longer supported"
+	select BR2_KERNEL_HEADERS_3_12
 	select BR2_LEGACY
 	help
 	  Version 3.13.x of the Linux kernel headers have been
 	  deprecated for more than four buildroot releases and are now
 	  removed.
+	  As an alternative, version 3.12.x of the headers have been
+	  automatically selected in your configuration.
 
 config BR2_KERNEL_HEADERS_3_15
 	bool "kernel headers version 3.15.x are no longer supported"
+	select BR2_KERNEL_HEADERS_3_12
 	select BR2_LEGACY
 	help
 	  Version 3.15.x of the Linux kernel headers have been
 	  deprecated for more than four buildroot releases and are now
 	  removed.
+	  As an alternative, version 3.12.x of the headers have been
+	  automatically selected in your configuration.
 
 config BR2_PACKAGE_DIRECTFB_EXAMPLES_ANDI
 	bool "DirectFB example df_andi has been removed"
@@ -3772,10 +3384,13 @@ config BR2_PACKAGE_LIBELF
 
 config BR2_KERNEL_HEADERS_3_8
 	bool "kernel headers version 3.8.x are no longer supported"
+	select BR2_KERNEL_HEADERS_3_4
 	select BR2_LEGACY
 	help
 	  Version 3.8.x of the Linux kernel headers have been deprecated
 	  for more than four buildroot releases and are now removed.
+	  As an alternative, version 3.4.x of the headers have been
+	  automatically selected in your configuration.
 
 config BR2_PACKAGE_GETTEXT_TOOLS
 	bool "support for gettext-tools on target has been removed"
@@ -3928,17 +3543,23 @@ config BR2_PACKAGE_EVTEST_CAPTURE
 
 config BR2_KERNEL_HEADERS_3_6
 	bool "kernel headers version 3.6.x are no longer supported"
+	select BR2_KERNEL_HEADERS_3_4
 	select BR2_LEGACY
 	help
 	  Version 3.6.x of the Linux kernel headers have been deprecated
 	  for more than four buildroot releases and are now removed.
+	  As an alternative, version 3.4.x of the headers have been
+	  automatically selected in your configuration.
 
 config BR2_KERNEL_HEADERS_3_7
 	bool "kernel headers version 3.7.x are no longer supported"
+	select BR2_KERNEL_HEADERS_3_4
 	select BR2_LEGACY
 	help
 	  Version 3.7.x of the Linux kernel headers have been deprecated
 	  for more than four buildroot releases and are now removed.
+	  As an alternative, version 3.4.x of the headers have been
+	  automatically selected in your configuration.
 
 config BR2_PACKAGE_VALA
 	bool "vala target package has been removed"
@@ -4100,24 +3721,33 @@ config BR2_sh3eb
 
 config BR2_KERNEL_HEADERS_3_1
 	bool "kernel headers version 3.1.x are no longer supported"
+	select BR2_KERNEL_HEADERS_3_2
 	select BR2_LEGACY
 	help
 	  Version 3.1.x of the Linux kernel headers have been deprecated
 	  for more than four buildroot releases and are now removed.
+	  As an alternative, version 3.2.x of the headers have been
+	  automatically selected in your configuration.
 
 config BR2_KERNEL_HEADERS_3_3
 	bool "kernel headers version 3.3.x are no longer supported"
+	select BR2_KERNEL_HEADERS_3_2
 	select BR2_LEGACY
 	help
 	  Version 3.3.x of the Linux kernel headers have been deprecated
 	  for more than four buildroot releases and are now removed.
+	  As an alternative, version 3.2.x of the headers have been
+	  automatically selected in your configuration.
 
 config BR2_KERNEL_HEADERS_3_5
 	bool "kernel headers version 3.5.x are no longer supported"
+	select BR2_KERNEL_HEADERS_3_4
 	select BR2_LEGACY
 	help
 	  Version 3.5.x of the Linux kernel headers have been deprecated
 	  for more than four buildroot releases and are now removed.
+	  As an alternative, version 3.4.x of the headers have been
+	  automatically selected in your configuration.
 
 config BR2_GDB_VERSION_7_2
 	bool "gdb 7.2.x is no longer supported"

Makefile

@@ -2,7 +2,7 @@
 #
 # Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
 # Copyright (C) 2006-2014 by the Buildroot developers <buildroot@uclibc.org>
-# Copyright (C) 2014-2019 by the Buildroot developers <buildroot@buildroot.org>
+# Copyright (C) 2014-2018 by the Buildroot developers <buildroot@buildroot.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -60,11 +60,6 @@ override O := $(patsubst %/,%,$(patsubst %.,%,$(O)))
 # avoid empty CANONICAL_O in case on non-existing entry.
 CANONICAL_O := $(shell mkdir -p $(O) >/dev/null 2>&1)$(realpath $(O))
 
-# gcc fails to build when the srcdir contains a '@'
-ifneq ($(findstring @,$(CANONICAL_O)),)
-$(error The build directory can not contain a '@')
-endif
-
 CANONICAL_CURDIR = $(realpath $(CURDIR))
 
 REQ_UMASK = 0022
@@ -92,9 +87,9 @@ all:
 .PHONY: all
 
 # Set and export the version string
-export BR2_VERSION := 2019.08.3
+export BR2_VERSION := 2018.08.1
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1575725000
+BR2_VERSION_EPOCH = 1538904000
 
 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)
@@ -105,6 +100,22 @@ ifneq ($(firstword $(sort $(RUNNING_MAKE_VERSION) $(MIN_MAKE_VERSION))),$(MIN_MA
 $(error You have make '$(RUNNING_MAKE_VERSION)' installed. GNU make >= $(MIN_MAKE_VERSION) is required)
 endif
 
+# Parallel execution of this Makefile is disabled because it changes
+# the packages building order, that can be a problem for two reasons:
+# - If a package has an unspecified optional dependency and that
+#   dependency is present when the package is built, it is used,
+#   otherwise it isn't (but compilation happily proceeds) so the end
+#   result will differ if the order is swapped due to parallel
+#   building.
+# - Also changing the building order can be a problem if two packages
+#   manipulate the same file in the target directory.
+#
+# Taking into account the above considerations, if you still want to execute
+# this top-level Makefile in parallel comment the ".NOTPARALLEL" line and
+# use the -j<jobs> option when building, e.g:
+#      make -j$((`getconf _NPROCESSORS_ONLN`+1))
+.NOTPARALLEL:
+
 # absolute path
 TOPDIR := $(CURDIR)
 CONFIG_CONFIG_IN = Config.in
@@ -117,9 +128,9 @@ export BR2_VERSION_FULL := $(BR2_VERSION)$(shell $(TOPDIR)/support/scripts/setlo
 
 # List of targets and target patterns for which .config doesn't need to be read in
 noconfig_targets := menuconfig nconfig gconfig xconfig config oldconfig randconfig \
-	defconfig %_defconfig allyesconfig allnoconfig alldefconfig syncconfig release \
+	defconfig %_defconfig allyesconfig allnoconfig alldefconfig silentoldconfig release \
 	randpackageconfig allyespackageconfig allnopackageconfig \
-	print-version olddefconfig distclean manual manual-% check-package
+	print-version olddefconfig distclean manual manual-%
 
 # Some global targets do not trigger a build, but are used to collect
 # metadata, or do various checks. When such targets are triggered,
@@ -135,7 +146,7 @@ nobuild_targets := source %-source \
 	clean distclean help show-targets graph-depends \
 	%-graph-depends %-show-depends %-show-version \
 	graph-build graph-size list-defconfigs \
-	savedefconfig update-defconfig printvars
+	savedefconfig printvars
 ifeq ($(MAKECMDGOALS),)
 BR_BUILDING = y
 else ifneq ($(filter-out $(nobuild_targets),$(MAKECMDGOALS)),)
@@ -179,9 +190,10 @@ $(if $(BASE_DIR),, $(error output directory "$(O)" does not exist))
 # still be overridden on the command line, therefore the file is re-created
 # every time make is run.
 
-BR2_EXTERNAL_FILE = $(BASE_DIR)/.br2-external.mk
+BR2_EXTERNAL_FILE = $(BASE_DIR)/.br-external.mk
 -include $(BR2_EXTERNAL_FILE)
-$(shell support/scripts/br2-external -d '$(BASE_DIR)' $(BR2_EXTERNAL))
+$(shell support/scripts/br2-external \
+	-m -o '$(BR2_EXTERNAL_FILE)' $(BR2_EXTERNAL))
 BR2_EXTERNAL_ERROR =
 include $(BR2_EXTERNAL_FILE)
 ifneq ($(BR2_EXTERNAL_ERROR),)
@@ -203,7 +215,10 @@ BR_GRAPH_OUT := $(or $(BR2_GRAPH_OUT),pdf)
 
 BUILD_DIR := $(BASE_DIR)/build
 BINARIES_DIR := $(BASE_DIR)/images
+# The target directory is common to all packages,
+# but there is one that is specific to each filesystem.
 BASE_TARGET_DIR := $(BASE_DIR)/target
+TARGET_DIR = $(if $(ROOTFS),$(ROOTFS_$(ROOTFS)_TARGET_DIR),$(BASE_TARGET_DIR))
 # initial definition so that 'make clean' works for most users, even without
 # .config. HOST_DIR will be overwritten later when .config is included.
 HOST_DIR := $(BASE_DIR)/host
@@ -226,27 +241,12 @@ ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
 -include $(BR2_CONFIG)
 endif
 
-# Parallel execution of this Makefile is disabled because it changes
-# the packages building order, that can be a problem for two reasons:
-# - If a package has an unspecified optional dependency and that
-#   dependency is present when the package is built, it is used,
-#   otherwise it isn't (but compilation happily proceeds) so the end
-#   result will differ if the order is swapped due to parallel
-#   building.
-# - Also changing the building order can be a problem if two packages
-#   manipulate the same file in the target directory.
-#
-# Taking into account the above considerations, if you still want to execute
-# this top-level Makefile in parallel comment the ".NOTPARALLEL" line and
-# use the -j<jobs> option when building, e.g:
-#      make -j$((`getconf _NPROCESSORS_ONLN`+1))
-.NOTPARALLEL:
-
 # timezone and locale may affect build output
 ifeq ($(BR2_REPRODUCIBLE),y)
 export TZ = UTC
 export LANG = C
 export LC_ALL = C
+export GZIP = -n
 endif
 
 # To put more focus on warnings, be less verbose as default
@@ -346,14 +346,8 @@ export HOSTARCH := $(shell LC_ALL=C $(HOSTCC_NOCCACHE) -v 2>&1 | \
 	    -e 's/macppc/powerpc/' \
 	    -e 's/sh.*/sh/' )
 
-# When adding a new host gcc version in Config.in,
-# update the HOSTCC_MAX_VERSION variable:
-HOSTCC_MAX_VERSION := 8
-
-HOSTCC_VERSION := $(shell V=$$($(HOSTCC_NOCCACHE) --version | \
-	sed -n -r 's/^.* ([0-9]*)\.([0-9]*)\.([0-9]*)[ ]*.*/\1 \2/p'); \
-	[ "$${V%% *}" -le $(HOSTCC_MAX_VERSION) ] || V=$(HOSTCC_MAX_VERSION); \
-	printf "%s" "$${V}")
+HOSTCC_VERSION := $(shell $(HOSTCC_NOCCACHE) --version | \
+	sed -n -r 's/^.* ([0-9]*)\.([0-9]*)\.([0-9]*)[ ]*.*/\1 \2/p')
 
 # For gcc >= 5.x, we only need the major version.
 ifneq ($(firstword $(HOSTCC_VERSION)),4)
@@ -417,8 +411,6 @@ unexport TERMINFO
 unexport MACHINE
 unexport O
 unexport GCC_COLORS
-unexport PLATFORM
-unexport OS
 
 GNU_HOST_NAME := $(shell support/gnuconfig/config.guess)
 
@@ -437,12 +429,10 @@ KERNEL_ARCH := $(shell echo "$(ARCH)" | sed -e "s/-.*//" \
 	-e s/arceb/arc/ \
 	-e s/arm.*/arm/ -e s/sa110/arm/ \
 	-e s/aarch64.*/arm64/ \
-	-e s/nds32.*/nds32/ \
 	-e s/or1k/openrisc/ \
 	-e s/parisc64/parisc/ \
 	-e s/powerpc64.*/powerpc/ \
 	-e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
-	-e s/riscv.*/riscv/ \
 	-e s/sh.*/sh/ \
 	-e s/microblazeel/microblaze/)
 
@@ -455,10 +445,6 @@ TAR_OPTIONS = $(call qstrip,$(BR2_TAR_OPTIONS)) -xf
 # packages compiled for the host go here
 HOST_DIR := $(call qstrip,$(BR2_HOST_DIR))
 
-# The target directory is common to all packages,
-# but there is one that is specific to each filesystem.
-TARGET_DIR = $(if $(ROOTFS),$(ROOTFS_$(ROOTFS)_TARGET_DIR),$(BASE_TARGET_DIR))
-
 ifneq ($(HOST_DIR),$(BASE_DIR)/host)
 HOST_DIR_SYMLINK = $(BASE_DIR)/host
 $(HOST_DIR_SYMLINK): $(BASE_DIR)
@@ -470,14 +456,14 @@ BR_PATH = "$(HOST_DIR)/bin:$(HOST_DIR)/sbin:$(PATH)"
 
 # Location of a file giving a big fat warning that output/target
 # should not be used as the root filesystem.
-TARGET_DIR_WARNING_FILE = $(TARGET_DIR)/THIS_IS_NOT_YOUR_ROOT_FILESYSTEM
+TARGET_DIR_WARNING_FILE = $(BASE_TARGET_DIR)/THIS_IS_NOT_YOUR_ROOT_FILESYSTEM
 
 ifeq ($(BR2_CCACHE),y)
-CCACHE = $(HOST_DIR)/bin/ccache
+CCACHE := $(HOST_DIR)/bin/ccache
 BR_CACHE_DIR ?= $(call qstrip,$(BR2_CCACHE_DIR))
 export BR_CACHE_DIR
-HOSTCC = $(CCACHE) $(HOSTCC_NOCCACHE)
-HOSTCXX = $(CCACHE) $(HOSTCXX_NOCCACHE)
+HOSTCC := $(CCACHE) $(HOSTCC)
+HOSTCXX := $(CCACHE) $(HOSTCXX)
 else
 export BR_NO_CCACHE
 endif
@@ -507,9 +493,9 @@ include Makefile.legacy
 
 include system/system.mk
 include package/Makefile.in
-# arch/arch.mk must be after package/Makefile.in because it may need to
+# arch/arch.mk.* must be after package/Makefile.in because it may need to
 # complement variables defined therein, like BR_NO_CHECK_HASH_FOR.
-include arch/arch.mk
+-include $(sort $(wildcard arch/arch.mk.*))
 include support/dependencies/dependencies.mk
 
 include $(sort $(wildcard toolchain/*.mk))
@@ -552,16 +538,9 @@ include $(BR2_EXTERNAL_MKS)
 #
 # Only trigger the check for default builds. If the user forces building
 # a package, even if not enabled in the configuration, we want to accept
-# it. However; we also want to be able to force checking the dependencies
-# if the user so desires. Forcing a dependency check is useful in the case
-# of test-pkg, as we want to make sure during testing, that a package has
-# all the dependencies selected in the config file.
+# it.
 #
 ifeq ($(MAKECMDGOALS),)
-BR_FORCE_CHECK_DEPENDENCIES = YES
-endif
-
-ifeq ($(BR_FORCE_CHECK_DEPENDENCIES),YES)
 
 define CHECK_ONE_DEPENDENCY
 ifeq ($$($(2)_TYPE),target)
@@ -581,8 +560,12 @@ $(foreach pkg,$(call UPPERCASE,$(PACKAGES)),\
 
 endif
 
+.PHONY: dirs
+dirs: $(BUILD_DIR) $(STAGING_DIR) $(BASE_TARGET_DIR) \
+	$(HOST_DIR) $(HOST_DIR_SYMLINK) $(BINARIES_DIR)
+
 $(BUILD_DIR)/buildroot-config/auto.conf: $(BR2_CONFIG)
-	$(MAKE1) $(EXTRAMAKEARGS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTCXX="$(HOSTCXX_NOCCACHE)" syncconfig
+	$(MAKE1) $(EXTRAMAKEARGS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTCXX="$(HOSTCXX_NOCCACHE)" silentoldconfig
 
 .PHONY: prepare
 prepare: $(BUILD_DIR)/buildroot-config/auto.conf
@@ -590,8 +573,8 @@ prepare: $(BUILD_DIR)/buildroot-config/auto.conf
 .PHONY: world
 world: target-post-image
 
-.PHONY: prepare-sdk
-prepare-sdk: world
+.PHONY: sdk
+sdk: world
 	@$(call MESSAGE,"Rendering the SDK relocatable")
 	$(TOPDIR)/support/scripts/fix-rpath host
 	$(TOPDIR)/support/scripts/fix-rpath staging
@@ -599,52 +582,29 @@ prepare-sdk: world
 	mkdir -p $(HOST_DIR)/share/buildroot
 	echo $(HOST_DIR) > $(HOST_DIR)/share/buildroot/sdk-location
 
-BR2_SDK_PREFIX ?= $(GNU_TARGET_NAME)_sdk-buildroot
-.PHONY: sdk
-sdk: prepare-sdk $(BR2_TAR_HOST_DEPENDENCY)
-	@$(call MESSAGE,"Generating SDK tarball")
-	$(if $(BR2_SDK_PREFIX),,$(error BR2_SDK_PREFIX can not be empty))
-	$(Q)mkdir -p $(BINARIES_DIR)
-	$(TAR) czf "$(BINARIES_DIR)/$(BR2_SDK_PREFIX).tar.gz" \
-		--owner=0 --group=0 --numeric-owner \
-		--transform='s#^$(patsubst /%,%,$(HOST_DIR))#$(BR2_SDK_PREFIX)#' \
-		-C / $(patsubst /%,%,$(HOST_DIR))
+# Populating the staging with the base directories is handled by the skeleton package
+$(STAGING_DIR):
+	@mkdir -p $(STAGING_DIR)
+	@ln -snf $(STAGING_DIR) $(BASE_DIR)/staging
 
 RSYNC_VCS_EXCLUSIONS = \
 	--exclude .svn --exclude .git --exclude .hg --exclude .bzr \
 	--exclude CVS
 
-# When stripping, obey to BR2_STRIP_EXCLUDE_DIRS and
-# BR2_STRIP_EXCLUDE_FILES
-STRIP_FIND_COMMON_CMD = \
-	find $(TARGET_DIR) \
-	$(if $(call qstrip,$(BR2_STRIP_EXCLUDE_DIRS)), \
-		\( $(call finddirclauses,$(TARGET_DIR),$(call qstrip,$(BR2_STRIP_EXCLUDE_DIRS))) \) \
-		-prune -o \
-	) \
-	$(if $(call qstrip,$(BR2_STRIP_EXCLUDE_FILES)), \
-		-not \( $(call findfileclauses,$(call qstrip,$(BR2_STRIP_EXCLUDE_FILES))) \) )
-
-# Regular stripping for everything, except libpthread, ld-*.so and
-# kernel modules:
+STRIP_FIND_CMD = find $(TARGET_DIR)
+ifneq (,$(call qstrip,$(BR2_STRIP_EXCLUDE_DIRS)))
+STRIP_FIND_CMD += \( $(call finddirclauses,$(TARGET_DIR),$(call qstrip,$(BR2_STRIP_EXCLUDE_DIRS))) \) -prune -o
+endif
+STRIP_FIND_CMD += -type f \( -perm /111 -o -name '*.so*' \)
+# file exclusions:
 # - libpthread.so: a non-stripped libpthread shared library is needed for
 #   proper debugging of pthread programs using gdb.
 # - ld.so: a non-stripped dynamic linker library is needed for valgrind
 # - kernel modules (*.ko): do not function properly when stripped like normal
 #   applications and libraries. Normally kernel modules are already excluded
-#   by the executable permission check, so the explicit exclusion is only
+#   by the executable permission check above, so the explicit exclusion is only
 #   done for kernel modules with incorrect permissions.
-STRIP_FIND_CMD = \
-	$(STRIP_FIND_COMMON_CMD) \
-	-type f \( -perm /111 -o -name '*.so*' \) \
-	-not \( $(call findfileclauses,libpthread*.so* ld-*.so* *.ko) \) \
-	-print0
-
-# Special stripping (only debugging symbols) for libpthread and ld-*.so.
-STRIP_FIND_SPECIAL_LIBS_CMD = \
-	$(STRIP_FIND_COMMON_CMD) \
-	\( -name 'ld-*.so*' -o -name 'libpthread*.so*' \) \
-	-print0
+STRIP_FIND_CMD += -not \( $(call findfileclauses,libpthread*.so* ld-*.so* *.ko $(call qstrip,$(BR2_STRIP_EXCLUDE_FILES))) \) -print0
 
 ifeq ($(BR2_ECLIPSE_REGISTER),y)
 define TOOLCHAIN_ECLIPSE_REGISTER
@@ -727,14 +687,8 @@ $(TARGETS_ROOTFS): target-finalize
 # Avoid the rootfs name leaking down the dependency chain
 target-finalize: ROOTFS=
 
-host-finalize: $(HOST_DIR_SYMLINK)
-
-.PHONY: staging-finalize
-staging-finalize:
-	@ln -snf $(STAGING_DIR) $(BASE_DIR)/staging
-
 .PHONY: target-finalize
-target-finalize: $(PACKAGES) host-finalize
+target-finalize: $(PACKAGES)
 	@$(call MESSAGE,"Finalizing target directory")
 	# Check files that are touched by more than one package
 	./support/scripts/check-uniq-files -t target $(BUILD_DIR)/packages-file-list.txt
@@ -762,8 +716,19 @@ endif
 	rm -rf $(TARGET_DIR)/usr/share/gtk-doc
 	rmdir $(TARGET_DIR)/usr/share 2>/dev/null || true
 	$(STRIP_FIND_CMD) | xargs -0 $(STRIPCMD) 2>/dev/null || true
-	$(STRIP_FIND_SPECIAL_LIBS_CMD) | xargs -0 -r $(STRIPCMD) $(STRIP_STRIP_DEBUG) 2>/dev/null || true
 
+# See http://sourceware.org/gdb/wiki/FAQ, "GDB does not see any threads
+# besides the one in which crash occurred; or SIGTRAP kills my program when
+# I set a breakpoint"
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
+	find $(TARGET_DIR)/lib/ -type f -name 'libpthread*.so*' | \
+		xargs -r $(STRIPCMD) $(STRIP_STRIP_DEBUG)
+endif
+
+# Valgrind needs ld.so with enough information, so only strip
+# debugging symbols.
+	find $(TARGET_DIR)/lib/ -type f -name 'ld-*.so*' | \
+		xargs -r $(STRIPCMD) $(STRIP_STRIP_DEBUG)
 	test -f $(TARGET_DIR)/etc/ld.so.conf && \
 		{ echo "ERROR: we shouldn't have a /etc/ld.so.conf file"; exit 1; } || true
 	test -d $(TARGET_DIR)/etc/ld.so.conf.d && \
@@ -781,25 +746,11 @@ endif
 	@$(call MESSAGE,"Sanitizing RPATH in target tree")
 	$(TOPDIR)/support/scripts/fix-rpath target
 
-# For a merged /usr, ensure that /lib, /bin and /sbin and their /usr
-# counterparts are appropriately setup as symlinks ones to the others.
-ifeq ($(BR2_ROOTFS_MERGED_USR),y)
-
-	@$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \
-		$(call MESSAGE,"Sanity check in overlay $(d)"); \
-		not_merged_dirs="$$(support/scripts/check-merged-usr.sh $(d))"; \
-		test -n "$$not_merged_dirs" && { \
-			echo "ERROR: The overlay in $(d) is not" \
-				"using a merged /usr for the following directories:" \
-				$$not_merged_dirs; \
-			exit 1; \
-		} || true$(sep))
-
-endif # merged /usr
-
 	@$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \
 		$(call MESSAGE,"Copying overlay $(d)"); \
-		$(call SYSTEM_RSYNC,$(d),$(TARGET_DIR))$(sep))
+		rsync -a --ignore-times --keep-dirlinks $(RSYNC_VCS_EXCLUSIONS) \
+			--chmod=u=rwX,go=rX --exclude .empty --exclude '*~' \
+			$(d)/ $(TARGET_DIR)$(sep))
 
 	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \
 		$(call MESSAGE,"Executing post-build script $(s)"); \
@@ -808,9 +759,8 @@ endif # merged /usr
 	touch $(TARGET_DIR)/usr
 
 .PHONY: target-post-image
-target-post-image: $(TARGETS_ROOTFS) target-finalize staging-finalize
+target-post-image: $(TARGETS_ROOTFS) target-finalize
 	@rm -f $(ROOTFS_COMMON_TAR)
-	$(Q)mkdir -p $(BINARIES_DIR)
 	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \
 		$(call MESSAGE,"Executing post-image script $(s)"); \
 		$(EXTRA_ENV) $(s) $(BINARIES_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))
@@ -830,15 +780,15 @@ legal-info-clean:
 .PHONY: legal-info-prepare
 legal-info-prepare: $(LEGAL_INFO_DIR)
 	@$(call MESSAGE,"Buildroot $(BR2_VERSION_FULL) Collecting legal info")
-	@$(call legal-license-file,buildroot,buildroot,support/legal-info/buildroot.hash,COPYING,COPYING,HOST)
-	@$(call legal-manifest,TARGET,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE,SOURCE SITE,DEPENDENCIES WITH LICENSES)
-	@$(call legal-manifest,HOST,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE,SOURCE SITE,DEPENDENCIES WITH LICENSES)
-	@$(call legal-manifest,HOST,buildroot,$(BR2_VERSION_FULL),GPL-2.0+,COPYING,not saved,not saved)
+	@$(call legal-license-file,buildroot,buildroot,support/legal-info,COPYING,COPYING,HOST)
+	@$(call legal-manifest,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE,SOURCE SITE,TARGET)
+	@$(call legal-manifest,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE,SOURCE SITE,HOST)
+	@$(call legal-manifest,buildroot,$(BR2_VERSION_FULL),GPL-2.0+,COPYING,not saved,not saved,HOST)
 	@$(call legal-warning,the Buildroot source code has not been saved)
 	@cp $(BR2_CONFIG) $(LEGAL_INFO_DIR)/buildroot.config
 
 .PHONY: legal-info
-legal-info: legal-info-clean legal-info-prepare $(foreach p,$(PACKAGES),$(p)-all-legal-info) \
+legal-info: dirs legal-info-clean legal-info-prepare $(foreach p,$(PACKAGES),$(p)-all-legal-info) \
 		$(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST)
 	@cat support/legal-info/README.header >>$(LEGAL_REPORT)
 	@if [ -r $(LEGAL_WARNINGS) ]; then \
@@ -899,21 +849,6 @@ check-dependencies:
 	@cd "$(CONFIG_DIR)"; \
 	$(TOPDIR)/support/scripts/graph-depends -C
 
-.PHONY: show-info
-show-info:
-	@:
-	$(info $(call clean-json, \
-			{ $(foreach p, \
-				$(sort $(foreach i,$(PACKAGES) $(TARGETS_ROOTFS), \
-						$(i) \
-						$($(call UPPERCASE,$(i))_FINAL_RECURSIVE_DEPENDENCIES) \
-					) \
-				), \
-				$(call json-info,$(call UPPERCASE,$(p)))$(comma) \
-			) } \
-		) \
-	)
-
 else # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
 
 # Some subdirectories are also package names. To avoid that "make linux"
@@ -933,6 +868,9 @@ endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
 HOSTCFLAGS = $(CFLAGS_FOR_BUILD)
 export HOSTCFLAGS
 
+.PHONY: prepare-kconfig
+prepare-kconfig: outputmakefile $(BUILD_DIR)/.br2-external.in
+
 $(BUILD_DIR)/buildroot-config/%onf:
 	mkdir -p $(@D)/lxdialog
 	PKG_CONFIG_PATH="$(HOST_PKG_CONFIG_PATH)" $(MAKE) CC="$(HOSTCC_NOCCACHE)" HOSTCC="$(HOSTCC_NOCCACHE)" \
@@ -949,22 +887,22 @@ COMMON_CONFIG_ENV = \
 	KCONFIG_TRISTATE=$(BUILD_DIR)/buildroot-config/tristate.config \
 	BR2_CONFIG=$(BR2_CONFIG) \
 	HOST_GCC_VERSION="$(HOSTCC_VERSION)" \
-	BASE_DIR=$(BASE_DIR) \
+	BUILD_DIR=$(BUILD_DIR) \
 	SKIP_LEGACY=
 
-xconfig: $(BUILD_DIR)/buildroot-config/qconf outputmakefile
+xconfig: $(BUILD_DIR)/buildroot-config/qconf prepare-kconfig
 	@$(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN)
 
-gconfig: $(BUILD_DIR)/buildroot-config/gconf outputmakefile
+gconfig: $(BUILD_DIR)/buildroot-config/gconf prepare-kconfig
 	@$(COMMON_CONFIG_ENV) srctree=$(TOPDIR) $< $(CONFIG_CONFIG_IN)
 
-menuconfig: $(BUILD_DIR)/buildroot-config/mconf outputmakefile
+menuconfig: $(BUILD_DIR)/buildroot-config/mconf prepare-kconfig
 	@$(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN)
 
-nconfig: $(BUILD_DIR)/buildroot-config/nconf outputmakefile
+nconfig: $(BUILD_DIR)/buildroot-config/nconf prepare-kconfig
 	@$(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN)
 
-config: $(BUILD_DIR)/buildroot-config/conf outputmakefile
+config: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
 	@$(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN)
 
 # For the config targets that automatically select options, we pass
@@ -972,11 +910,11 @@ config: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 # no values are set for the legacy options so a subsequent oldconfig
 # will query them. Therefore, run an additional olddefconfig.
 
-randconfig allyesconfig alldefconfig allnoconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
+randconfig allyesconfig alldefconfig allnoconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
 	@$(COMMON_CONFIG_ENV) SKIP_LEGACY=y $< --$@ $(CONFIG_CONFIG_IN)
 	@$(COMMON_CONFIG_ENV) $< --olddefconfig $(CONFIG_CONFIG_IN) >/dev/null
 
-randpackageconfig allyespackageconfig allnopackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
+randpackageconfig allyespackageconfig allnopackageconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
 	@grep -v BR2_PACKAGE_ $(BR2_CONFIG) > $(CONFIG_DIR)/.config.nopkg
 	@$(COMMON_CONFIG_ENV) SKIP_LEGACY=y \
 		KCONFIG_ALLCONFIG=$(CONFIG_DIR)/.config.nopkg \
@@ -984,29 +922,27 @@ randpackageconfig allyespackageconfig allnopackageconfig: $(BUILD_DIR)/buildroot
 	@rm -f $(CONFIG_DIR)/.config.nopkg
 	@$(COMMON_CONFIG_ENV) $< --olddefconfig $(CONFIG_CONFIG_IN) >/dev/null
 
-oldconfig syncconfig olddefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
+oldconfig silentoldconfig olddefconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
 	@$(COMMON_CONFIG_ENV) $< --$@ $(CONFIG_CONFIG_IN)
 
-defconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
+defconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
 	@$(COMMON_CONFIG_ENV) $< --defconfig$(if $(DEFCONFIG),=$(DEFCONFIG)) $(CONFIG_CONFIG_IN)
 
 define percent_defconfig
 # Override the BR2_DEFCONFIG from COMMON_CONFIG_ENV with the new defconfig
-%_defconfig: $(BUILD_DIR)/buildroot-config/conf $(1)/configs/%_defconfig outputmakefile
+%_defconfig: $(BUILD_DIR)/buildroot-config/conf $(1)/configs/%_defconfig prepare-kconfig
 	@$$(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$(1)/configs/$$@ \
 		$$< --defconfig=$(1)/configs/$$@ $$(CONFIG_CONFIG_IN)
 endef
 $(eval $(foreach d,$(call reverse,$(TOPDIR) $(BR2_EXTERNAL_DIRS)),$(call percent_defconfig,$(d))$(sep)))
 
-update-defconfig: savedefconfig
-
-savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
+savedefconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
 	@$(COMMON_CONFIG_ENV) $< \
 		--savedefconfig=$(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig) \
 		$(CONFIG_CONFIG_IN)
 	@$(SED) '/BR2_DEFCONFIG=/d' $(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig)
 
-.PHONY: defconfig savedefconfig update-defconfig
+.PHONY: defconfig savedefconfig
 
 ################################################################################
 #
@@ -1028,6 +964,13 @@ ifeq ($(NEED_WRAPPER),y)
 	$(Q)$(TOPDIR)/support/scripts/mkmakefile $(TOPDIR) $(O)
 endif
 
+# Even though the target is a real file, we mark it as PHONY as we
+# want it to be re-generated each time make is invoked, in case the
+# value of BR2_EXTERNAL is changed.
+.PHONY: $(BUILD_DIR)/.br2-external.in
+$(BUILD_DIR)/.br2-external.in: $(BUILD_DIR)
+	$(Q)support/scripts/br2-external -k -o "$(@)" $(BR2_EXTERNAL)
+
 # printvars prints all the variables currently defined in our
 # Makefiles. Alternatively, if a non-empty VARS variable is passed,
 # only the variables matching the make pattern passed in VARS are
@@ -1036,7 +979,7 @@ endif
 printvars:
 	@:
 	$(foreach V, \
-		$(sort $(filter $(VARS),$(.VARIABLES))), \
+		$(sort $(if $(VARS),$(filter $(VARS),$(.VARIABLES)),$(.VARIABLES))), \
 		$(if $(filter-out environment% default automatic, \
 				$(origin $V)), \
 		$(if $(QUOTED_VARS),\
@@ -1056,7 +999,7 @@ ifeq ($(O),$(CURDIR)/output)
 	rm -rf $(O)
 endif
 	rm -rf $(TOPDIR)/dl $(BR2_CONFIG) $(CONFIG_DIR)/.config.old $(CONFIG_DIR)/..config.tmp \
-		$(CONFIG_DIR)/.auto.deps $(BASE_DIR)/.br2-external.*
+		$(CONFIG_DIR)/.auto.deps $(BR2_EXTERNAL_FILE)
 
 .PHONY: help
 help:
@@ -1075,13 +1018,12 @@ help:
 	@echo '  xconfig                - interactive Qt-based configurator'
 	@echo '  gconfig                - interactive GTK-based configurator'
 	@echo '  oldconfig              - resolve any unresolved symbols in .config'
-	@echo '  syncconfig             - Same as oldconfig, but quietly, additionally update deps'
-	@echo '  olddefconfig           - Same as syncconfig but sets new symbols to their default value'
+	@echo '  silentoldconfig        - Same as oldconfig, but quietly, additionally update deps'
+	@echo '  olddefconfig           - Same as silentoldconfig but sets new symbols to their default value'
 	@echo '  randconfig             - New config with random answer to all options'
 	@echo '  defconfig              - New config with default answer to all options;'
 	@echo '                             BR2_DEFCONFIG, if set on the command line, is used as input'
 	@echo '  savedefconfig          - Save current config to BR2_DEFCONFIG (minimal config)'
-	@echo '  update-defconfig       - Same as savedefconfig'
 	@echo '  allyesconfig           - New config where all options are accepted with yes'
 	@echo '  allnoconfig            - New config where all options are answered with no'
 	@echo '  alldefconfig           - New config where all options are set to default'
@@ -1097,7 +1039,6 @@ help:
 	@echo '  <pkg>-depends          - Build <pkg>'\''s dependencies'
 	@echo '  <pkg>-configure        - Build <pkg> up to the configure step'
 	@echo '  <pkg>-build            - Build <pkg> up to the build step'
-	@echo '  <pkg>-show-info        - generate info about <pkg>, as a JSON blurb'
 	@echo '  <pkg>-show-depends     - List packages on which <pkg> depends'
 	@echo '  <pkg>-show-rdepends    - List packages which have <pkg> as a dependency'
 	@echo '  <pkg>-show-recursive-depends'
@@ -1130,8 +1071,7 @@ help:
 	@echo '  source                 - download all sources needed for offline-build'
 	@echo '  external-deps          - list external packages used'
 	@echo '  legal-info             - generate info about license compliance'
-	@echo '  show-info              - generate info about packages, as a JSON blurb'
-	@echo '  printvars              - dump internal variables selected with VARS=...'
+	@echo '  printvars              - dump all the internal variables'
 	@echo
 	@echo '  make V=0|1             - 0 => quiet build (default), 1 => verbose build'
 	@echo '  make O=dir             - Locate all output files in "dir", including .config'
@@ -1177,7 +1117,7 @@ release: OUT = buildroot-$(BR2_VERSION)
 release:
 	git archive --format=tar --prefix=$(OUT)/ HEAD > $(OUT).tar
 	$(MAKE) O=$(OUT) manual-html manual-text manual-pdf
-	$(MAKE) O=$(OUT) clean
+	$(MAKE) O=$(OUT) manual-clean
 	tar rf $(OUT).tar $(OUT)
 	gzip -9 -c < $(OUT).tar > $(OUT).tar.gz
 	bzip2 -9 -c < $(OUT).tar > $(OUT).tar.bz2
@@ -1186,13 +1126,11 @@ release:
 print-version:
 	@echo $(BR2_VERSION_FULL)
 
-check-package:
-	find $(TOPDIR) -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' \) \
-		-exec ./utils/check-package {} +
-
 .PHONY: .gitlab-ci.yml
 .gitlab-ci.yml: .gitlab-ci.yml.in
-	./support/scripts/generate-gitlab-ci-yml $< > $@
+	cp $< $@
+	(cd configs; LC_ALL=C ls -1 *_defconfig) | sed 's/$$/: *defconfig/' >> $@
+	./support/testing/run-tests -l 2>&1 | sed -r -e '/^test_run \((.*)\).*/!d; s//\1: *runtime_test/' | LC_ALL=C sort >> $@
 
 include docs/manual/manual.mk
 -include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(sort $(wildcard $(dir)/docs/*/*.mk)))

arch/Config.in

@@ -77,10 +77,8 @@ config BR2_aarch64_be
 
 config BR2_csky
 	bool "csky"
+	select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
 	select BR2_ARCH_HAS_MMU_MANDATORY
-	# Most variants are supported by gcc-9+, except one that is
-	# handled as a special exception in package/gcc/Config.in.host
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
 	help
 	  csky is processor IP from china.
 	  http://www.c-sky.com/
@@ -156,14 +154,6 @@ config BR2_mips64el
 	  http://www.mips.com/
 	  http://en.wikipedia.org/wiki/MIPS_Technologies
 
-config BR2_nds32
-	bool "nds32"
-	select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
-	select BR2_ARCH_HAS_MMU_MANDATORY
-	help
-	  nds32 is a 32-bit architecture developed by Andes Technology.
-	  https://en.wikipedia.org/wiki/Andes_Technology
-
 config BR2_nios2
 	bool "Nios II"
 	select BR2_ARCH_HAS_MMU_MANDATORY
@@ -208,17 +198,6 @@ config BR2_powerpc64le
 	  http://www.power.org/
 	  http://en.wikipedia.org/wiki/Powerpc
 
-config BR2_riscv
-	bool "RISCV"
-	select BR2_ARCH_HAS_MMU_MANDATORY
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
-	help
-	  RISC-V is an open, free Instruction Set Architecture created
-	  by the UC Berkeley Architecture Research group and supported
-	  and promoted by RISC-V Foundation.
-	  https://riscv.org/
-	  https://en.wikipedia.org/wiki/RISC-V
-
 config BR2_sh
 	bool "SuperH"
 	select BR2_ARCH_HAS_MMU_OPTIONAL
@@ -304,10 +283,6 @@ config BR2_ARCH_NEEDS_GCC_AT_LEAST_8
 	bool
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 
-config BR2_ARCH_NEEDS_GCC_AT_LEAST_9
-	bool
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_8
-
 # The following string values are defined by the individual
 # Config.in.$ARCH files
 config BR2_ARCH
@@ -331,6 +306,9 @@ config BR2_GCC_TARGET_FP32_MODE
 config BR2_GCC_TARGET_CPU
 	string
 
+config BR2_GCC_TARGET_CPU_REVISION
+	string
+
 # The value of this option will be passed as --with-fpu=<value> when
 # building gcc (internal backend) or -mfpu=<value> in the toolchain
 # wrapper (external toolchain)
@@ -433,10 +411,6 @@ if BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el
 source "arch/Config.in.mips"
 endif
 
-if BR2_nds32
-source "arch/Config.in.nds32"
-endif
-
 if BR2_nios2
 source "arch/Config.in.nios2"
 endif
@@ -449,10 +423,6 @@ if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le
 source "arch/Config.in.powerpc"
 endif
 
-if BR2_riscv
-source "arch/Config.in.riscv"
-endif
-
 if BR2_sh
 source "arch/Config.in.sh"
 endif

arch/Config.in.arc

@@ -13,37 +13,13 @@ config BR2_arc770d
 
 config BR2_archs38
 	bool "ARC HS38"
-	help
-	  Generic ARC HS capable of running Linux, i.e. with MMU,
-	  caches and multiplier. Also it corresponds to the default
-	  configuration in older GNU toolchain versions.
-
-	  If you're not sure which version of ARC HS core you  build for
-	  keep this one.
-
-config BR2_archs38_full
-	bool "ARC HS38 with Quad MAC & FPU"
-	help
-	  Fully featured ARC HS with additional support for
-	   - Dual- and quad multiply and MC oprations
-	   - Double-precision FPU
-
-	  It corresponds to "hs38_slc_full" ARC HS template in
-	  ARChitect.
-
-config BR2_archs4x_rel31
-	bool "ARC HS48 rel 31"
-	help
-	   Latest release of HS48 processor
-	   - Dual- and quad multiply and MC oprations
-	   - Double-precision FPU
 
 endchoice
 
 # Choice of atomic instructions presence
 config BR2_ARC_ATOMIC_EXT
 	bool "Atomic extension (LLOCK/SCOND instructions)"
-	default y if BR2_arc770d || BR2_archs38 || BR2_archs38_full || BR2_archs4x_rel31
+	default y if BR2_arc770d || BR2_archs38
 
 config BR2_ARCH
 	default "arc"	if BR2_arcle
@@ -61,12 +37,10 @@ config BR2_GCC_TARGET_CPU
 	default "arc700" if BR2_arc750d
 	default "arc700" if BR2_arc770d
 	default "archs"	 if BR2_archs38
-	default "hs38_linux"	 if BR2_archs38_full
-	default "hs4x_rel31"	 if BR2_archs4x_rel31
 
 config BR2_READELF_ARCH_NAME
 	default "ARCompact"	if BR2_arc750d || BR2_arc770d
-	default "ARCv2"		if BR2_archs38 || BR2_archs38_full || BR2_archs4x_rel31
+	default "ARCv2"		if BR2_archs38
 
 choice
 	prompt "MMU Page Size"
@@ -86,7 +60,7 @@ choice
 
 config BR2_ARC_PAGE_SIZE_4K
 	bool "4KB"
-	depends on BR2_arc770d || BR2_archs38 || BR2_archs38_full || BR2_archs4x_rel31
+	depends on BR2_arc770d || BR2_archs38
 
 config BR2_ARC_PAGE_SIZE_8K
 	bool "8KB"
@@ -96,7 +70,7 @@ config BR2_ARC_PAGE_SIZE_8K
 
 config BR2_ARC_PAGE_SIZE_16K
 	bool "16KB"
-	depends on BR2_arc770d || BR2_archs38 || BR2_archs38_full || BR2_archs4x_rel31
+	depends on BR2_arc770d || BR2_archs38
 
 endchoice
 
@@ -105,6 +79,3 @@ config BR2_ARC_PAGE_SIZE
 	default "4K" if BR2_ARC_PAGE_SIZE_4K
 	default "8K" if BR2_ARC_PAGE_SIZE_8K
 	default "16K" if BR2_ARC_PAGE_SIZE_16K
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-

arch/Config.in.arm

@@ -367,13 +367,6 @@ config BR2_cortex_a73_a53
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
-config BR2_emag
-	bool "emag"
-	depends on BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
 config BR2_exynos_m1
 	bool "exynos-m1"
 	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
@@ -385,60 +378,54 @@ config BR2_exynos_m1
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
 config BR2_falkor
 	bool "falkor"
-	depends on BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
-config BR2_phecda
-	bool "phecda"
-	depends on BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
 config BR2_qdf24xx
 	bool "qdf24xx"
-	depends on BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
+if BR2_ARCH_IS_64
 config BR2_thunderx
-	bool "thunderx (aka octeontx)"
-	depends on BR2_ARCH_IS_64
+	bool "thunderx"
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
 config BR2_thunderxt81
-	bool "thunderxt81 (aka octeontx81)"
-	depends on BR2_ARCH_IS_64
+	bool "thunderxt81"
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 config BR2_thunderxt83
-	bool "thunderxt83 (aka octeontx83)"
-	depends on BR2_ARCH_IS_64
+	bool "thunderxt83"
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 config BR2_thunderxt88
 	bool "thunderxt88"
-	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 config BR2_thunderxt88p1
 	bool "thunderxt88p1"
-	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
+endif # BR2_ARCH_IS_64
 config BR2_xgene1
 	bool "xgene1"
 	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
@@ -449,94 +436,36 @@ config BR2_xgene1
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
 
+if BR2_ARCH_IS_64
 comment "armv8.1a cores"
 config BR2_thunderx2t99
 	bool "thunderx2t99"
-	depends on BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 config BR2_thunderx2t99p1
 	bool "thunderx2t99p1"
-	depends on BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 config BR2_vulcan
 	bool "vulcan"
-	depends on BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
-
-comment "armv8.2a cores"
-config BR2_cortex_a55
-	bool "cortex-A55"
-	depends on BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_8
-config BR2_cortex_a75
-	bool "cortex-A75"
-	depends on BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_8
-config BR2_cortex_a75_a55
-	bool "cortex-A75/A55 big.LITTLE"
-	depends on BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_8
-config BR2_cortex_a76
-	bool "cortex-A76"
-	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
-config BR2_cortex_a76_a55
-	bool "cortex-A76/A55 big.LITTLE"
-	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
-config BR2_neoverse_n1
-	bool "neoverse-N1 (aka ares)"
-	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
-config BR2_tsv110
-	bool "tsv110"
-	depends on BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
-
-comment "armv8.4a cores"
-config BR2_saphira
-	bool "saphira"
-	depends on BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_8
+endif # BR2_ARCH_IS_64
 endchoice
 
 config BR2_ARM_ENABLE_NEON
@@ -869,17 +798,12 @@ config BR2_GCC_TARGET_CPU
 	default "cortex-a73"	if BR2_cortex_a73
 	default "cortex-a73.cortex-a35"	if BR2_cortex_a73_a35
 	default "cortex-a73.cortex-a53"	if BR2_cortex_a73_a53
-	default "emag"		if BR2_emag
 	default "exynos-m1"	if BR2_exynos_m1
 	default "falkor"	if BR2_falkor
-	default "phecda"	if BR2_phecda
 	default "qdf24xx"	if BR2_qdf24xx
-	default "thunderx"	if BR2_thunderx && !BR2_TOOLCHAIN_GCC_AT_LEAST_9
-	default "octeontx"	if BR2_thunderx && BR2_TOOLCHAIN_GCC_AT_LEAST_9
-	default "thunderxt81"	if BR2_thunderxt81 && !BR2_TOOLCHAIN_GCC_AT_LEAST_9
-	default "octeontx81"	if BR2_thunderxt81 && BR2_TOOLCHAIN_GCC_AT_LEAST_9
-	default "thunderxt83"	if BR2_thunderxt83 && !BR2_TOOLCHAIN_GCC_AT_LEAST_9
-	default "octeontx83"	if BR2_thunderxt83 && BR2_TOOLCHAIN_GCC_AT_LEAST_9
+	default "thunderx"	if BR2_thunderx
+	default "thunderxt81"	if BR2_thunderxt81
+	default "thunderxt83"	if BR2_thunderxt83
 	default "thunderxt88"	if BR2_thunderxt88
 	default "thunderxt88p1"	if BR2_thunderxt88p1
 	default "xgene1"	if BR2_xgene1
@@ -887,16 +811,6 @@ config BR2_GCC_TARGET_CPU
 	default "thunderx2t99"	if BR2_thunderx2t99
 	default "thunderx2t99p1"	if BR2_thunderx2t99p1
 	default "vulcan"	if BR2_vulcan
-	# armv8.2a
-	default "cortex-a55"	if BR2_cortex_a55
-	default "cortex-a75"	if BR2_cortex_a75
-	default "cortex-a75.cortex-a55"	if BR2_cortex_a75_a55
-	default "cortex-a76"	if BR2_cortex_a76
-	default "cortex-a76.cortex-a55"	if BR2_cortex_a76_a55
-	default "neoverse-n1"	if BR2_neoverse_n1
-	default "tsv110"	if BR2_tsv110
-	# armv8.4a
-	default "saphira"	if BR2_saphira
 
 config BR2_GCC_TARGET_ABI
 	default "aapcs-linux"	if BR2_arm || BR2_armeb
@@ -929,6 +843,3 @@ config BR2_GCC_TARGET_MODE
 config BR2_READELF_ARCH_NAME
 	default "ARM"		if BR2_arm || BR2_armeb
 	default "AArch64"	if BR2_aarch64 || BR2_aarch64_be
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-

arch/Config.in.csky

@@ -5,8 +5,6 @@ choice
 	  Specific CPU variant to use
 
 config BR2_ck610
-	# Not supported by upstream gcc <= 9, and handled as a special
-	# exception in package/gcc/Config.in.host
 	bool "ck610"
 
 config BR2_ck807
@@ -15,26 +13,19 @@ config BR2_ck807
 config BR2_ck810
 	bool "ck810"
 
-config BR2_ck860
-	bool "ck860"
-
 endchoice
 
 config BR2_CSKY_FPU
 	bool "Enable FPU coprocessor"
-	depends on BR2_ck810 || BR2_ck807 || BR2_ck860
+	depends on BR2_ck810 || BR2_ck807
 	help
 	  You can say N here if your C-SKY CPU doesn't have a
 	  Floating-Point Coprocessor or if you don't need FPU support
 	  for your user-space programs.
 
-config BR2_CSKY_VDSP
-	bool "Enable VDSP enhanced instructions Co-processor"
-	depends on BR2_CSKY_FPU
-
-config BR2_GCC_TARGET_FLOAT_ABI
-	default "soft"		if !BR2_CSKY_FPU
-	default "hard"		if BR2_CSKY_FPU
+config BR2_CSKY_DSP
+	bool "Enable DSP enhanced instructions"
+	depends on BR2_ck810 || BR2_ck807
 
 config BR2_ARCH
 	default "csky"
@@ -42,8 +33,16 @@ config BR2_ARCH
 config BR2_ENDIAN
 	default "LITTLE"
 
+config BR2_GCC_TARGET_CPU
+	default "ck610"		if (BR2_ck610 && !BR2_CSKY_FPU && !BR2_CSKY_DSP)
+	default "ck807"		if (BR2_ck807 && !BR2_CSKY_FPU && !BR2_CSKY_DSP)
+	default "ck807e"	if (BR2_ck807 && !BR2_CSKY_FPU &&  BR2_CSKY_DSP)
+	default "ck807f"	if (BR2_ck807 &&  BR2_CSKY_FPU && !BR2_CSKY_DSP)
+	default "ck807ef"	if (BR2_ck807 &&  BR2_CSKY_FPU &&  BR2_CSKY_DSP)
+	default "ck810"		if (BR2_ck810 && !BR2_CSKY_FPU && !BR2_CSKY_DSP)
+	default "ck810e"	if (BR2_ck810 && !BR2_CSKY_FPU &&  BR2_CSKY_DSP)
+	default "ck810f"	if (BR2_ck810 &&  BR2_CSKY_FPU && !BR2_CSKY_DSP)
+	default "ck810ef"	if (BR2_ck810 &&  BR2_CSKY_FPU &&  BR2_CSKY_DSP)
+
 config BR2_READELF_ARCH_NAME
 	default "CSKY"
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-

arch/Config.in.m68k

@@ -38,6 +38,3 @@ config BR2_GCC_TARGET_CPU
 
 config BR2_READELF_ARCH_NAME
 	default "MC68000"
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-

arch/Config.in.microblaze

@@ -12,6 +12,3 @@ config BR2_READELF_ARCH_NAME
 config BR2_microblaze
 	bool
 	default y if BR2_microblazeel || BR2_microblazebe
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-

arch/Config.in.mips

@@ -5,9 +5,6 @@ config BR2_MIPS_CPU_MIPS32
 config BR2_MIPS_CPU_MIPS32R2
 	bool
 	select BR2_MIPS_NAN_LEGACY
-config BR2_MIPS_CPU_MIPS32R3
-	bool
-	select BR2_MIPS_NAN_LEGACY
 config BR2_MIPS_CPU_MIPS32R5
 	bool
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
@@ -21,9 +18,6 @@ config BR2_MIPS_CPU_MIPS64
 config BR2_MIPS_CPU_MIPS64R2
 	bool
 	select BR2_MIPS_NAN_LEGACY
-config BR2_MIPS_CPU_MIPS64R3
-	bool
-	select BR2_MIPS_NAN_LEGACY
 config BR2_MIPS_CPU_MIPS64R5
 	bool
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
@@ -40,8 +34,8 @@ choice
 	help
 	  Specific CPU variant to use
 
-	  64bit capable: 64, 64r2, 64r3, 64r5, 64r6
-	  non-64bit capable: 32, 32r2, 32r3, 32r5, 32r6
+	  64bit cabable: 64, 64r2, 64r5, 64r6
+	  non-64bit capable: 32, 32r2, 32r5, 32r6
 
 config BR2_mips_32
 	bool "Generic MIPS32"
@@ -51,10 +45,6 @@ config BR2_mips_32r2
 	bool "Generic MIPS32R2"
 	depends on !BR2_ARCH_IS_64
 	select BR2_MIPS_CPU_MIPS32R2
-config BR2_mips_32r3
-	bool "Generic MIPS32R3"
-	depends on !BR2_ARCH_IS_64
-	select BR2_MIPS_CPU_MIPS32R3
 config BR2_mips_32r5
 	bool "Generic MIPS32R5"
 	depends on !BR2_ARCH_IS_64
@@ -105,10 +95,6 @@ config BR2_mips_64r2
 	bool "Generic MIPS64R2"
 	depends on BR2_ARCH_IS_64
 	select BR2_MIPS_CPU_MIPS64R2
-config BR2_mips_64r3
-	bool "Generic MIPS64R3"
-	depends on BR2_ARCH_IS_64
-	select BR2_MIPS_CPU_MIPS64R3
 config BR2_mips_64r5
 	bool "Generic MIPS64R5"
 	depends on BR2_ARCH_IS_64
@@ -122,20 +108,6 @@ config BR2_mips_i6400
 	depends on BR2_ARCH_IS_64
 	select BR2_MIPS_CPU_MIPS64R6
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
-config BR2_mips_octeon2
-	bool "Octeon II"
-	depends on BR2_ARCH_IS_64
-	select BR2_MIPS_CPU_MIPS64R2
-	help
-	  Marvell (formerly Cavium Networks) Octeon II CN60XX
-	  processors.
-config BR2_mips_octeon3
-	bool "Octeon III"
-	depends on BR2_ARCH_IS_64
-	select BR2_MIPS_CPU_MIPS64R3
-	help
-	  Marvell (formerly Cavium Networks) Octeon III CN7XXX
-	  processors.
 config BR2_mips_p6600
 	bool "P6600"
 	depends on BR2_ARCH_IS_64
@@ -163,7 +135,6 @@ endchoice
 config BR2_MIPS_SOFT_FLOAT
 	bool "Use soft-float"
 	default y
-	depends on !BR2_mips_octeon3 # hard-float only
 	select BR2_SOFT_FLOAT
 	help
 	  If your target CPU does not have a Floating Point Unit (FPU)
@@ -242,7 +213,6 @@ config BR2_ENDIAN
 config BR2_GCC_TARGET_ARCH
 	default "mips32"	if BR2_mips_32
 	default "mips32r2"	if BR2_mips_32r2
-	default "mips32r3"	if BR2_mips_32r3
 	default "mips32r5"	if BR2_mips_32r5
 	default "mips32r6"	if BR2_mips_32r6
 	default "interaptiv"	if BR2_mips_interaptiv
@@ -252,12 +222,9 @@ config BR2_GCC_TARGET_ARCH
 	default "mips32r2"	if BR2_mips_xburst
 	default "mips64"	if BR2_mips_64
 	default "mips64r2"	if BR2_mips_64r2
-	default "mips64r3"	if BR2_mips_64r3
 	default "mips64r5"	if BR2_mips_64r5
 	default "mips64r6"	if BR2_mips_64r6
 	default "i6400"		if BR2_mips_i6400
-	default "octeon2"	if BR2_mips_octeon2
-	default "octeon3"	if BR2_mips_octeon3
 	default "p6600"		if BR2_mips_p6600
 
 config BR2_MIPS_OABI32
@@ -271,6 +238,3 @@ config BR2_GCC_TARGET_ABI
 
 config BR2_READELF_ARCH_NAME
 	default "MIPS R3000"
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-

arch/Config.in.nds32

@@ -1,14 +0,0 @@
-config BR2_ARCH
-	default "nds32le"
-
-config BR2_GCC_TARGET_ARCH
-	default "v3"
-
-config BR2_ENDIAN
-	default "LITTLE"
-
-config BR2_READELF_ARCH_NAME
-	default "Andes Technology compact code size embedded RISC processor family"
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-

arch/Config.in.nios2

@@ -6,6 +6,3 @@ config BR2_ENDIAN
 
 config BR2_READELF_ARCH_NAME
 	default "Altera Nios II"
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-

arch/Config.in.or1k

@@ -6,6 +6,3 @@ config BR2_ENDIAN
 
 config BR2_READELF_ARCH_NAME
 	default "OpenRISC 1000"
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-

arch/Config.in.powerpc

@@ -205,9 +205,14 @@ config BR2_GCC_TARGET_CPU
 	default "power7"	if BR2_powerpc_power7
 	default "power8"	if BR2_powerpc_power8
 
+config BR2_GCC_TARGET_ABI
+	default "altivec"		if BR2_PPC_ABI_altivec
+	default "no-altivec"		if BR2_PPC_ABI_no-altivec
+	default "spe"			if BR2_PPC_ABI_spe
+	default "no-spe"		if BR2_PPC_ABI_no-spe
+	default "ibmlongdouble"		if BR2_PPC_ABI_ibmlongdouble
+	default "ieeelongdouble"	if BR2_PPC_ABI_ieeelongdouble
+
 config BR2_READELF_ARCH_NAME
 	default "PowerPC"	if BR2_powerpc
 	default "PowerPC64"	if BR2_powerpc64 || BR2_powerpc64le
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-

arch/Config.in.riscv

@@ -1,130 +0,0 @@
-# RISC-V CPU ISA extensions.
-
-config BR2_RISCV_ISA_RVI
-	bool
-
-config BR2_RISCV_ISA_RVM
-	bool
-
-config BR2_RISCV_ISA_RVA
-	bool
-
-config BR2_RISCV_ISA_RVF
-	bool
-
-config BR2_RISCV_ISA_RVD
-	bool
-
-config BR2_RISCV_ISA_RVC
-	bool
-
-choice
-	prompt "Target Architecture Variant"
-	default BR2_riscv_g
-
-config BR2_riscv_g
-	bool "General purpose (G)"
-	select BR2_RISCV_ISA_RVI
-	select BR2_RISCV_ISA_RVM
-	select BR2_RISCV_ISA_RVA
-	select BR2_RISCV_ISA_RVF
-	select BR2_RISCV_ISA_RVD
-	help
-	  General purpose (G) is equivalent to IMAFD.
-
-config BR2_riscv_custom
-	bool "Custom architecture"
-	select BR2_RISCV_ISA_RVI
-	select BR2_RISCV_ISA_CUSTOM_RVA
-
-endchoice
-
-if BR2_riscv_custom
-
-comment "Instruction Set Extensions"
-
-config BR2_RISCV_ISA_CUSTOM_RVM
-	bool "Integer Multiplication and Division (M)"
-	select BR2_RISCV_ISA_RVM
-
-config BR2_RISCV_ISA_CUSTOM_RVA
-	bool "Atomic Instructions (A)"
-	select BR2_RISCV_ISA_RVA
-
-config BR2_RISCV_ISA_CUSTOM_RVF
-	bool "Single-precision Floating-point (F)"
-	select BR2_RISCV_ISA_RVF
-
-config BR2_RISCV_ISA_CUSTOM_RVD
-	bool "Double-precision Floating-point (D)"
-	depends on BR2_RISCV_ISA_RVF
-	select BR2_RISCV_ISA_RVD
-
-config BR2_RISCV_ISA_CUSTOM_RVC
-	bool "Compressed Instructions (C)"
-	select BR2_RISCV_ISA_RVC
-endif
-
-choice
-	prompt "Target Architecture Size"
-	default BR2_RISCV_64
-
-config BR2_RISCV_32
-	bool "32-bit"
-
-config BR2_RISCV_64
-	bool "64-bit"
-	select BR2_ARCH_IS_64
-
-endchoice
-
-choice
-	prompt "Target ABI"
-	default BR2_RISCV_ABI_ILP32 if !BR2_ARCH_IS_64
-	default BR2_RISCV_ABI_LP64 if BR2_ARCH_IS_64
-
-config BR2_RISCV_ABI_ILP32
-	bool "ilp32"
-	depends on !BR2_ARCH_IS_64
-
-config BR2_RISCV_ABI_ILP32F
-	bool "ilp32f"
-	depends on !BR2_ARCH_IS_64 && BR2_RISCV_ISA_RVF
-
-config BR2_RISCV_ABI_ILP32D
-	bool "ilp32d"
-	depends on !BR2_ARCH_IS_64 && BR2_RISCV_ISA_RVD
-
-config BR2_RISCV_ABI_LP64
-	bool "lp64"
-	depends on BR2_ARCH_IS_64
-
-config BR2_RISCV_ABI_LP64F
-	bool "lp64f"
-	depends on BR2_ARCH_IS_64 && BR2_RISCV_ISA_RVF
-
-config BR2_RISCV_ABI_LP64D
-	bool "lp64d"
-	depends on BR2_ARCH_IS_64 && BR2_RISCV_ISA_RVD
-endchoice
-
-config BR2_ARCH
-	default "riscv32" if !BR2_ARCH_IS_64
-	default "riscv64" if BR2_ARCH_IS_64
-
-config BR2_ENDIAN
-	default "LITTLE"
-
-config BR2_GCC_TARGET_ABI
-	default "ilp32" if BR2_RISCV_ABI_ILP32
-	default "ilp32f" if BR2_RISCV_ABI_ILP32F
-	default "ilp32d" if BR2_RISCV_ABI_ILP32D
-	default "lp64" if BR2_RISCV_ABI_LP64
-	default "lp64f" if BR2_RISCV_ABI_LP64F
-	default "lp64d" if BR2_RISCV_ABI_LP64D
-
-config BR2_READELF_ARCH_NAME
-	default "RISC-V"
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-

arch/Config.in.sh

@@ -30,6 +30,3 @@ config BR2_ENDIAN
 
 config BR2_READELF_ARCH_NAME
 	default "Renesas / SuperH SH"
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-

arch/Config.in.sparc

@@ -32,6 +32,3 @@ config BR2_GCC_TARGET_CPU
 config BR2_READELF_ARCH_NAME
 	default "Sparc"		if BR2_sparc
 	default "Sparc v9"	if BR2_sparc64
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-

arch/Config.in.x86

@@ -101,15 +101,6 @@ config BR2_x86_corei7
 	select BR2_X86_CPU_HAS_SSSE3
 	select BR2_X86_CPU_HAS_SSE4
 	select BR2_X86_CPU_HAS_SSE42
-config BR2_x86_westmere
-	bool "westmere"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
-	select BR2_X86_CPU_HAS_SSE4
-	select BR2_X86_CPU_HAS_SSE42
 config BR2_x86_corei7_avx
 	bool "corei7-avx"
 	select BR2_X86_CPU_HAS_MMX
@@ -244,9 +235,8 @@ config BR2_ARCH
 	default "i686"		if BR2_x86_nocona && BR2_i386
 	default "i686"		if BR2_x86_core2 && BR2_i386
 	default "i686"		if BR2_x86_corei7 && BR2_i386
-	default "i686"		if BR2_x86_westmere && BR2_i386
 	default "i686"		if BR2_x86_corei7_avx && BR2_i386
-	default "i686"		if BR2_x86_core_avx2 && BR2_i386
+	default "i686"		if BR2_x86_corei7_avx2 && BR2_i386
 	default "i686"		if BR2_x86_atom && BR2_i386
 	default "i686"		if BR2_x86_silvermont && BR2_i386
 	default "i686"		if BR2_x86_opteron && BR2_i386
@@ -281,7 +271,6 @@ config BR2_GCC_TARGET_ARCH
 	default "corei7-avx"	if BR2_x86_corei7_avx
 	default "core-avx2"	if BR2_x86_core_avx2
 	default "atom"		if BR2_x86_atom
-	default "westmere"	if BR2_x86_westmere
 	default "silvermont"	if BR2_x86_silvermont
 	default "k8"		if BR2_x86_opteron
 	default "k8-sse3"	if BR2_x86_opteron_sse3
@@ -301,6 +290,3 @@ config BR2_GCC_TARGET_ARCH
 config BR2_READELF_ARCH_NAME
 	default "Intel 80386"			if BR2_i386
 	default "Advanced Micro Devices X86-64" if BR2_x86_64
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-

arch/Config.in.xtensa

@@ -50,6 +50,3 @@ config BR2_ARCH
 
 config BR2_READELF_ARCH_NAME
 	default "Tensilica Xtensa Processor"
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-

arch/arch.mk

@@ -1,22 +0,0 @@
-################################################################################
-#
-# Architecture-specific definitions
-#
-################################################################################
-
-# Allow GCC target configuration settings to be optionally
-# overwritten by architecture specific makefiles.
-
-# Makefiles must use the GCC_TARGET_* variables below instead
-# of the BR2_GCC_TARGET_* versions.
-GCC_TARGET_ARCH := $(call qstrip,$(BR2_GCC_TARGET_ARCH))
-GCC_TARGET_ABI := $(call qstrip,$(BR2_GCC_TARGET_ABI))
-GCC_TARGET_NAN := $(call qstrip,$(BR2_GCC_TARGET_NAN))
-GCC_TARGET_FP32_MODE := $(call qstrip,$(BR2_GCC_TARGET_FP32_MODE))
-GCC_TARGET_CPU := $(call qstrip,$(BR2_GCC_TARGET_CPU))
-GCC_TARGET_FPU := $(call qstrip,$(BR2_GCC_TARGET_FPU))
-GCC_TARGET_FLOAT_ABI := $(call qstrip,$(BR2_GCC_TARGET_FLOAT_ABI))
-GCC_TARGET_MODE := $(call qstrip,$(BR2_GCC_TARGET_MODE))
-
-# Include any architecture specific makefiles.
--include $(sort $(wildcard arch/arch.mk.*))

arch/arch.mk.arc

@@ -1,4 +0,0 @@
-# -matomic is always required when the ARC core has the atomic extensions
-ifeq ($(BR2_arc)$(BR2_ARC_ATOMIC_EXT),yy)
-ARCH_TOOLCHAIN_WRAPPER_OPTS = -matomic
-endif

arch/arch.mk.csky

@@ -1,26 +0,0 @@
-#
-# Configure the GCC_TARGET_ARCH variable and append the
-# appropriate C-SKY ISA extensions.
-#
-
-ifeq ($(BR2_csky),y)
-
-ifeq ($(BR2_ck610),y)
-GCC_TARGET_CPU := ck610
-else ifeq ($(BR2_ck807),y)
-GCC_TARGET_CPU := ck807
-else ifeq ($(BR2_ck810),y)
-GCC_TARGET_CPU := ck810
-else ifeq ($(BR2_ck860),y)
-GCC_TARGET_CPU := ck860
-endif
-
-ifeq ($(BR2_CSKY_FPU),y)
-GCC_TARGET_CPU := $(GCC_TARGET_CPU)f
-endif
-
-ifeq ($(BR2_CSKY_VDSP),y)
-GCC_TARGET_CPU := $(GCC_TARGET_CPU)v
-endif
-
-endif

arch/arch.mk.riscv

@@ -1,30 +0,0 @@
-#
-# Configure the GCC_TARGET_ARCH variable and append the
-# appropriate RISC-V ISA extensions.
-#
-
-ifeq ($(BR2_riscv),y)
-
-ifeq ($(BR2_RISCV_64),y)
-GCC_TARGET_ARCH := rv64i
-else
-GCC_TARGET_ARCH := rv32i
-endif
-
-ifeq ($(BR2_RISCV_ISA_RVM),y)
-GCC_TARGET_ARCH := $(GCC_TARGET_ARCH)m
-endif
-ifeq ($(BR2_RISCV_ISA_RVA),y)
-GCC_TARGET_ARCH := $(GCC_TARGET_ARCH)a
-endif
-ifeq ($(BR2_RISCV_ISA_RVF),y)
-GCC_TARGET_ARCH := $(GCC_TARGET_ARCH)f
-endif
-ifeq ($(BR2_RISCV_ISA_RVD),y)
-GCC_TARGET_ARCH := $(GCC_TARGET_ARCH)d
-endif
-ifeq ($(BR2_RISCV_ISA_RVC),y)
-GCC_TARGET_ARCH := $(GCC_TARGET_ARCH)c
-endif
-
-endif

board/aarch64-efi/post-image.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-BOARD_DIR="$(dirname $0)"
-
-cp -f ${BOARD_DIR}/grub.cfg ${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg

board/aarch64-efi/readme.txt

@@ -1,34 +0,0 @@
-
-The aarch64_efi_defconfig allows to build a minimal Linux system that
-can boot on all AArch64 servers providing an EFI firmware and ACPI.
-
-Building and booting
-====================
-
-$ make aarch64_efi_defconfig
-$ make
-
-The file output/images/disk.img is a complete disk image that can be
-booted, it includes the grub2 bootloader, Linux kernel and root
-filesystem.
-
-Testing under Qemu
-==================
-
-This image can also be tested using Qemu:
-
-qemu-system-aarch64 \
-	-M virt \
-	-cpu cortex-a57 \
-	-m 512 \
-	-nographic \
-	-bios </path/to/QEMU_EFI.fd> \
-	-drive file=output/images/disk.img,if=none,format=raw,id=hd0 \
-	-device virtio-blk-device,drive=hd0 \
-	-netdev user,id=eth0 \
-	-device virtio-net-device,netdev=eth0
-
-Note that </path/to/QEMU_EFI.fd> needs to point to a valid aarch64 UEFI
-firmware image for qemu.
-It may be provided by your distribution as a edk2-aarch64 or AAVMF
-package, in path such as /usr/share/edk2/aarch64/QEMU_EFI.fd .

board/acmesystems/aria-g25/genimage.cfg

@@ -11,7 +11,7 @@ image boot.vfat {
 		}
 
 		file boot.bin {
-			image = "at91sam9x5_aria-sdcardboot-linux-zimage-dt-3.8.13.bin"
+			image = "at91sam9x5_aria-sdcardboot-linux-zimage-dt-3.8.6.bin"
 		}
 	}
 	size = 16M

board/acmesystems/aria-g25/post-image.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
+GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+
+rm -rf "${GENIMAGE_TMP}"
+
+genimage  \
+	--rootpath "${TARGET_DIR}"     \
+	--tmppath "${GENIMAGE_TMP}"    \
+	--inputpath "${BINARIES_DIR}"  \
+	--outputpath "${BINARIES_DIR}" \
+	--config "${GENIMAGE_CFG}"

board/acmesystems/arietta-g25/genimage.cfg

@@ -11,7 +11,7 @@ image boot.vfat {
 		}
 		
 		file boot.bin {
-			image = "at91sam9x5_arietta-sdcardboot-linux-zimage-dt-3.8.13.bin"
+			image = "at91sam9x5_arietta-sdcardboot-linux-zimage-dt-3.8.6.bin"
 		} 
 	}
 	size = 16M

board/acmesystems/arietta-g25/post-image.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
+GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+
+rm -rf "${GENIMAGE_TMP}"
+
+genimage  \
+	--rootpath "${TARGET_DIR}"     \
+	--tmppath "${GENIMAGE_TMP}"    \
+	--inputpath "${BINARIES_DIR}"  \
+	--outputpath "${BINARIES_DIR}" \
+	--config "${GENIMAGE_CFG}"

board/amarula/a64-relic/extlinux.conf

@@ -1,4 +0,0 @@
-label linux-4.17.0-rc3
-  kernel /Image
-  devicetree /sun50i-a64-amarula-relic.dtb
-  append console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p4 rootwait

board/amarula/a64-relic/genimage.cfg

@@ -1,10 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"Image",
-			"sun50i-a64-amarula-relic.dtb",
-			"extlinux"
-		}
-	}
-	size = 64M
-}

board/amarula/a64-relic/post-build.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-BOARD_DIR="$(dirname $0)"
-
-install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf

board/amarula/a64-relic/readme.txt

@@ -1,90 +0,0 @@
-Amarula A64 Relic
-================
-
-Amarula A64-Relic is an Allwinner A64 based IoT device, which supports:
-- Allwinner A64 Cortex-A53
-- Mali-400MP2 GPU
-- AXP803 PMIC
-- 1GB DDR3 RAM
-- 8GB eMMC
-- AP6330 Wifi/BLE
-- MIPI-DSI
-- CSI: OV5640 sensor
-- USB OTG
-- 12V DC power supply
-
-Wiki link:
-https://openedev.amarulasolutions.com/display/ODWIKI/Amarual+A64-Relic
-
-Build
-=====
-
-  $ make amarula_a64_relic_defconfig
-
-  $ make
-
-build files at output/images/:
-  - sunxi-spl.bin
-  - u-boot.itb
-  - Image
-  - sun50i-a64-amarula-relic.dtb
-  - boot.vfat
-  - rootfs.ext4
-
-Write eMMC
-=========
-
-The board comes with an operating system preloaded on the eMMC.
-To replace it with the Buildroot-built system, take the following
-steps
-
-1. Connect the board UART with host and open minicom(ttyUSBx/115200N8)
-
-2. Supply 12V DC for power-on the board.
-
-3. Interrupt U-Boot by pressing enter
-
-4. Create GPT partitions
-  => mmc dev 1
-  => gpt write mmc 1 $partitions
-
-5. Connect the board USB-OTG with USB slot on the host.
-
-6. Initiate fastboot
-  => fastboot 0
-
-7. Write images from host onto eMMC using fastboot
-  $ cd output/images
-  $ sudo fastboot -i 0x1f3a flash loader1 sunxi-spl.bin
-  $ sudo fastboot -i 0x1f3a flash loader2 u-boot.itb
-  $ sudo fastboot -i 0x1f3a flash esp boot.vfat
-  $ sudo fastboot -i 0x1f3a flash system rootfs.ext4
-
-Update eMMC during Development
-==============================
-
-During development, reflashing the entire filesystem image at every
-change is time consuming. A useful alternative is to directly access
-over USB the filesystem stored on the eMMC, using the USB Mass Storage
-capability of U-Boot. To achieve this:
-
-1. Build U-Boot by enabling UMS
-   $ make uboot-menuconfig
-   (select CONFIG_CMD_USB_MASS_STORAGE=y)
-
-2. Follow all 6 steps from 'Write eMMC' and mount eMMC on host
-    => mmc dev 1
-    => ums 0 mmc 1
-
-WiFi
-====
-
- # wpa_passphrase ACCESSPOINTNAME >> /etc/wpa_supplicant.conf
-   (type password and enter)
- # wpa_supplicant -i wlan0 -c /etc/wpa_supplicant.conf -B
- # udhcpc -i wlan0
- # ping google.com
-
---
-Jagan Teki <jagan@amarulasolutions.com>
-29-Jun-2018

board/amarula/a64-relic/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt

@@ -1,83 +0,0 @@
-#AP6330_NVRAM_V1.0_20121130
-#Sample variables file for BCM94330 SD FC AGB board
-manfid=0x2d0
-prodid=0x0547
-vendid=0x14e4
-devid=0x4360
-boardtype=0x05e1
-boardrev=0x1202
-boardflags=0x0080200
-nocrc=1
-xtalfreq=26000
-boardnum=22
-macaddr=00:90:4c:c5:12:38
-ag0=254
-aa2g=1
-ccode=ALL
-pa0itssit=0x20
-pa0b0=5587
-pa0b1=-633
-pa0b2=-158
-rssismf2g=0xa
-rssismc2g=0x3
-rssisav2g=0x7
-#rssi params for 5GHz
-rssismf5g=0x4
-rssismc5g=0x3
-rssisav5g=0x7
-#PA parameters for lower a-band
-pa1lob0=4748
-pa1lob1=-566
-pa1lob2=-180
-#PA parameters for midband
-pa1b0=4762
-pa1b1=-593
-pa1b2=-172
-#PA parameters for high band
-#pa1hib0=4596
-pa1hib0=4666
-pa1hib1=-619
-pa1hib2=-163
-rxpo5g=0
-maxp2ga0=74
-maxp5ga0=66
-maxp5gla0=66
-maxp5gha0=66
-# 2.4G Tx Power offsets
-cck2gpo=0x2222
-ofdm2gpo=0x44444444
-mcs2gpo0=0x6666
-mcs2gpo1=0x6666
-# 5G Tx Power offsets
-ofdm5gpo=0x44444444
-ofdm5glpo=0x44444444
-ofdm5ghpo=0x44444444
-mcs5gpo0=0x6666
-mcs5gpo1=0x6666
-mcs5glpo0=0x6666
-mcs5glpo1=0x6666
-mcs5ghpo0=0x6666
-mcs5ghpo1=0x6666
-sromrev=3
-il0macaddr=00:90:4c:c5:12:38
-wl0id=0x431b
-cckPwrOffset=4
-swctrlmap_2g=0x44844484,0x42824282,0x40804484,0x18282,0x1ff
-triso5g=0
-swctrlmap_5g=0x00100010,0x20202020,0x20202020,0x14202,0x0f0
-rfreg033=0x19
-rfreg033_cck=0x1f
-dacrate2g=160
-dacrate5g=160
-txalpfbyp2g=1
-bphyscale=17
-cckPwrIdxCorr=-15
-pacalidx2g=50
-#pacalidx5g=20
-noise_cal_ref_2g=53
-noise_cal_po_2g=0
-noise_cal_ref_5g=52
-noise_cal_po_5g=5,0,0
-# 4330 OOB parameter: High level trigger
-muxenab=0x10
-

board/amarula/vyasa/patches/uboot/0001-include-configs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch

@@ -1,35 +0,0 @@
-From 8ee2b03039cccf64402a72dea2185d7fe1972729 Mon Sep 17 00:00:00 2001
-From: Shyam Saini <shyam.saini@amarulasolutions.com>
-Date: Mon, 15 Apr 2019 16:16:16 +0530
-Subject: [PATCH] include: configs: Increase CONFIG_SYS_BOOTM_LEN to 16MB
-
-The default value of CONFIG_SYS_BOOTM_LEN is 0x800000 i.e, 8MB which
-causes board reset because of larger uImage size.
-
-Error log snippet:
-   Booting using the fdt blob at 0x1f00000
-   Loading Kernel Image ... Image too large: increase CONFIG_SYS_BOOTM_LEN
-Must RESET board to recover
-resetting ...
-
-Signed-off-by: Shyam Saini <shyam.saini@amarulasolutions.com>
----
- include/configs/rk3288_common.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
-index 72a54bc0ab..eab7cf4d86 100644
---- a/include/configs/rk3288_common.h
-+++ b/include/configs/rk3288_common.h
-@@ -9,6 +9,8 @@
- #include <asm/arch/hardware.h>
- #include "rockchip-common.h"
- 
-+#define CONFIG_SYS_BOOTM_LEN (16 << 20) /* 16MB */
-+
- #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
- #define CONFIG_SYS_MALLOC_LEN		(32 << 20)
- #define CONFIG_SYS_CBSIZE		1024
--- 
-2.11.0
-

board/andes/ae3xx/ae3xx.fragment

@@ -1 +0,0 @@
-CONFIG_NDS32_BUILTIN_DTB="ae3xx"

board/andes/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch

@@ -1,28 +0,0 @@
-From 90d52d180dcc5d1300dc352ca709eb6453894143 Mon Sep 17 00:00:00 2001
-From: Nylon Chen <nylon7@andestech.com>
-Date: Wed, 28 Nov 2018 16:26:46 +0800
-Subject: [PATCH] nds32: Fix boot messages garbled
-
-In order to display uart correctly we have to pass the correct setting of uart to kernel by bootarg.
-This patch will provide such settings to set the correct uart baud rate.
-
-Signed-off-by: Nylon Chen <nylon7@andestech.com>
----
- arch/nds32/boot/dts/ae3xx.dts | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/nds32/boot/dts/ae3xx.dts b/arch/nds32/boot/dts/ae3xx.dts
-index bb39749a6673..aefe2090926a 100644
---- a/arch/nds32/boot/dts/ae3xx.dts
-+++ b/arch/nds32/boot/dts/ae3xx.dts
-@@ -6,6 +6,7 @@
- 	interrupt-parent = <&intc>;
- 
- 	chosen {
-+		bootargs = "memblock=debug earlycon console=ttyS0,38400n8 debug loglevel=7";
- 		stdout-path = &serial0;
- 	};
- 
--- 
-2.18.0
-

board/andes/readme.txt

@@ -1,49 +0,0 @@
-Intro
-=====
-
-Andestech(nds32) AE3XX Platform
-
-The AE3XX prototype demonstrates the AE3XX example platform on the FPGA. 
-It is composed of one Andestech(nds32) processor and AE3XX.
-
-How to build it
-===============
-
-Configure Buildroot
--------------------
-
-The andes_ae3xx_defconfig configuration is a sample configuration with
-all that is required to bring the FPGA Development Board:
-
-  $ make andes_ae3xx_defconfig
-
-Build everything
-----------------
-Note: you will need to have access to the network, since Buildroot will
-download the packages' sources.
-
-  $ make
-
-Result of the build
--------------------
-
-After building, you should obtain this tree:
-
-output/images/
-    +-- vmlinux
-    +-- rootfs.cpio
-    +-- rootfs.tar
-
-How to run it
-=============
-
-Run
----
-
-  Setup the Console with the rate 38400/8-N-1.
-
-  $ cd output/images
-  $ ../host/bin/nds32le-linux-gdb vmlinux
-  $ target remote [your host]
-  $ lo
-  $ c 

board/arcturus/ppc-ucp1020/configs/linux-4.1.x.config

@@ -0,0 +1,269 @@
+CONFIG_PPC_85xx=y
+CONFIG_SMP=y
+CONFIG_NR_CPUS=2
+CONFIG_CROSS_COMPILE="powerpc-linux-"
+CONFIG_LOCALVERSION="-ANI-uCP1020-64EE512"
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_DEFAULT_HOSTNAME="uCP1020-64EE512"
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_AUDIT=y
+CONFIG_NO_HZ_IDLE=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=14
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
+# CONFIG_RD_XZ is not set
+# CONFIG_RD_LZO is not set
+# CONFIG_RD_LZ4 is not set
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_EMBEDDED=y
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_COMPAT_BRK is not set
+CONFIG_JUMP_LABEL=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_BLK_DEV_BSG is not set
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_MAC_PARTITION=y
+# CONFIG_EFI_PARTITION is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_UCP1020_SOM=y
+CONFIG_HIGHMEM=y
+CONFIG_PREEMPT=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_MATH_EMULATION=y
+CONFIG_MATH_EMULATION_HW_UNIMPLEMENTED=y
+CONFIG_SWIOTLB=y
+# CONFIG_COMPACTION is not set
+CONFIG_PCI=y
+CONFIG_PCIEPORTBUS=y
+# CONFIG_PCIEAER is not set
+# CONFIG_PCIEASPM is not set
+CONFIG_PCI_MSI=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_XFRM_USER=y
+CONFIG_NET_KEY=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_IPV6 is not set
+CONFIG_NETFILTER=y
+CONFIG_BRIDGE_NETFILTER=y
+CONFIG_NF_CONNTRACK=y
+CONFIG_NF_CONNTRACK_FTP=y
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
+CONFIG_NETFILTER_XT_TARGET_MARK=y
+CONFIG_NETFILTER_XT_MATCH_COMMENT=y
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
+CONFIG_NETFILTER_XT_MATCH_HELPER=y
+CONFIG_NETFILTER_XT_MATCH_MARK=y
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
+CONFIG_NETFILTER_XT_MATCH_STATE=y
+CONFIG_NF_CONNTRACK_IPV4=y
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_NAT=y
+CONFIG_IP_NF_TARGET_MASQUERADE=y
+CONFIG_IP_NF_TARGET_NETMAP=y
+CONFIG_IP_NF_TARGET_REDIRECT=y
+CONFIG_IP_NF_MANGLE=y
+CONFIG_BRIDGE=y
+CONFIG_VLAN_8021Q=y
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_HTB=y
+CONFIG_CFG80211=y
+# CONFIG_CFG80211_DEFAULT_PS is not set
+CONFIG_MAC80211=y
+# CONFIG_MAC80211_RC_MINSTREL is not set
+CONFIG_UEVENT_HELPER_PATH="/bin/hotplug"
+CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_BLOCK=y
+CONFIG_FTL=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_PHYSMAP_OF=y
+CONFIG_MTD_M25P80=y
+CONFIG_MTD_SST25L=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_PLATFORM=y
+CONFIG_MTD_NAND_FSL_ELBC=y
+CONFIG_MTD_NAND_FSL_UPM=y
+CONFIG_MTD_SPI_NOR=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=131072
+CONFIG_EEPROM_AT25=y
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=y
+CONFIG_BLK_DEV_SR=y
+CONFIG_CHR_DEV_SG=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_NETDEVICES=y
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_VENDOR_ADAPTEC is not set
+# CONFIG_NET_VENDOR_AGERE is not set
+# CONFIG_NET_VENDOR_ALTEON is not set
+# CONFIG_NET_VENDOR_AMD is not set
+# CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_VENDOR_ATHEROS is not set
+# CONFIG_NET_CADENCE is not set
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_BROCADE is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CISCO is not set
+# CONFIG_NET_VENDOR_DEC is not set
+# CONFIG_NET_VENDOR_DLINK is not set
+# CONFIG_NET_VENDOR_EMULEX is not set
+# CONFIG_NET_VENDOR_EXAR is not set
+CONFIG_GIANFAR=y
+# CONFIG_NET_VENDOR_HP is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MELLANOX is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_NET_VENDOR_MYRI is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_NVIDIA is not set
+# CONFIG_NET_VENDOR_OKI is not set
+# CONFIG_NET_PACKET_ENGINE is not set
+# CONFIG_NET_VENDOR_QLOGIC is not set
+# CONFIG_NET_VENDOR_QUALCOMM is not set
+# CONFIG_NET_VENDOR_REALTEK is not set
+# CONFIG_NET_VENDOR_RDC is not set
+# CONFIG_NET_VENDOR_ROCKER is not set
+# CONFIG_NET_VENDOR_SAMSUNG is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SILAN is not set
+# CONFIG_NET_VENDOR_SIS is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+# CONFIG_NET_VENDOR_SUN is not set
+# CONFIG_NET_VENDOR_TEHUTI is not set
+# CONFIG_NET_VENDOR_TI is not set
+# CONFIG_NET_VENDOR_VIA is not set
+# CONFIG_NET_VENDOR_WIZNET is not set
+# CONFIG_NET_VENDOR_XILINX is not set
+CONFIG_MICREL_PHY=y
+CONFIG_IWLWIFI=m
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+CONFIG_SERIO_LIBPS2=y
+CONFIG_LEGACY_PTY_COUNT=16
+CONFIG_NOZOMI=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=2
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_DETECT_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_NVRAM=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MPC=y
+CONFIG_SPI=y
+CONFIG_SPI_BITBANG=y
+CONFIG_SPI_FSL_ESPI=y
+CONFIG_SPI_SPIDEV=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_MPC8XXX=y
+CONFIG_SENSORS_LM90=y
+CONFIG_THERMAL=y
+CONFIG_WATCHDOG=y
+CONFIG_BOOKE_WDT=y
+CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT=36
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+CONFIG_MEDIA_USB_SUPPORT=y
+CONFIG_USB_VIDEO_CLASS=y
+CONFIG_USB_GSPCA=y
+CONFIG_USB_PWC=y
+CONFIG_USB_ZR364XX=y
+CONFIG_USB_STKWEBCAM=y
+CONFIG_VIDEO_EM28XX=y
+CONFIG_VIDEO_EM28XX_V4L2=y
+# CONFIG_HID is not set
+# CONFIG_USB_HID is not set
+CONFIG_USB=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_DYNAMIC_MINORS=y
+CONFIG_USB_MON=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_FSL=y
+CONFIG_USB_ACM=y
+CONFIG_USB_WDM=y
+CONFIG_USB_TMC=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_STORAGE_DEBUG=y
+CONFIG_USB_MDC800=y
+CONFIG_MMC=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PLTFM=y
+CONFIG_MMC_SDHCI_OF_ESDHC=y
+CONFIG_DMADEVICES=y
+CONFIG_FSL_DMA=y
+CONFIG_ASYNC_TX_DMA=y
+# CONFIG_IOMMU_SUPPORT is not set
+CONFIG_EXT2_FS=y
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+# CONFIG_EXT3_FS_XATTR is not set
+CONFIG_EXT4_FS=y
+CONFIG_XFS_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_NTFS_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_TMPFS=y
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_WBUF_VERIFY=y
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RUBIN=y
+CONFIG_CRAMFS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V4=y
+CONFIG_NFSD=y
+CONFIG_CIFS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=y
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_DEBUG_PREEMPT is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_CPU_STALL_INFO is not set
+# CONFIG_FTRACE is not set
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA1_PPC=y
+CONFIG_CRYPTO_DEFLATE=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_CRYPTO_DEV_TALITOS=y

board/arcturus/ppc-ucp1020/patches/linux/0001-Arcturus-uCP1020-BSP-support.patch

@@ -0,0 +1,462 @@
+From a243628639e12a4bd0a737eac78a12ed240cd137 Mon Sep 17 00:00:00 2001
+From: Oleksandr G Zhadan <oleks@arcturusnetworks.com>
+Date: Mon, 18 Jul 2016 10:40:16 -0400
+Subject: [PATCH] Arcturus uCP1020 BSP support
+
+The uCP1020 product family (ucp1020) is an Arcturus Networks Inc.
+System on Modules product featuring a NXP QorIQ P1020 CPU,
+optionally populated with 1 or 2 Gig-Ethernet PHYs,
+DDR3, NOR Flash, eMMC NAND Flash and/or SPI Flash.
+
+Signed-off-by: Oleksandr G Zhadan <oleks@arcturusnetworks.com>
+Signed-off-by: Michael Durrant <arcsupport@arcturusnetworks.com>
+---
+ arch/powerpc/boot/dts/ucp1020.dts         |  87 ++++++++++++
+ arch/powerpc/boot/dts/ucp1020.dtsi        | 211 ++++++++++++++++++++++++++++++
+ arch/powerpc/platforms/85xx/Kconfig       |   7 +
+ arch/powerpc/platforms/85xx/Makefile      |   1 +
+ arch/powerpc/platforms/85xx/ucp1020_som.c |  92 +++++++++++++
+ 5 files changed, 398 insertions(+)
+ create mode 100644 arch/powerpc/boot/dts/ucp1020.dts
+ create mode 100644 arch/powerpc/boot/dts/ucp1020.dtsi
+ create mode 100644 arch/powerpc/platforms/85xx/ucp1020_som.c
+
+diff --git a/arch/powerpc/boot/dts/ucp1020.dts b/arch/powerpc/boot/dts/ucp1020.dts
+new file mode 100644
+index 0000000..291e70a
+--- /dev/null
++++ b/arch/powerpc/boot/dts/ucp1020.dts
+@@ -0,0 +1,87 @@
++/*
++ * uCP1020 Tree Source (32-bit address map)
++ *
++ * Copyright 2013-2016 Arcturus Networks Inc.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ *     * Redistributions of source code must retain the above copyright
++ *       notice, this list of conditions and the following disclaimer.
++ *     * Redistributions in binary form must reproduce the above copyright
++ *       notice, this list of conditions and the following disclaimer in the
++ *       documentation and/or other materials provided with the distribution.
++ *     * Neither the name of Freescale Semiconductor nor the
++ *       names of its contributors may be used to endorse or promote products
++ *       derived from this software without specific prior written permission.
++ *
++ *
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") as published by the Free Software
++ * Foundation, either version 2 of that License or (at your option) any
++ * later version.
++ *
++ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY
++ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
++ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
++ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
++ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
++ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
++ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
++ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
++
++/include/ "fsl/p1020si-pre.dtsi"
++/ {
++	model = "arcturus,uCP1020";
++	compatible = "arcturus,uCP1020";
++
++	memory {
++		device_type = "memory";
++	};
++
++	lbc: localbus@ffe05000 {
++		reg = <0 0xffe05000 0 0x1000>;
++
++		/* NOR Flash */
++		ranges = <0x0 0x0 0x0 0xec000000 0x04000000>;
++	};
++
++	soc: soc@ffe00000 {
++		ranges = <0x0 0x0 0xffe00000 0x100000>;
++	};
++
++	pci0: pcie@ffe09000 {
++		ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000
++			  0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000>;
++		reg = <0 0xffe09000 0 0x1000>;
++		pcie@0 {
++			ranges = <0x2000000 0x0 0xa0000000
++				  0x2000000 0x0 0xa0000000
++				  0x0 0x20000000
++
++				  0x1000000 0x0 0x0
++				  0x1000000 0x0 0x0
++				  0x0 0x100000>;
++		};
++	};
++
++	pci1: pcie@ffe0a000 {
++		reg = <0 0xffe0a000 0 0x1000>;
++		ranges = <0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000
++			  0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000>;
++		pcie@0 {
++			ranges = <0x2000000 0x0 0x80000000
++				  0x2000000 0x0 0x80000000
++				  0x0 0x20000000
++
++				  0x1000000 0x0 0x0
++				  0x1000000 0x0 0x0
++				  0x0 0x100000>;
++		};
++	};
++};
++
++/include/ "ucp1020.dtsi"
++/include/ "fsl/p1020si-post.dtsi"
+diff --git a/arch/powerpc/boot/dts/ucp1020.dtsi b/arch/powerpc/boot/dts/ucp1020.dtsi
+new file mode 100644
+index 0000000..7cff949
+--- /dev/null
++++ b/arch/powerpc/boot/dts/ucp1020.dtsi
+@@ -0,0 +1,211 @@
++/*
++ * uCP1020 Device Tree Source stub (no addresses or top-level ranges)
++ *
++ * Copyright 2013-2016 Arcturus Networks Inc.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ *     * Redistributions of source code must retain the above copyright
++ *       notice, this list of conditions and the following disclaimer.
++ *     * Redistributions in binary form must reproduce the above copyright
++ *       notice, this list of conditions and the following disclaimer in the
++ *       documentation and/or other materials provided with the distribution.
++ *     * Neither the name of Freescale Semiconductor nor the
++ *       names of its contributors may be used to endorse or promote products
++ *       derived from this software without specific prior written permission.
++ *
++ *
++ * ALTERNATIVELY, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") as published by the Free Software
++ * Foundation, either version 2 of that License or (at your option) any
++ * later version.
++ *
++ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY
++ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
++ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
++ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
++ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
++ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
++ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
++ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
++
++&lbc {
++	nor@0,0 {
++		#address-cells = <1>;
++		#size-cells = <1>;
++		compatible = "cfi-flash";
++		reg = <0x0 0x0 0x04000000>;
++		bank-width = <2>;
++		device-width = <1>;
++
++		partition@100000 {
++			/* 7MB - PART 0 */
++			reg = <0x00100000 0x00700000>;
++			label = "0";
++		};
++
++		partition@800000 {
++			/* 32MB - PART 1 */
++			reg = <0x0800000 0x02000000>;
++			label = "1";
++		};
++
++		partition@2800000 {
++			/* 8MB - PART 2 */
++			reg = <0x02800000 0x00800000>;
++			label = "2";
++		};
++
++		partition@3000000 {
++			/* (16MB - 512K) - PART 3 JFFS 2 */
++			reg = <0x03000000 0x00f80000>;
++			label = "3";
++		};
++
++		partition@0 {
++			/* 512KB - bootloader[u-boot, uCbootloader] */
++			reg = <0x0 0x00080000>;
++			label = "BOOT_SPI";
++		};
++
++		partition@3f80000 {
++			/* 512KB - bootloade NOR r[u-boot, uCbootloader] */
++			reg = <0x03f80000 0x00080000>;
++			label = "B";
++		};
++
++		partition@80000 {
++			/* 256KB - bootloaders environment (uCenv) */
++			reg = <0x00080000 0x00040000>;
++	
++			label = "E";
++		};
++
++		partition@C0000 {
++			/* 256KB - bootloaders environment (u-boot) */
++			reg = <0x000C0000 0x00040000>;
++			label = "UENV";
++		};
++	};
++};
++
++&soc {
++	i2c@3000 {
++		spoc@14 {
++			compatible = "conexant,cx2070x";
++			reg = <0x14>;
++		};
++	};
++
++	i2c@3100 {
++			dtt@4C {
++				compatible = "national,lm90";
++				reg = <0x4C>;
++			};
++	};
++
++	spi@7000 {
++		flash@0 {
++			#address-cells = <1>;
++			#size-cells = <1>;
++			compatible = "winbond,w25q80bl";
++			reg = <0>;
++			spi-max-frequency = <40000000>; /* input clock */
++
++			partition@0 {
++				label = "SPI MBR";
++				reg = <0x00000000 0x00002000>;
++				read-only;
++			};
++			partition@2000 {
++				label = "SPI ENV";
++				reg = <0x00002000 0x00006000>;
++				read-only;
++			};
++			partition@8000 {
++				label = "SPI FS";
++				reg = <0x00008000 0x000F8000>;
++			};
++		};
++		flash@3 {
++			#address-cells = <1>;
++			#size-cells = <1>;
++			compatible = "spansion,s25fl008k";
++			reg = <3>;
++			spi-max-frequency = <40000000>; /* input clock */
++			partition@0 {
++				label = "SPI USER";
++				reg = <0x00000000 0x00100000>;
++			};
++		};
++	};
++
++	usb@22000 {
++		phy_type = "ulpi";
++		dr_mode = "host";
++	};
++
++	mdio@24000 {
++		phy0: ethernet-phy@4 {
++			interrupt-parent = <&mpic>;
++			interrupts = <4 1>;
++			reg = <0x04>;
++		};
++
++		phy1: ethernet-phy@6 {
++			interrupt-parent = <&mpic>;
++			interrupts = <8 1>;
++			reg = <0x6>;
++		};
++	};
++
++	enet0: ethernet@b0000 {
++		phy-handle = <&phy0>;
++		phy-connection-type = "rgmii-id";
++	};
++
++	enet1: ethernet@b1000 {
++		status = "disabled";
++	};
++
++	enet2: ethernet@b2000 {
++		phy-handle = <&phy1>;
++		phy-connection-type = "rgmii-id";
++	};
++
++	gpio0: gpio@f000 {
++		compatible = "fsl,mpc8572-gpio", "fsl,pq3-gpio";
++		reg = <0xf000 0x1000>;
++		interrupts = <47 2>;
++		interrupt-parent = <&mpic>;
++		#gpio-cells = <2>;
++		gpio-controller;
++	};
++
++	gpio-leds {
++		compatible = "gpio-leds";
++		gpio5 {
++			label = "led1";		/* LED15 */
++			gpios = <&gpio0 5 0>;
++		};
++		gpio12 {
++			label = "led2";		/* LED16 */
++			gpios = <&gpio0 12 0>;
++		};
++		gpio13 {
++			label = "led3";		/* LED17 */
++			gpios = <&gpio0 13 0>;
++		};
++		gpio7 {
++			label = "led4";		/* LED18 */
++			gpios = <&gpio0 7 0>;
++		};
++		gpio6 {
++			label = "led5";		/* LED19 */
++			gpios = <&gpio0 6 0>;
++		};
++	};
++};
+diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
+index 2fb4b24..81a944f 100644
+--- a/arch/powerpc/platforms/85xx/Kconfig
++++ b/arch/powerpc/platforms/85xx/Kconfig
+@@ -241,6 +241,13 @@ config SGY_CTS1000
+ 	help
+ 	  Enable this to support functionality in Servergy's CTS-1000 systems.
+ 
++config UCP1020_SOM
++	bool "Arcturus uCP1020 Rev.1.3 System on Module"
++	select DEFAULT_UIMAGE
++	help
++	  This option enables support for the Arcturus Networks Inc. 
++	  uCP1020 System on Module.
++
+ config MVME2500
+ 	bool "Artesyn MVME2500"
+ 	select DEFAULT_UIMAGE
+diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile
+index 1fe7fb9..84f2b9a 100644
+--- a/arch/powerpc/platforms/85xx/Makefile
++++ b/arch/powerpc/platforms/85xx/Makefile
+@@ -31,4 +31,5 @@ obj-$(CONFIG_XES_MPC85xx) += xes_mpc85xx.o
+ obj-$(CONFIG_GE_IMP3A)	  += ge_imp3a.o
+ obj-$(CONFIG_PPC_QEMU_E500) += qemu_e500.o
+ obj-$(CONFIG_SGY_CTS1000) += sgy_cts1000.o
++obj-$(CONFIG_UCP1020_SOM) += ucp1020_som.o
+ obj-$(CONFIG_MVME2500)	  += mvme2500.o
+diff --git a/arch/powerpc/platforms/85xx/ucp1020_som.c b/arch/powerpc/platforms/85xx/ucp1020_som.c
+new file mode 100644
+index 0000000..777e8ad
+--- /dev/null
++++ b/arch/powerpc/platforms/85xx/ucp1020_som.c
+@@ -0,0 +1,92 @@
++/*
++ * Arcturus Networks Inc. uCP1020 module Setup
++ *
++ * Copyright 2014-2016 Arcturus Networks Inc.
++ *
++ * by Oleksandr G Zhadan & Michael Durrant (www.ArcturusNetworks.com)
++ *
++ * This program is free software; you can redistribute  it and/or modify it
++ * under  the terms of  the GNU General  Public License as published by the
++ * Free Software Foundation;  either version 2 of the  License, or (at your
++ * option) any later version.
++ */
++
++#include <linux/stddef.h>
++#include <linux/kernel.h>
++#include <linux/pci.h>
++#include <linux/kdev_t.h>
++#include <linux/delay.h>
++#include <linux/seq_file.h>
++#include <linux/interrupt.h>
++#include <linux/of_platform.h>
++
++#include <asm/time.h>
++#include <asm/machdep.h>
++#include <asm/pci-bridge.h>
++#include <mm/mmu_decl.h>
++#include <asm/prom.h>
++#include <asm/udbg.h>
++#include <asm/mpic.h>
++#include <asm/fsl_guts.h>
++
++#include <sysdev/fsl_soc.h>
++#include <sysdev/fsl_pci.h>
++#include "smp.h"
++
++#include "mpc85xx.h"
++
++void __init ucp1020_som_pic_init(void)
++{
++	struct mpic *mpic = mpic_alloc(NULL, 0, MPIC_BIG_ENDIAN |
++	  MPIC_SINGLE_DEST_CPU,
++	  0, 256, " OpenPIC  ");
++
++	BUG_ON(mpic == NULL);
++
++	mpic_init(mpic);
++}
++
++/*
++ * Setup the architecture
++ */
++static void __init ucp1020_som_setup_arch(void)
++{
++	if (ppc_md.progress)
++		ppc_md.progress("uCP1020_SoM_setup_arch()", 0);
++
++	mpc85xx_smp_init();
++
++	fsl_pci_assign_primary();
++	pr_info("\n\t%s (http://www.arcturusnetworks.com)\n", ppc_md.name);
++}
++
++machine_arch_initcall(ucp1020, mpc85xx_common_publish_devices);
++machine_arch_initcall(ucp1020, swiotlb_setup_bus_notifier);
++
++/*
++ * Called very early, device-tree isn't unflattened
++ */
++static int __init ucp1020_probe(void)
++{
++	unsigned long root = of_get_flat_dt_root();
++
++	if (of_flat_dt_is_compatible(root, "arcturus,uCP1020"))
++		return 1;
++	return 0;
++}
++
++define_machine(ucp1020) {
++	.name			= "uCP1020 SoM - Arcturus Networks Inc.",
++	.probe			= ucp1020_probe,
++	.setup_arch		= ucp1020_som_setup_arch,
++	.init_IRQ		= ucp1020_som_pic_init,
++#ifdef CONFIG_PCI
++	.pcibios_fixup_bus	= fsl_pcibios_fixup_bus,
++#endif
++	.get_irq		= mpic_get_irq,
++	.restart		= fsl_rstcr_restart,
++	.calibrate_decr		= generic_calibrate_decr,
++#ifdef DEBUG 
++	.progress		= udbg_progress,
++#endif
++};
+-- 
+2.1.4
+

board/arcturus/ppc-ucp1020/patches/linux/0002-p1020-esdhc-controller-reserved-bit.patch

@@ -0,0 +1,28 @@
+From 4c74fd1266287deca0c1ff091071c5b8558b9735 Mon Sep 17 00:00:00 2001
+From: Oleksandr G Zhadan <oleks@arcturusnetworks.com>
+Date: Mon, 18 Jul 2016 10:45:41 -0400
+Subject: [PATCH 1/1] p1020 esdhc controller reserved bit
+
+Prevent SDHCI core from writing reserved bits, where
+p1020 reserved bit is SDHCI_CTRL_HISPD, not 0x01(SDHCI_CTRL_LED).
+
+Signed-off-by: Oleksandr G Zhadan <oleks@arcturusnetworks.com>
+Signed-off-by: Michael Durrant <arcsupport@arcturusnetworks.com>
+---
+ drivers/mmc/host/sdhci-esdhc.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/mmc/host/sdhci-esdhc.h b/drivers/mmc/host/sdhci-esdhc.h
+index a870c42..b45de0a 100644
+--- a/drivers/mmc/host/sdhci-esdhc.h
++++ b/drivers/mmc/host/sdhci-esdhc.h
+@@ -45,6 +45,6 @@
+ #define ESDHC_DMA_SYSCTL	0x40c
+ #define ESDHC_DMA_SNOOP		0x00000040
+ 
+-#define ESDHC_HOST_CONTROL_RES	0x01
++#define ESDHC_HOST_CONTROL_RES	(SDHCI_CTRL_HISPD)
+ 
+ #endif /* _DRIVERS_MMC_SDHCI_ESDHC_H */
+-- 
+2.1.4

board/arcturus/ppc-ucp1020/patches/linux/0003-powerpc-ptrace-Fix-out-of-bounds-array-access-warning.patch

@@ -0,0 +1,53 @@
+From 35b7ce4f8f290794d3b89db7461e8c568b5defa1 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 25 Apr 2016 09:19:17 -0700
+Subject: powerpc/ptrace: Fix out of bounds array access warning
+
+commit 1e407ee3b21f981140491d5b8a36422979ca246f upstream.
+
+gcc-6 correctly warns about a out of bounds access
+
+arch/powerpc/kernel/ptrace.c:407:24: warning: index 32 denotes an offset greater than size of 'u64[32][1] {aka long long unsigned int[32][1]}' [-Warray-bounds]
+        offsetof(struct thread_fp_state, fpr[32][0]));
+                        ^
+
+check the end of array instead of beginning of next element to fix this
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Cc: Kees Cook <keescook@chromium.org>
+Cc: Michael Ellerman <mpe@ellerman.id.au>
+Cc: Segher Boessenkool <segher@kernel.crashing.org>
+Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
+Acked-by: Olof Johansson <olof@lixom.net>
+Cc: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Oleksandr Zhadan <oleks@arcturusnetworks.com>
+---
+ arch/powerpc/kernel/ptrace.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
+index f21897b..93f200f 100644
+--- a/arch/powerpc/kernel/ptrace.c
++++ b/arch/powerpc/kernel/ptrace.c
+@@ -376,7 +376,7 @@ static int fpr_get(struct task_struct *target, const struct user_regset *regset,
+ 
+ #else
+ 	BUILD_BUG_ON(offsetof(struct thread_fp_state, fpscr) !=
+-		     offsetof(struct thread_fp_state, fpr[32][0]));
++		     offsetof(struct thread_fp_state, fpr[32]));
+ 
+ 	return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
+ 				   &target->thread.fp_state, 0, -1);
+@@ -404,7 +404,7 @@ static int fpr_set(struct task_struct *target, const struct user_regset *regset,
+ 	return 0;
+ #else
+ 	BUILD_BUG_ON(offsetof(struct thread_fp_state, fpscr) !=
+-		     offsetof(struct thread_fp_state, fpr[32][0]));
++		     offsetof(struct thread_fp_state, fpr[32]));
+ 
+ 	return user_regset_copyin(&pos, &count, &kbuf, &ubuf,
+ 				  &target->thread.fp_state, 0, -1);
+-- 
+cgit v1.1

board/arcturus/ppc-ucp1020/readme.txt

@@ -38,7 +38,6 @@ You'll need to program the files created by buildroot into the NOR flash.
     B$ protect off 0xeff80000 +$filesize
     B$ erase 0xeff80000 +$filesize
     B$ cp.b $loadaddr 0xeff80000 $filesize
-    B$ protect on 0xeff80000 +$filesize
 
 2. Program the kernel
 

board/armadeus/readme.txt

@@ -44,11 +44,11 @@ Result of the build
 When the build is finished, you will end up with:
 
     output/images/
-    +-- imx**-apfxxdev.dtb	[1]
-    +-- rootfs.tar
-    +-- rootfs.ubi
-    +-- rootfs.ubifs
-    +-- uImage
+    ├── imx**-apfxxdev.dtb	[1]
+    ├── rootfs.tar
+    ├── rootfs.ubi
+    ├── rootfs.ubifs
+    └── uImage
 
 [1] Only if the kernel version used uses a Device Tree.
 

board/asus/tinker/patches/uboot/0001-include-configs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch

@@ -1,35 +0,0 @@
-From 8ee2b03039cccf64402a72dea2185d7fe1972729 Mon Sep 17 00:00:00 2001
-From: Shyam Saini <shyam.saini@amarulasolutions.com>
-Date: Mon, 15 Apr 2019 16:16:16 +0530
-Subject: [PATCH] include: configs: Increase CONFIG_SYS_BOOTM_LEN to 16MB
-
-The default value of CONFIG_SYS_BOOTM_LEN is 0x800000 i.e, 8MB which
-causes board reset because of larger uImage size.
-
-Error log snippet:
-   Booting using the fdt blob at 0x1f00000
-   Loading Kernel Image ... Image too large: increase CONFIG_SYS_BOOTM_LEN
-Must RESET board to recover
-resetting ...
-
-Signed-off-by: Shyam Saini <shyam.saini@amarulasolutions.com>
----
- include/configs/rk3288_common.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
-index 72a54bc0ab..eab7cf4d86 100644
---- a/include/configs/rk3288_common.h
-+++ b/include/configs/rk3288_common.h
-@@ -9,6 +9,8 @@
- #include <asm/arch/hardware.h>
- #include "rockchip-common.h"
- 
-+#define CONFIG_SYS_BOOTM_LEN (16 << 20) /* 16MB */
-+
- #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
- #define CONFIG_SYS_MALLOC_LEN		(32 << 20)
- #define CONFIG_SYS_CBSIZE		1024
--- 
-2.11.0
-

board/atmel/sama5d27_som1_ek_mmc/genimage.cfg

@@ -5,6 +5,9 @@ image boot.vfat {
 		files = {
 			"zImage",
 			"at91-sama5d27_som1_ek.dtb",
+			"at91-sama5d27_som1_ek_pda4.dtb",
+			"at91-sama5d27_som1_ek_pda7.dtb",
+			"at91-sama5d27_som1_ek_pda7b.dtb",
 			"boot.bin",
 			"u-boot.bin"
 		}

board/atmel/sama5d2_xplained_mmc/genimage.cfg

@@ -5,6 +5,9 @@ image boot.vfat {
 		files = {
 			"zImage",
 			"at91-sama5d2_xplained.dtb",
+			"at91-sama5d2_xplained_pda4.dtb",
+			"at91-sama5d2_xplained_pda7.dtb",
+			"at91-sama5d2_xplained_pda7b.dtb",
 			"boot.bin",
 			"u-boot.bin"
 		}

board/atmel/sama5d3_xplained_mmc/genimage.cfg

@@ -5,6 +5,9 @@ image boot.vfat {
 		files = {
 			"zImage",
 			"at91-sama5d3_xplained.dtb",
+			"at91-sama5d3_xplained_pda4.dtb",
+			"at91-sama5d3_xplained_pda7.dtb",
+			"at91-sama5d3_xplained_pda7b.dtb",
 			"boot.bin",
 			"u-boot.bin"
 		}

board/atmel/sama5d4_xplained_mmc/genimage.cfg

@@ -5,6 +5,10 @@ image boot.vfat {
 		files = {
 			"zImage",
 			"at91-sama5d4_xplained.dtb",
+			"at91-sama5d4_xplained_hdmi.dtb",
+			"at91-sama5d4_xplained_pda4.dtb",
+			"at91-sama5d4_xplained_pda7.dtb",
+			"at91-sama5d4_xplained_pda7b.dtb",
 			"boot.bin",
 			"u-boot.bin"
 		}

board/bananapi/bananapi-m2-ultra/boot.cmd

@@ -1,7 +0,0 @@
-setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
-
-mmc dev 0
-fatload mmc 0 $kernel_addr_r zImage
-fatload mmc 0 $fdt_addr_r sun8i-r40-bananapi-m2-ultra.dtb
-
-bootz $kernel_addr_r - $fdt_addr_r

board/bananapi/bananapi-m2-ultra/genimage.cfg

@@ -1,33 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"zImage",
-			"sun8i-r40-bananapi-m2-ultra.dtb",
-			"boot.scr"
-		}
-	}
-	size = 64M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8192
-		size = 1040384 # 1MB - 8192
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
-}

board/bananapi/bananapi-m2-ultra/readme.txt

@@ -1,35 +0,0 @@
-Intro
-=====
-
-This default configuration will allow you to start experimenting with the
-buildroot environment for the Bananapi M2 ULtra. With the current
-configuration it will bring-up the board, and allow access through the
-serial console.
-
-Bananapi M2 Ultra link:
-http://www.banana-pi.org/m2u.html
-
-This configuration uses U-Boot mainline and kernel mainline.
-
-How to build
-============
-
-    $ make bananapi_m2_ultra_defconfig
-    $ make
-
-Note: you will need access to the internet to download the required
-sources.
-
-How to write the SD card
-========================
-
-Once the build process is finished you will have an image called "sdcard.img"
-in the output/images/ directory.
-
-Copy the bootable "sdcard.img" onto an SD card with "dd":
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
-  $ sudo sync
-
-Insert the micro SDcard in your Bananapi M2 Ultra and power it up. The console
-is on the serial line, 115200 8N1.

board/beagleboardx15/readme.txt

@@ -26,17 +26,17 @@ Result of the build
 After building, you should get a tree like this:
 
   output/images/
-  +-- am57xx-beagle-x15.dtb
-  +-- am57xx-beagle-x15-revb1.dtb
-  +-- boot.vfat
-  +-- MLO
-  +--rootfs.ext2
-  +-- rootfs.ext4
-  +-- rootfs.tar
-  +-- sdcard.img
-  +-- u-boot.img
-  +-- u-boot-spl.bin
-  +-- zImage
+  ├── am57xx-beagle-x15.dtb
+  ├── am57xx-beagle-x15-revb1.dtb
+  ├── boot.vfat
+  ├── MLO
+  ├── rootfs.ext2
+  ├── rootfs.ext4
+  ├── rootfs.tar
+  ├── sdcard.img
+  ├── u-boot.img
+  ├── u-boot-spl.bin
+  └── zImage
 
 How to write the microSD card
 =============================

board/beaglebone/readme.txt

@@ -27,18 +27,18 @@ $ make
 Result of the build
 ===================
 output/images/
-+-- am335x-boneblack.dtb
-+-- am335x-bone.dtb
-+-- am335x-evm.dtb
-+-- am335x-evmsk.dtb
-+-- boot.vfat
-+-- MLO
-+-- rootfs.ext2
-+-- rootfs.tar
-+-- sdcard.img
-+-- u-boot.img
-+-- uEnv.txt
-+-- zImage
+├── am335x-boneblack.dtb
+├── am335x-bone.dtb
+├── am335x-evm.dtb
+├── am335x-evmsk.dtb
+├── boot.vfat
+├── MLO
+├── rootfs.ext2
+├── rootfs.tar
+├── sdcard.img
+├── u-boot.img
+├── uEnv.txt
+└── zImage
 
 To copy the image file to the sdcard use dd:
 $ dd if=output/images/sdcard.img of=/dev/XXX

board/beaglebone/uEnv.txt

@@ -3,9 +3,6 @@ devtype=mmc
 bootdir=
 bootfile=zImage
 bootpartition=mmcblk0p2
-console=ttyS0,115200n8
-loadaddr=0x82000000
-fdtaddr=0x88000000
 set_mmc1=if test $board_name = A33515BB; then setenv bootpartition mmcblk1p2; fi
-set_bootargs=setenv bootargs console=${console} root=/dev/${bootpartition} rw rootfstype=ext4 rootwait
+set_bootargs=setenv bootargs console=ttyO0,115200n8 root=/dev/${bootpartition} rw rootfstype=ext4 rootwait
 uenvcmd=run set_mmc1; run set_bootargs;run loadimage;run loadfdt;printenv bootargs;bootz ${loadaddr} - ${fdtaddr}

board/ci20/patches/uboot/0001-mips-Remove-default-endiannes.patch

@@ -1,66 +0,0 @@
-From b3a1e97498e7987073775d49a703932c20f2df1d Mon Sep 17 00:00:00 2001
-From: Ezequiel Garcia <ezequiel@collabora.com>
-Date: Mon, 12 Nov 2018 14:04:46 -0300
-Subject: [PATCH] mips: Remove default endiannes
-
-Currently, trying to build ci20_mmc fails on little-endian
-toolchains. The problem seems to be that some targets don't
-have CONFIG_SYS_LITTLE_ENDIAN properly set, and therefore
-the default -EB switch is selected.
-
-Let's get rid of the default switch entirely, and fix this problem.
-While this may be a hack, it is a quick solution until
-U-Boot gets CI20 proper support.
-
-make ARCH=mips CROSS_COMPILE=mips-linux-gnu- ci20_mmc
-Configuring for ci20_mmc - Board: ci20, Options: SPL_MMC_SUPPORT,ENV_IS_IN_MMC
-make
-make[1]: Entering directory '/home/zeta/repos/u-boot-ci20'
-Generating include/autoconf.mk
-Generating include/autoconf.mk.dep
-mips-linux-gnu-gcc: error: may not use both -EB and -EL
-mips-linux-gnu-gcc: error: may not use both -EB and -EL
-Generating include/spl-autoconf.mk
-mips-linux-gnu-gcc: error: may not use both -EB and -EL
-Generating include/tpl-autoconf.mk
-mips-linux-gnu-gcc: error: may not use both -EB and -EL
-mips-linux-gnu-gcc -DDO_DEPS_ONLY \
-	-g  -Os   -ffunction-sections -fdata-sections -D__KERNEL__ -I/home/zeta/repos/u-boot-ci20/include -fno-builtin -ffreestanding -nostdinc -isystem /home/zeta/repos/buildroot/mips/output/host/opt/ext-toolchain/bin/../lib/gcc/mips-linux-gnu/5.3.0/include -pipe  -DCONFIG_MIPS -D__MIPS__ -G 0 -EB -msoft-float -fpic -mabicalls -march=mips32 -mabi=32 -DCONFIG_32BIT -mno-branch-likely -Wall -Wstrict-prototypes       \
-	-o lib/asm-offsets.s lib/asm-offsets.c -c -S
-if [ -f arch/mips/cpu/xburst/jz4780/asm-offsets.c ];then \
-	mips-linux-gnu-gcc -DDO_DEPS_ONLY \
-	-g  -Os   -ffunction-sections -fdata-sections -D__KERNEL__ -I/home/zeta/repos/u-boot-ci20/include -fno-builtin -ffreestanding -nostdinc -isystem /home/zeta/repos/buildroot/mips/output/host/opt/ext-toolchain/bin/../lib/gcc/mips-linux-gnu/5.3.0/include -pipe  -DCONFIG_MIPS -D__MIPS__ -G 0 -EB -msoft-float -fpic -mabicalls -march=mips32 -mabi=32 -DCONFIG_32BIT -mno-branch-likely -Wall -Wstrict-prototypes       \
-		-o arch/mips/cpu/xburst/jz4780/asm-offsets.s arch/mips/cpu/xburst/jz4780/asm-offsets.c -c -S; \
-else \
-	touch arch/mips/cpu/xburst/jz4780/asm-offsets.s; \
-fi
-mips-linux-gnu-gcc: error: may not use both -EB and -EL
-make[1]: *** [Makefile:747: lib/asm-offsets.s] Error 1
-make[1]: *** Waiting for unfinished jobs....
-make[1]: Leaving directory '/home/zeta/repos/u-boot-ci20'
-make: *** [.boards.depend:463: ci20_mmc] Error 2
-
-Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
----
-https://github.com/MIPS/CI20_u-boot/pull/19
-
- arch/mips/config.mk | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/arch/mips/config.mk b/arch/mips/config.mk
-index c89279025507..43560abbc0e1 100644
---- a/arch/mips/config.mk
-+++ b/arch/mips/config.mk
-@@ -20,9 +20,6 @@ ifdef CONFIG_SYS_BIG_ENDIAN
- ENDIANNESS := -EB
- endif
- 
--# Default to EB if no endianess is configured
--ENDIANNESS ?= -EB
--
- PLATFORM_CPPFLAGS += -DCONFIG_MIPS -D__MIPS__
- 
- #
--- 
-2.19.1
-

board/csky/gx6605s/gx6605s.dts

@@ -1,155 +0,0 @@
-/dts-v1/;
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-/ {
-	model = "C-SKY gx6605s";
-	compatible = "csky,gx6605s";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	memory {
-		device_type = "memory";
-		reg = <0x10000000 0x04000000>;
-	};
-
-	soc {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		compatible = "simple-bus";
-		ranges;
-
-		dummy_apb: apb-clock {
-			compatible = "fixed-clock";
-			clock-frequency = <27000000>;
-			clock-output-names = "dummy_apb";
-			#clock-cells = <0>;
-		};
-
-		intc: interrupt-controller@500000 {
-			compatible = "csky,gx6605s-intc";
-			reg = <0x00500000 0x400>;
-			interrupt-controller;
-			#interrupt-cells = <1>;
-		};
-
-		timer@20a000 {
-			compatible = "csky,gx6605s-timer";
-			reg = <0x0020a000 0x400>;
-			clocks = <&dummy_apb>;
-			interrupts = <10>;
-			interrupt-parent = <&intc>;
-		};
-
-		ehci-hcd@900000 {
-			compatible = "generic-ehci";
-			reg = <0x00900000 0x400>;
-			interrupt-parent = <&intc>;
-			interrupts = <59>;
-		};
-
-		ohci-hcd0@a00000 {
-			compatible = "generic-ohci";
-			reg = <0x00a00000 0x400>;
-			interrupt-parent = <&intc>;
-			interrupts = <58>;
-		};
-
-		ohci-hcd1@b00000 {
-			compatible = "generic-ohci";
-			reg = <0x00b00000 0x400>;
-			interrupt-parent = <&intc>;
-			interrupts = <57>;
-		};
-
-		serial@403000 {
-			compatible = "ns16550a";
-			reg = <0x00403000 0x400>;
-			interrupt-parent = <&intc>;
-			interrupts = <15>;
-			clock-frequency = <29491200>;
-			baud = <115200>;
-			reg-shift = <2>;
-			reg-io-width = <1>;
-		};
-
-		gpio0: gpio@305000 {
-			compatible = "wd,mbl-gpio";
-			reg-names = "dirout", "dat", "set", "clr";
-			reg = <0x305000 4>, <0x305004 4>, <0x305008 4>, <0x30500c 4>;
-			bgpio-base = <0>;
-			#gpio-cells = <2>;
-			gpio-controller;
-		};
-
-		gpio_buttons {
-			compatible = "gpio-keys-polled";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			poll-interval = <100>;
-			autorepeat;
-
-			button0 {
-				label = "button8";
-				linux,code = <KEY_LEFT>;
-				gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
-			};
-
-			button1 {
-				label = "button6";
-				linux,code = <KEY_RIGHT>;
-				gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
-			};
-
-			button2 {
-				label = "button5";
-				linux,code = <KEY_UP>;
-				gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
-			};
-
-			button3 {
-				label = "button9";
-				linux,code = <KEY_DOWN>;
-				gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
-			};
-
-			button4 {
-				label = "button7";
-				linux,code = <KEY_ENTER>;
-				gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
-			};
-		};
-
-		gpio_leds {
-			compatible = "gpio-leds";
-
-			led0 {
-				label = "led10";
-				gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
-				linux,default-trigger = "heartbeat";
-			};
-
-			led1 {
-				label = "led11";
-				gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
-				linux,default-trigger = "timer";
-			};
-
-			led2 {
-				label = "led12";
-				gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
-				linux,default-trigger = "default-on";
-			};
-
-			led3 {
-				label = "led13";
-				gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
-				linux,default-trigger = "default-on";
-			};
-		};
-	};
-
-	chosen {
-		bootargs = "console=ttyS0,115200 init=/sbin/init root=/dev/sda2 rw rootwait";
-	};
-};

board/csky/readme.txt

@@ -41,9 +41,9 @@ Result of the build
 After building, you should obtain this tree:
 
     output/images/
-    +-- vmlinux
-    +-- rootfs.ext2
-    +-- <board name>.dtb
+    ├── vmlinux
+    ├── rootfs.ext2
+    └── <board name>.dtb
 
 How to run it
 =============

board/digilent/zybo/genimage.cfg

@@ -1,13 +1,12 @@
 image boot.vfat {
   vfat {
     files = {
-      "bcm2711-rpi-4-b.dtb",
-      "rpi-firmware/cmdline.txt",
-      "rpi-firmware/config.txt",
-      "rpi-firmware/fixup4.dat",
-      "rpi-firmware/start4.elf",
-      "rpi-firmware/overlays",
-      "zImage"
+      "BOOT.BIN",
+      "uEnv.txt",
+      "system.bit",
+      "zynq-zybo.dtb",
+      "u-boot-dtb.img",
+      "uImage"
     }
   }
   size = 32M

board/digilent/zybo/post-image.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
+GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+OUTPUT_DIR="${O}/images"
+
+rm -rf "${GENIMAGE_TMP}"
+
+cp board/digilent/zybo/uEnv.txt ${BINARIES_DIR}
+cp board/digilent/zybo/system.bit ${BINARIES_DIR}
+
+genimage                               \
+	--rootpath "${TARGET_DIR}"     \
+	--tmppath "${GENIMAGE_TMP}"    \
+	--inputpath "${BINARIES_DIR}"  \
+	--outputpath "${BINARIES_DIR}" \
+	--config "${GENIMAGE_CFG}"

board/digilent/zybo/readme.txt

@@ -0,0 +1,76 @@
+Digilent Zybo
+=============
+
+This is the Buildroot board support for the Digilent Zybo. The Zybo is
+a development board based on the Xilinx Zynq-7000 based All-Programmable
+System-On-Chip.
+
+Zybo information including schematics, reference designs, and manuals are
+available from http://store.digilentinc.com/zybo-zynq-7000-arm-fpga-soc-trainer-board/ .
+
+If you want a custom FPGA bitstream to be loaded by U-Boot, copy it as
+system.bit in board/digilent/zybo/.
+
+Steps to create a working system for Zybo:
+
+1) make zynq_zybo_defconfig
+2) make
+3) write your SD Card with the sdcard.img file using dd by doing
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
+4) insert the SD Card and power up your Zybo
+5) Expect serial console on the second USB serial port exposed by the board
+
+The expected output:
+
+ U-Boot SPL 2016.05 (May 20 2016 - 16:16:24)
+ mmc boot
+ Trying to boot from MMC1
+ reading system.dtb
+ spl_load_image_fat_os: error reading image system.dtb, err - -1
+ reading u-boot-dtb.img
+ reading u-boot-dtb.img
+
+
+ U-Boot 2016.05 (May 20 2016 - 16:16:24 +0200)
+
+ Model: Zynq ZYBO Development Board
+ Board: Xilinx Zynq
+ I2C:   ready
+ DRAM:  ECC disabled 512 MiB
+ MMC:   sdhci@e0100000: 0
+ SF: Detected S25FL128S_64K with page size 256 Bytes, erase size 64 KiB, total 16 MiB
+ In:    serial@e0001000
+ Out:   serial@e0001000
+ Err:   serial@e0001000
+ Model: Zynq ZYBO Development Board
+ Board: Xilinx Zynq
+ Net:   ZYNQ GEM: e000b000, phyaddr 0, interface rgmii-id
+ I2C EEPROM MAC address read failed
+
+ Warning: ethernet@e000b000 (eth0) using random MAC address - 56:64:dd:a7:6d:94
+ eth0: ethernet@e000b000
+ ...
+
+Resulting system
+----------------
+Once the build process is finished you will have an image called "sdcard.img"
+in the output/images/ directory.
+
+The first partition is a FAT32 partition created at the beginning of the SD Card
+that contains the following files :
+    /BOOT.BIN
+    /zynq-zybo.dtb
+    /uEnv.txt
+    /system.bit
+    /uImage
+    /u-boot-dtb.img
+
+The second partition is an ext4 partition that contains the root filesystem.
+
+You can alter the booting procedure by modifying the uEnv.txt file
+in first partition of the SD card. It is a plain text file in format
+<key>=<value> one per line:
+
+kernel_image=myimage
+modeboot=myboot
+myboot=...

board/digilent/zybo/uEnv.txt

@@ -0,0 +1,5 @@
+bootargs=root=/dev/mmcblk0p2 rootwait rw rootfstype=ext4
+fpga_image=system.bit
+fpgaboot=if fatload mmc 0 0x1000000 ${fpga_image}; then echo Booting FPGA from ${fpga_image}; fpga info 0 && fpga loadb 0 0x1000000 $filesize; else echo FPGA image ${fpga_image} was not found, skipping...; fi;
+kernel_image=uImage
+sdboot=echo Booting from SD...; run fpgaboot; fatload mmc 0 0x1000000 ${kernel_image} && fatload mmc 0 0x2000000 zynq-zybo.dtb && bootm 0x1000000 - 0x2000000

board/embest/riotboard/genimage.cfg

@@ -1,17 +0,0 @@
-image sdcard.img {
-    hdimage {
-    }
-
-    partition u-boot {
-        in-partition-table = "no"
-        image = "u-boot.imx"
-        offset = 1024
-    }
-
-    partition rootfs {
-        partition-type = 0x83
-        image = "rootfs.ext2"
-        offset = 1M
-        size = 60M
-    }
-}

board/embest/riotboard/readme.txt

@@ -1,38 +0,0 @@
-Buildroot for Embest RIoTboard
-==============================
-
-This is a small development board, based on Freescale IMX6 Solo SoC
-(single core ARM Cortex-A9).
-
-More details about the board can be found at:
-
-  http://www.embest-tech.com/riotboard
-
-1. Compiling buildroot
-----------------------
-
-$ make riotboard_defconfig
-$ make
-
-2. Installing buildroot
------------------------
-
-Prepare an SD-card and plug it into your card reader. Always double
-check the block device before writing to it, as writing to the wrong
-block device can cause irrecoverable data loss. Now you can write the
-image to your SD-card:
-
-sudo dd if=output/images/sdcard.img of=/dev/<sdcard-block-device> bs=1M
-
-3. Running buildroot
---------------------
-
-Position the board so you can read the label "RIoTboard" on the right
-side of SW1 DIP switches. Configure the SW1 swiches like this:
-
-1   0  1   0   0  1   0  1
-ON OFF ON OFF OFF ON OFF ON
-
-Now plug your prepared SD-card in slot J6. Connect a serial console
-(115200, 8, N, 1) to header J18. Connect a 5V/1A power supply to the
-board and enjoy.

board/embest/riotboard/rootfs_overlay/boot/extlinux/extlinux.conf

@@ -1,6 +0,0 @@
-default buildroot
-
-label buildroot
-kernel /boot/zImage
-devicetree /boot/imx6dl-riotboard.dtb
-append console=ttymxc1,115200 root=/dev/mmcblk1p1 rw

board/freescale/common/imx/genimage.cfg.template_imx8

@@ -3,7 +3,7 @@
 # We mimic the .sdcard Freescale's image format:
 # * the SD card must have 33 kB free space at the beginning,
 # * U-Boot is integrated into imx8-boot-sd.bin and is dumped as is,
-# * a FAT partition at offset 8MB is containing Image and DTB files
+# * a FAT partition at offset 32MB is containing Image and DTB files
 # * a single root filesystem partition is required (ext2, ext3 or ext4)
 #
 
@@ -23,7 +23,7 @@ image sdcard.img {
   partition imx-boot {
     in-partition-table = "no"
     image = "imx8-boot-sd.bin"
-    offset = %IMXOFFSET%
+    offset = 33K
   }
 
   partition boot {

board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl

@@ -1,30 +0,0 @@
-# Minimal SD card image for the Freescale boards Template for SPL Boot
-#
-# We mimic the .sdcard Freescale's image format:
-# * the SD card must have 1 kB free space at the beginning,
-# * SPL is at the offset expected by ROM,
-# * U-Boot is at the offset expected by SPL,
-# * The first partition is expected to be an ext2 and have a /boot directory.
-#
-
-image sdcard.img {
-  hdimage {
-  }
-
-  partition spl {
-    in-partition-table = "no"
-    image = "SPL"
-    offset = 1024
-  }
-
-  partition u-boot {
-    in-partition-table = "no"
-    image = "%UBOOTBIN%"
-    offset = 69K
-  }
-
-  partition rootfs {
-    partition-type = 0x83
-    image = "rootfs.ext2"
-  }
-}

board/freescale/common/imx/genimage.cfg.template_spl

@@ -26,9 +26,9 @@ image sdcard.img {
     offset = 1024
   }
 
-  partition u-boot {
+  partition u-boot-img {
     in-partition-table = "no"
-    image = "%UBOOTBIN%"
+    image = "u-boot.img"
     offset = 69K
   }
 

board/freescale/common/imx/imx8-bootloader-prepare.sh

@@ -7,29 +7,12 @@ main ()
 		echo "ERROR: couldn't find dtb: $UBOOT_DTB"
 		exit 1
 	fi
+	cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/lpddr4_pmu_train_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin
+	BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot.bin ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its
+	${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb
+	rm -f ${BINARIES_DIR}/u-boot.its
 
-	if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then
-		cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/lpddr4_pmu_train_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin
-		BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot.bin ATF_LOAD_ADDR=0x00910000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its
-		${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb
-		rm -f ${BINARIES_DIR}/u-boot.its
-
-		${HOST_DIR}/bin/mkimage_imx8 -fit -signed_hdmi ${BINARIES_DIR}/signed_hdmi_imx8m.bin -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
-	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" ${BR2_CONFIG}; then
-		cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/lpddr4_pmu_train_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin
-		BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot.bin ATF_LOAD_ADDR=0x00920000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its
-		${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb
-		rm -f ${BINARIES_DIR}/u-boot.its
-
-		${HOST_DIR}/bin/mkimage_imx8 -fit -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
-	else
-		${HOST_DIR}/bin/mkimage_imx8 -commit > ${BINARIES_DIR}/mkimg.commit
-		cat ${BINARIES_DIR}/u-boot.bin ${BINARIES_DIR}/mkimg.commit > ${BINARIES_DIR}/u-boot-hash.bin
-		cp ${BINARIES_DIR}/bl31.bin ${BINARIES_DIR}/u-boot-atf.bin
-		dd if=${BINARIES_DIR}/u-boot-hash.bin of=${BINARIES_DIR}/u-boot-atf.bin bs=1K seek=128
-
-		${HOST_DIR}/bin/mkimage_imx8 -soc QX -rev B0 -append ${BINARIES_DIR}/ahab-container.img -c -scfw ${BINARIES_DIR}/mx8qx-mek-scfw-tcm.bin -ap ${BINARIES_DIR}/u-boot-atf.bin a35 0x80000000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
-	fi
+	${HOST_DIR}/bin/mkimage_imx8 -fit -signed_hdmi ${BINARIES_DIR}/signed_hdmi_imx8m.bin -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
 
 	exit $?
 }

board/freescale/common/imx/post-image.sh

@@ -34,14 +34,6 @@ genimage_type()
 {
 	if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then
 		echo "genimage.cfg.template_imx8"
-	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" ${BR2_CONFIG}; then
-		echo "genimage.cfg.template_imx8"
-	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X=y$" ${BR2_CONFIG}; then
-		echo "genimage.cfg.template_imx8"
-	elif grep -Eq "^BR2_LINUX_KERNEL_INSTALL_TARGET=y$" ${BR2_CONFIG}; then
-		if grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then
-		    echo "genimage.cfg.template_no_boot_part_spl"
-		fi
 	elif grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then
 		echo "genimage.cfg.template_spl"
 	else
@@ -49,40 +41,23 @@ genimage_type()
 	fi
 }
 
-imx_offset()
-{
-	if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then
-		echo "33K"
-	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" ${BR2_CONFIG}; then
-		echo "33K"
-	else
-		echo "32K"
-	fi
-}
-
 uboot_image()
 {
 	if grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y$" ${BR2_CONFIG}; then
 		echo "u-boot-dtb.imx"
 	elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_IMX=y$" ${BR2_CONFIG}; then
 		echo "u-boot.imx"
-	elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y$" ${BR2_CONFIG}; then
-	    echo "u-boot-dtb.img"
-	elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_IMG=y$" ${BR2_CONFIG}; then
-	    echo "u-boot.img"
 	fi
 }
 
 main()
 {
 	local FILES="$(dtb_list) $(linux_image)"
-	local IMXOFFSET="$(imx_offset)"
 	local UBOOTBIN="$(uboot_image)"
 	local GENIMAGE_CFG="$(mktemp --suffix genimage.cfg)"
 	local GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
 
 	sed -e "s/%FILES%/${FILES}/" \
-		-e "s/%IMXOFFSET%/${IMXOFFSET}/" \
 		-e "s/%UBOOTBIN%/${UBOOTBIN}/" \
 		board/freescale/common/imx/$(genimage_type) > ${GENIMAGE_CFG}
 

board/freescale/imx6-sabresd/readme.txt

@@ -80,7 +80,6 @@ Running kmscube application:
 Running Qt5 Cinematic Demo:
 
 # export QT_QPA_EGLFS_KMS_CONFIG=/root/sabresd.json
-# export QT_QPA_EGLFS_ALWAYS_SET_MODE=1
 # /usr/share/Qt5/CinematicExperience/Qt5_CinematicExperience
 
 Running gl2mark benchmark:

board/freescale/imx6sabre/patches/uboot/0002-imx-Create-distinct-pre-processed-mkimage-config-fil.patch

@@ -1,89 +0,0 @@
-From 27a2cd6a1980adf3002412678c8fdec6528dc47d Mon Sep 17 00:00:00 2001
-From: Trent Piepho <tpiepho@impinj.com>
-Date: Fri, 6 Apr 2018 17:11:27 -0700
-Subject: [PATCH] imx: Create distinct pre-processed mkimage config files
-
-Each imx image is created by a separate sub-make and during this process
-the mkimage config file is run though cpp.
-
-The cpp output is to the same file no matter what imx image is being
-created.
-
-This means if two imx images are generated in parallel they will attempt
-to independently produce the same pre-processed mkimage config file at
-the same time.
-
-Avoid the problem by making the pre-processed config file name unique
-based on the imx image it will be used in.  This way each image will
-create a unique config file and they won't clobber each other when run
-in parallel.
-
-This should fixed the build bug referenced in b5b0e4e3 ("imximage:
-Remove failure when no IVT offset is found").
-
-Cc: Breno Lima <breno.lima@nxp.com>
-Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Cc: Fabio Estevam <fabio.estevam@nxp.com>
-Signed-off-by: Trent Piepho <tpiepho@impinj.com>
-Tested-by: Fabio Estevam <fabio.estevam@nxp.com>
-[fabio: Adapted to imx_v2017.03_4.9.11_1.0.0_ga]
-Signed-off-by: Fabio Estevam <festevam@gmail.com>
----
- arch/arm/imx-common/Makefile | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile
-index d862258..f1bae8d 100644
---- a/arch/arm/imx-common/Makefile
-+++ b/arch/arm/imx-common/Makefile
-@@ -69,9 +69,11 @@ endif
- quiet_cmd_cpp_cfg = CFGS    $@
-       cmd_cpp_cfg = $(CPP) $(cpp_flags) -x c -o $@ $<
- 
--IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%).cfgtmp
-+# mkimage source config file
-+IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%)
- 
--$(IMX_CONFIG): %.cfgtmp: % FORCE
-+# How to create a cpp processed config file, they all use the same source
-+%.cfgout: $(IMX_CONFIG) FORCE
- 	$(Q)mkdir -p $(dir $@)
- 	$(call if_changed_dep,cpp_cfg)
- 
-@@ -79,7 +81,7 @@ MKIMAGEFLAGS_u-boot.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T imxim
- 	-e $(CONFIG_SYS_TEXT_BASE)
- u-boot.imx: MKIMAGEOUTPUT = u-boot.imx.log
- 
--u-boot.imx: u-boot.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE
-+u-boot.imx: u-boot.bin u-boot.cfgout $(PLUGIN).bin FORCE
- 	$(call if_changed,mkimage)
- 
- ifeq ($(CONFIG_OF_SEPARATE),y)
-@@ -87,16 +89,15 @@ MKIMAGEFLAGS_u-boot-dtb.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T i
- 	-e $(CONFIG_SYS_TEXT_BASE)
- u-boot-dtb.imx: MKIMAGEOUTPUT = u-boot-dtb.imx.log
- 
--u-boot-dtb.imx: u-boot-dtb.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE
-+u-boot-dtb.imx: u-boot-dtb.bin u-boot-dtb.cfgout $(PLUGIN).bin FORCE
- 	$(call if_changed,mkimage)
- endif
- 
- MKIMAGEFLAGS_SPL = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T imximage \
- 	-e $(CONFIG_SPL_TEXT_BASE)
--
- SPL: MKIMAGEOUTPUT = SPL.log
- 
--SPL: spl/u-boot-spl.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE
-+SPL: spl/u-boot-spl.bin spl/u-boot-spl.cfgout $(PLUGIN).bin FORCE
- 	$(call if_changed,mkimage)
- 
- MKIMAGEFLAGS_u-boot.uim = -A arm -O U-Boot -a $(CONFIG_SYS_TEXT_BASE) \
-@@ -124,4 +125,4 @@ cmd_u-boot-nand-spl_imx = (printf '\000\000\000\000\106\103\102\040\001' && \
- spl/u-boot-nand-spl.imx: SPL FORCE
- 	$(call if_changed,u-boot-nand-spl_imx)
- 
--targets += $(addprefix ../../../,$(IMX_CONFIG) SPL u-boot.uim spl/u-boot-nand-spl.imx)
-+targets += $(addprefix ../../../,SPL spl/u-boot-spl.cfgout u-boot-dtb.cfgout u-boot.cfgout u-boot.uim spl/u-boot-nand-spl.imx)
--- 
-2.7.4
-

board/freescale/imx6sabre/patches/uboot/0002-imximage-Remove-failure-when-no-IVT-offset-is-found.patch

@@ -0,0 +1,55 @@
+From 24ba28680abe868e8db3442a9bf523ad3af1febd Mon Sep 17 00:00:00 2001
+From: Fabio Estevam <fabio.estevam@nxp.com>
+Date: Fri, 9 Mar 2018 08:25:00 -0300
+Subject: [PATCH] imximage: Remove failure when no IVT offset is found
+
+Sometimes imximage throws the following error:
+
+  CFGS    board/freescale/vf610twr/imximage.cfg.cfgtmp
+  CFGS    board/freescale/vf610twr/imximage.cfg.cfgtmp
+  MKIMAGE u-boot-dtb.imx
+Error: No BOOT_FROM tag in board/freescale/vf610twr/imximage.cfg.cfgtmp
+arch/arm/mach-imx/Makefile:100: recipe for target 'u-boot-dtb.imx' failed
+
+Later on, when running mkimage for the u-boot.imx it will succeed in
+finding the IVT offset.
+
+Looks like some race condition happening during parallel build when
+processing mkimage for u-boot-dtb.imx and u-boot.imx.
+
+A proper fix still needs to be implemented, but as a workaround let's
+remove the error when the IVT offset is not found.
+
+It is useful to have such message, especially during bring-up phase,
+but the build error that it causes is severe, so better avoid the
+build error for now.
+
+The error checking can be re-implemented later when we have a proper
+fix.
+
+Reported-by: Breno Lima <breno.lima@nxp.com>
+Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
+---
+ tools/imximage.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/tools/imximage.c b/tools/imximage.c
+index 0c43196..bef56f8 100644
+--- a/tools/imximage.c
++++ b/tools/imximage.c
+@@ -765,11 +765,6 @@ static uint32_t parse_cfg_file(struct imx_header *imxhdr, char *name)
+ 	(*set_dcd_rst)(imxhdr, dcd_len, name, lineno);
+ 	fclose(fd);
+ 
+-	/* Exit if there is no BOOT_FROM field specifying the flash_offset */
+-	if (imximage_ivt_offset == FLASH_OFFSET_UNDEFINED) {
+-		fprintf(stderr, "Error: No BOOT_FROM tag in %s\n", name);
+-		exit(EXIT_FAILURE);
+-	}
+ 	return dcd_len;
+ }
+ 
+-- 
+2.7.4
+

board/freescale/imx7dsdb/patches/uboot/0001-imx-Create-distinct-pre-processed-mkimage-config-fil.patch

@@ -1,89 +0,0 @@
-From 27a2cd6a1980adf3002412678c8fdec6528dc47d Mon Sep 17 00:00:00 2001
-From: Trent Piepho <tpiepho@impinj.com>
-Date: Fri, 6 Apr 2018 17:11:27 -0700
-Subject: [PATCH] imx: Create distinct pre-processed mkimage config files
-
-Each imx image is created by a separate sub-make and during this process
-the mkimage config file is run though cpp.
-
-The cpp output is to the same file no matter what imx image is being
-created.
-
-This means if two imx images are generated in parallel they will attempt
-to independently produce the same pre-processed mkimage config file at
-the same time.
-
-Avoid the problem by making the pre-processed config file name unique
-based on the imx image it will be used in.  This way each image will
-create a unique config file and they won't clobber each other when run
-in parallel.
-
-This should fixed the build bug referenced in b5b0e4e3 ("imximage:
-Remove failure when no IVT offset is found").
-
-Cc: Breno Lima <breno.lima@nxp.com>
-Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Cc: Fabio Estevam <fabio.estevam@nxp.com>
-Signed-off-by: Trent Piepho <tpiepho@impinj.com>
-Tested-by: Fabio Estevam <fabio.estevam@nxp.com>
-[fabio: Adapted to imx_v2017.03_4.9.11_1.0.0_ga]
-Signed-off-by: Fabio Estevam <festevam@gmail.com>
----
- arch/arm/imx-common/Makefile | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile
-index d862258..f1bae8d 100644
---- a/arch/arm/imx-common/Makefile
-+++ b/arch/arm/imx-common/Makefile
-@@ -69,9 +69,11 @@ endif
- quiet_cmd_cpp_cfg = CFGS    $@
-       cmd_cpp_cfg = $(CPP) $(cpp_flags) -x c -o $@ $<
- 
--IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%).cfgtmp
-+# mkimage source config file
-+IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%)
- 
--$(IMX_CONFIG): %.cfgtmp: % FORCE
-+# How to create a cpp processed config file, they all use the same source
-+%.cfgout: $(IMX_CONFIG) FORCE
- 	$(Q)mkdir -p $(dir $@)
- 	$(call if_changed_dep,cpp_cfg)
- 
-@@ -79,7 +81,7 @@ MKIMAGEFLAGS_u-boot.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T imxim
- 	-e $(CONFIG_SYS_TEXT_BASE)
- u-boot.imx: MKIMAGEOUTPUT = u-boot.imx.log
- 
--u-boot.imx: u-boot.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE
-+u-boot.imx: u-boot.bin u-boot.cfgout $(PLUGIN).bin FORCE
- 	$(call if_changed,mkimage)
- 
- ifeq ($(CONFIG_OF_SEPARATE),y)
-@@ -87,16 +89,15 @@ MKIMAGEFLAGS_u-boot-dtb.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T i
- 	-e $(CONFIG_SYS_TEXT_BASE)
- u-boot-dtb.imx: MKIMAGEOUTPUT = u-boot-dtb.imx.log
- 
--u-boot-dtb.imx: u-boot-dtb.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE
-+u-boot-dtb.imx: u-boot-dtb.bin u-boot-dtb.cfgout $(PLUGIN).bin FORCE
- 	$(call if_changed,mkimage)
- endif
- 
- MKIMAGEFLAGS_SPL = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T imximage \
- 	-e $(CONFIG_SPL_TEXT_BASE)
--
- SPL: MKIMAGEOUTPUT = SPL.log
- 
--SPL: spl/u-boot-spl.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE
-+SPL: spl/u-boot-spl.bin spl/u-boot-spl.cfgout $(PLUGIN).bin FORCE
- 	$(call if_changed,mkimage)
- 
- MKIMAGEFLAGS_u-boot.uim = -A arm -O U-Boot -a $(CONFIG_SYS_TEXT_BASE) \
-@@ -124,4 +125,4 @@ cmd_u-boot-nand-spl_imx = (printf '\000\000\000\000\106\103\102\040\001' && \
- spl/u-boot-nand-spl.imx: SPL FORCE
- 	$(call if_changed,u-boot-nand-spl_imx)
- 
--targets += $(addprefix ../../../,$(IMX_CONFIG) SPL u-boot.uim spl/u-boot-nand-spl.imx)
-+targets += $(addprefix ../../../,SPL spl/u-boot-spl.cfgout u-boot-dtb.cfgout u-boot.cfgout u-boot.uim spl/u-boot-nand-spl.imx)
--- 
-2.7.4
-

board/freescale/imx8mmevk/readme.txt

@@ -1,71 +0,0 @@
-***************************
-Freescale i.MX8MM EVK board
-***************************
-
-This file documents the Buildroot support for the Freescale i.MX8MM
-EVK board.
-
-Build
-=====
-
-First, configure Buildroot for the i.MX8MM EVK board:
-
-  make freescale_imx8mmevk_defconfig
-
-Build all components:
-
-  make
-
-You will find in output/images/ the following files:
-  - bl31.bin
-  - boot.vfat
-  - fsl-imx8mm-evk.dtb
-  - Image
-  - imx8-boot-sd.bin
-  - lpddr4_pmu_train_fw.bin
-  - rootfs.ext2
-  - rootfs.ext4
-  - rootfs.tar
-  - sdcard.img
-  - u-boot.bin
-  - u-boot.imx
-  - u-boot-nodtb.bin
-  - u-boot-spl-ddr.bin
-
-Create a bootable SD card
-=========================
-
-To determine the device associated to the SD card have a look in the
-/proc/partitions file:
-
-  cat /proc/partitions
-
-Buildroot prepares a bootable "sdcard.img" image in the output/images/
-directory, ready to be dumped on a SD card. Launch the following
-command as root:
-
-  dd if=output/images/sdcard.img of=/dev/<your-sd-device>
-
-*** WARNING! This will destroy all the card content. Use with care! ***
-
-For details about the medium image layout, see the definition in
-board/freescale/common/imx/genimage.cfg.template_imx8.
-
-Boot the i.MX8MM EVK board
-==========================
-
-To boot your newly created system (refer to the i.MX8MMini EVK Quick Start Guide
-[1] for guidance):
-- insert the SD card in the SD slot of the board;
-- Configure the switches as follows:
-SW1101:	0110110010 [D1-D10]
-SW1102:	0001101000 [D1-D10]
-- put a micro USB cable into the Debug USB Port and connect using a terminal
-  emulator at 115200 bps, 8n1;
-- power on the board.
-
-Enjoy!
-
-References
-==========
-[1] https://www.nxp.com/document/guide/Get-Started-with-the-i.MX-8M-Mini-EVK:GS-iMX-8M-Mini-EVK

board/freescale/imx8mqevk/readme.txt

@@ -21,7 +21,7 @@ You will find in output/images/ the following files:
   - boot.vfat
   - fsl-imx8mq-evk.dtb
   - Image
-  - imx8-boot-sd.bin
+  - imx-boot-imx8mqevk-sd.bin
   - lpddr4_pmu_train_fw.bin
   - rootfs.ext2
   - rootfs.ext4
@@ -69,7 +69,7 @@ Enable HDMI output
 
 To enable HDMI output at boot you must provide the video kernel boot
 argument.  To set the video boot argument from U-Boot run after
-stopping in U-Boot prompt:
+stoping in U-Boot prompt:
 
 setenv mmcargs 'setenv bootargs console=${console} root=${mmcroot} video=HDMI-A-1:1920x1080-32@60'
 saveenv

board/freescale/imx8qxpmek/readme.txt

@@ -1,67 +0,0 @@
-***************************
-Freescale i.MX8QXP MEK board
-***************************
-
-This file documents the Buildroot support for the Freescale i.MX8QXP
-MEK board.
-
-Build
-=====
-
-First, configure Buildroot for the i.MX8QXP MEK board:
-
-  make freescale_imx8qxpmek_defconfig
-
-Build all components:
-
-  make
-
-You will find in output/images/ the following files:
-  - ahab-container.img
-  - bl31.bin
-  - boot.vfat
-  - fsl-imx8qxp-mek.dtb
-  - Image
-  - imx8-boot-sd.bin
-  - mkimg.commit
-  - mx8qx-mek-scfw-tcm.bin
-  - mx8qx-val-scfw-tcm.bin
-  - rootfs.ext2
-  - rootfs.ext4
-  - rootfs.tar
-  - sdcard.img
-  - u-boot-atf.bin
-  - u-boot.bin
-  - u-boot-hash.bin
-
-Create a bootable SD card
-=========================
-
-To determine the device associated to the SD card have a look in the
-/proc/partitions file:
-
-  cat /proc/partitions
-
-Buildroot prepares a bootable "sdcard.img" image in the output/images/
-directory, ready to be dumped on a SD card. Launch the following
-command as root:
-
-  dd if=output/images/sdcard.img of=/dev/<your-sd-device>
-
-*** WARNING! This will destroy all the card content. Use with care! ***
-
-For details about the medium image layout, see the definition in
-board/freescale/common/imx/genimage.cfg.template_imx8.
-
-Boot the i.MX8QXP MEK board
-==========================
-
-To boot your newly created system:
-- insert the SD card in the SD slot of the board;
-- Configure the boot switch as follows:
-SW2:	ON	ON	OFF	OFF
-- put a micro USB cable into the Debug USB Port and connect using a terminal
-  emulator at 115200 bps, 8n1;
-- power on the board.
-
-Enjoy!

board/freescale/t1040d4rdb/readme.txt

@@ -4,12 +4,8 @@ release notes for reflashing.
 
 To program the kernel and rootfs created by buildroot into the flash. The
 fast way is to tftp transfer the files via one of the network interfaces.
-Make sure your devkit has ipaddr, netmask, and serverip defined to reach your
-tftp server. Verify bootargs are reasonable (console=ttyS0,115200).
-
-------------------------------------------------------------------------------
-
-Devkit: T1040RDB
+Make sure your devkit has ipaddr and serverip defined to reach your tftp
+server.
 
 (Assuming the default u-boot env from NXP)
 1. Program the DTB to NOR flash
@@ -26,26 +22,3 @@ Devkit: T1040RDB
     => boot
 
     You can login with user "root".
-------------------------------------------------------------------------------
-
-Devkit: T2080 QDS or RDB
-
-(Assuming the default u-boot env from NXP)
-1. Netboot the kernel/rootfs/dtb
-
-    => tftp 0x1000000 uImage && tftp 0x2000000 rootfs.cpio.uboot
-
-    RDB => tftp 0x3000000 t2080rdb.dtb
-     or
-    QDS => tftp 0x3000000 t2080qds.dtb
-
-2. Booting your new system
-
-    => bootm 0x1000000 0x2000000 0x3000000
-
-    You can login with user "root".
-
-3. If flashing is desired, a similar approach to the T1040 can be followed
-   with updated addresses for the flash layout.  Example is in the NXP default
-   env.
-------------------------------------------------------------------------------

board/friendlyarm/nanopi-m1-plus/patches/linux/0001-ARM-dts-nanopi-m1-plus-add-dts-to-linux-4.11.5.patch

@@ -0,0 +1,103 @@
+From 4ec28d4e1040b94c66e97aa77071c9ef3478f022 Mon Sep 17 00:00:00 2001
+From: Chakra Divi <chakra@openedev.com>
+Date: Thu, 6 Jul 2017 18:22:35 +0530
+Subject: [PATCH] ARM: dts: nanopi-m1-plus : add dts to linux 4.11.5
+
+This patch is used to add nanopi-m1-plus dts
+file in linux source code helps to add nanopi-m1-plus
+board support in buildroot and is part of the linux
+main-line ; refer to the below link for info
+[https://patchwork.kernel.org/patch/9755033]
+
+Signed-off-by: Chakra Divi <chakra@openedev.com>
+---
+ arch/arm/boot/dts/Makefile                    |    1 +
+ arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts |   64 +++++++++++++++++++++++++
+ 2 files changed, 65 insertions(+)
+ create mode 100644 arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts
+
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index 0118084..928e5d3 100644
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -867,6 +867,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \
+ 	sun8i-h3-bananapi-m2-plus.dtb \
+ 	sun8i-h3-beelink-x2.dtb \
+ 	sun8i-h3-nanopi-m1.dtb	\
++	sun8i-h3-nanopi-m1-plus.dtb \
+ 	sun8i-h3-nanopi-neo.dtb \
+ 	sun8i-h3-orangepi-2.dtb \
+ 	sun8i-h3-orangepi-lite.dtb \
+diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts
+new file mode 100644
+index 0000000..8ddd1b2
+--- /dev/null
++++ b/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts
+@@ -0,0 +1,64 @@
++/*
++ * Copyright (C) 2017 Jagan Teki <jteki@openedev.com>
++ *
++ * This file is dual-licensed: you can use it either under the terms
++ * of the GPL or the X11 license, at your option. Note that this dual
++ * licensing only applies to this file, and not this project as a
++ * whole.
++ *
++ *  a) This file is free software; you can redistribute it and/or
++ *     modify it under the terms of the GNU General Public License as
++ *     published by the Free Software Foundation; either version 2 of the
++ *     License, or (at your option) any later version.
++ *
++ *     This file is distributed in the hope that it will be useful,
++ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *     GNU General Public License for more details.
++ *
++ * Or, alternatively,
++ *
++ *  b) Permission is hereby granted, free of charge, to any person
++ *     obtaining a copy of this software and associated documentation
++ *     files (the "Software"), to deal in the Software without
++ *     restriction, including without limitation the rights to use,
++ *     copy, modify, merge, publish, distribute, sublicense, and/or
++ *     sell copies of the Software, and to permit persons to whom the
++ *     Software is furnished to do so, subject to the following
++ *     conditions:
++ *
++ *     The above copyright notice and this permission notice shall be
++ *     included in all copies or substantial portions of the Software.
++ *
++ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ *     OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++#include "sun8i-h3-nanopi.dtsi"
++
++/ {
++	model = "FriendlyArm NanoPi M1 Plus";
++	compatible = "friendlyarm,nanopi-m1-plus", "allwinner,sun8i-h3";
++};
++
++&ehci1 {
++	status = "okay";
++};
++
++&ehci2 {
++	status = "okay";
++};
++
++&ohci1 {
++	status = "okay";
++};
++
++&ohci2 {
++	status = "okay";
++};
+-- 
+1.7.9.5
+

board/hardkernel/odroidxu4/boot.ini

@@ -1,38 +0,0 @@
-ODROIDXU-UBOOT-CONFIG
-
-# U-Boot Parameters
-setenv initrd_high "0xffffffff"
-setenv fdt_high "0xffffffff"
-
-setenv macaddr "00:1e:06:61:7a:39"
-setenv bootrootfs "console=tty1 root=/dev/mmcblk1p2 rootwait rw fsck.repair=yes net.ifnames=0"
-setenv bootcmd "load mmc 0:1 0x40008000 zImage; load mmc 0:1 0x44000000 exynos5422-odroidxu4.dtb; bootz 0x40008000 - 0x44000000"
-setenv vout "hdmi"
-setenv governor "performance"
-setenv HPD "true"
-
-#  TMDS data amplitude control.
-setenv hdmi_tx_amp_lvl  "31"
-
-#  TMDS data amplitude fine control for each channel.
-setenv hdmi_tx_lvl_ch0      "3"
-setenv hdmi_tx_lvl_ch1      "3"
-setenv hdmi_tx_lvl_ch2      "3"
-
-#  TMDS data pre-emphasis level control.
-setenv hdmi_tx_emp_lvl      "6"
-
-#  TMDS clock amplitude control.
-setenv hdmi_clk_amp_lvl     "31"
-
-#  TMDS data source termination resistor control.
-setenv hdmi_tx_res      "0"
-
-setenv hdmi_phy_control "hdmi_tx_amp_lvl=${hdmi_tx_amp_lvl} hdmi_tx_lvl_ch0=${hdmi_tx_lvl_ch0} hdmi_tx_lvl_ch1=${hdmi_tx_lvl_ch1} hdmi_tx_lvl_ch2=${hdmi_tx_lvl_ch2} hdmi_tx_emp_lvl=${hdmi_tx_emp_lvl} hdmi_clk_amp_lvl=${hdmi_clk_amp_lvl} hdmi_tx_res=${hdmi_tx_res} HPD=${HPD} vout=${vout}"
-
-# final boot args
-setenv bootargs "${bootrootfs} ${videoconfig} smsc95xx.macaddr=${macaddr} governor=${governor} ${hdmi_phy_control}"
-
-# Boot the board
-boot
-

board/hardkernel/odroidxu4/genimage.cfg

@@ -1,54 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"boot.ini",
-			"zImage",
-			"exynos5422-odroidxu4.dtb"
-		}
-	}
-	size = 32M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition bl1 {
-		in-partition-table = "no"
-		image = "bl1.bin.hardkernel"
-		offset = 512
-		size = 15360
-	}
-
-	partition bl2 {
-		in-partition-table = "no"
-		image = "bl2.bin.hardkernel.720k_uboot"
-		offset = 15872
-		size = 16384
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot-dtb.bin"
-		offset = 32256
-		size = 720k
-	}
-
-	partition tzsw {
-		in-partition-table = "no"
-		image = "tzsw.bin.hardkernel"
-		offset = 769536
-		size = 256k
-	}
-
-	partition vfat {
-		partition-type = 0xC
-		image = "boot.vfat"
-		offset = 2097152
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
-}

board/hardkernel/odroidxu4/post-image.sh

@@ -1,24 +0,0 @@
-#!/bin/sh
-
-BOARD_DIR="$(dirname $0)"
-GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
-GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
-
-cp ${BOARD_DIR}/boot.ini ${BINARIES_DIR}/
-
-# The bl1.bin.hardkernel file provided by the uboot hardkernel repository is overwritten
-# by the bl2.bin.hardkernel in the sd_fusing.sh script because it is too big.
-# In order to implement this in genimage, we need to truncate the bl1.bin file
-# so that it does not exceed the available place.
-# An issue has been filled about this: https://github.com/hardkernel/u-boot/issues/45
-truncate -s 15360 ${BINARIES_DIR}/bl1.bin.hardkernel
-
-rm -rf "${GENIMAGE_TMP}"
-
-genimage                           \
-	--rootpath "${TARGET_DIR}"     \
-	--tmppath "${GENIMAGE_TMP}"    \
-	--inputpath "${BINARIES_DIR}"  \
-	--outputpath "${BINARIES_DIR}" \
-	--config "${GENIMAGE_CFG}"
-

board/hardkernel/odroidxu4/readme.txt

@@ -1,37 +0,0 @@
-Odroid XU-4 board with Samsung Exynos 5422 SoC
-
-How to build it
-===============
-
-  $ make odroidxu4_defconfig
-
-Then you can edit the build options using
-
-  $ make menuconfig
-
-Compile all and build rootfs image:
-
-  $ make
-
-Note: you will need to have access to the network, since Buildroot will
-download the packages' sources.
-
-Result of the build
--------------------
-
-After building, you should obtain all output files in output/images/
-
-
-How to write the SD card or eMMC
-================================
-
-Once the build process is finished you will have an image called "sdcard.img"
-in the output/images/ directory.
-
-Copy the bootable "sdcard.img" onto an SD card or eMMC with "dd":
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
-
-Insert the SDcard into your ODROID-XU4, and power it up. Your new system
-should come up now.
-

board/lego/ev3/genimage.cfg

@@ -16,15 +16,10 @@ image flash.bin {
 	flashtype = "nor-16M-256"
 	partition uboot {
 		image = "u-boot.bin"
-		size = 256K
-	}
-	partition dtb {
-		image = "da850-lego-ev3.dtb"
-		size = 64K
-		offset = 0x40000
+		size = 320K
 	}
 	partition uimage {
-		image = "uImage"
+		image = "uImage.da850-lego-ev3"
 		size = 4M
 		offset = 0x50000
 	}
@@ -40,10 +35,7 @@ image flash.bin {
 image boot.vfat {
 	vfat {
 		file uImage {
-			image = "uImage"
-		}
-		file da850-lego-ev3.dtb {
-			image = "da850-lego-ev3.dtb"
+			image = "uImage.da850-lego-ev3"
 		}
 	}
 	size = 16M

board/lego/ev3/linux.fragment

@@ -1,4 +1,3 @@
-CONFIG_ARM_APPENDED_DTB=n
 CONFIG_ARCH_DAVINCI_DM644x=n
 CONFIG_ARCH_DAVINCI_DM355=n
 CONFIG_ARCH_DAVINCI_DM646x=n
@@ -61,8 +60,3 @@ CONFIG_DRM_DUMB_VGA_DAC=n
 CONFIG_DRM_TINYDRM=y
 CONFIG_TINYDRM_ST7586=y
 CONFIG_FB_DA8XX=n
-CONFIG_COMMON_CLK_PWM=y
-CONFIG_BT=y
-CONFIG_BT_HS=n
-CONFIG_BT_LE=n
-CONFIG_RFKILL=y

board/lego/ev3/patches/uboot/configs-legoev3-increase-flash-image-sizes.patch

@@ -0,0 +1,31 @@
+From cdd8d11858fa34f6e813fae46b5556e9fb3570dc Mon Sep 17 00:00:00 2001
+From: David Lechner <david@lechnology.com>
+Date: Sun, 19 Nov 2017 19:54:32 -0600
+Subject: [PATCH] configs: legoev3: increase flash image sizes
+
+This increases the kernel image to 4M and the rootfs image to 10M.
+
+It is getting hard to get a kernel image to fit in 3M and the rootfs image
+size now matches the filesyssize variable.
+
+Signed-off-by: David Lechner <david@lechnology.com>
+---
+ include/configs/legoev3.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
+index 79fa3c4..2eeaf85 100644
+--- a/include/configs/legoev3.h
++++ b/include/configs/legoev3.h
+@@ -204,7 +204,7 @@
+ 	"mmcargs=setenv bootargs mem=${memsize} console=${console} root=/dev/mmcblk0p2 rw rootwait lpj=747520\0" \
+ 	"mmcboot=bootm ${loadaddr}\0" \
+ 	"flashargs=setenv bootargs mem=${memsize} initrd=${filesysaddr},${filesyssize} root=/dev/ram0 rw rootfstype=squashfs console=${console} lpj=747520\0" \
+-	"flashboot=sf probe 0; sf read ${loadaddr} 0x50000 0x300000; sf read ${filesysaddr} 0x350000 0x960000; bootm ${loadaddr}\0" \
++	"flashboot=sf probe 0; sf read ${loadaddr} 0x50000 0x400000; sf read ${filesysaddr} 0x450000 0xA00000; bootm ${loadaddr}\0" \
+ 	"loadimage=fatload mmc 0 ${loadaddr} uImage\0" \
+ 	"loadbootscr=fatload mmc 0 ${bootscraddr} boot.scr\0" \
+ 	"bootscript=source ${bootscraddr}\0" \
+-- 
+2.7.4
+

board/lego/ev3/readme.txt

@@ -70,13 +70,6 @@ official Lego Mindstorms EV3 programming software firmware update tool to load
 the image. To use sdcard.img, use a disk writing tool such as Etcher or dd to
 write the image to the µSD card.
 
-NOTE: The sdcard.img created by lego_ev3_defconfig won't boot if the official
-LEGO firmware is installed on the EV3 (it has an old version of U-Boot that
-doesn't know about device tree). You must either set the kernel configuration
-option to append the device tree to the kernel or you can create a boot.scr
-that chainloads a newer U-Boot or you can install a newer U-Boot in the flash
-memory (just flashing u-boot.bin is enough).
-
 Finish
 ======
 
@@ -87,13 +80,3 @@ See:
 - http://botbench.com/blog/2013/08/05/mindsensors-ev3-usb-console-adapter/
 
 The serial port config to use is 115200/8-N-1.
-
-Bluetooth
-=========
-
-To enable Bluetooth:
-
-    # modprobe hci_uart
-    # /usr/libexec/bluetooth/bluetoothd &
-    # bluetoothctl
-    [bluetooth]# power on

board/lemaker/bananapro/linux-wifi.fragment

@@ -2,7 +2,6 @@
 CONFIG_WIRELESS=y
 CONFIG_CFG80211=y
 CONFIG_CFG80211_WEXT=y
-CONFIG_RFKILL=y
 
 # Network device support
 CONFIG_WLAN=y

board/lemaker/bananapro/patches/linux/0001-arch-arm-boot-dts-sun7i-a20-bananapro.dts-disable-00.patch

@@ -1,44 +0,0 @@
-From 896e82ab14e7e4e361ffa7c81def787907c1bf4c Mon Sep 17 00:00:00 2001
-From: Bartosz Bilas <b.bilas@grinn-global.com>
-Date: Sun, 19 May 2019 21:04:35 +0200
-Subject: [PATCH] arch/arm/boot/dts/sun7i-a20-bananapro.dts: disable 00B
- IRQ for brcm wifi module
-
-	BugLink: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908438
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-Signed-off-by: Bartosz Bilas <b.bilas@grinn-global.com>
----
- arch/arm/boot/dts/sun7i-a20-bananapro.dts | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/boot/dts/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
-index 0176e9de0..93b3340f5 100644
---- a/arch/arm/boot/dts/sun7i-a20-bananapro.dts
-+++ b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
-@@ -160,9 +160,19 @@
- 	brcmf: wifi@1 {
- 		reg = <1>;
- 		compatible = "brcm,bcm4329-fmac";
--		interrupt-parent = <&pio>;
--		interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>;
--		interrupt-names = "host-wake";
-+		/*
-+		 * OOB interrupt support is broken ATM, often the first irq
-+		 * does not get seen resulting in the drv probe failing with:
-+		 *
-+		 * brcmfmac: brcmf_sdio_bus_rxctl: resumed on timeout
-+		 * brcmfmac: brcmf_bus_started: failed: -110
-+		 * brcmfmac: brcmf_attach: dongle is not responding: err=-110
-+		 * brcmfmac: brcmf_sdio_firmware_callback: brcmf_attach failed
-+		 *
-+		 * interrupt-parent = <&pio>;
-+		 * interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>;
-+		 * interrupt-names = "host-wake";
-+		 */
- 	};
- };
- 
--- 
-2.21.0
-

board/lemaker/bananapro/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.lemaker,bananapro.txt

@@ -1 +0,0 @@
-brcmfmac43362-sdio.txt

board/licheepi/boot.cmd

@@ -1,4 +0,0 @@
-setenv bootargs console=ttyS0,115200 panic=5 console=tty0 rootwait root=/dev/mmcblk0p2 earlyprintk rw
-load mmc 0:1 0x41000000 zImage
-load mmc 0:1 0x41800000 sun8i-v3s-licheepi-zero-dock.dtb
-bootz 0x41000000 - 0x41800000

board/licheepi/genimage.cfg

@@ -1,35 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"zImage",
-			"sun8i-v3s-licheepi-zero-dock.dtb",
-			"sun8i-v3s-licheepi-zero.dtb",
-			"boot.scr"
-		}
-	}
-	size = 8M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8192
-		size = 516096 # 512KB - 8192
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-		size = 0
-	}
-}

board/licheepi/readme.txt

@@ -1,62 +0,0 @@
-Intro
-=====
-
-This directory contains a buildroot configuration for building a
-LicheePi Zero.
-
-How to build it
-===============
-
-Configure Buildroot
--------------------
-
-  $ make licheepi_zero_defconfig
-
-Build the rootfs
-----------------
-
-Note: you will need to have access to the network, since Buildroot
-will download the packages' sources.
-
-You may now build your rootfs with:
-
-  $ make
-
-(This may take a while, consider getting yourself a coffee ;-) )
-
-Result of the build
--------------------
-
-After building, you should obtain this tree:
-
-    output/images/
-    +-- boot.scr
-    +-- boot.vfat
-    +-- rootfs.ext2
-    +-- rootfs.ext4 -> rootfs.ext2
-    +-- rootfs.tar
-    +-- sdcard.img
-    +-- sun8i-v3s-licheepi-zero-dock.dtb
-    +-- sun8i-v3s-licheepi-zero.dtb
-    +-- u-boot.bin
-    +-- u-boot-sunxi-with-spl.bin
-    `-- zImage
-
-How to write the SD card
-========================
-
-Once the build process is finished you will have an image called
-"sdcard.img" in the output/images/ directory.
-
-Copy the bootable "sdcard.img" onto an SD card with "dd":
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
-
-Alternatively, you can use the Etcher graphical tool to burn the image
-to the SD card safely and on any platform:
-
-https://etcher.io/
-
-Once the SD card is burned, insert it into your LicheePi Zero board,
-and power it up. Your new system should come up now and start a
-console on the UART0 serial port.

board/olimex/a20_olinuxino/boot-mali.cmd

@@ -0,0 +1,5 @@
+setenv bootm_boot_mode sec
+setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 sunxi_ve_mem_reserve=0 sunxi_g2d_mem_reserve=0 sunxi_no_mali_mem_reserve sunxi_fb_mem_reserve=16 consoleblank=0 ${extra}
+ext4load mmc 0 0x43000000 /boot/script.bin
+ext4load mmc 0 0x48000000 /boot/zImage
+bootz 0x48000000