Update for 2018.05.1

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
linux-headers: bump 4.{4, 17}.x series
2026-01-09 06:10:17 +03:00 · 2018-07-20 00:39:18 +02:00 · 2018-07-20 00:11:16 +02:00 · 2018-07-19 23:51:11 +02:00 · 2018-07-19 23:50:38 +02:00 · 2018-07-19 23:50:02 +02:00
4709 changed files with 40225 additions and 75117 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,17 +6,16 @@

 image: buildroot/base:20180318.1724

-.defconfig_script:
-    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
-            }
+.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:
@@ -44,34 +43,26 @@ check-flake8:

 check-package:
    script:
-        - make check-package
+        - find . -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' \)
+            -exec ./utils/check-package {} +

-.defconfig:
-    extends: .defconfig_script
+.defconfig: &defconfig
    # Running the defconfigs for every push is too much, so limit to
    # explicit triggers through the API.
    only:
        - triggers
        - tags
-        - /-defconfigs$/
+    script: *defconfig_script
    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

-.runtime_test:
-    # Running the runtime tests for every push is too much, so limit to
-    # explicit triggers through the API.
-    only:
-        - triggers
-        - tags
-        - /-runtime-tests$/
+.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
@@ -84,314 +75,234 @@ check-package:
            - test-output/*.log
            - test-output/*/.config
            - test-output/*/images/*
-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 }
-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_imx8mqevk_defconfig: { extends: .defconfig }
-freescale_p1025twr_defconfig: { extends: .defconfig }
-freescale_t1040d4rdb_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 }
-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 }
-lego_ev3_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 }
-odroidc2_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_lime_legacy_defconfig: { extends: .defconfig }
-olimex_a20_olinuxino_micro_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_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_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_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 }
-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_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 }
-ts4800_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_ipython.TestIPythonPy2: { extends: .runtime_test }
-tests.package.test_ipython.TestIPythonPy3: { extends: .runtime_test }
-tests.package.test_lua.TestLua: { extends: .runtime_test }
-tests.package.test_lua.TestLuajit: { 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_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 }
+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
+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
+odroidc2_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
+tests.boot.test_atf.TestATFAllwinner: *runtime_test
+tests.boot.test_atf.TestATFMarvell: *runtime_test
+tests.boot.test_atf.TestATFVexpress: *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
--- a/.gitlab-ci.yml.in
+++ b/.gitlab-ci.yml.in
@@ -6,17 +6,16 @@

 image: buildroot/base:20180318.1724

-.defconfig_script:
-    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
-            }
+.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:
@@ -44,34 +43,26 @@ check-flake8:

 check-package:
    script:
-        - make check-package
+        - find . -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' \)
+            -exec ./utils/check-package {} +

-.defconfig:
-    extends: .defconfig_script
+.defconfig: &defconfig
    # Running the defconfigs for every push is too much, so limit to
    # explicit triggers through the API.
    only:
        - triggers
        - tags
-        - /-defconfigs$/
+    script: *defconfig_script
    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

-.runtime_test:
-    # Running the runtime tests for every push is too much, so limit to
-    # explicit triggers through the API.
-    only:
-        - triggers
-        - tags
-        - /-runtime-tests$/
+.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
--- a/1232
+++ b/1232
--- a/Config.in
+++ b/Config.in
@@ -67,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
@@ -136,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"
@@ -677,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
@@ -820,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
@@ -829,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.
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -142,623 +142,6 @@ comment "unpredictable ways.                                 "
 comment "----------------------------------------------------"
 endif

-###############################################################################
-
-comment "Legacy options removed in 2019.02"
-
-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.
-
-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
-	select BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20
-	help
-	  Modular X.org server was updated to version 1.20.0
-
-config BR2_PACKAGE_XPROTO_APPLEWMPROTO
-	bool "xproto-applewmproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-applewmproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_BIGREQSPROTO
-	bool "xproto-bigreqsproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-bigreqsproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_COMPOSITEPROTO
-	bool "xproto-compositeproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-compositeproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_DAMAGEPROTO
-	bool "xproto-dameproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-dameproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_DMXPROTO
-	bool "xproto-dmxproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-dmxproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_DRI2PROTO
-	bool "xproto-dri2proto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-dri2proto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_DRI3PROTO
-	bool "xproto-dri3proto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-dri3proto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_FIXESPROTO
-	bool "xproto-fixesproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-fixesproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_FONTCACHEPROTO
-	bool "xproto-fontcacheproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-fontcacheproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_FONTSPROTO
-	bool "xproto-fontsproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-fontsproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_GLPROTO
-	bool "xproto-glproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-glproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_INPUTPROTO
-	bool "xproto-inputproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-inputproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_KBPROTO
-	bool "xproto-kbproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-kbproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_PRESENTPROTO
-	bool "xproto-presentproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-presentproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_RANDRPROTO
-	bool "xproto-randrproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-randrproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_RECORDPROTO
-	bool "xproto-recordproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-recordproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_RENDERPROTO
-	bool "xproto-renderproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-renderproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_RESOURCEPROTO
-	bool "xproto-resourceproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-resourceproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_SCRNSAVERPROTO
-	bool "xproto-scrnsaverprot package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-scrnsaverprot package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_VIDEOPROTO
-	bool "xproto-videoproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-videoproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_WINDOWSWMPROTO
-	bool "xproto-windowswmproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-windowswmproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_XCMISCPROTO
-	bool "xproto-xcmiscproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-xcmiscproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_XEXTPROTO
-	bool "xproto-xextproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-xextproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_XF86BIGFONTPROTO
-	bool "xproto-xf86bigfontproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-xf86bigfontproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_XF86DGAPROTO
-	bool "xproto-xf86dgaproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-xf86dgaproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_XF86DRIPROTO
-	bool "xproto-xf86driproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-xf86driproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
-	bool "xproto-xf86vidmodeproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-xf86vidmodeproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_XINERAMAPROTO
-	bool "xproto-xineramaproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-xineramaproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_XPROTO
-	bool "xproto-xproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-xproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_XPROXYMANAGEMENTPROTOCOL
-	bool "xproto-xproxymanagementprotocol package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-xproxymanagementprotocol package has been
-	  replaced by the xorgproto package, which combines all
-	  xproto_* packages.
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_OPENGL
-	bool "gst1-plugins-bad opengl option moved to gst1-plugins-base"
-	select BR2_LEGACY
-	select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL
-	help
-	  The opengl option has been moved from gst1-plugins-bad to
-	  gst1-plugins-base.
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_GLES2
-	bool "gst1-plugins-bad gles2 option moved to gst1-plugins-base"
-	select BR2_LEGACY
-	select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLES2
-	help
-	  The gles2 option has been moved from gst1-plugins-bad to
-	  gst1-plugins-base.
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_GLX
-	bool "gst1-plugins-bad glx option moved to gst1-plugins-base"
-	select BR2_LEGACY
-	select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLX
-	help
-	  The glx option has been moved from gst1-plugins-bad to
-	  gst1-plugins-base.
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL
-	bool "gst1-plugins-bad egl option moved to gst1-plugins-base"
-	select BR2_LEGACY
-	select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL
-	help
-	  The egl option has been moved from gst1-plugins-bad to
-	  gst1-plugins-base.
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_X11
-	bool "gst1-plugins-bad x11 option moved to gst1-plugins-base"
-	select BR2_LEGACY
-	select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_X11
-	help
-	  The x11 option has been moved from gst1-plugins-bad to
-	  gst1-plugins-base.
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_WAYLAND
-	bool "gst1-plugins-bad wayland option moved to gst1-plugins-base"
-	select BR2_LEGACY
-	select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_WAYLAND
-	help
-	  The wayland option has been moved from gst1-plugins-bad to
-	  gst1-plugins-base.
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_DISPMANX
-	bool "gst1-plugins-bad dispmanx option moved to gst1-plugins-base"
-	select BR2_LEGACY
-	select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_DISPMANX
-	help
-	  The dispmanx option has been moved from gst1-plugins-mad to
-	  gst1-plugins-base.
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXER
-	bool "gst1-plugins-bad audiomixer option moved to gst1-plugins-base"
-	select BR2_LEGACY
-	select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOMIXER
-	help
-	  The audiomixer option has been moved from gst1-plugins-bad to
-	  gst1-plugins-base.
-
-config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_LAME
-	bool "gst1-plugins-ugly lame option moved to gst1-plugins-good"
-	select BR2_LEGACY
-	select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAME
-	help
-	  The lame option has been moved from gst1-plugins-ugly to
-	  gst1-plugins-good.
-
-config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPG123
-	bool "gst1-plugins-ugly mpg123 option moved to gst1-plugins-good"
-	select BR2_LEGACY
-	select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MPG123
-	help
-	  The mpg123 option has been moved from gst1-plugins-ugly to
-	  gst1-plugins-good.
-
-config BR2_GDB_VERSION_7_11
-	bool "gdb 7.11 has been removed"
-	select BR2_LEGACY
-	help
-	  The 7.11 version of gdb has been removed. Use a newer version
-	  instead.
-
-config BR2_GDB_VERSION_7_10
-	bool "gdb 7.10 has been removed"
-	select BR2_LEGACY
-	help
-	  The 7.10 version of gdb has been removed. Use a newer version
-	  instead.
-
 ###############################################################################
 comment "Legacy options removed in 2018.05"

@@ -786,8 +169,6 @@ config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF
 	  BR2_PACKAGE_MEDIAART_BACKEND_QT has been renamed to
 	  BR2_PACKAGE_LIBMEDIAART_BACKEND_QT

-# Note: BR2_PACKAGE_TI_SGX_AM335X is still referenced from
-# package/ti-sgx-km/Config.in
 config BR2_PACKAGE_TI_SGX_AM335X
 	bool "ti-sgx-km AM335X option renamed"
 	select BR2_LEGACY
@@ -796,8 +177,6 @@ config BR2_PACKAGE_TI_SGX_AM335X
 	  BR2_PACKAGE_TI_SGX_AM335X has been renamed to
 	  BR2_PACKAGE_TI_SGX_KM_AM335X.

-# Note: BR2_PACKAGE_TI_SGX_AM437X is still referenced from
-# package/ti-sgx-km/Config.in
 config BR2_PACKAGE_TI_SGX_AM437X
 	bool "ti-sgx-km AM437X option renamed"
 	select BR2_LEGACY
@@ -806,8 +185,6 @@ config BR2_PACKAGE_TI_SGX_AM437X
 	  BR2_PACKAGE_TI_SGX_AM437X has been renamed to
 	  BR2_PACKAGE_TI_SGX_KM_AM437X.

-# Note: BR2_PACKAGE_TI_SGX_AM4430 is still referenced from
-# package/ti-sgx-km/Config.in
 config BR2_PACKAGE_TI_SGX_AM4430
 	bool "ti-sgx-km AM4430 option renamed"
 	select BR2_LEGACY
@@ -816,8 +193,6 @@ config BR2_PACKAGE_TI_SGX_AM4430
 	  BR2_PACKAGE_TI_SGX_AM4430 has been renamed to
 	  BR2_PACKAGE_TI_SGX_KM_AM4430.

-# Note: BR2_PACKAGE_TI_SGX_AM5430 is still referenced from
-# package/ti-sgx-km/Config.in
 config BR2_PACKAGE_TI_SGX_AM5430
 	bool "ti-sgx-km AM5430 option renamed"
 	select BR2_LEGACY
@@ -1332,24 +707,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"
@@ -1900,17 +1284,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"
@@ -1933,31 +1323,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"
@@ -2086,17 +1488,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"
@@ -2171,18 +1579,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"
@@ -2395,11 +1809,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"
@@ -2540,11 +1957,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"
@@ -2745,34 +2165,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"
@@ -3599,10 +3031,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"
@@ -3755,17 +3190,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"
@@ -3927,24 +3368,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"
--- a/471
+++ b/471
--- a/228
+++ b/228
@@ -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.02.4
+export BR2_VERSION := 2018.05.1
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1562745000
+BR2_VERSION_EPOCH = 1532040000

 # 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)),)
@@ -204,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
@@ -227,22 +241,6 @@ 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
@@ -348,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)
@@ -419,8 +411,6 @@ unexport TERMINFO
 unexport MACHINE
 unexport O
 unexport GCC_COLORS
-unexport PLATFORM
-unexport OS

 GNU_HOST_NAME := $(shell support/gnuconfig/config.guess)

@@ -443,7 +433,6 @@ KERNEL_ARCH := $(shell echo "$(ARCH)" | sed -e "s/-.*//" \
 	-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/)

@@ -456,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)
@@ -471,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
@@ -508,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))
@@ -553,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)
@@ -582,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
@@ -591,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
@@ -600,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
@@ -728,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
@@ -763,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 && \
@@ -782,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)"); \
@@ -809,7 +759,7 @@ 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)
 	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \
 		$(call MESSAGE,"Executing post-image script $(s)"); \
@@ -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 \
@@ -972,7 +922,7 @@ 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 prepare-kconfig
+oldconfig silentoldconfig olddefconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
 	@$(COMMON_CONFIG_ENV) $< --$@ $(CONFIG_CONFIG_IN)

 defconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
@@ -986,15 +936,13 @@ define percent_defconfig
 endef
 $(eval $(foreach d,$(call reverse,$(TOPDIR) $(BR2_EXTERNAL_DIRS)),$(call percent_defconfig,$(d))$(sep)))

-update-defconfig: savedefconfig
-
 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

 ################################################################################
 #
@@ -1029,8 +977,7 @@ $(BUILD_DIR)/.br2-external.in: $(BUILD_DIR)
 # displayed.
 .PHONY: printvars
 printvars:
-	@:
-	$(foreach V, \
+	@:$(foreach V, \
 		$(sort $(if $(VARS),$(filter $(VARS),$(.VARIABLES)),$(.VARIABLES))), \
 		$(if $(filter-out environment% default automatic, \
 				$(origin $V)), \
@@ -1070,13 +1017,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 '  defconfig              - New config with default answer to all options'
+	@echo '                             BR2_DEFCONFIG, if set, 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'
@@ -1170,7 +1116,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
@@ -1179,13 +1125,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)))
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -15,6 +15,9 @@ config BR2_ARCH_HAS_MMU_MANDATORY
 config BR2_ARCH_HAS_MMU_OPTIONAL
 	bool

+config BR2_ARCH_HAS_FDPIC_SUPPORT
+	bool
+
 choice
 	prompt "Target Architecture"
 	default BR2_i386
@@ -198,17 +201,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
@@ -290,10 +282,6 @@ config BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 	bool
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6

-config BR2_ARCH_NEEDS_GCC_AT_LEAST_8
-	bool
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
-
 # The following string values are defined by the individual
 # Config.in.$ARCH files
 config BR2_ARCH
@@ -317,6 +305,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)
@@ -349,6 +340,7 @@ config BR2_READELF_ARCH_NAME
 choice
 	prompt "Target Binary Format"
 	default BR2_BINFMT_ELF if BR2_USE_MMU
+	default BR2_BINFMT_FDPIC if BR2_ARCH_HAS_FDPIC_SUPPORT
 	default BR2_BINFMT_FLAT

 config BR2_BINFMT_ELF
@@ -360,6 +352,16 @@ config BR2_BINFMT_ELF
 	  and executables used across different architectures and
 	  operating systems.

+config BR2_BINFMT_FDPIC
+	bool "FDPIC"
+	depends on BR2_ARCH_HAS_FDPIC_SUPPORT
+	select BR2_BINFMT_SUPPORTS_SHARED
+	help
+	  ELF FDPIC binaries are based on ELF, but allow the individual
+	  load segments of a binary to be located in memory
+	  independently of each other. This makes this format ideal for
+	  use in environments where no MMU is available.
+
 config BR2_BINFMT_FLAT
 	bool "FLAT"
 	depends on !BR2_USE_MMU
@@ -431,10 +433,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
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -6,21 +6,12 @@ config BR2_ARM_CPU_HAS_NEON
 config BR2_ARM_CPU_MAYBE_HAS_NEON
 	bool

-# For some cores, the FPU is optional
-config BR2_ARM_CPU_MAYBE_HAS_FPU
-	bool
-
-config BR2_ARM_CPU_HAS_FPU
-	bool
-
 # for some cores, VFPv2 is optional
 config BR2_ARM_CPU_MAYBE_HAS_VFPV2
 	bool
-	select BR2_ARM_CPU_MAYBE_HAS_FPU

 config BR2_ARM_CPU_HAS_VFPV2
 	bool
-	select BR2_ARM_CPU_HAS_FPU

 # for some cores, VFPv3 is optional
 config BR2_ARM_CPU_MAYBE_HAS_VFPV3
@@ -40,24 +31,6 @@ config BR2_ARM_CPU_HAS_VFPV4
 	bool
 	select BR2_ARM_CPU_HAS_VFPV3

-# FPv4 is always optional
-config BR2_ARM_CPU_MAYBE_HAS_FPV4
-	bool
-	select BR2_ARM_CPU_MAYBE_HAS_FPU
-
-config BR2_ARM_CPU_HAS_FPV4
-	bool
-	select BR2_ARM_CPU_HAS_FPU
-
-# FPv5 is always optional
-config BR2_ARM_CPU_MAYBE_HAS_FPV5
-	bool
-	select BR2_ARM_CPU_MAYBE_HAS_FPV4
-
-config BR2_ARM_CPU_HAS_FPV5
-	bool
-	select BR2_ARM_CPU_HAS_FPV4
-
 config BR2_ARM_CPU_HAS_FP_ARMV8
 	bool
 	select BR2_ARM_CPU_HAS_VFPV4
@@ -267,14 +240,7 @@ config BR2_cortex_m3
 config BR2_cortex_m4
 	bool "cortex-M4"
 	select BR2_ARM_CPU_HAS_THUMB2
-	select BR2_ARM_CPU_MAYBE_HAS_FPV4
 	select BR2_ARM_CPU_ARMV7M
-config BR2_cortex_m7
-	bool "cortex-M7"
-	select BR2_ARM_CPU_HAS_THUMB2
-	select BR2_ARM_CPU_MAYBE_HAS_FPV5
-	select BR2_ARM_CPU_ARMV7M
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
 endif # !BR2_ARCH_IS_64

 comment "armv8 cores"
@@ -376,19 +342,25 @@ config BR2_exynos_m1
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
-if BR2_ARCH_IS_64
 config BR2_falkor
 	bool "falkor"
+	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_qdf24xx
 	bool "qdf24xx"
+	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"
 	select BR2_ARM_CPU_HAS_FP_ARMV8
@@ -434,55 +406,32 @@ if BR2_ARCH_IS_64
 comment "armv8.1a cores"
 config BR2_thunderx2t99
 	bool "thunderx2t99"
+	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"
+	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"
+	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
 endif # BR2_ARCH_IS_64
-
-if BR2_ARCH_IS_64
-comment "armv8.2a cores"
-config BR2_cortex_a55
-	bool "cortex-A55"
-	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"
-	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"
-	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
-
-if BR2_ARCH_IS_64
-comment "armv8.3a cores"
-config BR2_saphira
-	bool "saphira"
-	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
@@ -496,9 +445,7 @@ config BR2_ARM_ENABLE_NEON

 config BR2_ARM_ENABLE_VFP
 	bool "Enable VFP extension support"
-	depends on BR2_ARM_CPU_MAYBE_HAS_FPU
-	select BR2_ARM_CPU_HAS_FPV5 if BR2_ARM_CPU_MAYBE_HAS_FPV5
-	select BR2_ARM_CPU_HAS_FPV4 if BR2_ARM_CPU_MAYBE_HAS_FPV4
+	depends on BR2_ARM_CPU_MAYBE_HAS_VFPV2
 	select BR2_ARM_CPU_HAS_VFPV4 if BR2_ARM_CPU_MAYBE_HAS_VFPV4
 	select BR2_ARM_CPU_HAS_VFPV3 if BR2_ARM_CPU_MAYBE_HAS_VFPV3
 	select BR2_ARM_CPU_HAS_VFPV2 if BR2_ARM_CPU_MAYBE_HAS_VFPV2
@@ -509,7 +456,7 @@ config BR2_ARM_ENABLE_VFP

 choice
 	prompt "Target ABI"
-	default BR2_ARM_EABIHF if BR2_ARM_CPU_HAS_FPU
+	default BR2_ARM_EABIHF if BR2_ARM_CPU_HAS_VFPV2
 	default BR2_ARM_EABI
 	depends on BR2_arm || BR2_armeb
 	help
@@ -544,7 +491,7 @@ config BR2_ARM_EABI

 config BR2_ARM_EABIHF
 	bool "EABIhf"
-	depends on BR2_ARM_CPU_HAS_FPU
+	depends on BR2_ARM_CPU_HAS_VFPV2
 	help
 	  The EABIhf is an extension of EABI which supports the 'hard'
 	  floating point model. This model uses the floating point
@@ -565,12 +512,10 @@ endchoice
 choice
 	prompt "Floating point strategy"
 	default BR2_ARM_FPU_FP_ARMV8 if BR2_ARM_CPU_HAS_FP_ARMV8
-	default BR2_ARM_FPU_FPV5D16 if BR2_ARM_CPU_HAS_FPV5
-	default BR2_ARM_FPU_FPV4D16 if BR2_ARM_CPU_HAS_FPV4
 	default BR2_ARM_FPU_VFPV4D16 if BR2_ARM_CPU_HAS_VFPV4
 	default BR2_ARM_FPU_VFPV3D16 if BR2_ARM_CPU_HAS_VFPV3
 	default BR2_ARM_FPU_VFPV2 if BR2_ARM_CPU_HAS_VFPV2
-	default BR2_ARM_SOFT_FLOAT if !BR2_ARM_CPU_HAS_FPU
+	default BR2_ARM_SOFT_FLOAT if !BR2_ARM_CPU_HAS_VFPV2

 config BR2_ARM_SOFT_FLOAT
 	bool "Soft float"
@@ -677,38 +622,6 @@ config BR2_ARM_FPU_NEON_VFPV4
 	  example on Cortex-A5 and Cortex-A7, support for VFPv4 and
 	  NEON is optional.

-config BR2_ARM_FPU_FPV4D16
-	bool "FPv4-D16"
-	depends on BR2_ARM_CPU_HAS_FPV4
-	help
-	  This option allows to use the FPv4-SP (single precision)
-	  floating point unit, as available in some ARMv7m processors
-	  (Cortex-M4).
-
-config BR2_ARM_FPU_FPV5D16
-	bool "FPv5-D16"
-	depends on BR2_ARM_CPU_HAS_FPV5
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
-	help
-	  This option allows to use the FPv5-SP (single precision)
-	  floating point unit, as available in some ARMv7m processors
-	  (Cortex-M7).
-
-	  Note that if you want binary code that works on the earlier
-	  Cortex-M4, you should instead select FPv4-D16.
-
-config BR2_ARM_FPU_FPV5DPD16
-	bool "FPv5-DP-D16"
-	depends on BR2_ARM_CPU_HAS_FPV5
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
-	help
-	  This option allows to use the FPv5-DP (double precision)
-	  floating point unit, as available in some ARMv7m processors
-	  (Cortex-M7).
-
-	  Note that if you want binary code that works on the earlier
-	  Cortex-M4, you should instead select FPv4-D16.
-
 config BR2_ARM_FPU_FP_ARMV8
 	bool "FP-ARMv8"
 	depends on BR2_ARM_CPU_HAS_FP_ARMV8
@@ -803,7 +716,6 @@ config BR2_GCC_TARGET_CPU
 	# armv7m
 	default "cortex-m3"	if BR2_cortex_m3
 	default "cortex-m4"	if BR2_cortex_m4
-	default "cortex-m7"	if BR2_cortex_m7
 	# armv8a
 	default "cortex-a32"	if BR2_cortex_a32
 	default "cortex-a35"	if BR2_cortex_a35
@@ -828,12 +740,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
-	# armv8.3a
-	default "saphira"	if BR2_saphira

 config BR2_GCC_TARGET_ABI
 	default "aapcs-linux"	if BR2_arm || BR2_armeb
@@ -847,9 +753,6 @@ config BR2_GCC_TARGET_FPU
 	default "vfpv4-d16"	if BR2_ARM_FPU_VFPV4D16
 	default "neon"		if BR2_ARM_FPU_NEON
 	default "neon-vfpv4"	if BR2_ARM_FPU_NEON_VFPV4
-	default "fpv4-sp-d16"   if BR2_ARM_FPU_FPV4D16
-	default "fpv5-sp-d16"	if BR2_ARM_FPU_FPV5D16
-	default "fpv5-d16"	if BR2_ARM_FPU_FPV5DPD16
 	default "fp-armv8"	if BR2_ARM_FPU_FP_ARMV8
 	default "neon-fp-armv8"	if BR2_ARM_FPU_NEON_FP_ARMV8
 	depends on BR2_arm || BR2_armeb
--- a/arch/Config.in.mips
+++ b/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
--- a/arch/Config.in.riscv
+++ b/arch/Config.in.riscv
@@ -1,127 +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"
--- a/arch/Config.in.x86
+++ b/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
--- a/arch/arch.mk
+++ b/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.*))
--- a/arch/arch.mk.riscv
+++ b/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
--- a/board/aarch64-efi/post-image.sh
+++ b/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
--- a/board/aarch64-efi/readme.txt
+++ b/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 .
--- a/board/amarula/a64-relic/extlinux.conf
+++ b/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
--- a/board/amarula/a64-relic/genimage.cfg
+++ b/board/amarula/a64-relic/genimage.cfg
@@ -1,10 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"Image",
-			"sun50i-a64-amarula-relic.dtb",
-			"extlinux"
-		}
-	}
-	size = 64M
-}
--- a/board/amarula/a64-relic/post-build.sh
+++ b/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
--- a/board/amarula/a64-relic/readme.txt
+++ b/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
--- a/board/amarula/a64-relic/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt
+++ b/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
-
--- a/board/amarula/vyasa/genimage.cfg
+++ b/board/amarula/vyasa/genimage.cfg
@@ -12,7 +12,6 @@ image sdcard.img {
 		in-partition-table = "no"
 		image = "u-boot-dtb.img"
 		offset = 8M
-		size = 30M # falcon mode: args @ 16M args, uImage @ 17M
 	}

 	partition rootfs {
--- a/board/amarula/vyasa/patches/uboot/0001-include-configs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch
+++ b/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
-
--- a/board/asus/tinker/patches/uboot/0001-include-configs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch
+++ b/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
-
--- a/board/bananapi/bananapi-m2-ultra/boot.cmd
+++ b/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
--- a/board/bananapi/bananapi-m2-ultra/genimage.cfg
+++ b/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"
-	}
-}
--- a/board/bananapi/bananapi-m2-ultra/readme.txt
+++ b/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.
--- a/board/boundarydevices/common/6x_bootscript.txt
+++ b/board/boundarydevices/common/6x_bootscript.txt
@@ -0,0 +1,131 @@
+setenv bootargs ''
+
+if itest.s x6SX == "x${cpu}" || itest.s x7D == "x${cpu}"; then
+	a_script=0x80800000
+	a_zImage=0x80800000
+	a_fdt=0x83000000
+	m4=''
+	if itest.s "x1" == "x$m4enabled" ; then
+		run m4boot;
+		m4='-m4';
+	fi
+else
+	a_script=0x10800000
+	a_zImage=0x10800000
+	a_fdt=0x13000000
+fi
+
+setenv initrd_high 0xffffffff
+if itest.s "x" == "x${dtbname}" ; then
+	if itest.s x6SOLO == "x${cpu}" ; then
+		dtbname=imx6dl-${board}.dtb;
+	elif itest.s x6DL == "x${cpu}" ; then
+		dtbname=imx6dl-${board}.dtb;
+	elif itest.s x6QP == "x${cpu}" ; then
+		dtbname=imx6qp-${board}.dtb;
+	elif itest.s x6SX == "x${cpu}" ; then
+		dtbname=imx6sx-${board}${m4}.dtb;
+	elif itest.s x7D == "x${cpu}" ; then
+		dtbname=imx7d-${board}${m4}.dtb;
+	else
+		dtbname=imx6q-${board}.dtb;
+	fi
+fi
+
+if load ${dtype} ${disk}:1 ${a_script} uEnv.txt ; then
+    env import -t ${a_script} ${filesize}
+fi
+
+if itest.s x == x${bootdir} ; then
+	bootdir=/boot/
+fi
+
+if itest.s x${bootpart} == x ; then
+	bootpart=1
+fi
+
+if load ${dtype} ${disk}:${bootpart} ${a_fdt} ${bootdir}${dtbname} ; then
+	fdt addr ${a_fdt}
+	setenv fdt_high 0xffffffff
+else
+	echo "!!!! Error loading ${bootdir}${dtbname}";
+	exit;
+fi
+
+cmd_xxx_present=
+fdt resize
+if itest.s "x" != "x${cmd_custom}" ; then
+	run cmd_custom
+	cmd_xxx_present=1;
+fi
+
+if itest.s "x" != "x${cmd_hdmi}" ; then
+	run cmd_hdmi
+	cmd_xxx_present=1;
+	if itest.s x == x${allow_noncea} ; then
+		setenv bootargs ${bootargs} mxc_hdmi.only_cea=1;
+		echo "only CEA modes allowed on HDMI port";
+	else
+		setenv bootargs ${bootargs} mxc_hdmi.only_cea=0;
+		echo "non-CEA modes allowed on HDMI, audio may be affected";
+	fi
+fi
+
+if itest.s "x" != "x${cmd_lcd}" ; then
+	run cmd_lcd
+	cmd_xxx_present=1;
+fi
+if itest.s "x" != "x${cmd_lvds}" ; then
+	run cmd_lvds
+	cmd_xxx_present=1;
+fi
+if itest.s "x" != "x${cmd_lvds2}" ; then
+	run cmd_lvds2
+	cmd_xxx_present=1;
+fi
+
+if itest.s "x" == "x${cmd_xxx_present}" ; then
+	echo "!!!!!!!!!!!!!!!!"
+	echo "warning: your u-boot may be outdated, please upgrade"
+	echo "!!!!!!!!!!!!!!!!"
+fi
+
+setenv bootargs "${bootargs} console=${console},115200 vmalloc=400M consoleblank=0 rootwait fixrtc"
+
+if test "sata" = "${dtype}" ; then
+	setenv bootargs "${bootargs} root=/dev/sda${bootpart}" ;
+elif test "usb" = "${dtype}" ; then
+	setenv bootargs "${bootargs} root=/dev/sda${bootpart}" ;
+else
+	setenv bootargs "${bootargs} root=/dev/mmcblk${disk}p${bootpart}"
+fi
+
+if itest.s "x" != "x${disable_giga}" ; then
+	setenv bootargs ${bootargs} fec.disable_giga=1
+fi
+
+if itest.s "x" != "x${wlmac}" ; then
+	setenv bootargs ${bootargs} wlcore.mac=${wlmac}
+	setenv bootargs ${bootargs} wlan.mac=${wlmac}
+fi
+
+if itest.s "x" != "x${gpumem}" ; then
+	setenv bootargs ${bootargs} galcore.contiguousSize=${gpumem}
+fi
+
+if itest.s "x" != "x${cma}" ; then
+	setenv bootargs ${bootargs} cma=${cma}
+fi
+
+if itest.s "x" != "x${show_fdt}" ; then
+	fdt print /
+fi
+
+if itest.s "x" != "x${show_env}" ; then
+	printenv
+fi
+
+if load ${dtype} ${disk}:${bootpart} ${a_zImage} ${bootdir}/zImage ; then
+	bootz ${a_zImage} - ${a_fdt}
+fi
+echo "Error loading kernel image"
--- a/board/boundarydevices/common/6x_upgrade.txt
+++ b/board/boundarydevices/common/6x_upgrade.txt
@@ -0,0 +1,69 @@
+if itest.s a$uboot_defconfig == a; then
+        echo "Please set uboot_defconfig to the appropriate value"
+        exit
+fi
+
+offset=0x400
+a_uImage1=0x12000000
+a_uImage2=0x12400000
+
+if itest.s x6SX == "x${cpu}" || itest.s x7D == "x${cpu}"; then
+	a_uImage1=0x82000000
+	a_uImage2=0x82400000
+fi
+
+setenv stdout serial,vga
+echo "check U-Boot" ;
+
+if load ${dtype} ${disk}:1 ${a_uImage1} u-boot.$uboot_defconfig ; then
+else
+	echo "No U-Boot image found on SD card" ;
+	exit
+fi
+echo "read $filesize bytes from SD card" ;
+if sf probe || sf probe || sf probe 1 27000000 || sf probe 1 27000000 ; then
+	echo "probed SPI ROM" ;
+else
+	echo "Error initializing EEPROM" ;
+	exit
+fi ;
+if sf read ${a_uImage2} $offset $filesize ; then
+else
+	echo "Error reading boot loader from EEPROM" ;
+	exit
+fi
+if cmp.b ${a_uImage1} ${a_uImage2} $filesize ; then
+	echo "------- U-Boot versions match" ;
+	exit
+fi
+echo "Need U-Boot upgrade" ;
+echo "Program in 5 seconds" ;
+for n in 5 4 3 2 1 ; do
+	echo $n ;
+	sleep 1 ;
+done
+echo "erasing" ;
+sf erase 0 0xC0000 ;
+
+# two steps to prevent bricking
+echo "programming" ;
+setexpr a1 ${a_uImage1} + 0x400
+setexpr o1 ${offset} + 0x400
+setexpr s1 ${filesize} - 0x400
+sf write ${a1} ${o1} ${s1} ;
+sf write ${a_uImage1} $offset 0x400 ;
+
+echo "verifying" ;
+if sf read ${a_uImage2} $offset $filesize ; then
+else
+	echo "Error re-reading EEPROM" ;
+	exit
+fi
+if cmp.b ${a_uImage1} ${a_uImage2} $filesize ; then
+else
+	echo "Read verification error" ;
+	exit
+fi
+while echo "---- U-Boot upgraded. reset" ; do
+	sleep 120
+done
--- a/board/boundarydevices/common/boot.cmd
+++ b/board/boundarydevices/common/boot.cmd
@@ -2,8 +2,6 @@ setenv bootargs ''

 setenv initrd_high 0xffffffff
 m4=''
-kernelimage=zImage
-bootcommand=bootz
 a_base=0x10000000
 if itest.s x51 == "x${imx_cpu}" ; then
 	a_base=0x90000000
@@ -11,14 +9,10 @@ elif itest.s x53 == "x${imx_cpu}"; then
 	a_base=0x70000000
 elif itest.s x6SX == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then
 	a_base=0x80000000
-elif itest.s x8MQ == "x${imx_cpu}"; then
-	a_base=0x40000000
-	kernelimage=Image
-	bootcommand=booti
-fi
-if itest.s "x1" == "x${m4enabled}" ; then
-	run m4boot;
-	m4='-m4';
+	if itest.s "x1" == "x$m4enabled" ; then
+		run m4boot;
+		m4='-m4';
+	fi
 fi

 setexpr a_script  ${a_base} + 0x00800000
@@ -45,12 +39,10 @@ if itest.s "x" == "x${fdt_file}" ; then
 		fdt_file=imx6sx-${board}${m4}.dtb;
 	elif itest.s x7D == "x${imx_cpu}" ; then
 		fdt_file=imx7d-${board}${m4}.dtb;
-	elif itest.s x8MQ == "x${imx_cpu}" ; then
-		fdt_file=imx8mq-${board}${m4}.dtb;
 	elif itest.s x51 == "x${imx_cpu}" ; then
-		fdt_file=imx51-${board}.dtb;
+		fdt_file=imx51-${board}${m4}.dtb;
 	elif itest.s x53 == "x${imx_cpu}" ; then
-		fdt_file=imx53-${board}.dtb;
+		fdt_file=imx53-${board}${m4}.dtb;
 	else
 		fdt_file=imx6q-${board}.dtb;
 	fi
@@ -74,12 +66,16 @@ else
 	exit;
 fi

+cmd_xxx_present=
 fdt resize
 if itest.s "x" != "x${cmd_custom}" ; then
 	run cmd_custom
+	cmd_xxx_present=1;
 fi
+
 if itest.s "x" != "x${cmd_hdmi}" ; then
 	run cmd_hdmi
+	cmd_xxx_present=1;
 	if itest.s x == x${allow_noncea} ; then
 		setenv bootargs ${bootargs} mxc_hdmi.only_cea=1;
 		echo "only CEA modes allowed on HDMI port";
@@ -91,18 +87,25 @@ fi

 if itest.s "x" != "x${cmd_lcd}" ; then
 	run cmd_lcd
+	cmd_xxx_present=1;
 fi
 if itest.s "x" != "x${cmd_lcd2}" ; then
 	run cmd_lcd2
+	cmd_xxx_present=1;
 fi
 if itest.s "x" != "x${cmd_lvds}" ; then
 	run cmd_lvds
+	cmd_xxx_present=1;
 fi
 if itest.s "x" != "x${cmd_lvds2}" ; then
 	run cmd_lvds2
+	cmd_xxx_present=1;
 fi
-if itest.s "x" != "x${cmd_mipi}" ; then
-	run cmd_mipi
+
+if itest.s "x" == "x${cmd_xxx_present}" ; then
+	echo "!!!!!!!!!!!!!!!!"
+	echo "warning: your u-boot may be outdated, please upgrade"
+	echo "!!!!!!!!!!!!!!!!"
 fi

 if test "sata" = "${devtype}" ; then
@@ -123,6 +126,7 @@ fi

 if itest.s "x" != "x${wlmac}" ; then
 	setenv bootargs ${bootargs} wlcore.mac=${wlmac}
+	setenv bootargs ${bootargs} wlan.mac=${wlmac}
 fi

 if itest.s "x" != "x${gpumem}" ; then
@@ -145,7 +149,7 @@ if itest.s "x" != "x${show_env}" ; then
 	printenv
 fi

-if load ${devtype} ${devnum}:${distro_bootpart} ${a_zImage} ${prefix}${kernelimage} ; then
-	${bootcommand} ${a_zImage} - ${a_fdt}
+if load ${devtype} ${devnum}:${distro_bootpart} ${a_zImage} ${prefix}zImage ; then
+	bootz ${a_zImage} - ${a_fdt}
 fi
 echo "Error loading kernel image"
--- a/board/boundarydevices/common/post-build.sh
+++ b/board/boundarydevices/common/post-build.sh
@@ -6,24 +6,20 @@
 #

 BOARD_DIR="$(dirname $0)"
-UBOOT_DEFCONFIG="$(grep BR2_TARGET_UBOOT_BOARD_DEFCONFIG ${BR2_CONFIG} | sed 's/.*\"\(.*\)\"/\1/')"
-
-if grep -Eq "^BR2_aarch64=y$" ${BR2_CONFIG}; then
-	MKIMAGE_ARCH=arm64
-	UBOOT_BINARY=imx8-boot-sd.bin
-else
-	MKIMAGE_ARCH=arm
-	UBOOT_BINARY=u-boot.imx
-fi

 # bd u-boot looks for standard bootscript
-$HOST_DIR/bin/mkimage -A $MKIMAGE_ARCH -O linux -T script -C none -a 0 -e 0 \
-    -n "boot script" -d $BOARD_DIR/boot.cmd $TARGET_DIR/boot/boot.scr
+install -m 0644 -D $BINARIES_DIR/boot.scr $TARGET_DIR/boot/
+# legacy 6x_bootscript script
+$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
+-n "boot script" -d $BOARD_DIR/6x_bootscript.txt $TARGET_DIR/6x_bootscript

 # u-boot / update script for bd upgradeu command
-if [ -e $BINARIES_DIR/$UBOOT_BINARY ]; then
-    install -D -m 0644 $BINARIES_DIR/$UBOOT_BINARY \
-        $TARGET_DIR/u-boot.$UBOOT_DEFCONFIG
-    $HOST_DIR/bin/mkimage -A $MKIMAGE_ARCH -O linux -T script -C none -a 0 -e 0 \
-        -n "upgrade script" -d $BOARD_DIR/upgrade.cmd $TARGET_DIR/upgrade.scr
+if [ -e $BINARIES_DIR/u-boot.imx ];
+then
+    install -D -m 0644 $BINARIES_DIR/u-boot.imx $TARGET_DIR/u-boot.imx
+    $HOST_DIR/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
+    -n "upgrade script" -d $BOARD_DIR/upgrade.cmd $TARGET_DIR/upgrade.scr
+    # legacy 6x_upgrade script
+    $HOST_DIR/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
+    -n "upgrade script" -d $BOARD_DIR/6x_upgrade.txt $TARGET_DIR/6x_upgrade
 fi
--- a/board/boundarydevices/common/upgrade.cmd
+++ b/board/boundarydevices/common/upgrade.cmd
@@ -7,7 +7,6 @@ offset=0x400
 erase_size=0xC0000
 qspi_offset=0x0
 a_base=0x12000000
-block_size=0x200

 if itest.s x51 == "x${imx_cpu}"; then
 	a_base=0x92000000
@@ -15,9 +14,6 @@ elif itest.s x53 == "x${imx_cpu}"; then
 	a_base=0x72000000
 elif itest.s x6SX == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then
 	a_base=0x82000000
-elif itest.s x8MQ == "x${imx_cpu}"; then
-	a_base=0x42000000
-	offset=0x8400
 fi

 qspi_match=1
@@ -29,54 +25,6 @@ setexpr a_script ${a_base}

 setenv stdout serial,vga

-if itest.s "x${sfname}" == "x" ; then
-# U-Boot resides in (e)MMC
-if itest.s "x${env_dev}" == "x" || itest.s "x${env_part}" == "x"; then
-        echo "Please set env_dev/part to the appropriate values"
-        exit
-fi
-
-# Load bootloader binary for this board
-if ${fs}load ${devtype} ${devnum}:${distro_bootpart} ${a_uImage1} u-boot.$uboot_defconfig ; then
-else
-	echo "File u-boot.$uboot_defconfig not found on SD card" ;
-	exit
-fi
-
-# Compute block count for filesize and offset
-setexpr cntoffset ${offset} / ${block_size}
-setexpr cntfile ${filesize} / ${block_size}
-# Add 1 in case the $filesize is not a multiple of $block_size
-setexpr cntfile ${cntfile} + 1
-
-# Select media partition (if different from main partition)
-mmc dev ${env_dev} ${env_part}
-
-# Read and compare current U-Boot
-mmc read ${a_uImage2} ${cntoffset} ${cntfile}
-if cmp.b ${a_uImage1} ${a_uImage2} ${filesize} ; then
-	echo "------- U-Boot versions match" ;
-	exit ;
-fi
-
-echo "Need U-Boot upgrade" ;
-echo "Program in 5 seconds" ;
-for n in 5 4 3 2 1 ; do
-	echo $n ;
-	sleep 1 ;
-done
-mmc write ${a_uImage1} ${cntoffset} ${cntfile}
-
-# Make sure to boot from the proper partition
-if itest ${env_part} != 0 ; then
-	mmc partconf ${env_dev} 1 ${env_part} 0
-fi
-
-# Switch back to main eMMC partition (to avoid confusion)
-mmc dev ${env_dev}
-
-else
-# U-Boot resides in NOR flash
 if sf probe || sf probe || sf probe 1 27000000 || sf probe 1 27000000 ; then
 	echo "probed SPI ROM" ;
 else
@@ -84,13 +32,9 @@ else
 	exit
 fi

-if itest.s "x${sfname}" == "xat45db041d" ; then
-	erase_size=0x7e000
-fi
-
 if itest.s x7D == "x${imx_cpu}"; then
 	echo "check qspi parameter block" ;
-	if ${fs}load ${devtype} ${devnum}:${distro_bootpart} ${a_qspi1} qspi-${sfname}.${uboot_defconfig} ; then
+	if ${fs}load ${devtype} ${devnum}:1 ${a_qspi1} qspi-${sfname}.${uboot_defconfig} ; then
 	else
 		echo "parameter file qspi-${sfname}.${uboot_defconfig} not found on SD card"
 		exit
@@ -119,7 +63,7 @@ fi

 echo "check U-Boot" ;

-if ${fs}load ${devtype} ${devnum}:${distro_bootpart} ${a_uImage1} u-boot.$uboot_defconfig ; then
+if ${fs}load ${devtype} ${devnum}:1 ${a_uImage1} u-boot.$uboot_defconfig ; then
 else
 	echo "File u-boot.$uboot_defconfig not found on SD card" ;
 	exit
@@ -136,7 +80,7 @@ if cmp.b ${a_uImage1} ${a_uImage2} $filesize ; then
 	if itest.s "${qspi_match}" == "1" ; then
 		echo "------- upgrade not needed" ;
 		if itest.s "x" != "x${next}" ; then
-			if ${fs}load ${devtype} ${devnum}:${distro_bootpart} ${a_script} ${next} ; then
+			if ${fs}load ${devtype} ${devnum}:1 ${a_script} ${next} ; then
 				source ${a_script}
 			else
 				echo "${next} not found on SD card"
@@ -198,14 +142,13 @@ if itest.s x7D == "x${imx_cpu}"; then
 fi

 if itest.s "x" != "x${next}" ; then
-	if ${fs}load ${devtype} ${devnum}:${distro_bootpart} ${a_script} ${next} ; then
+	if ${fs}load ${devtype} ${devnum}:1 ${a_script} ${next} ; then
 		source ${a_script}
 	else
-		echo "${next} not found on ${devtype} ${devnum}:${distro_bootpart}"
+		echo "${next} not found on ${devtype} ${devnum}"
 	fi
 fi
-fi

-while echo "---- U-Boot upgraded. Please reset the board" ; do
+while echo "---- U-Boot upgraded. reset" ; do
 	sleep 120
 done
--- a/board/ci20/patches/uboot/0001-mips-Remove-default-endiannes.patch
+++ b/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
-
--- a/board/csky/gx6605s/patches/linux/0001-csky-update-cmdline-for-serial-console-and-rootfs-on.patch
+++ b/board/csky/gx6605s/patches/linux/0001-csky-update-cmdline-for-serial-console-and-rootfs-on.patch
@@ -1,25 +0,0 @@
-From 7e3f2c482bc16537a093e87a27f0d465804a88e4 Mon Sep 17 00:00:00 2001
-From: Julien Olivain <juju@cotds.org>
-Date: Tue, 11 Dec 2018 23:04:46 +0100
-Subject: [PATCH] csky: update cmdline for serial console and rootfs on sda1
-
-Signed-off-by: Julien Olivain <juju@cotds.org>
---
- arch/csky/boot/dts/gx6605s.dts | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/csky/boot/dts/gx6605s.dts b/arch/csky/boot/dts/gx6605s.dts
-index ce56106af967..f5d60b21e6f9 100644
--- a/arch/csky/boot/dts/gx6605s.dts
-+++ b/arch/csky/boot/dts/gx6605s.dts
-@@ -155,6 +155,6 @@
- 	};
- 
- 	chosen {
-		bootargs = "console=tty0 init=/sbin/init root=/dev/sda2 rw rootwait";
-+		bootargs = "console=ttyS0,115200 init=/sbin/init root=/dev/sda1 rw rootwait";
- 	};
- };
-- 
-2.19.2
-
--- a/board/digilent/zybo/genimage.cfg
+++ b/board/digilent/zybo/genimage.cfg
@@ -0,0 +1,29 @@
+image boot.vfat {
+  vfat {
+    files = {
+      "BOOT.BIN",
+      "uEnv.txt",
+      "system.bit",
+      "zynq-zybo.dtb",
+      "u-boot-dtb.img",
+      "uImage"
+    }
+  }
+  size = 32M
+}
+
+image sdcard.img {
+  hdimage {
+  }
+
+  partition boot {
+    partition-type = 0xC
+    bootable = "true"
+    image = "boot.vfat"
+  }
+
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext4"
+  }
+}
--- a/board/digilent/zybo/post-image.sh
+++ b/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}"
--- a/board/digilent/zybo/readme.txt
+++ b/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=...
--- a/support/testing/tests/download/init.py
+++ b/support/testing/tests/download/init.py
--- a/board/digilent/zybo/uEnv.txt
+++ b/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
--- a/board/embest/riotboard/genimage.cfg
+++ b/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
-    }
-}
--- a/board/embest/riotboard/readme.txt
+++ b/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.
--- a/board/embest/riotboard/rootfs_overlay/boot/extlinux/extlinux.conf
+++ b/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
--- a/board/freescale/common/imx/genimage.cfg.template
+++ b/board/freescale/common/imx/genimage.cfg.template
@@ -22,7 +22,7 @@ image sdcard.img {

  partition u-boot {
    in-partition-table = "no"
-    image = "%UBOOTBIN%"
+    image = "u-boot.imx"
    offset = 1024
  }

--- a/board/freescale/common/imx/genimage.cfg.template_imx8
+++ b/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)
 #

--- a/board/freescale/common/imx/imx8-bootloader-prepare.sh
+++ b/board/freescale/common/imx/imx8-bootloader-prepare.sh
@@ -2,13 +2,9 @@

 main ()
 {
-	UBOOT_DTB=$2
-	if [ ! -e "$UBOOT_DTB" ]; then
-		echo "ERROR: couldn't find dtb: $UBOOT_DTB"
-		exit 1
-	fi
+	# Currently we support imx8mqevk.
 	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
+	BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot.bin ${HOST_DIR}/bin/mkimage_fit_atf.sh ${BINARIES_DIR}/fsl-imx8mq-evk.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

--- a/board/freescale/common/imx/post-image.sh
+++ b/board/freescale/common/imx/post-image.sh
@@ -41,24 +41,13 @@ genimage_type()
 	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"
-	fi
-}
-
 main()
 {
 	local FILES="$(dtb_list) $(linux_image)"
-	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/%UBOOTBIN%/${UBOOTBIN}/" \
 		board/freescale/common/imx/$(genimage_type) > ${GENIMAGE_CFG}

 	rm -rf "${GENIMAGE_TMP}"
--- a/board/freescale/imx6sabre/patches/uboot/0002-imx-Create-distinct-pre-processed-mkimage-config-fil.patch
+++ b/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
-
--- a/board/freescale/imx6sabre/patches/uboot/0002-imximage-Remove-failure-when-no-IVT-offset-is-found.patch
+++ b/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
+
--- a/board/freescale/imx7dsdb/patches/uboot/0001-imx-Create-distinct-pre-processed-mkimage-config-fil.patch
+++ b/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
-
--- a/board/freescale/imx8mqevk/readme.txt
+++ b/board/freescale/imx8mqevk/readme.txt
@@ -5,6 +5,12 @@ Freescale i.MX8MQ EVK board
 This file documents the Buildroot support for the Freescale i.MX8MQ
 EVK board.

+Hardware support
+================
+
+Currently only basic support for hardware is available, currently no
+support for GPU, VPU and other HW features.
+
 Build
 =====

@@ -21,7 +27,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 +75,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
--- a/board/hardkernel/odroidxu4/boot.ini
+++ b/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
-
--- a/board/hardkernel/odroidxu4/genimage.cfg
+++ b/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"
-	}
-}
--- a/board/hardkernel/odroidxu4/post-image.sh
+++ b/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}"
-
--- a/board/hardkernel/odroidxu4/readme.txt
+++ b/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.
-
--- a/board/lego/ev3/genimage.cfg
+++ b/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
--- a/board/lego/ev3/linux.fragment
+++ b/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
--- a/board/lego/ev3/patches/uboot/configs-legoev3-increase-flash-image-sizes.patch
+++ b/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
+
--- a/board/lego/ev3/readme.txt
+++ b/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
--- a/board/olimex/a10_olinuxino/boot.cmd
+++ b/board/olimex/a10_olinuxino/boot.cmd
@@ -1 +0,0 @@
-../a20_olinuxino/boot.cmd
--- a/board/olimex/a10_olinuxino/genimage.cfg
+++ b/board/olimex/a10_olinuxino/genimage.cfg
@@ -1 +0,0 @@
-../a20_olinuxino/genimage.cfg
--- a/board/olimex/a10_olinuxino/post-build.sh
+++ b/board/olimex/a10_olinuxino/post-build.sh
@@ -1 +0,0 @@
-../a20_olinuxino/post-build.sh
--- a/board/olimex/a10_olinuxino/readme.txt
+++ b/board/olimex/a10_olinuxino/readme.txt
@@ -1,57 +0,0 @@
-A10-OLinuXino-LIME
-
-Intro
-=====
-
-These are open hardware boards, all based on the Allwinner A10 SoC.
-
-for more details about the boards see the following pages:
- - https://www.olimex.com/Products/OLinuXino/open-source-hardware
- - https://www.olimex.com/Products/OLinuXino/A10/A10-OLinuXino-LIME/
-
-The following defconfigs are available:
- - olimex_a10_olinuxino_lime_defconfig
-   for the A10-OLinuXino-LIME board using mainline kernel
-
-(see http://linux-sunxi.org/Linux_Kernel for more details)
-
-How to build it
-===============
-
-Configure Buildroot:
-
-    $ make <board>_defconfig
-
-Compile everything and build the rootfs image:
-
-    $ make
-
-Result of the build
-------------------
-
-After building, you should get a tree like this:
-
-    output/images/
-    +-- boot.scr
-    +-- rootfs.ext2
-    +-- rootfs.ext4 -> rootfs.ext2
-    +-- sdcard.img
-    +-- sun4i-a10-olinuxino-lime.dtb (lime, mainline)
-    +-- u-boot.bin
-    +-- u-boot-sunxi-with-spl.bin
-    `-- zImage
-
-
-How to write the SD card
-========================
-
-The sdcard.img file is a complete bootable image ready to be written
-on the boot medium. To install it, simply copy the image to a uSD
-card:
-
-    # dd if=output/images/sdcard.img of=/dev/sdX
-
-Where 'sdX' is the device node of the uSD.
-
-Eject the SD card, insert it in the A10-OLinuXino board, and power it up.
-
--- a/board/olimex/a20_olinuxino/boot-legacy.cmd
+++ b/board/olimex/a20_olinuxino/boot-legacy.cmd
--- a/board/olimex/a20_olinuxino/readme.txt
+++ b/board/olimex/a20_olinuxino/readme.txt
@@ -16,7 +16,7 @@ The following defconfigs are available:
   for the A20-OLinuXino-MICRO board using mainline kernel
 - olimex_a20_olinuxino_lime_defconfig
   for the A20-OLinuXino-LIME board using mainline kernel
- - olimex_a20_olinuxino_lime_legacy_defconfig
+ - olimex_a20_olinuxino_lime_mali_defconfig
   for the A20-OLinuXino-LIME board using legacy linux-sunxi kernel
 - olimex_a20_olinuxino_lime2_defconfig
   for the A20-OLinuXino-LIME2 board using mainline kernel
@@ -51,7 +51,7 @@ After building, you should get a tree like this:
    output/images/
    +-- rootfs.ext2
    +-- rootfs.ext4 -> rootfs.ext2
-    +-- script.bin (lime_legacy)
+    +-- script.bin (lime_mali)
    +-- sdcard.img
    +-- sun7i-a20-olinuxino-lime.dtb (lime, mainline)
    +-- sun7i-a20-olinuxino-lime2.dtb (lime2, mainline)
--- a/board/orangepi/orangepi-lite/linux-extras.config
+++ b/board/orangepi/orangepi-lite/linux-extras.config
@@ -6,10 +6,3 @@ CONFIG_CFG80211_WEXT=y

 # wireless drivers
 CONFIG_WLAN=y
-
-# hdmi
-CONFIG_DRM_SUN8I_DW_HDMI=y
-CONFIG_SUN8I_DE2_CCU=y
-
-# analog audio
-CONFIG_SND_SUN8I_CODEC_ANALOG=y
--- a/board/orangepi/orangepi-lite2/extlinux.conf
+++ b/board/orangepi/orangepi-lite2/extlinux.conf
@@ -1,4 +0,0 @@
-label linux
-  kernel /Image
-  devicetree /sun50i-h6-orangepi-lite2.dtb
-  append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
--- a/board/orangepi/orangepi-lite2/genimage.cfg
+++ b/board/orangepi/orangepi-lite2/genimage.cfg
@@ -1,33 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"Image",
-			"sun50i-h6-orangepi-lite2.dtb",
-			"extlinux"
-		}
-	}
-	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"
-	}
-}
--- a/board/orangepi/orangepi-lite2/post-build.sh
+++ b/board/orangepi/orangepi-lite2/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
--- a/board/orangepi/orangepi-lite2/readme.txt
+++ b/board/orangepi/orangepi-lite2/readme.txt
@@ -1,44 +0,0 @@
-Intro
-=====
-
-This default configuration will allow you to start experimenting with the
-buildroot environment for the Orangepi Lite2. With the current configuration
-it will bring-up the board, and allow access through the serial console.
-
-Orangepi Lite2 link:
-http://www.orangepi.org/Orange%20Pi%20Lite%202/
-
-Wiki link:
-https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+Lite2
-
-How to build
-============
-
-    $ make orangepi_lite2_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 Orangepi Lite2 and power it up. The console
-is on the serial line, 115200 8N1.
-
-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
--- a/board/orangepi/orangepi-lite2/rootfs_overlay/lib/firmware/brcm/brcmfmac43455-sdio.txt
+++ b/board/orangepi/orangepi-lite2/rootfs_overlay/lib/firmware/brcm/brcmfmac43455-sdio.txt
@@ -1,82 +0,0 @@
-#AP6255_NVRAM_V1.0_29052015
-
-NVRAMRev=$Rev: 498373 $
-sromrev=11
-vendid=0x14e4
-devid=0x43ab
-manfid=0x2d0
-prodid=0x06e4
-macaddr=00:90:4c:c5:12:38
-nocrc=1
-boardtype=0x6e4
-boardrev=0x1304
-xtalfreq=37400
-#boardflags: 5GHz eTR switch by default
-#2.4GHz eTR switch by default
-#bit1 for btcoex
-boardflags=0x00080201
-boardflags2=0x40000000
-boardflags3=0x48200100
-rxgains2gelnagaina0=0
-rxgains2gtrisoa0=0
-rxgains2gtrelnabypa0=0
-rxgains5gelnagaina0=0
-rxgains5gtrisoa0=0
-rxgains5gtrelnabypa0=0
-rxchain=1
-txchain=1
-aa2g=1
-aa5g=1
-tssipos5g=1
-tssipos2g=1
-femctrl=0
-AvVmid_c0=0,157,1,126,1,126,1,126,1,126
-pa2ga0=-112,6296,-662
-pa2ga1=-165,3699,-515
-pa5ga0=-143,6016,-683,-141,6013,-678,-137,5988,-670,-136,5982,-670
-pa5ga1=-161,3544,-499,-166,3543,-497,-169,3569,-497,-171,3598,-498
-itrsw=1
-pdoffset2g40ma0=10
-pdoffset40ma0=0xaaaa
-pdoffset80ma0=0xaaaa
-extpagain5g=2
-extpagain2g=2
-tworangetssi2g=1
-tworangetssi5g=1
-# LTECX flags
-# WCI2
-ltecxmux=0
-ltecxpadnum=0x0504
-ltecxfnsel=0x22
-ltecxgcigpio=0x32
-
-maxp2ga0=64
-ofdmlrbw202gpo=0x0033
-dot11agofdmhrbw202gpo=0x1553
-mcsbw202gpo=0x99355533
-
-maxp5ga0=80,82,76,77
-
-mcsbw205glpo=0x99755000
-mcsbw205gmpo=0x9df55000
-mcsbw205ghpo=0x99855000
-
-mcsbw405glpo=0xb8555000
-mcsbw405gmpo=0xed955000
-mcsbw405ghpo=0xd9755000
-
-mcsbw805glpo=0xc8555000
-mcsbw805gmpo=0xe9555000
-mcsbw805ghpo=0xd9555000
-
-swctrlmap_2g=0x00040004,0x00020002,0x00040004,0x010a02,0x1ff
-swctrlmap_5g=0x00100010,0x00200020,0x00100010,0x010a02,0x2f4
-swctrlmapext_5g=0x00000000,0x00000000,0x00000000,0x000000,0x000
-swctrlmapext_2g=0x00000000,0x00000000,0x00000000,0x000000,0x000
-
-vcodivmode=1
-deadman_to=481500000
-ed_thresh2g=-54
-ed_thresh5g=-54
-
-muxenab=0x10
--- a/board/orangepi/orangepi-one-plus/extlinux.conf
+++ b/board/orangepi/orangepi-one-plus/extlinux.conf
@@ -1,4 +0,0 @@
-label linux
-  kernel /Image
-  devicetree /sun50i-h6-orangepi-one-plus.dtb
-  append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
--- a/board/orangepi/orangepi-one-plus/genimage.cfg
+++ b/board/orangepi/orangepi-one-plus/genimage.cfg
@@ -1,33 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"Image",
-			"sun50i-h6-orangepi-one-plus.dtb",
-			"extlinux"
-		}
-	}
-	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"
-	}
-}
--- a/board/orangepi/orangepi-one-plus/post-build.sh
+++ b/board/orangepi/orangepi-one-plus/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
--- a/board/orangepi/orangepi-one-plus/readme.txt
+++ b/board/orangepi/orangepi-one-plus/readme.txt
@@ -1,37 +0,0 @@
-Intro
-=====
-
-This default configuration will allow you to start experimenting with the
-buildroot environment for the Orangepi One Plus. With the current configuration
-it will bring-up the board, and allow access through the serial console.
-
-Orangepi One Plus link:
-http://www.orangepi.org/OrangePiOneplus/
-
-Wiki link:
-https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+One+Plus
-
-This configuration uses U-Boot mainline and kernel mainline.
-
-How to build
-============
-
-    $ make orangepi_one_plus_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 Orangepi One Plus and power it up. The console
-is on the serial line, 115200 8N1.
--- a/board/orangepi/orangepi-pc/linux.fragment
+++ b/board/orangepi/orangepi-pc/linux.fragment
@@ -1,5 +0,0 @@
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-CONFIG_REGULATOR_SY8106A=y
-CONFIG_DRM_SUN8I_DW_HDMI=y
-CONFIG_SUN8I_DE2_CCU=y
-CONFIG_SND_SUN8I_CODEC_ANALOG=y
--- a/board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-enable-ap6212.patch
+++ b/board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-enable-ap6212.patch
@@ -0,0 +1,73 @@
+From: Sergey Matyukevich <geomatsi@gmail.com>
+Date: Sun, 11 Feb 2018 16:21:43 +0300
+Subject: [PATCH] arm64: dts: orange-pi-zero-plus2: enable AP6212a WiFi/BT combo
+
+Enable AP6212a WiFi/BT combo chip on orange-pi-zero-plus2 board:
+- WiFi SDIO interface is connected to MMC1
+- WiFi REG_ON pin connected to gpio PA9: attach to mmc-pwrseq
+- WiFi HOST_WAKE pin connected to gpio PL7
+- BT is connected to UART1
+
+Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ .../allwinner/sun50i-h5-orangepi-zero-plus2.dts    | 32 ++++++++++++++++++++++
+ 1 file changed, 32 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
+index a42fd79a62a3..d415b7b67cce 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
+@@ -64,6 +64,13 @@
+ 		regulator-min-microvolt = <3300000>;
+ 		regulator-max-microvolt = <3300000>;
+ 	};
+
+	wifi_pwrseq: wifi_pwrseq {
+		compatible = "mmc-pwrseq-simple";
+		pinctrl-names = "default";
+		reset-gpios = <&pio 0 9 GPIO_ACTIVE_LOW>; /* PA9 */
+		post-power-on-delay-ms = <200>;
+	};
+ };
+ 
+ &mmc0 {
+@@ -75,6 +82,25 @@
+ 	status = "okay";
+ };
+ 
+&mmc1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc1_pins_a>;
+	vmmc-supply = <&reg_vcc3v3>;
+	vqmmc-supply = <&reg_vcc3v3>;
+	mmc-pwrseq = <&wifi_pwrseq>;
+	bus-width = <4>;
+	non-removable;
+	status = "okay";
+
+	brcmf: wifi@1 {
+		reg = <1>;
+		compatible = "brcm,bcm4329-fmac";
+		interrupt-parent = <&r_pio>;
+		interrupts = <0 7 IRQ_TYPE_LEVEL_LOW>;	/* PL7 */
+		interrupt-names = "host-wake";
+	};
+};
+
+ &mmc2 {
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&mmc2_8bit_pins>;
+@@ -90,3 +116,9 @@
+ 	pinctrl-0 = <&uart0_pins_a>;
+ 	status = "okay";
+ };
+
+&uart1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
+	status = "okay";
+};
+-- 
+2.16.1
+
--- a/board/orangepi/orangepi-zero/linux-extras.config
+++ b/board/orangepi/orangepi-zero/linux-extras.config
@@ -15,6 +15,3 @@ CONFIG_CFG80211_WEXT=y

 # wireless drivers
 CONFIG_WLAN=y
-
-# ondemand cpufreq governor
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
--- a/board/aarch64-efi/genimage-efi.cfg
+++ b/board/aarch64-efi/genimage-efi.cfg
@@ -6,11 +6,11 @@ image efi-part.vfat {
    file EFI {
      image = "efi-part/EFI"
    }
-    file Image {
-      image = "Image"
+    file bzImage {
+      image = "bzImage"
    }
  }
-  size = 32M
+  size = 16M
 }

 image disk.img {
@@ -27,4 +27,5 @@ image disk.img {
    partition-type = 0x83
    image = "rootfs.ext2"
  }
+
 }
--- a/board/aarch64-efi/grub.cfg
+++ b/board/aarch64-efi/grub.cfg
@@ -2,5 +2,5 @@ set default="0"
 set timeout="5"

 menuentry "Buildroot" {
-	linux /Image root=/dev/vda2 rootwait console=ttyAMA0
+	linux /bzImage root=/dev/sda2 rootwait console=tty1
 }
--- a/board/pc/linux.config
+++ b/board/pc/linux.config
@@ -82,4 +82,3 @@ CONFIG_EXT4_FS=y
 CONFIG_FUSE_FS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_SQUASHFS=y
-CONFIG_UNWINDER_FRAME_POINTER=y
--- a/board/pc/post-build.sh
+++ b/board/pc/post-build.sh
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-BOARD_DIR=$(dirname "$0")
-
-cp -f "$BOARD_DIR/grub-bios.cfg" "$TARGET_DIR/boot/grub/grub.cfg"
-
-# Copy grub 1st stage to binaries, required for genimage
-cp -f "$HOST_DIR/lib/grub/i386-pc/boot.img" "$BINARIES_DIR"
--- a/board/pc/post-image-efi-gpt.sh
+++ b/board/pc/post-image-efi-gpt.sh
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd ${BINARIES_DIR}
-
-# GPT partition type UUIDs
-esp_type=c12a7328-f81f-11d2-ba4b-00a0c93ec93b
-linux_type=44479540-f297-41b2-9af7-d131d5f0458a
-
-# Partition UUIDs
-efi_part_uuid=$(uuidgen)
-root_part_uuid=$(uuidgen)
-
-# Boot partition offset and size, in 512-byte sectors
-efi_part_start=64
-efi_part_size=32768
-
-# Rootfs partition offset and size, in 512-byte sectors
-root_part_start=$(( efi_part_start + efi_part_size ))
-root_part_size=$(( $(stat -c %s rootfs.ext2) / 512 ))
-
-first_lba=34
-last_lba=$(( root_part_start + root_part_size ))
-
-# Disk image size in 512-byte sectors
-image_size=$(( last_lba + first_lba ))
-
-cat > efi-part/EFI/BOOT/grub.cfg <<EOF
-set default="0"
-set timeout="5"
-
-menuentry "Buildroot" {
-	linux /bzImage root=PARTUUID=$root_part_uuid rootwait console=tty1
-}
-EOF
-
-# Create EFI system partition
-rm -f efi-part.vfat
-dd if=/dev/zero of=efi-part.vfat bs=512 count=0 seek=$efi_part_size
-mkdosfs  efi-part.vfat
-mcopy -bsp -i efi-part.vfat efi-part/startup.nsh ::startup.nsh
-mcopy -bsp -i efi-part.vfat efi-part/EFI ::EFI
-mcopy -bsp -i efi-part.vfat bzImage ::bzImage
-
-rm -f disk.img
-dd if=/dev/zero of=disk.img bs=512 count=0 seek=$image_size
-
-sfdisk disk.img <<EOF
-label: gpt
-label-id: $(uuidgen)
-device: /dev/foobar0
-unit: sectors
-first-lba: $first_lba
-last-lba: $last_lba
-
-/dev/foobar0p1 : start=$efi_part_start,  size=$efi_part_size,  type=$esp_type,   uuid=$efi_part_uuid,  name="efi-part.vfat"
-/dev/foobar0p2 : start=$root_part_start, size=$root_part_size, type=$linux_type, uuid=$root_part_uuid, name="rootfs.ext2"
-EOF
-
-dd if=efi-part.vfat of=disk.img bs=512 count=$efi_part_size seek=$efi_part_start conv=notrunc
-dd if=rootfs.ext2   of=disk.img bs=512 count=$root_part_size seek=$root_part_start conv=notrunc
--- a/board/pc/post-image.sh
+++ b/board/pc/post-image.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+
+# Detect boot strategy, EFI or BIOS
+if [ -f ${BINARIES_DIR}/efi-part/startup.nsh ]; then
+  cp -f ${BOARD_DIR}/grub-efi.cfg ${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg
+else
+  cp -f ${BOARD_DIR}/grub-bios.cfg ${TARGET_DIR}/boot/grub/grub.cfg
+  # Copy grub 1st stage to binaries, required for genimage
+  cp -f ${HOST_DIR}/lib/grub/i386-pc/boot.img ${BINARIES_DIR}
+fi
+
+exit $?
--- a/board/pc/readme.txt
+++ b/board/pc/readme.txt
@@ -9,7 +9,7 @@ Bare PC sample config

  $ make pc_x86_64_bios_defconfig

-  For EFI-based boot strategy on a GPT-partitioned disk:
+  Or for EFI:

  $ make pc_x86_64_efi_defconfig

@@ -57,7 +57,13 @@ qemu-system-x86_64 \
 Emulation in qemu (UEFI)
 ========================

-Run the emulation with:
+1. Edit grub-efi.cfg
+
+  Since the driver will show up in the virtual machine as /dev/vda,
+  change board/pc/grub-efi.cfg to use root=/dev/vda2 instead of
+  root=/dev/sda2. Then rebuild grub2 and the image.
+
+2. Run the emulation with:

 qemu-system-x86_64 \
 	-M pc \
--- a/board/pine64/rock64/extlinux.conf
+++ b/board/pine64/rock64/extlinux.conf
@@ -1,4 +0,0 @@
-label rock64-buildroot
-  kernel /boot/Image
-  devicetree /boot/rk3328-rock64.dtb
-  append console=ttyS2,1500000n8 root=/dev/mmcblk0p1 ro rootwait
--- a/board/pine64/rock64/genimage.cfg
+++ b/board/pine64/rock64/genimage.cfg
@@ -1,23 +0,0 @@
-image sdcard.img {
-    hdimage {
-    }
-
-    partition uboot-spl {
-        in-partition-table = "no"
-        image = "u-boot-tpl-spl.img"
-        offset = 32768 # 512 * 0x40 from start of sd card
-    }
-
-    partition uboot {
-        in-partition-table = "no"
-        image = "u-boot.itb"
-        offset = 262144 # 512 * 0x200 from start of sd card
-    }
-
-    partition rootfs {
-        partition-type = 0x83
-        bootable = "yes"
-        image = "rootfs.ext2"
-        size = 500M
-    }
-}
--- a/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch
+++ b/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch
@@ -1,32 +0,0 @@
-From 211bf049084e6e374dac253138fa813682910146 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20=C5=81yszczek?= <michal.lyszczek@bofc.pl>
-Date: Tue, 5 Feb 2019 22:08:54 +0100
-Subject: [PATCH] Makefile: rk3328 needs itb image to boot properly
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Michał Łyszczek <michal.lyszczek@bofc.pl>
---
- Makefile | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index 8086f3c93e..a6425b5b03 100644
--- a/Makefile
-+++ b/Makefile
-@@ -799,6 +799,11 @@ ifneq ($(BUILD_ROM),)
- ALL-$(CONFIG_X86_RESET_VECTOR) += u-boot.rom
- endif
- 
-+# rk3328 needs itb image to boot properly
-+ifeq ($(CONFIG_ROCKCHIP_RK3328),y)
-+ALL-y += u-boot.itb
-+endif
-+
- # enable combined SPL/u-boot/dtb rules for tegra
- ifeq ($(CONFIG_TEGRA)$(CONFIG_SPL),yy)
- ALL-y += u-boot-tegra.bin u-boot-nodtb-tegra.bin
-- 
-2.18.1
-
--- a/board/pine64/rock64/post-build.sh
+++ b/board/pine64/rock64/post-build.sh
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-MKIMAGE=$HOST_DIR/bin/mkimage
-BOARD_DIR="$(dirname $0)"
-
-$MKIMAGE -n rk3328 -T rksd -d $BINARIES_DIR/u-boot-tpl.bin $BINARIES_DIR/u-boot-tpl.img
-cat $BINARIES_DIR/u-boot-tpl.img $BINARIES_DIR/u-boot-spl.bin > $BINARIES_DIR/u-boot-tpl-spl.img
-
-install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf
--- a/board/pine64/rock64/readme.txt
+++ b/board/pine64/rock64/readme.txt
@@ -1,95 +0,0 @@
-Intro
-=====
-
-This default configuration will allow you to start experimenting with the
-buildroot environment for the Rock64. With this default configuration you
-can log in into board via uart and look around.
-
-Board homepage: https://www.pine64.org/?page_id=7147
-
-Build
-=====
-
-First, load rock64 config for buildroot
-
-  $ make rock64_defconfig
-
-Optionally make changes to buildroot config (to install more programs)
-
-  $ make menuconfig
-
-And then build everything
-
-  $ make
-
-When completed, following files will be generated in output/images directory:
-
-  .
-  ├── Image
-  ├── bl31.bin
-  ├── bl31.elf
-  ├── rk3328-rock64.dtb
-  ├── rootfs.ext2
-  ├── rootfs.ext4 -> rootfs.ext2
-  ├── rootfs.tar
-  ├── sdcard.img
-  ├── u-boot-spl.bin
-  ├── u-boot-tpl-spl.img
-  ├── u-boot-tpl.bin
-  ├── u-boot-tpl.img
-  ├── u-boot.bin
-  └── u-boot.itb
-
-Creating bootable SD card
-=========================
-
-!!! THIS COMMAND MAY WIPE YOUR DISK!
-!!! MAKE SURE YOU PASSED CORRECT DEVICE!
-!!! OR IT THIS WILL WIPE YOUR DISK!
-
-Simply invoke (as root)
-
-  # dd if=output/images/sdcard.img of=/dev/sdX && sync
-
-Where X is your SD card device (not partition), of= argument may also be
-/dev/mmcblk0 if you are using built-in sd card reader.
-
-Runtime
-=======
-
-Login
-----
-
-By default, buildroot has no password, just type 'root' as login user, and
-you will be logged in.
-
-Serial console
--------------
-
-Serial console needs to be connected to pins (into 40pin rpi compatible part)
-
-pin 6:  gnd
-pin 8:  tx
-pin 10: rx
-
-Pin numbers are printed on board.
-
-Uart configuration is not standard. Rock64 uses 1500000 (1,5M) baudrate
-with standard 8n1.
-
-Ethernet
--------
-
-To enable ethernet you need to load modules for it:
-
-# modprobe stmmac
-# modprobe dwmac-rk
-
-and since by default there is no dhcp installed, you need to configure ip
-address, remember to change address to fit your network.
-
-# ifconfig eth0 up
-# ip addr add 10.1.1.180/24 dev eth0
-# ping 10.1.1.1
-PING 10.1.1.1 (10.1.1.1): 56 data bytes
-64 bytes from 10.1.1.1: seq=0 ttl=64 time=0.695 ms
--- a/board/qemu/aarch64-virt/linux-4.15.config
+++ b/board/qemu/aarch64-virt/linux-4.15.config
--- a/board/qemu/aarch64-virt/readme.txt
+++ b/board/qemu/aarch64-virt/readme.txt
@@ -1,7 +1,7 @@
 Run the emulation with:

-  qemu-system-aarch64 -M virt -cpu cortex-a53 -nographic -smp 1 -kernel output/images/Image -append "rootwait root=/dev/vda console=ttyAMA0" -netdev user,id=eth0 -device virtio-net-device,netdev=eth0 -drive file=output/images/rootfs.ext4,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0
+  qemu-system-aarch64 -M virt -cpu cortex-a57 -nographic -smp 1 -kernel output/images/Image -append "root=/dev/vda console=ttyAMA0" -netdev user,id=eth0 -device virtio-net-device,netdev=eth0 -drive file=output/images/rootfs.ext4,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0

 The login prompt will appear in the terminal that started Qemu.

-Tested with QEMU 2.12.0
+Tested with QEMU 2.11.0
--- a/board/qemu/arm-versatile/linux-4.13.config
+++ b/board/qemu/arm-versatile/linux-4.13.config
--- a/board/qemu/arm-versatile/linux-4.4-nommu.config
+++ b/board/qemu/arm-versatile/linux-4.4-nommu.config
@@ -1,12 +1,11 @@
 # CONFIG_MMU is not set
 CONFIG_ARCH_VERSATILE=y
-CONFIG_ARM_SINGLE_ARCH_VERSATILE=y
 CONFIG_SET_MEM_PARAM=y
 CONFIG_DRAM_BASE=0x00000000
 CONFIG_DRAM_SIZE=0x08000000
 CONFIG_ARCH_VERSATILE_PB=y
 CONFIG_MACH_VERSATILE_AB=y
-CONFIG_MACH_VERSATILE_DT=y
+# CONFIG_MACH_VERSATILE_DT is not set
 CONFIG_BINFMT_FLAT=y
 CONFIG_SYSVIPC=y
 CONFIG_MODULES=y
--- a/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch
+++ b/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch
@@ -1,113 +1,30 @@
-From 4ac4324dcdaf237aa34545b3795acb2e5c42d10e Mon Sep 17 00:00:00 2001
-From: Waldemar Brodkorb <wbx@openadk.org>
-Date: Fri, 1 Feb 2019 11:36:20 +0100
-Subject: [PATCH] arm-versatile-nommu: Linux patch
+From b7c1666813424d329868335c8faf8886b0f85b6c Mon Sep 17 00:00:00 2001
+From: Greg Ungerer <gerg@linux-m68k.org>
+Date: Thu, 11 Aug 2016 21:33:11 +1000
+Subject: [PATCH] arm: fix versatile platform to work in no-MMU mode

-Originally made by Waldemar Brodkorb <wbx@openadk.org> from LKML.
+If CONFIG_MMU is disabled then do not carry out the virtual memory address
+translation for IO devices.

-Signed-Off-by: Waldemar Brodkorb <wbx@openadk.org>
-[Gerome: reformated as a Git patch]
-Signed-off-by: Gerome Burlats <gerome.burlats@smile.fr>
-[Romain: fix Waldemar's authorship in Git patch]
-Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
- arch/arm/Kconfig                       | 11 +++++++++++
- arch/arm/Kconfig.debug                 |  3 ++-
- arch/arm/include/asm/mach/map.h        |  1 +
- arch/arm/mach-versatile/Kconfig        |  5 +++--
- arch/arm/mach-versatile/Makefile.boot  |  3 +++
- arch/arm/mach-versatile/versatile_dt.c |  4 ++++
- 6 files changed, 24 insertions(+), 3 deletions(-)
- create mode 100644 arch/arm/mach-versatile/Makefile.boot
+With this fix in place we can run the ARM Versatile board (including its
+qemu emulation) as a no-MMU Linux system.

-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index e8cd55a5b04c..fc2dbff70394 100644
--- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -353,6 +353,17 @@ config ARM_SINGLE_ARMV7M
- 	select SPARSE_IRQ
- 	select USE_OF
+Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+
+diff -Nur linux-4.4.17.orig/arch/arm/mach-versatile/include/mach/hardware.h linux-4.4.17/arch/arm/mach-versatile/include/mach/hardware.h
+--- linux-4.4.17.orig/arch/arm/mach-versatile/include/mach/hardware.h	2016-08-10 11:49:43.000000000 +0200
+++ linux-4.4.17/arch/arm/mach-versatile/include/mach/hardware.h	2016-08-25 23:19:03.691716292 +0200
+@@ -30,8 +30,12 @@
+ #define VERSATILE_PCI_VIRT_BASE		(void __iomem *)0xe8000000ul
+ #define VERSATILE_PCI_CFG_VIRT_BASE	(void __iomem *)0xe9000000ul
 
-+config ARM_SINGLE_ARCH_VERSATILE
-+	bool "ARM Ltd. Versatile family"
-+	depends on !MMU
-+	select AUTO_ZRELADDR
-+	select CLKSRC_OF
-+	select COMMON_CLK
-+	select GENERIC_CLOCKEVENTS
-+	select GPIOLIB
-+	select SPARSE_IRQ
-+	select USE_OF
-+
- config ARCH_EBSA110
- 	bool "EBSA-110"
- 	select ARCH_USES_GETTIMEOFFSET
-diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
-index f6fcb8a79889..92fc637d3db8 100644
--- a/arch/arm/Kconfig.debug
-+++ b/arch/arm/Kconfig.debug
-@@ -1843,7 +1843,8 @@ config DEBUG_UNCOMPRESS
- config UNCOMPRESS_INCLUDE
- 	string
- 	default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \
-					PLAT_SAMSUNG || ARM_SINGLE_ARMV7M
-+					PLAT_SAMSUNG || ARM_SINGLE_ARMV7M || \
-+					ARM_SINGLE_ARCH_VERSATILE
- 	default "mach/uncompress.h"
- 
- config EARLY_PRINTK
-diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
-index 9b7c328fb207..b1fe9c8b5c3e 100644
--- a/arch/arm/include/asm/mach/map.h
-+++ b/arch/arm/include/asm/mach/map.h
-@@ -62,6 +62,7 @@ extern int ioremap_page(unsigned long virt, unsigned long phys,
- #else
- #define iotable_init(map,num)	do { } while (0)
- #define vm_reserve_area_early(a,s,c)	do { } while (0)
-+#define debug_ll_io_init()	do { } while (0)
- #endif
- 
- #endif
-diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig
-index f5c275434d6c..06ad999d5978 100644
--- a/arch/arm/mach-versatile/Kconfig
-+++ b/arch/arm/mach-versatile/Kconfig
-@@ -1,7 +1,8 @@
- # SPDX-License-Identifier: GPL-2.0
- config ARCH_VERSATILE
-	bool "ARM Ltd. Versatile family"
-	depends on ARCH_MULTI_V5
-+	bool "ARM Ltd. Versatile family" if ARCH_MULTI_V5
-+	depends on ARCH_MULTI_V5 || ARM_SINGLE_ARCH_VERSATILE
-+	default y if ARM_SINGLE_ARCH_VERSATILE
- 	select ARM_AMBA
- 	select ARM_TIMER_SP804
- 	select ARM_VIC
-diff --git a/arch/arm/mach-versatile/Makefile.boot b/arch/arm/mach-versatile/Makefile.boot
-new file mode 100644
-index 000000000000..eacfc3f5c33e
--- /dev/null
-+++ b/arch/arm/mach-versatile/Makefile.boot
-@@ -0,0 +1,3 @@
-+# Empty file waiting for deletion once Makefile.boot isn't needed any more.
-+# Patch waits for application at
-+# http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 .
-diff --git a/arch/arm/mach-versatile/versatile_dt.c b/arch/arm/mach-versatile/versatile_dt.c
-index 3c8d39c12909..8cfa05a37295 100644
--- a/arch/arm/mach-versatile/versatile_dt.c
-+++ b/arch/arm/mach-versatile/versatile_dt.c
-@@ -37,7 +37,11 @@
- #include <asm/mach/map.h>
- 
- /* macro to get at MMIO space when running virtually */
 +#ifdef CONFIG_MMU
+ /* macro to get at MMIO space when running virtually */
 #define IO_ADDRESS(x)		(((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000)
 +#else
 +#define IO_ADDRESS(x)		(x)
 +#endif
+ 
 #define __io_address(n)		((void __iomem __force *)IO_ADDRESS(n))
 
- /*
-- 
-2.14.5
-
--- a/board/qemu/arm-versatile/readme.txt
+++ b/board/qemu/arm-versatile/readme.txt
@@ -1,12 +1,12 @@
 Run the emulation with:

-  qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -drive file=output/images/rootfs.ext2,if=scsi,format=raw -append "rootwait root=/dev/sda console=ttyAMA0,115200" -serial stdio -net nic,model=rtl8139 -net user
+  qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -drive file=output/images/rootfs.ext2,if=scsi,format=raw -append "root=/dev/sda console=ttyAMA0,115200" -serial stdio -net nic,model=rtl8139 -net user

 Or for the noMMU emulation:

-  qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -append "console=ttyAMA0,115200" -serial stdio -net user -net nic,model=smc91c111
+  qemu-system-arm -M versatilepb -kernel output/images/zImage -append "console=ttyAMA0,115200" -serial stdio -net user -net nic,model=smc91c111

 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.

-Tested with QEMU 2.12.0
+Tested with QEMU 2.9.0
--- a/board/qemu/arm-vexpress/readme.txt
+++ b/board/qemu/arm-vexpress/readme.txt
@@ -1,6 +1,6 @@
 Run the emulation with:

-  qemu-system-arm -M vexpress-a9 -smp 1 -m 256 -kernel output/images/zImage -dtb output/images/vexpress-v2p-ca9.dtb -drive file=output/images/rootfs.ext2,if=sd,format=raw -append "console=ttyAMA0,115200 rootwait root=/dev/mmcblk0" -serial stdio -net nic,model=lan9118 -net user
+  qemu-system-arm -M vexpress-a9 -smp 1 -m 256 -kernel output/images/zImage -dtb output/images/vexpress-v2p-ca9.dtb -drive file=output/images/rootfs.ext2,if=sd,format=raw -append "console=ttyAMA0,115200 root=/dev/mmcblk0" -serial stdio -net nic,model=lan9118 -net user

 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
@@ -8,4 +8,4 @@ graphical window is the framebuffer.
 If you want to emulate more cores change "-smp 1" to "-smp 2" for
 dual-core or even "smp -4" for a quad-core configuration.

-Tested with QEMU 2.12.0
+Tested with QEMU 2.9.0
--- a/board/qemu/m68k-mcf5208/linux-4.11.config
+++ b/board/qemu/m68k-mcf5208/linux-4.11.config
--- a/board/qemu/m68k-mcf5208/readme.txt
+++ b/board/qemu/m68k-mcf5208/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:

 The login prompt will appear in the terminal that started Qemu.

-Tested with QEMU 2.12.0
+Tested with QEMU 2.9.0
--- a/board/qemu/m68k-q800/linux-4.11.config
+++ b/board/qemu/m68k-q800/linux-4.11.config
--- a/board/qemu/m68k-q800/readme.txt
+++ b/board/qemu/m68k-q800/readme.txt
@@ -1,8 +1,8 @@
 Run the emulation with:

- qemu-system-m68k -M q800 -kernel output/images/vmlinux -nographic -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/sda console=ttyS0"
+ qemu-system-m68k -M q800 -kernel output/images/vmlinux -nographic -drive file=output/images/rootfs.ext2,format=raw -append "root=/dev/sda console=ttyS0"

 The login prompt will appear in the terminal that started Qemu.

-Tested with QEMU 2.11.0 from https://github.com/vivier/qemu-m68k
-You need following branch: q800-v2.11.0
+Tested with QEMU 2.4.0 from https://github.com/vivier/qemu-m68k
+You need following branch: q800-v2.4.0
--- a/Show More
+++ b/Show More