Update for 2018.11.2

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
leveldb: disable parallel build
2026-01-10 10:10:28 +03:00 · 2019-01-30 16:40:52 +01:00 · 2019-01-30 10:43:02 +01:00 · 2019-01-30 10:42:56 +01:00 · 2019-01-30 10:17:00 +01:00 · 2019-01-29 23:06:58 +01:00
2442 changed files with 20831 additions and 36868 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:
@@ -46,32 +45,28 @@ check-package:
    script:
        - make 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:
+.runtime_test: &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$/
    # 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 +79,261 @@ 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_a64_relic_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_m2_ultra_defconfig: *defconfig
+bananapi_m64_defconfig: *defconfig
+bananapro_defconfig: *defconfig
+beagleboardx15_defconfig: *defconfig
+beaglebone_defconfig: *defconfig
+beaglebone_qt5_defconfig: *defconfig
+chromebook_snow_defconfig: *defconfig
+ci20_defconfig: *defconfig
+csky_gx6605s_defconfig: *defconfig
+cubieboard2_defconfig: *defconfig
+engicam_imx6qdl_icore_defconfig: *defconfig
+engicam_imx6qdl_icore_qt5_defconfig: *defconfig
+engicam_imx6qdl_icore_rqs_defconfig: *defconfig
+engicam_imx6ul_geam_defconfig: *defconfig
+engicam_imx6ul_isiot_defconfig: *defconfig
+freescale_imx28evk_defconfig: *defconfig
+freescale_imx6dlsabreauto_defconfig: *defconfig
+freescale_imx6dlsabresd_defconfig: *defconfig
+freescale_imx6qsabreauto_defconfig: *defconfig
+freescale_imx6qsabresd_defconfig: *defconfig
+freescale_imx6sxsabresd_defconfig: *defconfig
+freescale_imx7dsabresd_defconfig: *defconfig
+freescale_imx8mqevk_defconfig: *defconfig
+freescale_p1025twr_defconfig: *defconfig
+freescale_t1040d4rdb_defconfig: *defconfig
+friendlyarm_nanopi_a64_defconfig: *defconfig
+friendlyarm_nanopi_neo2_defconfig: *defconfig
+galileo_defconfig: *defconfig
+grinn_chiliboard_defconfig: *defconfig
+grinn_liteboard_defconfig: *defconfig
+imx23evk_defconfig: *defconfig
+imx6-sabreauto_defconfig: *defconfig
+imx6-sabresd_defconfig: *defconfig
+imx6-sabresd_qt5_defconfig: *defconfig
+imx6slevk_defconfig: *defconfig
+imx6sx-sdb_defconfig: *defconfig
+imx6ulevk_defconfig: *defconfig
+imx6ulpico_defconfig: *defconfig
+imx7d-sdb_defconfig: *defconfig
+imx7dpico_defconfig: *defconfig
+lego_ev3_defconfig: *defconfig
+linksprite_pcduino_defconfig: *defconfig
+minnowboard_max-graphical_defconfig: *defconfig
+minnowboard_max_defconfig: *defconfig
+mx25pdk_defconfig: *defconfig
+mx51evk_defconfig: *defconfig
+mx53loco_defconfig: *defconfig
+mx6cubox_defconfig: *defconfig
+mx6sx_udoo_neo_defconfig: *defconfig
+mx6udoo_defconfig: *defconfig
+nanopi_m1_defconfig: *defconfig
+nanopi_m1_plus_defconfig: *defconfig
+nanopi_neo_defconfig: *defconfig
+nexbox_a95x_defconfig: *defconfig
+nitrogen6sx_defconfig: *defconfig
+nitrogen6x_defconfig: *defconfig
+nitrogen7_defconfig: *defconfig
+nitrogen8m_defconfig: *defconfig
+odroidc2_defconfig: *defconfig
+odroidxu4_defconfig: *defconfig
+olimex_a10_olinuxino_lime_defconfig: *defconfig
+olimex_a13_olinuxino_defconfig: *defconfig
+olimex_a20_olinuxino_lime2_defconfig: *defconfig
+olimex_a20_olinuxino_lime_defconfig: *defconfig
+olimex_a20_olinuxino_lime_legacy_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_riscv64_virt_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
+riotboard_defconfig: *defconfig
+roseapplepi_defconfig: *defconfig
+s6lx9_microboard_defconfig: *defconfig
+sheevaplug_defconfig: *defconfig
+snps_aarch64_vdk_defconfig: *defconfig
+snps_arc700_axs101_defconfig: *defconfig
+snps_archs38_axs103_defconfig: *defconfig
+snps_archs38_haps_defconfig: *defconfig
+snps_archs38_hsdk_defconfig: *defconfig
+snps_archs38_vdk_defconfig: *defconfig
+socrates_cyclone5_defconfig: *defconfig
+solidrun_clearfog_defconfig: *defconfig
+solidrun_macchiatobin_mainline_defconfig: *defconfig
+solidrun_macchiatobin_marvell_defconfig: *defconfig
+stm32f429_disco_defconfig: *defconfig
+stm32f469_disco_defconfig: *defconfig
+toradex_apalis_imx6_defconfig: *defconfig
+ts4800_defconfig: *defconfig
+ts4900_defconfig: *defconfig
+ts5500_defconfig: *defconfig
+ts7680_defconfig: *defconfig
+wandboard_defconfig: *defconfig
+warp7_defconfig: *defconfig
+warpboard_defconfig: *defconfig
+zynq_microzed_defconfig: *defconfig
+zynq_zc706_defconfig: *defconfig
+zynq_zed_defconfig: *defconfig
+zynq_zybo_defconfig: *defconfig
+zynqmp_zcu106_defconfig: *defconfig
+tests.boot.test_atf.TestATFAllwinner: *runtime_test
+tests.boot.test_atf.TestATFMarvell: *runtime_test
+tests.boot.test_atf.TestATFVexpress: *runtime_test
+tests.core.test_file_capabilities.TestFileCapabilities: *runtime_test
+tests.core.test_hardening.TestFortifyConserv: *runtime_test
+tests.core.test_hardening.TestFortifyNone: *runtime_test
+tests.core.test_hardening.TestRelro: *runtime_test
+tests.core.test_hardening.TestRelroPartial: *runtime_test
+tests.core.test_hardening.TestSspNone: *runtime_test
+tests.core.test_hardening.TestSspStrong: *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_f2fs.TestF2FS: *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_autobahn.TestPythonPy2Autobahn: *runtime_test
+tests.package.test_python_autobahn.TestPythonPy3Autobahn: *runtime_test
+tests.package.test_python_cryptography.TestPythonPy2Cryptography: *runtime_test
+tests.package.test_python_cryptography.TestPythonPy3Cryptography: *runtime_test
+tests.package.test_python_incremental.TestPythonPy2Incremental: *runtime_test
+tests.package.test_python_incremental.TestPythonPy3Incremental: *runtime_test
+tests.package.test_python_twisted.TestPythonPy2Twisted: *runtime_test
+tests.package.test_python_twisted.TestPythonPy3Twisted: *runtime_test
+tests.package.test_python_txaio.TestPythonPy2Txaio: *runtime_test
+tests.package.test_python_txaio.TestPythonPy3Txaio: *runtime_test
+tests.package.test_python_txtorcon.TestPythonPy2Txtorcon: *runtime_test
+tests.package.test_python_txtorcon.TestPythonPy3Txtorcon: *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:
@@ -46,32 +45,28 @@ check-package:
    script:
        - make 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:
+.runtime_test: &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$/
    # 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/502
+++ b/502
@@ -1,417 +1,3 @@
-2019.02.5, Released September 2nd, 2019
-
-	Important / security related fixes.
-
-	Filesystems: Pass extra pax options to tar for binary
-	reproducibility.
-
-	Updated/fixed packages: apache, arm-trusted-firmware,
-	asterisk, atk, autofs, batctl, batman-adv, berkeleydb, brotli,
-	busybox, bzip2, clamav, cloop, cmake, collectd, connman-gtk,
-	cryptopp, dahdi-linux, dahdi-tools, daq, dehydrated, dovecot,
-	dovecot-pigeonhole,, elfutils, evtest, exim, expect, giflib,
-	git, glib-networking, glibc, gnupg2, gnutls, go,
-	gst1-rtsp-server, gtkperf, gupnp-tools, gvfs, imagemagick,
-	imx-uuc, intel-microcode, json-glib, lftp, libbsd, libcurl,
-	libgit2, libgtk3, libmodplug, libnss, libpri, libshout,
-	libss7, libssh2, libvips, libxcb, linux-headers, mdadm,
-	mesa3d, metacity, mpg123, mosquitto, musl, nginx, openblas,
-	opencv3, openldap, openvmtools, pcmanfm, php, pigpio,
-	postgresql, prboom, proftpd, proj, python, python-django,
-	python-idna, python-numpy, python-urllib3, python3, qemu, qt5,
-	qt5base, qt5enginio, quagga, rygel, squid, subversion,
-	tcpreplay, unzip, vlc, vte, webkitgtk, weston, wireless-regdb,
-	xen, xfont_font-util, xlib_libICE, xlib_libXfont,
-	xlib_libXfont2, yad, zeromq
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#11741: pigpio does not build host-pigpio
-	#11876: automount using host mount/umount
-	#11881: Build breaks with lftp package enabled and libexpat1-dev inst..
-	#11921: dahdi fails to build
-	#11961: libpri build failure
-	#12096: tcpreplay: build fails if libdumbnet-dev is installed in the..
-	#12106: daq: build fails if libdumbnet-dev is installed in the host
-	#12126: vc4 has neon as hard dependency
-
-2019.02.4, Released July 10th, 2019
-
-	Important / security related fixes.
-
-	arch: x86: Fix typo breaking 'core-avx2' variant, add Westmere
-	variant.
-
-	linux: Workaround -Werror related build failure on powerpc,
-	by forcing CONFIG_PPC_DISABLE_WERROR on.
-
-	support/testing: Emulate a machine with 256MB RAM to fix
-	issues with certain tests running out of memory.
-
-	test-pkg: Correct long option handling and clean output dir
-	after a successful build to save disk space.
-
-	Ensure custom <pkg>_OVERRIDE_SRCDIR_RSYNC_EXCLUSIONS are
-	passed before the standard exclusions so they are not ignored
-	by rsync when using override-srcdir.
-
-	Defconfigs: QEMU: use 'rootwait' kernel option to ensure root
-	partition is available before mounting.
-
-	Updated/fixed packages: barebox, bzip2, davfs2, dbus, dialog,
-	docker-cli, docker-engine, expat, faad2, ffmpeg, freeswitch,
-	gerbera, haveged, irssi, libcdadio, libgit2, libglib2,
-	libsecret, libvncserver, lmbench, logrotate, mariadb, meson,
-	mongoose, monit, mpd, openblas, php, postgresql, psplash,
-	python, python-django, python3, qt5base, samba4, taglib,
-	tvheadend, vlc, webkitgtk, xserver_xorg-server, znc
-
-2019.02.3, Released June 7th, 2019
-
-	Important / security related fixes.
-
-	Infra: pkg-config: Use a dedicated timestamp file rather than
-	.config as that gets touched by linux-4.19+, causing repeated
-	builds.
-
-	check-bin-arch: Also ignore /usr/lib/grub to support merged
-	/usr setups, similar to how /lib/grub is ignored.
-
-	gnuconfig/config.sub: Add C-SKY architecture support.
-
-	Updated/fixed packages: assimp, atftp, atop, botan, busybox,
-	ca-certificates, chocolate-doom, cjson, coreutils, cracklib,
-	ddrescue, dhcp, docker-cli, docker-containerd, docker-engine,
-	dosfstools, dovecot, dovecot-pigeonhole, dropbear, exim,
-	ffmpeg, flare-engine, gcc, gdb, gerbera, glibmm, go, gpsd,
-	gst-ffmpeg, gst1-plugins-bad, gst1-plugins-base, imagemagick,
-	intel-microcode, jasper, kf5-kcoreaddons, kismet, libcurl,
-	libglib2, libnss, libopenssl, libsigrok, libssh2, libupnp18,
-	linuxptp, luajit, lynx, matchbox-panel, mender,
-	netcat-openbsd, netsurf, nfs-utils, opus, orc, owfs,
-	pcsc-lite, php, popt, postgresql, python, python-cython,
-	python-django, python-ply, qt5enginio, rpm, runc, samba4,
-	sqlite, subversion, supertux, systemd, tslib, uclibc,
-	v4l2loopback, webkitgtk, woff2
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#11816: Only selected coreutils binaries are installed
-	#11841: grub-efi.cfg not used when building EFI disk image
-	#11911: systemd v240 memory leak in systemd-journald
-
-2019.02.2, Released April 29th, 2019
-
-	Important / security related fixes.
-
-	Only build host-lzip / host-xz when really needed by packages,
-	not just when not available on the build host.
-
-	fs: Set FAKEROOTDONTTRYCHOWN environment variable to not
-	forward {f,l,}chown calls to libc when running under fakeroot
-	to fix issues when building in restricted environments
-	(E.G. user namespace with bubblewrap).
-
-	Linux: Also build default make target to ensure extra files
-	like the gdb scripts enabled by CONFIG_GDB_SCRIPTS are also
-	built. Notice: This may mean that extra host utilities like
-	uboot-mkimage are needed.
-
-	Defconfigs: ASUS tinker and Amarula vyasa rk3822: Support
-	larger kernel images, Atmel SAM5D27, SAM5D2,3,4 xplained:
-	Increase rootfs size to fit utilities, Raspberry Pi 64bit:
-	Include overlays in sdcard image
-
-	Updated/fixed packages: android-tools, apache, bind, binutils,
-	busybox, civetweb, cjson, copas, davfs2, docker-cli,
-	docker-containerd, docker-engine, dovecot, dovecot-pigeonhole,
-	freerdp, gerbera, ghostscript, git, gnutls, go, gst-omx,
-	gst1-plugins-base, gst1-plugins-ugly, haproxy, hostapd,
-	ipsec-tools, libfreefare, libfuse, libkrb5, libpng, libxml2,
-	libxslt, linknx, linux, linux-firmware, linux-tools, live555,
-	lldp, lrzsz, lynx, madplay, make, minicom, mongodb, msmtp,
-	musl, mutt, neon, netsnmp, numactl, opus, perl, php,
-	postgresql, pure-ftpd, python-urllib3, python3, qt5base,
-	rapidxml, rpm, rsyslog, ruby, runc, samba4, sane-backends,
-	softether, stunnel, sysklogd, syslinux, syslog-ng,
-	systemd-bootchart, thttpd, thrift, tiff, tor, tpm2-tools,
-	tpm2-tss, webkitgtk, yaffs2utils, wget, wpa_supplicant, wsapi,
-	xapp_xfd, xapp_xload, xlib_libXpm, xserver_xorg-server, xz,
-	znc
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#11756: package/syslinux: MBR's don't fit because of binutils..
-	#11761: Building custom kernel 5.1-rc3 or later breaks on objtool
-
-2019.02.1, Released March 29th, 2019
-
-	Important / security related fixes.
-
-	pkg-generic: Only tweak .la files needing it to ensure they
-	are not included in subsequent package file lists.
-
-	test-pkg: Generate a basic package config if none is
-	specified.
-
-	Updated/fixed packages: asterisk, avahi, bash, beecrypt,
-	binutils, busybox, clamav, cups, efl, eigen, fetchmail, file,
-	flashrom, fltk, gerbera, git, glibc, gnuradio, go,
-	gst-plugins-bad, intel-gmmlib, jq, kexec, kf5-modemmanager-qt,
-	leveldb, libcurl, libdrm, libftdi1, libglib2, libiio, libpcap,
-	libseccomp, libssh2, log4cplus, lvm2, mariadb, mender,
-	mongodb, mosquitto, musl, nodejs, ntp, openjpeg, owfs, php,
-	pure-ftpd, putty, python-aiojobs, qt5webkit, rdesktop, samba4,
-	sunxi-tools, supertux, swupdate, tpm2-abrmd, tpm2-tss,
-	wavemon, wireshark, vsftpd, xapp_xdm, xen,
-	xdriver_xf86-video-fbdev, xlib_libXdmcp
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#11716: Typo on website, saying latest release is 2018.2.11
-
-2019.02, released March 4th, 2019
-
-	Minor fixes.
-
-	Libressl support added for Qt 5.6 as a replacement for
-	openssl, as 5.6 is not compatible with openssl 1.1.x.
-
-	Updated/fixed packages: cutelyst, devmem2, gqrx,
-	gst-plugins-bad, libraw, libsoxr, qt5base, runc, systemd, tor
-
-2019.02-rc3, released March 1st, 2019
-
-	Fixes all over the tree.
-
-	Openssl support dropped from Qt 5.6, as it isn't compatible
-	with openssl 1.1.x.
-
-	Toolchain: GCC 8.x updated to 8.3.0, fixing a number of
-	issues.
-
-	Dependencies: Require CMake 3.8 or newer to fix compilation
-	issue with certain packages. If not available, host-cmake will
-	instead be built.
-
-	Printvars: Fix performance regression since 2018.02
-
-	Scanypi: Correctly handle underscores in python package names.
-
-	Updated/fixed packages: botan, clamav, cryptopp, i2pd,
-	ibrcommon, iproute2, libcpprestsdk, libssh, lua-curl,
-	luaexpat, qt5base, runc, stress-ng, syslinux, systemd,
-	upmpdcli, zbar
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#9966: util-linux-2.30/.stamp_built' failed
-	#11696: possible typo in board/pc/post-build.sh
-
-2019.02-rc2, released February 23th, 2019
-
-	Fixes all over the tree.
-
-	Removed zynq_zybo defconfig, as it hasn't seen any update
-	since it was added in 2016, and uses a U-Boot version not
-	compatible with openssl-1.1.x.
-
-	Linux: Ignore user supplied downloadable hashes, as no hash
-	checksums are available for those.
-
-	Updated/fixed packages: bind, cryptopp, docker-containerd,
-	dtc, efivar, gdb, imagemagick, ipmiutil, libcpprestsdk,
-	libcurl, libgpiod, libid3tag, libv4l, log4cplus, luvi,
-	madplay, mender, mosquitto, poco, postgresql, proftpd,
-	pulseaudio, python-django, qemu, qt5base, qwt, rabbitmq-c,
-	reaver, safeclip, stress-ng, swupdate, syslog-ng, systemd,
-	tor, unzip, xenomai
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#11501: compile sdl2 with enable wayland
-	#11681: .. unable to initialize decompress status for section..
-
-2019.02-rc1, released February 13th, 2019
-
-	Fixes all over the tree and new features.
-
-
-	Dependencies:
-
-	Require Python >= 2.7 as it is needed for E.G. building
-	libglib2.
-
-	Ensure GNU gzip is used for reproducible tarballs (instead of
-	pigz)
-
-
-	Infrastucture:
-
-	Ensure the PLATFORM and OS environment variables are not set,
-	as they cause build issues for some packages.
-
-	The package list infrastructure now correctly handles packages
-	installing files with old mtime.
-
-	Add a config option to force all optional host utilities to be
-	built, even if suitable versions are available on the build
-	machine.
-
-	graph-build-time: Also show time spent downloading
-
-	Download: fixes for SSH/SCP support
-
-	Ensure user provided permissions override permissions from
-	packages.
-
-	SDK: Fix handling of relative symlinks (targets starting with
-	'.' or '..')
-
-	BR2_SYSTEM_DEFAULT_PATH setting to customize the default path
-	for processes.
-
-	The custom skeleton logic will now populate the needed /bin,
-	/lib, /sbin directories/symlinks if not present. Merged /usr
-	can now be used with a custom skeleton.
-
-	Rootfs overlays can now override symbolic links from
-	packages. This was disabled to ensure the correct symbolic
-	links are present when merged /usr is used. Instead validate
-	that the rootfs overlays do not include invalid /bin, /sbin
-	and /lib entries.
-
-	The waf infrastructure now support the <pkg>_SUBDIR variable,
-	similar to the other package types.
-
-	cmake: Also set CMAKE_SYSTEM_VERSION in toolchainfile.cmake
-
-	Various improvements to the meson infrastructure.
-
-	Luarocks: A Buildroot addon has been added to automate
-	creating a Buildroot package from luarocks, similar to
-	scancpan and scanpypi.
-
-	scanpypi: protect against zip-slip vulnerability in zip/tar
-	handling
-
-	check-package: fix Python 3 support
-
-	get-developers: Fix behaviour when called from elsewhere than
-	the toplevel directory.
-
-	pkg-stats: Show latest upstream version of each package, based
-	on data from release-monitoring.org
-
-	kconfig: Fix for make linux-menuconfig / uboot-menuconfig from
-	a clean tree when ccache is enabled.
-
-	Default to sha256 password encoding, drop md5 support.
-
-
-	Architecture:
-
-	Support for RISC-V 32bit architecture, ARM A55, 75 and Saphira
-	variants, MIPS support for mips32r3, mips64r3 and Marvell
-	Octeon II/III variants.
-
-
-	Toolchain:
-
-	ARC toolchain 2018.09, ARM 8.2-2018.11, Codescape IMG/MTI MIPS
-	2018.09-02, MUSL 1.1.21, GCC 6.5.0 / 7.4.0, GDB 8.2.1
-
-
-	Packages:
-
-	openssl: Bump to 1.1.1x series, bringing TLSv1.3 support and
-	long term support.
-
-	fftw: Split into fftw-{single,double,long-double,quad}
-	packages for the different data precision options.
-
-	libcurl: Now has explicit TLS backend selection options.
-
-	linux: Support building device tree blobs with the -@ option
-	for device tree overlays.
-
-	weston: The weston-imx i.MX variant is now used when
-	imx-gpu-viv is enabled
-
-	pkgconf: Update to 1.5.3, which brings support for
-	--define-prefix (used by GStreamer)
-
-	Add host-python3-setuptools package to handle host python
-	packages needing python3 with setuptools support.
-
-
-	New defconfigs: Aarch64 EFI, Orangepi one plus, Orangepi lite
-	2, QEMU RISC-V 32bit virt, Rock64
-
-
-	New packages: brcm-patchram-plus, clinfo, cunit, docker-cli,
-	erlang-p1-eimp, exempi, fail2ban, fftw-double,
-	fftw-double-long, fftw-quad, fftw-single, gerbera, grpc,
-	gst1-shark, intel-gmmlib, iwd, kf5-kcoreaddons, libeastl,
-	libpackagekite, libtorrent-rasterbar, lua-std-debug,
-	lua-std-normalize, mini-snmpd, netsurf, pamtester, pcm-tools,
-	python-aiodns, python-aiohttp, python-aiohttp-jinja2,
-	python-aiohttp-remotes, python-aiohttp-security,
-	python-aiohttp-session, python-aiohttpd-sse, python-aiojobs,
-	python-cchardet, python-pycares, python-sentry-sdk,
-	python-wtforms, python3-setuptools, rcw, rtc-tools, shim,
-	utp_com, vmtouch, websocketpp
-
-	Removed packages: fftw, lua 5.2.x, luacrypto, perl-time-hires,
-	python-pyqt, qt, qtuio, tn5250
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#10851: Patch to handle numpad Enter key properly
-	#11066: x11r7 X11 S40xorg leads to a black screen on QEMU x86..
-	#11126: Bash Shell Programming using Buildroot
-	#11426: pps-tools bash dependency
-	#11476: stdio2.h error invalid use of __builtin_va_arg_pack
-	#11536: dt-utils building fails with glibc 2.28
-	#11546: open-vm-tools with glibc 2.28
-	#11566: Fix init script
-	#11576: Unable to start apache with event MPM on raspberry pi 3
-	#11591: [pkgconf 1.5.3] xserver OpenGL support is missing
-	#11606: libjpeg has no Config.in
-	#11616: 2018.02.09 fails to build libzlib with full RELRO..
-	#11656: Custom device tree and u-boot boot.scr not integrated..
-	#11666: Touchscreen with (Py)Qt5 should use tslib instead of evdev
-
-2018.11.3, Released February 23th, 2019
-
-	Important / security related fixes.
-
-	Ensure the PLATFORM and OS environment variables are not set,
-	as they cause build issues for some packages.
-
-	The package list infrastructure now correctly handles packages
-	installing files with old mtime.
-
-	Linux: Skip hash checks for user supplied downloadable
-	patches, as no hash checksums are available for those.
-
-	scanpypi: protect against zip-slip vulnerability in zip/tar
-	handling
-
-	Download: fixes for SSH/SCP support
-
-	SDK: Fix handling of relative symlinks (targets starting with
-	'.' or '..')
-
-	Updated/fixed packages: bind, dhcpcd, docker-compose,
-	docker-containerd, docker-engine, dovecot, dovecot-pigeonhole,
-	dtc, efivar, ghostscript, gnuradio, imagemagick, jpeg-turbo,
-	libarchive, libb64, libcurl, libgeotiff, libgpiod, libid3tag,
-	libupnp18, log4cplus, madplay, meson, mosquitto, openssh, php,
-	poco, postgresql, proftpd, pulseaudio, python, python-django,
-	python3, qt5base, reaver, runc, sg3_utils, sqlcipher,
-	swupdate, systemd, unzip, webkitgtk, xenomai
-
 2018.11.2, Released January 30th, 2019

 	Important / security related fixes.
@@ -635,26 +221,6 @@
 	#11451: Can't find libmpfr.so.4 when using external toolchain on ubuntu..
 	#11481: Docs: Is external.desc required?

-2018.08.4, Released December 20th, 2018
-
-	Important / security related fixes.
-
-	Defconfigs: Fixes for ci20, orangepi zero plus 2
-
-	Download wrapper: Fix for urlencode handling
-
-	Updated/fixed packages: c-ares, dante, docker-compose,
-	domoticz, freetype, ghostscript, gnutls, libcurl, libgpgme,
-	libid3tag, libiscsi, libmpd, libopenssl, liboping, libpjsip,
-	linux-firmware, liquid-dsp, luvi, lynx, msgpack, nginx,
-	nodejs, php, popt, pps-tools, prosody, python-numpy,
-	python-requests, samba4, sdl2_net, squashfs, swupdate,
-	systemd, uclibc, vte, webkitgtk, wine, xfsprogs
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#11426: pps-tools bash dependency
-
 2018.08.3, Released November 26th, 2018

 	Important / security related fixes.
@@ -1193,74 +759,6 @@
 	#10961: Grub2 fails to build for x86_64 when BR2_SSP_ALL is
 		enabled

-2018.02.11, Released February 23th, 2019
-
-	Important / security related fixes.
-
-	Ensure the PLATFORM and OS environment variables are not set,
-	as they cause build issues for some packages.
-
-	The package list infrastructure now correctly handles packages
-	installing files with old mtime.
-
-	Linux: Skip hash checks for user supplied downloadable
-	patches, as no hash checksums are available for those.
-
-	scanpypi: protect against zip-slip vulnerability in zip/tar
-	handling
-
-	Updated/fixed packages: bind, dhcpcd, dovecot, ghostscript,
-	gnuradio, imagemagick, jpeg-turbo, libarchive, libb64,
-	libcurl, libid3tag, madplay, mosquitto, openssh, php,
-	postgresql, proftpd, python, python-django, python3, qt5base,
-	sqlcipher, swupdate, systemd, unzip, webkitgtk
-
-2018.02.10, Released January 31th, 2019
-
-	Important / security related fixes.
-
-	Defconfigs: Fixes for Lego EV3, QEMU AArch64-virt
-
-	check-package: fix Python 3 support
-
-	get-developers: Fix behaviour when called from elsewhere than
-	the toplevel directory.
-
-	cmake: Also set CMAKE_SYSTEM_VERSION in toolchainfile.cmake
-
-	Updated/fixed packages: acpica, apache, apr, asterisk,
-	avrdude, cargo, cc-tool, dash, dhcpdump, dmalloc, gnuchess,
-	gnupg2, leveldb, libarchive, libassuan, libftdi1,
-	libgpg-error, libhttpparser, libmad, libsndfile, libsquish,
-	liburiparser, libwebsock, libxml2, lighttpd, lm-sensors,
-	lua-msgpack-native, mbedtls, mosquitto, netatalk, nodejs,
-	openssh, pango, patchelf, php, python-django, python-pyyaml,
-	rauc, rp-pppoe, s6-networking, samba4, sdl_sound,
-	shairport-sync, sqlite, subversion, sunxi-cedarx, tcpreplay,
-	tekui, usb_modeswitch, webkitgtk, wireshark, wolfssl,
-	xapp_rgb, xenomai, xerces
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#11576: Unable to start apache with event MPM on raspberry pi 3
-
-2018.02.9, Released December 20th, 2018
-
-	Important / security related fixes.
-
-	defconfigs: Fixes for ci20
-
-	Updated/fixed packages: c-ares, dante, freetype, ghostscript,
-	glibc, gnutls, go, libcurl, libgpgme, libid3tag, libiscsi,
-	libmpd, libopenssl, libpjsip, linux, liquid-dsp, luvi, lynx,
-	msgpack, nginx, nodejs, php, popt, pps-tools, python-numpy,
-	python-requests, samba4, sdl2_net, squashfs, swupdate, uclibc,
-	wine, webkitgtk, xfsprogs
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#11426: pps-tools bash dependency
-
 2018.02.8, Released November 26th, 2018

 	Important / security related fixes.
--- a/Config.in
+++ b/Config.in
@@ -136,6 +136,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 +681,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
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -143,145 +143,6 @@ 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
@@ -377,34 +238,6 @@ config BR2_PACKAGE_LIBNFTNL_XML
 	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"

--- a/132
+++ b/132
@@ -26,6 +26,9 @@
 #   infrastructure, and will be CC'ed on all patches that add or
 #   modify packages that use this infrastructure.

+N:	Abhilash Tuse <abhilash.tuse@imgtec.com>
+F:	package/gstreamer1/gst1-rtsp-server/
+
 N:	Adam Duskett <aduskett@gmail.com>
 F:	package/audit/
 F:	package/busybox/
@@ -46,11 +49,8 @@ F:	package/libressl/
 F:	package/libselinux/
 F:	package/libsemanage/
 F:	package/libsepol/
-F:	package/libwebsockets/
 F:	package/nginx-naxsi/
-F:	package/php/
 F:	package/policycoreutils/
-F:	package/python3/
 F:	package/python-flask-sqlalchemy/
 F:	package/python-mutagen/
 F:	package/python-pip/
@@ -63,7 +63,6 @@ F:	package/selinux-python/
 F:	package/semodule-utils/
 F:	package/setools/
 F:	package/sngrep/
-F:	package/systemd/

 N:	Adrian Perez de Castro <aperez@igalia.com>
 F:	package/brotli/
@@ -99,9 +98,6 @@ F:	package/openpgm/
 N:	Alexander Mukhin <alexander.i.mukhin@gmail.com>
 F:	package/hostapd/

-N:	Alexander Sverdlin <alexander.sverdlin@gmail.com>
-F:	package/mini-snmpd/
-
 N:	Alexander Varnin <fenixk19@mail.ru>
 F:	package/liblog4c-localtime/

@@ -145,9 +141,11 @@ F:	package/zstd/
 N:	Andrey Yurovsky <yurovsky@gmail.com>
 F:	package/rauc/

+N:	Andy Kennedy <andy.kennedy@adtran.com>
+F:	package/libunwind/
+
 N:	Angelo Compagnucci <angelo.compagnucci@gmail.com>
 F:	package/corkscrew/
-F:	package/fail2ban/
 F:	package/i2c-tools/
 F:	package/mender/
 F:	package/mono/
@@ -162,7 +160,6 @@ F:	package/sysdig/
 N:	Anisse Astier <anisse@astier.eu>
 F:	package/go/
 F:	package/nghttp2/
-F:	package/pkg-golang.mk

 N:	Anthony Viallard <viallard@syscom-instruments.com>
 F:	package/gnuplot/
@@ -195,7 +192,6 @@ F:	package/dehydrated/
 F:	package/freescale-imx/firmware-imx/
 F:	package/freescale-imx/imx-lib/
 F:	package/gstreamer/gst-fsl-plugins/
-F:	package/libpagekite/
 F:	package/lua-bit32/
 F:	package/owfs/
 F:	package/python-bottle/
@@ -214,6 +210,7 @@ F:	package/ti-cgt-pru/
 N:	Assaf Inbal <shmuelzon@gmail.com>
 F:	package/lbase64/
 F:	package/luabitop/
+F:	package/luacrypto/
 F:	package/luaexpatutils/
 F:	package/luaposix/
 F:	package/luasec/
@@ -261,7 +258,6 @@ F:	package/alsa-utils/
 F:	package/apache/
 F:	package/apr/
 F:	package/apr-util/
-F:	package/asterisk/
 F:	package/bcg729/
 F:	package/bluez-tools/
 F:	package/boinc/
@@ -355,6 +351,7 @@ F:	package/perl-mime-base64/
 F:	package/perl-net-dns/
 F:	package/perl-net-http/
 F:	package/perl-netaddr-ip/
+F:	package/perl-time-hires/
 F:	package/perl-timedate/
 F:	package/perl-uri/
 F:	package/perl-www-robotrules/
@@ -406,25 +403,23 @@ N:	Bogdan Radulescu <bogdan@nimblex.net>
 F:	package/iftop/
 F:	package/ncdu/

-N:	Brandon Maier <brandon.maier@rockwellcollins.com>
-F:	package/vmtouch/
-
 N:	Brock Williams <brock@cottonwoodcomputer.com>
 F:	package/pdmenu/

+N:	Bryan Brinsko <bryan.brinsko@rockwellcollins.com>
+F:	package/pps-tools/
+
 N:	Carlo Caione <carlo.caione@gmail.com>
 F:	package/sunxi-boards/

-N:	Carlos Santos <unixmania@gmail.com>
+N:	Carlos Santos <casantos@datacom.com.br>
+F:	package/aer-inject/
 F:	package/busybox/
 F:	package/gtest/
 F:	package/initscripts/
-F:	package/intel-microcode/
 F:	package/libpam-radius-auth/
 F:	package/libpam-tacplus/
 F:	package/modem-manager/
-F:	package/pamtester/
-F:	package/pcm-tools/
 F:	package/perl-file-util/
 F:	package/skeleton-custom/
 F:	package/skeleton-init-common/
@@ -459,7 +454,6 @@ F:	configs/orangepi_plus_defconfig

 N:	Chris Packham <judge.packham@gmail.com>
 F:	package/eventlog/
-F:	package/gstreamer1/gst1-shark/
 F:	package/micropython/
 F:	package/micropython-lib/
 F:	package/syslog-ng/
@@ -472,13 +466,11 @@ F:	linux/linux-ext-aufs.mk
 F:	package/aufs/
 F:	package/aufs-util/
 F:	package/batman-adv/
-F:	package/docker-cli/
 F:	package/docker-containerd/
 F:	package/docker-engine/
 F:	package/docker-proxy/
 F:	package/go/
 F:	package/mosh/
-F:	package/pkg-golang.mk
 F:	package/rtl8821au/
 F:	package/runc/
 F:	package/tini/
@@ -627,6 +619,9 @@ F:	package/unscd/
 N:	Dushara Jayasinghe <nidujay@gmail.com>
 F:	package/prosody/

+N:	Ed Swierk <eswierk@skyportsystems.com>
+F:	package/xxhash/
+
 N:	Eric Le Bihan <eric.le.bihan.dev@free.fr>
 F:	docs/manual/adding-packages-meson.txt
 F:	package/adwaita-icon-theme/
@@ -658,8 +653,6 @@ F:	package/pifmrds/
 F:	package/ympd/

 N:	Erico Nunes <nunes.erico@gmail.com>
-F:	board/aarch64-efi/
-F:	configs/aarch64_efi_defconfig
 F:	package/acpica/
 F:	package/acpitool/
 F:	package/efibootmgr/
@@ -738,7 +731,6 @@ F:	package/cairo/
 F:	package/duktape/
 F:	package/expat/
 F:	package/flatbuffers/
-F:	package/gerbera/
 F:	package/gtksourceview/
 F:	package/gssdp/
 F:	package/gupnp/
@@ -785,7 +777,6 @@ F:	package/libxslt/
 F:	package/mbedtls/
 F:	package/minissdpd/
 F:	package/minizip/
-F:	package/mongodb/
 F:	package/motion/
 F:	package/mutt/
 F:	package/ncmpc/
@@ -812,9 +803,11 @@ N:	Francois Perrad <francois.perrad@gadz.org>
 F:	board/olimex/a20_olinuxino
 F:	configs/olimex_a20_olinuxino_*
 F:	package/4th/
+F:	package/botan/
 F:	package/chipmunk/
 F:	package/dado/
 F:	package/ficl/
+F:	package/gdbm/
 F:	package/libtomcrypt/
 F:	package/libtommath/
 F:	package/libump/
@@ -828,10 +821,12 @@ F:	package/lua*
 F:	package/lunit/
 F:	package/lzlib/
 F:	package/moarvm/
-F:	package/netsurf/
 F:	package/perl*
 F:	package/pkg-perl.mk
 F:	package/pkg-luarocks.mk
+F:	package/qemu/
+F:	package/sdl2_mixer/
+F:	package/sdl2_net/
 F:	package/tekui/
 F:	package/wsapi-fcgi/
 F:	package/wsapi-xavante/
@@ -850,13 +845,13 @@ F:	package/ucl/
 F:	package/upx/
 F:	package/zxing-cpp/

-N:	Gaël Portay <gael.portay@collabora.com>
+N:	Gaël Portay <gael.portay@savoirfairelinux.com>
 F:	package/qt5/qt5virtualkeyboard/
 F:	package/qt5/qt5webengine/
 F:	package/qt5/qt5webkit/
 F:	package/qt5/qt5webkit-examples/

-N:	Gary Bisson <bisson.gary@gmail.com>
+N:	Gary Bisson <gary.bisson@boundarydevices.com>
 F:	board/boundarydevices/
 F:	configs/nitrogen*
 F:	package/freescale-imx/
@@ -884,7 +879,6 @@ F:	package/webp/
 F:	package/xapian/

 N:	Giulio Benetti <giulio.benetti@micronovasrl.com>
-F:	package/minicom/
 F:	package/sunxi-mali-mainline/
 F:	package/sunxi-mali-mainline-driver/

@@ -905,7 +899,6 @@ F:	package/pigpio/
 F:	package/python-falcon/
 F:	package/python-mimeparse/
 F:	package/python-pigpio/
-F:	package/python-wtforms/

 N:	Guillaume Gardet <guillaume.gardet@oliseo.fr>
 F:	package/c-icap/
@@ -933,6 +926,7 @@ F:	package/gr-osmosdr/
 F:	package/libusbgx/
 F:	package/python-cheetah/
 F:	package/python-markdown/
+F:	package/python-pyqt/
 F:	package/python-remi/
 F:	package/python-sip/

@@ -953,9 +947,6 @@ F:	package/angularjs/
 N:	Ilias Apalodimas <apalos@gmail.com>
 F:	package/keepalived/

-N:	Ilya Averyanov <averyanovin@gmail.com>
-F:	package/exempi/
-
 N:	Ismael Luceno <ismael@iodev.co.uk>
 F:	package/axel/

@@ -967,8 +958,6 @@ F:	board/engicam/
 F:	board/friendlyarm/nanopi-a64/
 F:	board/friendlyarm/nanopi-neo2/
 F:	board/olimex/a64-olinuxino/
-F:	board/orangepi/orangepi-lite2/
-F:	board/orangepi/orangepi-one-plus
 F:	board/orangepi/orangepi-pc2/
 F:	board/orangepi/orangepi-prime/
 F:	board/orangepi/orangepi-win/
@@ -987,8 +976,6 @@ F:	configs/engicam_imx6ul_isiot_defconfig
 F:	configs/friendlyarm_nanopi_a64_defconfig
 F:	configs/friendlyarm_nanopi_neo2_defconfig
 F:	configs/olimex_a64_olinuxino_defconfig
-F:	configs/orangepi_lite2_defconfig
-F:	configs/orangepi_one_plus_defconfig
 F:	configs/orangepi_pc2_defconfig
 F:	configs/orangepi_prime_defconfig
 F:	configs/orangepi_win_defconfig
@@ -997,21 +984,8 @@ F:	configs/pine64_defconfig
 F:	configs/pine64_sopine_defconfig

 N:	James Hilliard <james.hilliard1@gmail.com>
-F:	package/lua-std-debug/
-F:	package/lua-std-normalize/
-F:	package/python-aiodns/
-F:	package/python-aiohttp/
-F:	package/python-aiohttp-jinja2/
-F:	package/python-aiohttp-remotes/
-F:	package/python-aiohttp-security/
-F:	package/python-aiohttp-session/
-F:	package/python-aiohttp-sse/
-F:	package/python-aiojobs/
-F:	package/python-aiorwlock/
 F:	package/python-async-timeout/
-F:	package/python-cchardet/
 F:	package/python-multidict/
-F:	package/python-pycares/
 F:	package/python-yarl/

 N:	James Knight <james.knight@rockwellcollins.com>
@@ -1092,7 +1066,6 @@ F:	package/python-libconfig/

 N:	Johan Oudinet <johan.oudinet@gmail.com>
 F:	package/ejabberd/
-F:	package/erlang-eimp/
 F:	package/erlang-goldrush/
 F:	package/erlang-jiffy/
 F:	package/erlang-lager/
@@ -1160,7 +1133,6 @@ F:	package/llvm/
 F:	package/python-cython/
 F:	package/python-raven/
 F:	package/python-schedule/
-F:	package/python-sentry-sdk/
 F:	package/python-websockets/
 F:	package/python-xlib/

@@ -1195,9 +1167,6 @@ F:	package/qt5/
 N:	Julien Floret <julien.floret@6wind.com>
 F:	package/lldpd/

-N:	Julien Grossholtz <julien.grossholtz@openest.io>
-F:	package/paho-mqtt-c
-
 N:	Julien Viard de Galbert <julien@vdg.name>
 F:	package/dieharder/
 F:	package/easy-rsa/
@@ -1250,15 +1219,10 @@ N:	Lionel Orry <lionel.orry@gmail.com>
 F:	package/mongrel2/

 N:	Lothar Felten <lothar.felten@gmail.com>
-F:	board/bananapi/bananapi-m2-ultra/
-F:	configs/bananapi_m2_ultra_defconfig
 F:	package/ti-sgx-demos/
 F:	package/ti-sgx-km/
 F:	package/ti-sgx-um/

-N:	Louis-Paul Cordier <lpdev@cordier.org>
-F:	package/intel-gmmlib/
-
 N:	Luca Ceresoli <luca@lucaceresoli.net>
 F:	board/olimex/a20_olinuxino/
 F:	board/zynq/
@@ -1320,6 +1284,9 @@ F:	package/luaossl/
 F:	package/rs485conf/
 F:	package/turbolua/

+N:	Marcin Nowakowski <marcin.nowakowski@imgtec.com>
+F:	package/libkcapi/
+
 N:	Marcus Folkesson <marcus.folkesson@gmail.com>
 F:	package/libostree/
 F:	package/libselinux/
@@ -1345,12 +1312,14 @@ F:	package/ratpoison/
 N:	Mark Corbin <mark.corbin@embecosm.com>
 F:	arch/arch.mk.riscv
 F:	arch/Config.in.riscv
-F:	board/qemu/riscv32-virt/
 F:	board/qemu/riscv64-virt/
 F:	boot/riscv-pk/
-F:	configs/qemu_riscv32_virt_defconfig
 F:	configs/qemu_riscv64_virt_defconfig

+N:	Markos Chandras <markos.chandras@imgtec.com>
+F:	package/harfbuzz/
+F:	package/libsecret/
+
 N:	Martin Bark <martin@barkynet.com>
 F:	board/raspberrypi/
 F:	configs/raspberrypi3_defconfig
@@ -1392,7 +1361,6 @@ F:	package/checkpolicy/
 F:	package/checksec/
 F:	package/cgroupfs-mount/
 F:	package/crda/
-F:	package/cunit/
 F:	package/devmem2/
 F:	package/dnsmasq/
 F:	package/dosfstools/
@@ -1415,7 +1383,6 @@ F:	package/kvm-unit-tests/
 F:	package/kvmtool/
 F:	package/libcsv/
 F:	package/libcurl/
-F:	package/libeastl/
 F:	package/libfcgi/
 F:	package/libopenssl/
 F:	package/libselinux/
@@ -1446,7 +1413,6 @@ F:	package/python-posix-ipc/
 F:	package/python-pypcap/
 F:	package/python-pyrex/
 F:	package/raptor/
-F:	package/rcw/
 F:	package/rng-tools/
 F:	package/rsyslog/
 F:	package/setools/
@@ -1533,8 +1499,6 @@ F:	package/python-spidev/

 N:	Michał Łyszczek <michal.lyszczek@bofc.pl>
 F:	board/altera/socrates_cyclone5/
-F:	board/pine64/rock64
-F:	configs/rock64_defconfig
 F:	configs/socrates_cyclone5_defconfig

 N:	Mike Harmony <mike.harmony@snapav.com>
@@ -1642,7 +1606,6 @@ F:	board/openblocks/a6/
 F:	board/orangepi/
 F:	board/pandaboard/
 F:	board/roseapplepi/
-F:	boot/shim/
 F:	configs/minnowboard_max-graphical_defconfig
 F:	configs/minnowboard_max_defconfig
 F:	configs/nexbox_a95x_defconfig
@@ -1697,7 +1660,6 @@ F:	package/ghostscript-fonts/
 F:	package/gstreamer1/gst1-interpipe/
 F:	package/gstreamer1/gst1-validate/
 F:	package/gstreamer1/gstreamer1-editing-services/
-F:	package/iwd/
 F:	package/libevdev/
 F:	package/log4cplus/
 F:	package/postgresql/
@@ -1736,9 +1698,6 @@ F:	package/psplash/
 F:	package/sispmctl/
 F:	package/zsh/

-N:	Philipp Richter <richterphilipp.pops@gmail.com>
-F:	package/libtorrent-rasterbar/
-
 N:	Philippe Proulx <eeppeliteloop@gmail.com>
 F:	package/lttng-babeltrace/
 F:	package/lttng-libust/
@@ -1813,9 +1772,6 @@ F:	package/subversion/
 N:	RJ Ascani <rj.ascani@gmail.com>
 F:	package/azmq/

-N:	Robert Rose <robertroyrose@gmail.com>
-F:	package/grpc/
-
 N:	Rodrigo Rebello <rprebello@gmail.com>
 F:	package/chocolate-doom/
 F:	package/irssi/
@@ -1866,7 +1822,6 @@ F:	package/python-pysnmp/
 F:	package/python-pysnmp-apps/
 F:	package/python-pysnmp-mibs/
 F:	package/python-tornado/
-F:	package/websocketpp/

 N:	Ryan Coe <bluemrp9@gmail.com>
 F:	package/inadyn/
@@ -1940,6 +1895,7 @@ F:	package/aoetools/
 F:	package/curlpp/
 F:	package/daq/
 F:	package/libgdiplus/
+F:	package/mongodb/
 F:	package/pimd/
 F:	package/snort/
 F:	package/stella/
@@ -2002,6 +1958,7 @@ F:	package/cache-calibrator/
 F:	package/gtest/
 F:	package/mtdev/
 F:	package/mtdev2tuio/
+F:	package/qtuio/

 N:	Steve Calfee <stevecalfee@gmail.com>
 F:	package/python-pymysql/
@@ -2020,6 +1977,9 @@ F:	package/tovid/
 F:	package/udftools/
 F:	package/xorriso/

+N:	Steve Thomas <scjthm@live.com>
+F:	package/isl/
+
 N:	Steven Noonan <steven@uplinklabs.net>
 F:	package/hwloc/
 F:	package/powertop/
@@ -2065,7 +2025,6 @@ F:	package/perl-net-snmp/
 F:	package/perl-net-ssh2/
 F:	package/perl-net-telnet/
 F:	package/pigz/
-F:	package/xenomai/
 F:	support/scripts/size-stats
 F:	utils/size-stats-compare
 F:	toolchain/
@@ -2118,7 +2077,6 @@ F:	package/python-serial/
 F:	package/qextserialport/
 F:	package/rpcbind/
 F:	package/rt-tests/
-F:	package/rtc-tools/
 F:	package/sam-ba/
 F:	package/scons/
 F:	package/squashfs/
@@ -2133,21 +2091,29 @@ N:	Tzu-Jung Lee <roylee17@gmail.com>
 F:	package/dropwatch/
 F:	package/tstools/

-N:	Vadim Kochan <vadim4j@gmail.com>
-F:	package/brcm-patchram-plus/
-
 N:	Valentin Korenblit <valentinkorenblit@gmail.com>
 F:	package/clang/
-F:	package/clinfo/
 F:	package/libclc/
 F:	package/llvm/

 N:	Vanya Sergeev <vsergeev@gmail.com>
 F:	package/lua-periphery/

+N:	Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+F:	arch/Config.in.mips
+F:	package/gnupg2/
+F:	package/hidapi/
+F:	package/libfm/
+F:	package/libfm-extra/
+F:	package/libksba/
+F:	package/menu-cache/
+F:	package/openblas/
+F:	package/openmpi/
+F:	package/pinentry/
+F:	package/trinity/
+
 N:	Vincent Prince <vincent.prince.fr@gmail.com>
 F:	package/nss-myhostname/
-F:	package/utp_com/

 N:	Vincent Stehlé <vincent.stehle@laposte.net>
 F:	package/i7z/
--- a/168
+++ b/168
@@ -92,9 +92,9 @@ all:
 .PHONY: all

 # Set and export the version string
-export BR2_VERSION := 2019.02.5
+export BR2_VERSION := 2018.11.2
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1567455000
+BR2_VERSION_EPOCH = 1545257000

 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)
@@ -105,6 +105,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
@@ -135,7 +151,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 +220,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,27 +246,12 @@ ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
 -include $(BR2_CONFIG)
 endif

-# Parallel execution of this Makefile is disabled because it changes
-# the packages building order, that can be a problem for two reasons:
-# - If a package has an unspecified optional dependency and that
-#   dependency is present when the package is built, it is used,
-#   otherwise it isn't (but compilation happily proceeds) so the end
-#   result will differ if the order is swapped due to parallel
-#   building.
-# - Also changing the building order can be a problem if two packages
-#   manipulate the same file in the target directory.
-#
-# Taking into account the above considerations, if you still want to execute
-# this top-level Makefile in parallel comment the ".NOTPARALLEL" line and
-# use the -j<jobs> option when building, e.g:
-#      make -j$((`getconf _NPROCESSORS_ONLN`+1))
-.NOTPARALLEL:
-
 # timezone and locale may affect build output
 ifeq ($(BR2_REPRODUCIBLE),y)
 export TZ = UTC
 export LANG = C
 export LC_ALL = C
+export GZIP = -n
 endif

 # To put more focus on warnings, be less verbose as default
@@ -418,8 +422,6 @@ unexport TERMINFO
 unexport MACHINE
 unexport O
 unexport GCC_COLORS
-unexport PLATFORM
-unexport OS

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

@@ -455,10 +457,6 @@ TAR_OPTIONS = $(call qstrip,$(BR2_TAR_OPTIONS)) -xf
 # packages compiled for the host go here
 HOST_DIR := $(call qstrip,$(BR2_HOST_DIR))

-# The target directory is common to all packages,
-# but there is one that is specific to each filesystem.
-TARGET_DIR = $(if $(ROOTFS),$(ROOTFS_$(ROOTFS)_TARGET_DIR),$(BASE_TARGET_DIR))
-
 ifneq ($(HOST_DIR),$(BASE_DIR)/host)
 HOST_DIR_SYMLINK = $(BASE_DIR)/host
 $(HOST_DIR_SYMLINK): $(BASE_DIR)
@@ -470,14 +468,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
@@ -552,16 +550,9 @@ include $(BR2_EXTERNAL_MKS)
 #
 # Only trigger the check for default builds. If the user forces building
 # a package, even if not enabled in the configuration, we want to accept
-# it. However; we also want to be able to force checking the dependencies
-# if the user so desires. Forcing a dependency check is useful in the case
-# of test-pkg, as we want to make sure during testing, that a package has
-# all the dependencies selected in the config file.
+# it.
 #
 ifeq ($(MAKECMDGOALS),)
-BR_FORCE_CHECK_DEPENDENCIES = YES
-endif
-
-ifeq ($(BR_FORCE_CHECK_DEPENDENCIES),YES)

 define CHECK_ONE_DEPENDENCY
 ifeq ($$($(2)_TYPE),target)
@@ -581,6 +572,10 @@ $(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

@@ -607,44 +602,32 @@ sdk: prepare-sdk $(BR2_TAR_HOST_DEPENDENCY)
 	$(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))
+		--transform='s#^\.#$(BR2_SDK_PREFIX)#' \
+		-C $(HOST_DIR) "."
+
+# Populating the staging with the base directories is handled by the skeleton package
+$(STAGING_DIR):
+	@mkdir -p $(STAGING_DIR)
+	@ln -snf $(STAGING_DIR) $(BASE_DIR)/staging

 RSYNC_VCS_EXCLUSIONS = \
 	--exclude .svn --exclude .git --exclude .hg --exclude .bzr \
 	--exclude CVS

-# When stripping, obey to BR2_STRIP_EXCLUDE_DIRS and
-# BR2_STRIP_EXCLUDE_FILES
-STRIP_FIND_COMMON_CMD = \
-	find $(TARGET_DIR) \
-	$(if $(call qstrip,$(BR2_STRIP_EXCLUDE_DIRS)), \
-		\( $(call finddirclauses,$(TARGET_DIR),$(call qstrip,$(BR2_STRIP_EXCLUDE_DIRS))) \) \
-		-prune -o \
-	) \
-	$(if $(call qstrip,$(BR2_STRIP_EXCLUDE_FILES)), \
-		-not \( $(call findfileclauses,$(call qstrip,$(BR2_STRIP_EXCLUDE_FILES))) \) )
-
-# Regular stripping for everything, except libpthread, ld-*.so and
-# kernel modules:
+STRIP_FIND_CMD = find $(TARGET_DIR)
+ifneq (,$(call qstrip,$(BR2_STRIP_EXCLUDE_DIRS)))
+STRIP_FIND_CMD += \( $(call finddirclauses,$(TARGET_DIR),$(call qstrip,$(BR2_STRIP_EXCLUDE_DIRS))) \) -prune -o
+endif
+STRIP_FIND_CMD += -type f \( -perm /111 -o -name '*.so*' \)
+# file exclusions:
 # - libpthread.so: a non-stripped libpthread shared library is needed for
 #   proper debugging of pthread programs using gdb.
 # - ld.so: a non-stripped dynamic linker library is needed for valgrind
 # - kernel modules (*.ko): do not function properly when stripped like normal
 #   applications and libraries. Normally kernel modules are already excluded
-#   by the executable permission check, so the explicit exclusion is only
+#   by the executable permission check above, so the explicit exclusion is only
 #   done for kernel modules with incorrect permissions.
-STRIP_FIND_CMD = \
-	$(STRIP_FIND_COMMON_CMD) \
-	-type f \( -perm /111 -o -name '*.so*' \) \
-	-not \( $(call findfileclauses,libpthread*.so* ld-*.so* *.ko) \) \
-	-print0
-
-# Special stripping (only debugging symbols) for libpthread and ld-*.so.
-STRIP_FIND_SPECIAL_LIBS_CMD = \
-	$(STRIP_FIND_COMMON_CMD) \
-	\( -name 'ld-*.so*' -o -name 'libpthread*.so*' \) \
-	-print0
+STRIP_FIND_CMD += -not \( $(call findfileclauses,libpthread*.so* ld-*.so* *.ko $(call qstrip,$(BR2_STRIP_EXCLUDE_FILES))) \) -print0

 ifeq ($(BR2_ECLIPSE_REGISTER),y)
 define TOOLCHAIN_ECLIPSE_REGISTER
@@ -727,14 +710,8 @@ $(TARGETS_ROOTFS): target-finalize
 # Avoid the rootfs name leaking down the dependency chain
 target-finalize: ROOTFS=

-host-finalize: $(HOST_DIR_SYMLINK)
-
-.PHONY: staging-finalize
-staging-finalize:
-	@ln -snf $(STAGING_DIR) $(BASE_DIR)/staging
-
 .PHONY: target-finalize
-target-finalize: $(PACKAGES) host-finalize
+target-finalize: $(PACKAGES)
 	@$(call MESSAGE,"Finalizing target directory")
 	# Check files that are touched by more than one package
 	./support/scripts/check-uniq-files -t target $(BUILD_DIR)/packages-file-list.txt
@@ -762,8 +739,19 @@ endif
 	rm -rf $(TARGET_DIR)/usr/share/gtk-doc
 	rmdir $(TARGET_DIR)/usr/share 2>/dev/null || true
 	$(STRIP_FIND_CMD) | xargs -0 $(STRIPCMD) 2>/dev/null || true
-	$(STRIP_FIND_SPECIAL_LIBS_CMD) | xargs -0 -r $(STRIPCMD) $(STRIP_STRIP_DEBUG) 2>/dev/null || true

+# See http://sourceware.org/gdb/wiki/FAQ, "GDB does not see any threads
+# besides the one in which crash occurred; or SIGTRAP kills my program when
+# I set a breakpoint"
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
+	find $(TARGET_DIR)/lib/ -type f -name 'libpthread*.so*' | \
+		xargs -r $(STRIPCMD) $(STRIP_STRIP_DEBUG)
+endif
+
+# Valgrind needs ld.so with enough information, so only strip
+# debugging symbols.
+	find $(TARGET_DIR)/lib/ -type f -name 'ld-*.so*' | \
+		xargs -r $(STRIPCMD) $(STRIP_STRIP_DEBUG)
 	test -f $(TARGET_DIR)/etc/ld.so.conf && \
 		{ echo "ERROR: we shouldn't have a /etc/ld.so.conf file"; exit 1; } || true
 	test -d $(TARGET_DIR)/etc/ld.so.conf.d && \
@@ -781,25 +769,11 @@ endif
 	@$(call MESSAGE,"Sanitizing RPATH in target tree")
 	$(TOPDIR)/support/scripts/fix-rpath target

-# For a merged /usr, ensure that /lib, /bin and /sbin and their /usr
-# counterparts are appropriately setup as symlinks ones to the others.
-ifeq ($(BR2_ROOTFS_MERGED_USR),y)
-
-	@$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \
-		$(call MESSAGE,"Sanity check in overlay $(d)"); \
-		not_merged_dirs="$$(support/scripts/check-merged-usr.sh $(d))"; \
-		test -n "$$not_merged_dirs" && { \
-			echo "ERROR: The overlay in $(d) is not" \
-				"using a merged /usr for the following directories:" \
-				$$not_merged_dirs; \
-			exit 1; \
-		} || true$(sep))
-
-endif # merged /usr
-
 	@$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \
 		$(call MESSAGE,"Copying overlay $(d)"); \
-		$(call SYSTEM_RSYNC,$(d),$(TARGET_DIR))$(sep))
+		rsync -a --ignore-times --keep-dirlinks $(RSYNC_VCS_EXCLUSIONS) \
+			--chmod=u=rwX,go=rX --exclude .empty --exclude '*~' \
+			$(d)/ $(TARGET_DIR)$(sep))

 	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \
 		$(call MESSAGE,"Executing post-build script $(s)"); \
@@ -808,9 +782,8 @@ endif # merged /usr
 	touch $(TARGET_DIR)/usr

 .PHONY: target-post-image
-target-post-image: $(TARGETS_ROOTFS) target-finalize staging-finalize
+target-post-image: $(TARGETS_ROOTFS) target-finalize
 	@rm -f $(ROOTFS_COMMON_TAR)
-	$(Q)mkdir -p $(BINARIES_DIR)
 	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \
 		$(call MESSAGE,"Executing post-image script $(s)"); \
 		$(EXTRA_ENV) $(s) $(BINARIES_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))
@@ -838,7 +811,7 @@ legal-info-prepare: $(LEGAL_INFO_DIR)
 	@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 \
@@ -986,15 +959,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

 ################################################################################
 #
@@ -1076,7 +1047,6 @@ help:
 	@echo '  defconfig              - New config with default answer to all options;'
 	@echo '                             BR2_DEFCONFIG, if set on the command line, is used as input'
 	@echo '  savedefconfig          - Save current config to BR2_DEFCONFIG (minimal config)'
-	@echo '  update-defconfig       - Same as savedefconfig'
 	@echo '  allyesconfig           - New config where all options are accepted with yes'
 	@echo '  allnoconfig            - New config where all options are answered with no'
 	@echo '  alldefconfig           - New config where all options are set to default'
@@ -1170,7 +1140,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
@@ -1185,7 +1155,9 @@ 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/' >> $@
+	set -o pipefail; ./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.arm
+++ b/arch/Config.in.arm
@@ -434,55 +434,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
@@ -828,12 +805,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
--- 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
@@ -65,35 +65,14 @@ config BR2_RISCV_ISA_CUSTOM_RVC
 	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"
+	bool
+	default y
 	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
+	default BR2_RISCV_ABI_LP64

 config BR2_RISCV_ABI_LP64
 	bool "lp64"
@@ -109,16 +88,12 @@ config BR2_RISCV_ABI_LP64D
 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
--- 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.riscv
+++ b/arch/arch.mk.riscv
@@ -5,10 +5,8 @@

 ifeq ($(BR2_riscv),y)

-ifeq ($(BR2_RISCV_64),y)
+ifeq ($(BR2_ARCH_IS_64),y)
 GCC_TARGET_ARCH := rv64i
-else
-GCC_TARGET_ARCH := rv32i
 endif

 ifeq ($(BR2_RISCV_ISA_RVM),y)
--- 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/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/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/lego/ev3/genimage.cfg
+++ b/board/lego/ev3/genimage.cfg
@@ -18,13 +18,8 @@ image flash.bin {
 		image = "u-boot.bin"
 		size = 256K
 	}
-	partition dtb {
-		image = "da850-lego-ev3.dtb"
-		size = 64K
-		offset = 0x40000
-	}
 	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/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 +1,3 @@
-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/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/post-build.sh
+++ b/board/pc/post-build.sh
@@ -4,7 +4,12 @@ set -e

 BOARD_DIR=$(dirname "$0")

-cp -f "$BOARD_DIR/grub-bios.cfg" "$TARGET_DIR/boot/grub/grub.cfg"
+# 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"
+    # Copy grub 1st stage to binaries, required for genimage
+    cp -f "$HOST_DIR/lib/grub/i387-pc/boot.img" "$BINARIES_DIR"
+fi
--- 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/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/readme.txt
+++ b/board/qemu/aarch64-virt/readme.txt
@@ -1,6 +1,6 @@
 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-a53 -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.

--- a/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch
+++ b/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch
@@ -1,30 +1,10 @@
-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
-
-Originally made by Waldemar Brodkorb <wbx@openadk.org> from LKML.
-
 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
+From LKML.

-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
+diff -Nur linux-4.15.13.orig/arch/arm/Kconfig linux-4.15.13/arch/arm/Kconfig
+--- linux-4.15.13.orig/arch/arm/Kconfig	2018-03-24 11:02:53.000000000 +0100
+++ linux-4.15.13/arch/arm/Kconfig	2018-04-01 03:47:33.415078244 +0100
+@@ -355,6 +355,17 @@
 	select SPARSE_IRQ
 	select USE_OF
 
@@ -42,11 +22,10 @@ index e8cd55a5b04c..fc2dbff70394 100644
 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
+diff -Nur linux-4.15.13.orig/arch/arm/Kconfig.debug linux-4.15.13/arch/arm/Kconfig.debug
+--- linux-4.15.13.orig/arch/arm/Kconfig.debug	2018-03-24 11:02:53.000000000 +0100
+++ linux-4.15.13/arch/arm/Kconfig.debug	2018-04-01 03:47:33.416078232 +0100
+@@ -1795,7 +1795,8 @@
 config UNCOMPRESS_INCLUDE
 	string
 	default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \
@@ -56,11 +35,10 @@ index f6fcb8a79889..92fc637d3db8 100644
 	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,
+diff -Nur linux-4.15.13.orig/arch/arm/include/asm/mach/map.h linux-4.15.13/arch/arm/include/asm/mach/map.h
+--- linux-4.15.13.orig/arch/arm/include/asm/mach/map.h	2018-03-24 11:02:53.000000000 +0100
+++ linux-4.15.13/arch/arm/include/asm/mach/map.h	2018-04-01 03:47:17.587276119 +0100
+@@ -62,6 +62,7 @@
 #else
 #define iotable_init(map,num)	do { } while (0)
 #define vm_reserve_area_early(a,s,c)	do { } while (0)
@@ -68,10 +46,9 @@ index 9b7c328fb207..b1fe9c8b5c3e 100644
 #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
+diff -Nur linux-4.15.13.orig/arch/arm/mach-versatile/Kconfig linux-4.15.13/arch/arm/mach-versatile/Kconfig
+--- linux-4.15.13.orig/arch/arm/mach-versatile/Kconfig	2018-03-24 11:02:53.000000000 +0100
+++ linux-4.15.13/arch/arm/mach-versatile/Kconfig	2018-04-01 03:47:33.417078219 +0100
@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: GPL-2.0
 config ARCH_VERSATILE
@@ -83,19 +60,16 @@ index f5c275434d6c..06ad999d5978 100644
 	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
+diff -Nur linux-4.15.13.orig/arch/arm/mach-versatile/Makefile.boot linux-4.15.13/arch/arm/mach-versatile/Makefile.boot
+--- linux-4.15.13.orig/arch/arm/mach-versatile/Makefile.boot	1970-01-01 01:00:00.000000000 +0100
+++ linux-4.15.13/arch/arm/mach-versatile/Makefile.boot	2018-04-01 03:47:25.644175394 +0100
@@ -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
+diff -Nur linux-4.15.13.orig/arch/arm/mach-versatile/versatile_dt.c linux-4.15.13/arch/arm/mach-versatile/versatile_dt.c
+--- linux-4.15.13.orig/arch/arm/mach-versatile/versatile_dt.c	2018-03-24 11:02:53.000000000 +0100
+++ linux-4.15.13/arch/arm/mach-versatile/versatile_dt.c	2018-04-01 03:47:10.913359555 +0100
@@ -37,7 +37,11 @@
 #include <asm/mach/map.h>
 
@@ -108,6 +82,3 @@ index 3c8d39c12909..8cfa05a37295 100644
 #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,6 +1,6 @@
 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:

--- 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.
--- a/board/qemu/m68k-q800/readme.txt
+++ b/board/qemu/m68k-q800/readme.txt
@@ -1,6 +1,6 @@
 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.

--- a/board/qemu/mips32r2-malta/readme.txt
+++ b/board/qemu/mips32r2-malta/readme.txt
@@ -1,6 +1,6 @@
 Run the emulation with:

- qemu-system-mips -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -net nic,model=pcnet -net user
+ qemu-system-mips -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "root=/dev/hda" -net nic,model=pcnet -net user

 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer. No keyboard support has been
--- a/board/qemu/mips32r2el-malta/readme.txt
+++ b/board/qemu/mips32r2el-malta/readme.txt
@@ -1,6 +1,6 @@
 Run the emulation with:

- qemu-system-mipsel -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -net nic,model=pcnet -net user
+ qemu-system-mipsel -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "root=/dev/hda" -net nic,model=pcnet -net user

 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer. No keyboard support has been
--- a/board/qemu/mips32r6-malta/readme.txt
+++ b/board/qemu/mips32r6-malta/readme.txt
@@ -1,6 +1,6 @@
 Run the emulation with:

-qemu-system-mips -M malta -cpu mips32r6-generic -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -nographic
+qemu-system-mips -M malta -cpu mips32r6-generic -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "root=/dev/hda" -nographic

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

--- a/board/qemu/mips32r6el-malta/readme.txt
+++ b/board/qemu/mips32r6el-malta/readme.txt
@@ -1,6 +1,6 @@
 Run the emulation with:

-qemu-system-mipsel -M malta -cpu mips32r6-generic -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -net nic,model=pcnet -net user -nographic
+qemu-system-mipsel -M malta -cpu mips32r6-generic -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "root=/dev/hda" -net nic,model=pcnet -net user -nographic

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

--- a/board/qemu/mips64-malta/readme.txt
+++ b/board/qemu/mips64-malta/readme.txt
@@ -1,6 +1,6 @@
 Run the emulation with:

- qemu-system-mips64 -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda"
+ qemu-system-mips64 -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "root=/dev/hda"

 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
--- a/board/qemu/mips64el-malta/readme.txt
+++ b/board/qemu/mips64el-malta/readme.txt
@@ -1,6 +1,6 @@
 Run the emulation with:

- qemu-system-mips64el -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda"
+ qemu-system-mips64el -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "root=/dev/hda"

 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
--- a/board/qemu/mips64r6-malta/readme.txt
+++ b/board/qemu/mips64r6-malta/readme.txt
@@ -1,6 +1,6 @@
 Run the emulation with:

- qemu-system-mips64 -M malta -cpu I6400 -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -nographic
+ qemu-system-mips64 -M malta -cpu I6400 -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "root=/dev/hda" -nographic

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

--- a/board/qemu/mips64r6el-malta/readme.txt
+++ b/board/qemu/mips64r6el-malta/readme.txt
@@ -1,6 +1,6 @@
 Run the emulation with:

- qemu-system-mips64el -M malta -cpu I6400 -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -nographic
+ qemu-system-mips64el -M malta -cpu I6400 -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "root=/dev/hda" -nographic

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

--- a/board/qemu/ppc-g3beige/readme.txt
+++ b/board/qemu/ppc-g3beige/readme.txt
@@ -1,6 +1,6 @@
 Run the emulation with:

-  qemu-system-ppc -M g3beige -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "console=ttyS0 rootwait root=/dev/hda" -serial stdio -net nic,model=rtl8139 -net user
+  qemu-system-ppc -M g3beige -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "console=ttyS0 root=/dev/hda" -serial stdio -net nic,model=rtl8139 -net user

 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
--- a/board/qemu/ppc64-e5500/readme.txt
+++ b/board/qemu/ppc64-e5500/readme.txt
@@ -1,6 +1,6 @@
 Run the emulation with:

- qemu-system-ppc64 -M ppce500 -cpu e5500 -m 256 -kernel output/images/uImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "console=ttyS0 rootwait root=/dev/vda" -serial mon:stdio -nographic
+ qemu-system-ppc64 -M ppce500 -cpu e5500 -m 256 -kernel output/images/uImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "console=ttyS0 root=/dev/vda" -serial mon:stdio -nographic

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

--- a/board/qemu/ppc64-pseries/readme.txt
+++ b/board/qemu/ppc64-pseries/readme.txt
@@ -1,6 +1,6 @@
 Run the emulation with:

- qemu-system-ppc64 -M pseries -cpu POWER7 -m 256 -kernel output/images/vmlinux -append "console=hvc0 rootwait root=/dev/sda" -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses
+ qemu-system-ppc64 -M pseries -cpu POWER7 -m 256 -kernel output/images/vmlinux -append "console=hvc0 root=/dev/sda" -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses

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

--- a/board/qemu/ppc64le-pseries/readme.txt
+++ b/board/qemu/ppc64le-pseries/readme.txt
@@ -1,6 +1,6 @@
 Run the emulation with:

-qemu-system-ppc64 -M pseries -cpu POWER8 -m 256 -kernel output/images/vmlinux -append "console=hvc0 rootwait root=/dev/sda" -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses
+qemu-system-ppc64 -M pseries -cpu POWER8 -m 256 -kernel output/images/vmlinux -append "console=hvc0 root=/dev/sda" -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses

 The login prompt will appear in the terminal window.

--- a/board/qemu/riscv32-virt/readme.txt
+++ b/board/qemu/riscv32-virt/readme.txt
@@ -1,7 +0,0 @@
-Run the emulation with:
-
-  qemu-system-riscv32 -M virt -kernel output/images/bbl -append "rootwait root=/dev/vda ro console=ttyS0" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic
-
-The login prompt will appear in the terminal that started Qemu.
-
-Tested with QEMU 2.12.1
--- a/board/qemu/riscv64-virt/linux.config
+++ b/board/qemu/riscv64-virt/linux.config
@@ -1,4 +1,4 @@
-CONFIG_ARCH_RV32I=y
+CONFIG_ARCH_RV64I=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=8
 CONFIG_PCI=y
--- a/board/qemu/riscv64-virt/readme.txt
+++ b/board/qemu/riscv64-virt/readme.txt
@@ -1,6 +1,6 @@
 Run the emulation with:

-  qemu-system-riscv64 -M virt -kernel output/images/bbl -append "rootwait root=/dev/vda ro console=ttyS0" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic
+  qemu-system-riscv64 -M virt -kernel output/images/bbl -append "root=/dev/vda ro console=ttyS0" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic

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

--- a/board/qemu/sh4-r2d/readme.txt
+++ b/board/qemu/sh4-r2d/readme.txt
@@ -1,6 +1,6 @@
 Run the emulation with:

-  qemu-system-sh4 -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "rootwait root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user
+  qemu-system-sh4 -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user

 The login prompt will appear in the terminal that started Qemu.
 The graphical window is the framebuffer.
--- a/board/qemu/sh4eb-r2d/readme.txt
+++ b/board/qemu/sh4eb-r2d/readme.txt
@@ -1,6 +1,6 @@
 Run the emulation with:

-  qemu-system-sh4eb -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "rootwait root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user
+  qemu-system-sh4eb -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append "root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user

 The login prompt will appear in the terminal that started Qemu.
 The graphical window is the framebuffer.
--- a/board/qemu/sparc-ss10/readme.txt
+++ b/board/qemu/sparc-ss10/readme.txt
@@ -1,6 +1,6 @@
 Run the emulation with:

-  qemu-system-sparc -M SS-10 -kernel output/images/zImage -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/sda console=ttyS0,115200" -serial stdio -net nic,model=lance -net user
+  qemu-system-sparc -M SS-10 -kernel output/images/zImage -drive file=output/images/rootfs.ext2,format=raw -append "root=/dev/sda console=ttyS0,115200" -serial stdio -net nic,model=lance -net user

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

--- a/board/qemu/sparc64-sun4u/readme.txt
+++ b/board/qemu/sparc64-sun4u/readme.txt
@@ -1,6 +1,6 @@
 Run the emulation with:

-  qemu-system-sparc64 -M sun4u -kernel output/images/vmlinux -append "rootwait root=/dev/sda console=ttyS0,115200" -serial stdio -drive file=output/images/rootfs.ext2,format=raw -net nic,model=e1000 -net user
+  qemu-system-sparc64 -M sun4u -kernel output/images/vmlinux -append "root=/dev/sda console=ttyS0,115200" -serial stdio -drive file=output/images/rootfs.ext2,format=raw -net nic,model=e1000 -net user

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

--- a/board/qemu/x86/readme.txt
+++ b/board/qemu/x86/readme.txt
@@ -1,6 +1,6 @@
 Run the emulation with:

-  qemu-system-i386 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda" -net nic,model=virtio -net user
+  qemu-system-i386 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "root=/dev/vda" -net nic,model=virtio -net user

 Optionally add -smp N to emulate a SMP system with N CPUs.

--- a/board/qemu/x86_64/readme.txt
+++ b/board/qemu/x86_64/readme.txt
@@ -1,6 +1,6 @@
 Run the emulation with:

-  qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda" -net nic,model=virtio -net user
+  qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "root=/dev/vda" -net nic,model=virtio -net user

 Optionally add -smp N to emulate a SMP system with N CPUs.

--- a/board/qemu/xtensa-lx60/linux-nommu.config
+++ b/board/qemu/xtensa-lx60/linux-nommu.config
@@ -6,7 +6,6 @@ CONFIG_XTENSA_VARIANT_CUSTOM_NAME="dc233c"
 # CONFIG_XTENSA_VARIANT_MMU is not set
 CONFIG_XTENSA_UNALIGNED_USER=y
 CONFIG_PREEMPT=y
-CONFIG_MEMMAP_CACHEATTR=0x2cccccc7
 CONFIG_KERNEL_LOAD_ADDRESS=0x00003000
 # CONFIG_PCI is not set
 CONFIG_XTENSA_PLATFORM_XTFPGA=y
--- a/board/raspberrypi/genimage-raspberrypi3-64.cfg
+++ b/board/raspberrypi/genimage-raspberrypi3-64.cfg
@@ -9,7 +9,6 @@ image boot.vfat {
      "rpi-firmware/config.txt",
      "rpi-firmware/fixup.dat",
      "rpi-firmware/start.elf",
-      "rpi-firmware/overlays",
      "Image"
    }
  }
--- a/board/solidrun/clearfog/readme.txt
+++ b/board/solidrun/clearfog/readme.txt
@@ -15,6 +15,13 @@ built-in microSD card slot *WILL NOT WORK*. The Internet says that you have to
 upload the first bootloader via UART. This manual does not cover these steps;
 only MicroSoMs without the eMMC are supported.

+Limitations
+===========
+
+There's no access to the SPI flash in this combination of kernel/uboot/dts.
+
+There is no support for the SFP.
+
 Build
 =====

@@ -42,7 +49,7 @@ command as root:

  dd if=output/images/sdcard.img of=/dev/<your-microsd-device> conv=fdatasync

-*** WARNING! The dd command will destroy all the card content. Use with care! ***
+*** WARNING! The script will destroy all the card content. Use with care! ***

 For details about the medium image layout, see the definition in
 board/solidrun/clearfog/genimage.cfg.
--- a/board/solidrun/macchiatobin/extlinux.conf
+++ b/board/solidrun/macchiatobin/extlinux.conf
@@ -1,4 +0,0 @@
-label Macchiatobin Linux
-  kernel /boot/Image
-  devicetree /boot/armada-8040-mcbin.dtb
-  append console=ttyS0,115200n8 root=/dev/mmcblk1p1 rootwait
--- a/board/solidrun/macchiatobin/linux-extras.config
+++ b/board/solidrun/macchiatobin/linux-extras.config
@@ -1,3 +1,3 @@
 CONFIG_MARVELL_PHY=y
 CONFIG_MARVELL_10G_PHY=y
-CONFIG_SFP=y
+CONFIG_PHY_MVEBU_CP110_COMPHY=y
--- a/board/solidrun/macchiatobin/post-build-mainline.sh
+++ b/board/solidrun/macchiatobin/post-build-mainline.sh
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-BOARD_DIR="$(dirname $0)"
-
-install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf
--- a/board/solidrun/macchiatobin/readme.txt
+++ b/board/solidrun/macchiatobin/readme.txt
@@ -15,20 +15,19 @@ How to build
 There are two build options: mainline support and vendor support.

 For the mainline BSP, we use:
- - Linux v4.19.2
- - U-Boot v2018.11
+ - Linux v4.15
+ - U-Boot v2018.01

 For the vendor BSP, we use the sources available from Marvell Github
 page at https://github.com/MarvellEmbeddedProcessors, which uses:
- - Linux v4.4.120
- - U-Boot v2018.03
+ - Linux v4.4.52
+ - U-Boot v2017.03

-At the moment mainline support for the board is a work in
-progress. Mainline kernel 4.19 enables eth2 in 1Gb (RJ45 connector J5),
-copper 10Gb interfaces, and automatic configuration of select SFP
-modules on the SFP cages. The vendor BSP enables more hardware features
-out of the box, but lacks support for SFP detection and automatic
-configuration.
+At the moment mainline support for the board is a work in progress.
+Mainline kernel 4.15 enables eth2 in 1Gb (RJ45 connector J5) and
+eth0 in 10Gb (SFP connector CON15 and RJ45 connector CON16).
+The vendor BSP enables more hardware features out of the box,
+e.g. all the network interfaces.

 To use the mainline BSP run the following commands:

@@ -74,13 +73,10 @@ Insert the micro SDcard in the MacchiatoBin board and power it up.
 The serial console is accessible at the micro-USB Type-B connector
 marked CON9. The serial line settings are 115200 8N1.

-Note: the following text only applies to the vendor BSP from
-solidrun_macchiatobin_marvell_defconfig.
-
-By default Marvell provided U-Boot will load its environment from the
-SPI flash. On the first boot SPI flash may be empty or it may contain a
-legacy environment that prevents proper boot. Then the following
-commands can be used to boot the board:
+By default U-Boot will load its environment from the SPI flash. On the
+first boot SPI flash may be empty or it may contain a legacy
+environment incompatible with up-to-date mainline U-Boot and
+kernel. Then the following commands can be used to boot the board:

 => ext4load mmc 1:1 0x01700000 /boot/uEnv-example.txt
 => env import -t 0x01700000 $filesize
--- a/board/solidrun/macchiatobin/uboot-fragment.config
+++ b/board/solidrun/macchiatobin/uboot-fragment.config
@@ -1,2 +0,0 @@
-CONFIG_ENV_IS_IN_MMC=y
-# CONFIG_ENV_IS_IN_SPI_FLASH is not set
--- a/boot/Config.in
+++ b/boot/Config.in
@@ -15,7 +15,6 @@ source "boot/mv-ddr-marvell/Config.in"
 source "boot/mxs-bootlets/Config.in"
 source "boot/riscv-pk/Config.in"
 source "boot/s500-bootloader/Config.in"
-source "boot/shim/Config.in"
 source "boot/syslinux/Config.in"
 source "boot/ts4800-mbrboot/Config.in"
 source "boot/uboot/Config.in"
--- a/boot/afboot-stm32/afboot-stm32.mk
+++ b/boot/afboot-stm32/afboot-stm32.mk
@@ -6,15 +6,13 @@

 AFBOOT_STM32_VERSION = v0.1
 AFBOOT_STM32_SITE = $(call github,mcoquelin-stm32,afboot-stm32,$(AFBOOT_STM32_VERSION))
-AFBOOT_STM32_INSTALL_IMAGES = YES
-AFBOOT_STM32_INSTALL_TARGET = NO

 define AFBOOT_STM32_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CROSS_COMPILE=$(TARGET_CROSS) all
 endef

-define AFBOOT_STM32_INSTALL_IMAGES_CMDS
-	$(INSTALL) -m 0755 -t $(BINARIES_DIR) -D $(@D)/stm32*.bin
+define AFBOOT_STM32_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 $(@D)/stm32*.bin $(BINARIES_DIR)
 endef

 $(eval $(generic-package))
--- a/boot/arm-trusted-firmware/Config.in
+++ b/boot/arm-trusted-firmware/Config.in
@@ -16,11 +16,6 @@ choice
 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
 	bool "v1.4"

-config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION
-	bool "Custom version"
-	help
-	  This option allows to use a specific official versions
-
 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL
 	bool "Custom tarball"

@@ -36,18 +31,12 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION

 endif

-config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE
-	string "ATF version"
-	depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION
-
 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION
 	string
 	default "v1.4"		if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
 	default "custom"	if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL
 	default BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION \
 				if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT
-	default BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE \
-				if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION

 if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT

--- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk
+++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
@@ -5,26 +5,21 @@
 ################################################################################

 ARM_TRUSTED_FIRMWARE_VERSION = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION))
+ARM_TRUSTED_FIRMWARE_LICENSE = BSD-3-Clause
+ARM_TRUSTED_FIRMWARE_LICENSE_FILES = license.rst

 ifeq ($(ARM_TRUSTED_FIRMWARE_VERSION),custom)
 # Handle custom ATF tarballs as specified by the configuration
 ARM_TRUSTED_FIRMWARE_TARBALL = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION))
 ARM_TRUSTED_FIRMWARE_SITE = $(patsubst %/,%,$(dir $(ARM_TRUSTED_FIRMWARE_TARBALL)))
 ARM_TRUSTED_FIRMWARE_SOURCE = $(notdir $(ARM_TRUSTED_FIRMWARE_TARBALL))
+BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE)
 else ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT),y)
 ARM_TRUSTED_FIRMWARE_SITE = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL))
 ARM_TRUSTED_FIRMWARE_SITE_METHOD = git
-else
-# Handle stable official ATF versions
-ARM_TRUSTED_FIRMWARE_SITE = $(call github,ARM-software,arm-trusted-firmware,$(ARM_TRUSTED_FIRMWARE_VERSION))
-# The licensing of custom or from-git versions is unknown.
-# This is valid only for the official v1.4.
-ARM_TRUSTED_FIRMWARE_LICENSE = BSD-3-Clause
-ARM_TRUSTED_FIRMWARE_LICENSE_FILES = license.rst
-endif
-
-ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION),y)
 BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE)
+else
+ARM_TRUSTED_FIRMWARE_SITE = $(call github,ARM-software,arm-trusted-firmware,$(ARM_TRUSTED_FIRMWARE_VERSION))
 endif

 ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES = YES
@@ -99,13 +94,6 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += RESET_TO_BL31=1
 ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-uboot-tools
 endif

-ifeq ($(BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF),y)
-define ARM_TRUSTED_FIRMWARE_BL31_UBOOT_INSTALL_ELF
-	$(INSTALL) -D -m 0644 $(ARM_TRUSTED_FIRMWARE_IMG_DIR)/bl31/bl31.elf \
-		$(BINARIES_DIR)/bl31.elf
-endef
-endif
-
 define ARM_TRUSTED_FIRMWARE_BUILD_CMDS
 	$(ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL)
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \
@@ -116,7 +104,6 @@ endef
 define ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES_CMDS
 	cp -dpf $(ARM_TRUSTED_FIRMWARE_IMG_DIR)/*.bin $(BINARIES_DIR)/
 	$(ARM_TRUSTED_FIRMWARE_BL31_UBOOT_INSTALL)
-	$(ARM_TRUSTED_FIRMWARE_BL31_UBOOT_INSTALL_ELF)
 endef

 # Configuration check
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -12,7 +12,7 @@ choice
 	  Select the specific Barebox version you want to use

 config BR2_TARGET_BAREBOX_LATEST_VERSION
-	bool "2018.12.0"
+	bool "2018.10.0"

 config BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	bool "Custom version"
@@ -40,7 +40,7 @@ endif

 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2018.12.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
+	default "2018.10.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
 	default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
--- a/boot/barebox/barebox.hash
+++ b/boot/barebox/barebox.hash
@@ -1,5 +1,5 @@
-# From https://www.barebox.org/download/barebox-2018.12.0.tar.bz2.md5
-md5 f84d7d3562055c80c3eedce0b14d4a0d barebox-2018.12.0.tar.bz2
+# http://www.barebox.org/download/barebox-2018.10.0.tar.bz2.md5
+md5 f4c89bc92903425c960aa41e997b2251 barebox-2018.10.0.tar.bz2

 # Locally calculated
-sha256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 barebox-2018.12.0.tar.bz2
+sha256 c25bfeaff7dda8862defd8d9011e7e6d23216ee4fc4e8bb5b91a1efd833a6d1c barebox-2018.10.0.tar.bz2
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -76,10 +76,6 @@ $(1)_KCONFIG_FRAGMENT_FILES = $$(call qstrip,$$(BR2_TARGET_$(1)_CONFIG_FRAGMENT_
 $(1)_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig
 $(1)_KCONFIG_OPTS = $$($(1)_MAKE_FLAGS)

-$(1)_KCONFIG_DEPENDENCIES = \
-	$(BR2_BISON_HOST_DEPENDENCY) \
-	$(BR2_FLEX_HOST_DEPENDENCY)
-
 ifeq ($$(BR2_TARGET_$(1)_BAREBOXENV),y)
 define $(1)_BUILD_BAREBOXENV_CMDS
 	$$(TARGET_CC) $$(TARGET_CFLAGS) $$(TARGET_LDFLAGS) -o $$(@D)/bareboxenv \
--- a/boot/grub2/Config.in
+++ b/boot/grub2/Config.in
@@ -2,9 +2,6 @@ config BR2_TARGET_GRUB2_ARCH_SUPPORTS
 	bool
 	default y if BR2_i386
 	default y if BR2_x86_64
-	default y if BR2_arm
-	default y if BR2_aarch64
-	depends on BR2_USE_MMU

 config BR2_TARGET_GRUB2
 	bool "grub2"
@@ -32,14 +29,12 @@ choice

 config BR2_TARGET_GRUB2_I386_PC
 	bool "i386-pc"
-	depends on BR2_i386 || BR2_x86_64
 	help
 	  Select this option if the platform you're targetting is a
 	  x86 or x86-64 legacy BIOS based platform.

 config BR2_TARGET_GRUB2_I386_EFI
 	bool "i386-efi"
-	depends on BR2_i386 || BR2_x86_64
 	help
 	  Select this option if the platform you're targetting has a
 	  32 bits EFI BIOS. Note that some x86-64 platforms use a 32
@@ -47,38 +42,14 @@ config BR2_TARGET_GRUB2_I386_EFI

 config BR2_TARGET_GRUB2_X86_64_EFI
 	bool "x86-64-efi"
-	depends on BR2_x86_64
+	depends on BR2_ARCH_IS_64
 	help
 	  Select this option if the platform you're targetting has a
 	  64 bits EFI BIOS.

-config BR2_TARGET_GRUB2_ARM_UBOOT
-	bool "arm-uboot"
-	depends on BR2_arm
-	help
-	  Select this option if the platform you're targetting is an
-	  ARM u-boot platform, and you want to boot Grub 2 as an u-boot
-	  compatible image.
-
-config BR2_TARGET_GRUB2_ARM_EFI
-	bool "arm-efi"
-	depends on BR2_arm
-	help
-	  Select this option if the platform you're targetting is an
-	  ARM platform and you want to boot Grub 2 as an EFI
-	  application.
-
-config BR2_TARGET_GRUB2_ARM64_EFI
-	bool "arm64-efi"
-	depends on BR2_aarch64
-	help
-	  Select this option if the platform you're targetting is an
-	  Aarch64 platform and you want to boot Grub 2 as an EFI
-	  application.
-
 endchoice

-if BR2_TARGET_GRUB2_I386_PC || BR2_TARGET_GRUB2_ARM_UBOOT
+if BR2_TARGET_GRUB2_I386_PC

 config BR2_TARGET_GRUB2_BOOT_PARTITION
 	string "boot partition"
@@ -89,15 +60,13 @@ config BR2_TARGET_GRUB2_BOOT_PARTITION
 	  first disk if using a legacy partition table, or 'hd0,gpt1'
 	  if using GPT partition table.

-endif # BR2_TARGET_GRUB2_I386_PC || BR2_TARGET_GRUB2_ARM_UBOOT
+endif # BR2_TARGET_GRUB2_I386_PC

 config BR2_TARGET_GRUB2_BUILTIN_MODULES
 	string "builtin modules"
 	default "boot linux ext2 fat squash4 part_msdos part_gpt normal biosdisk" if BR2_TARGET_GRUB2_I386_PC
 	default "boot linux ext2 fat squash4 part_msdos part_gpt normal efi_gop" \
-		if BR2_TARGET_GRUB2_I386_EFI || BR2_TARGET_GRUB2_X86_64_EFI || \
-		   BR2_TARGET_GRUB2_ARM_EFI  || BR2_TARGET_GRUB2_ARM64_EFI
-	default "linux ext2 fat part_msdos normal" if BR2_TARGET_GRUB2_ARM_UBOOT
+		if BR2_TARGET_GRUB2_I386_EFI || BR2_TARGET_GRUB2_X86_64_EFI

 config BR2_TARGET_GRUB2_BUILTIN_CONFIG
 	string "builtin config"
@@ -107,15 +76,6 @@ config BR2_TARGET_GRUB2_BUILTIN_CONFIG
 	  device and other configuration parameters, but however menu
 	  entries cannot be described in this embedded configuration.

-config BR2_TARGET_GRUB2_INSTALL_TOOLS
-	bool "install tools"
-	help
-	  Install support tools to interact with GNU GRUB Multiboot
-	  boot loader.
-
-	  This will also install the Grub 2 loadable modules to the
-	  target.
-
 endif # BR2_TARGET_GRUB2

 comment "grub2 needs a toolchain w/ wchar"
--- a/boot/grub2/grub2.mk
+++ b/boot/grub2/grub2.mk
@@ -9,15 +9,7 @@ GRUB2_SITE = http://ftp.gnu.org/gnu/grub
 GRUB2_SOURCE = grub-$(GRUB2_VERSION).tar.xz
 GRUB2_LICENSE = GPL-3.0+
 GRUB2_LICENSE_FILES = COPYING
-GRUB2_DEPENDENCIES = host-bison host-flex host-grub2
-HOST_GRUB2_DEPENDENCIES = host-bison host-flex
-GRUB2_INSTALL_IMAGES = YES
-
-ifeq ($(BR2_TARGET_GRUB2_INSTALL_TOOLS),y)
-GRUB2_INSTALL_TARGET = YES
-else
-GRUB2_INSTALL_TARGET = NO
-endif
+GRUB2_DEPENDENCIES = host-bison host-flex

 GRUB2_BUILTIN_MODULES = $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES))
 GRUB2_BUILTIN_CONFIG = $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_CONFIG))
@@ -44,48 +36,29 @@ GRUB2_PREFIX = /EFI/BOOT
 GRUB2_TUPLE = x86_64-efi
 GRUB2_TARGET = x86_64
 GRUB2_PLATFORM = efi
-else ifeq ($(BR2_TARGET_GRUB2_ARM_UBOOT),y)
-GRUB2_IMAGE = $(BINARIES_DIR)/boot-part/grub/grub.img
-GRUB2_CFG = $(BINARIES_DIR)/boot-part/grub/grub.cfg
-GRUB2_PREFIX = ($(GRUB2_BOOT_PARTITION))/boot/grub
-GRUB2_TUPLE = arm-uboot
-GRUB2_TARGET = arm
-GRUB2_PLATFORM = uboot
-else ifeq ($(BR2_TARGET_GRUB2_ARM_EFI),y)
-GRUB2_IMAGE = $(BINARIES_DIR)/efi-part/EFI/BOOT/bootarm.efi
-GRUB2_CFG = $(BINARIES_DIR)/efi-part/EFI/BOOT/grub.cfg
-GRUB2_PREFIX = /EFI/BOOT
-GRUB2_TUPLE = arm-efi
-GRUB2_TARGET = arm
-GRUB2_PLATFORM = efi
-else ifeq ($(BR2_TARGET_GRUB2_ARM64_EFI),y)
-GRUB2_IMAGE = $(BINARIES_DIR)/efi-part/EFI/BOOT/bootaa64.efi
-GRUB2_CFG = $(BINARIES_DIR)/efi-part/EFI/BOOT/grub.cfg
-GRUB2_PREFIX = /EFI/BOOT
-GRUB2_TUPLE = arm64-efi
-GRUB2_TARGET = aarch64
-GRUB2_PLATFORM = efi
 endif

 # Grub2 is kind of special: it considers CC, LD and so on to be the
-# tools to build the host programs and uses TARGET_CC, TARGET_CFLAGS,
-# TARGET_CPPFLAGS, TARGET_LDFLAGS to build the bootloader itself.
+# tools to build the native tools (i.e to be executed on the build
+# machine), and uses TARGET_CC, TARGET_CFLAGS, TARGET_CPPFLAGS,
+# TARGET_LDFLAGS to build the bootloader itself. However, to add to
+# the confusion, it also uses NM, OBJCOPY and STRIP to build the
+# bootloader itself; none of these are used to build the native
+# tools.
 #
 # NOTE: TARGET_STRIP is overridden by !BR2_STRIP_strip, so always
 # use the cross compile variant to ensure grub2 builds

-HOST_GRUB2_CONF_ENV = \
-	CPP="$(HOSTCC) -E"
-
 GRUB2_CONF_ENV = \
-	CPP="$(TARGET_CC) -E" \
+	$(HOST_CONFIGURE_OPTS) \
+	CPP="$(HOSTCC) -E" \
 	TARGET_CC="$(TARGET_CC)" \
 	TARGET_CFLAGS="$(TARGET_CFLAGS)" \
 	TARGET_CPPFLAGS="$(TARGET_CPPFLAGS) -fno-stack-protector" \
 	TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
-	TARGET_NM="$(TARGET_NM)" \
-	TARGET_OBJCOPY="$(TARGET_OBJCOPY)" \
-	TARGET_STRIP="$(TARGET_CROSS)strip"
+	NM="$(TARGET_NM)" \
+	OBJCOPY="$(TARGET_OBJCOPY)" \
+	STRIP="$(TARGET_CROSS)strip"

 GRUB2_CONF_OPTS = \
 	--target=$(GRUB2_TARGET) \
@@ -99,13 +72,12 @@ GRUB2_CONF_OPTS = \
 	--enable-libzfs=no \
 	--disable-werror

-HOST_GRUB2_CONF_OPTS = \
-	--disable-grub-mkfont \
-	--enable-efiemu=no \
-	ac_cv_lib_lzma_lzma_code=no \
-	--enable-device-mapper=no \
-	--enable-libzfs=no \
-	--disable-werror
+# We don't want all the native tools and Grub2 modules to be installed
+# in the target. So we in fact install everything into the host
+# directory, and the image generation process (below) will use the
+# grub-mkimage tool and Grub2 modules from the host directory.
+
+GRUB2_INSTALL_TARGET_OPTS = DESTDIR=$(HOST_DIR) install

 ifeq ($(BR2_TARGET_GRUB2_I386_PC),y)
 define GRUB2_IMAGE_INSTALL_ELTORITO
@@ -114,10 +86,10 @@ define GRUB2_IMAGE_INSTALL_ELTORITO
 endef
 endif

-define GRUB2_INSTALL_IMAGES_CMDS
+define GRUB2_IMAGE_INSTALLATION
 	mkdir -p $(dir $(GRUB2_IMAGE))
-	$(HOST_DIR)/usr/bin/grub-mkimage \
-		-d $(@D)/grub-core/ \
+	$(HOST_DIR)/bin/grub-mkimage \
+		-d $(HOST_DIR)/lib/grub/$(GRUB2_TUPLE) \
 		-O $(GRUB2_TUPLE) \
 		-o $(GRUB2_IMAGE) \
 		-p "$(GRUB2_PREFIX)" \
@@ -127,14 +99,14 @@ define GRUB2_INSTALL_IMAGES_CMDS
 	$(INSTALL) -D -m 0644 boot/grub2/grub.cfg $(GRUB2_CFG)
 	$(GRUB2_IMAGE_INSTALL_ELTORITO)
 endef
+GRUB2_POST_INSTALL_TARGET_HOOKS += GRUB2_IMAGE_INSTALLATION

 ifeq ($(GRUB2_PLATFORM),efi)
 define GRUB2_EFI_STARTUP_NSH
 	echo $(notdir $(GRUB2_IMAGE)) > \
 		$(BINARIES_DIR)/efi-part/startup.nsh
 endef
-GRUB2_POST_INSTALL_IMAGES_HOOKS += GRUB2_EFI_STARTUP_NSH
+GRUB2_POST_INSTALL_TARGET_HOOKS += GRUB2_EFI_STARTUP_NSH
 endif

 $(eval $(autotools-package))
-$(eval $(host-autotools-package))
--- a/boot/grub2/readme.txt
+++ b/boot/grub2/readme.txt
@@ -53,8 +53,8 @@ To test your BIOS image in Qemu

 qemu-system-{i386,x86-64} -hda disk.img

-Notes on using Grub2 for x86/x86_64 EFI-based platforms
-=======================================================
+Notes on using Grub2 for EFI-based platforms
+============================================

 1. Create a disk image
   dd if=/dev/zero of=disk.img bs=1M count=32
@@ -83,108 +83,16 @@ Notes on using Grub2 for x86/x86_64 EFI-based platforms
   sudo losetup -d /dev/loop0
 7. Your disk.img is ready!

-To test your i386/x86-64 EFI image in Qemu
------------------------------------------
+To test your EFI image in Qemu
+------------------------------

 1. Download the EFI BIOS for Qemu
   Version IA32 or X64 depending on the chosen Grub2
   platform (i386-efi vs. x86-64-efi)
-   https://www.kraxel.org/repos/jenkins/edk2/
-   (or use one provided by your distribution as OVMF)
+   http://sourceforge.net/projects/edk2/files/OVMF/
 2. Extract, and rename OVMF.fd to bios.bin and
   CirrusLogic5446.rom to vgabios-cirrus.bin.
 3. qemu-system-{i386,x86-64} -L ovmf-dir/ -hda disk.img
 4. Make sure to pass pci=nocrs to the kernel command line,
   to workaround a bug in the EFI BIOS regarding the
   EFI framebuffer.
-
-Notes on using Grub2 for ARM u-boot-based platforms
-===================================================
-
-The following steps show how to use the Grub2 arm-uboot platform
-support in the simplest way possible and with a single
-buildroot-generated filesystem.
-
- 1. Load qemu_arm_vexpress_defconfig
-
- 2. Enable u-boot with the vexpress_ca9x4 board name and with
-    u-boot.elf image format.
-
- 3. Enable grub2 for the arm-uboot platform.
-
- 4. Enable "Install kernel image to /boot in target" in the kernel
-    menu to populate a /boot directory with zImage in it.
-
- 5. The upstream u-boot vexpress_ca9x4 doesn't have CONFIG_API enabled
-    by default, which is required.
-
-    Before building, patch u-boot (for example, make u-boot-extract to
-    edit the source before building) file
-    include/configs/vexpress_common.h to define:
-
-    #define CONFIG_API
-    #define CONFIG_SYS_MMC_MAX_DEVICE   1
-
- 6. Create a custom grub2 config file with the following contents and
-    set its path in BR2_TARGET_GRUB2_CFG:
-
-    set default="0"
-    set timeout="5"
-
-    menuentry "Buildroot" {
-        set root='(hd0)'
-        linux /boot/zImage root=/dev/mmcblk0 console=ttyAMA0
-        devicetree /boot/vexpress-v2p-ca9.dtb
-    }
-
- 7. Create a custom builtin config file with the following contents
-    and set its path in BR2_TARGET_GRUB2_BUILTIN_CONFIG:
-
-    set root=(hd0)
-    set prefix=/boot/grub
-
- 8. Create a custom post-build script which copies files from
-    ${BINARIES_DIR}/boot-part to $(TARGET_DIR)/boot (set its path in
-    BR2_ROOTFS_POST_BUILD_SCRIPT):
-
-    #!/bin/sh
-    cp -r ${BINARIES_DIR}/boot-part/* ${TARGET_DIR}/boot/
-
- 9. make
-
-10. Run qemu with:
-
-    qemu-system-arm -M vexpress-a9 -kernel output/images/u-boot -m 1024 \
-    -nographic -sd output/images/rootfs.ext2
-
-11. In u-boot, stop at the prompt and run grub2 with:
-
-  => ext2load mmc 0:0 ${loadaddr} /boot/grub/grub.img
-  => bootm
-
-12. This should bring the grub2 menu, upon which selecting the "Buildroot"
-    entry should boot Linux.
-
-
-Notes on using Grub2 for Aarch64 EFI-based platforms
-====================================================
-
-The following steps show how to use the Grub2 arm64-efi platform,
-using qemu and EFI firmware built for qemu.
-
- 1. Load aarch64_efi_defconfig
-
- 2. make
-
- 3. Download the EFI firmware for qemu aarch64
-    https://www.kraxel.org/repos/jenkins/edk2/
-    (or use one provided by your distribution as OVMF-aarch64 or AAVMF)
-
- 4. Run qemu with:
-
-    qemu-system-aarch64 -M virt -cpu cortex-a57 -m 512 -nographic \
-    -bios <path/to/EDK2>/QEMU_EFI.fd -hda output/images/disk.img \
-    -netdev user,id=eth0 -device virtio-net-device,netdev=eth0
-
- 5. This should bring the grub2 menu, upon which selecting the
-    "Buildroot" entry should boot Linux.
--- a/boot/gummiboot/Config.in
+++ b/boot/gummiboot/Config.in
@@ -1,7 +1,6 @@
 config BR2_TARGET_GUMMIBOOT
 	bool "gummiboot"
 	depends on BR2_i386 || BR2_x86_64
-	depends on BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS
 	select BR2_PACKAGE_GNU_EFI
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
--- a/boot/shim/Config.in
+++ b/boot/shim/Config.in
@@ -1,19 +0,0 @@
-config BR2_TARGET_SHIM
-	bool "shim"
-	depends on BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS
-	# ARM32 build currently broken
-	depends on !BR2_ARM_CPU_HAS_ARM
-	select BR2_PACKAGE_GNU_EFI
-	help
-	  Boot loader to chain-load signed boot loaders under Secure
-	  Boot.
-
-	  This package provides a minimalist boot loader which allows
-	  verifying signatures of other UEFI binaries against either
-	  the Secure Boot DB/DBX or against a built-in signature
-	  database.  Its purpose is to allow a small,
-	  infrequently-changing binary to be signed by the UEFI CA,
-	  while allowing an OS distributor to revision their main
-	  bootloader independently of the CA.
-
-	  https://github.com/rhboot/shim
--- a/boot/shim/shim.hash
+++ b/boot/shim/shim.hash
@@ -1,3 +0,0 @@
-# locally computed hash
-sha256 279d19cc95b9974ea2379401a6a0653d949c3fa3d61f0c4bd6a7b9e840bdc425  shim-15.tar.gz
-sha256 15edf527919ddcb2f514ab9d16ad07ef219e4bb490e0b79560be510f0c159cc2  COPYRIGHT
--- a/boot/shim/shim.mk
+++ b/boot/shim/shim.mk
@@ -1,31 +0,0 @@
-################################################################################
-#
-# shim
-#
-################################################################################
-
-SHIM_VERSION = 15
-SHIM_SITE = $(call github,rhboot,shim,$(SHIM_VERSION))
-SHIM_LICENSE = BSD-2-Clause
-SHIM_LICENSE_FILES = COPYRIGHT
-SHIM_DEPENDENCIES = gnu-efi
-SHIM_INSTALL_TARGET = NO
-SHIM_INSTALL_IMAGES = YES
-
-SHIM_MAKE_OPTS = \
-	ARCH="$(GNU_EFI_PLATFORM)" \
-	CROSS_COMPILE="$(TARGET_CROSS)" \
-	DASHJ="-j$(PARALLEL_JOBS)" \
-	EFI_INCLUDE="$(STAGING_DIR)/usr/include/efi" \
-	EFI_PATH="$(STAGING_DIR)/usr/lib" \
-	LIBDIR="$(STAGING_DIR)/usr/lib"
-
-define SHIM_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(SHIM_MAKE_OPTS)
-endef
-
-define SHIM_INSTALL_IMAGES_CMDS
-	$(INSTALL) -m 0755 -t $(BINARIES_DIR) $(@D)/*.efi
-endef
-
-$(eval $(generic-package))
--- a/boot/syslinux/0013-Fix-build-with-gnu-efi-version-3.0.9.patch
+++ b/boot/syslinux/0013-Fix-build-with-gnu-efi-version-3.0.9.patch
@@ -1,45 +0,0 @@
-From 44a1b42e561b9a257209300e2860b901b100cc17 Mon Sep 17 00:00:00 2001
-From: Carlos Santos <casantos@datacom.com.br>
-Date: Tue, 26 Feb 2019 08:07:22 -0300
-Subject: [PATCH] Fix build with gnu-efi version 3.0.9
-
-Adapt a patch already applied upstream to prevent multiple definitions
-of 'memset' and 'memcpy'.
-
-Signed-off-by: Carlos Santos <casantos@datacom.com.br>
-(adapted from commit 363d61c4f112b972649b19d67e96b9321f738f00)
---
- mk/lib.mk | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/mk/lib.mk b/mk/lib.mk
-index ceb95bd0..c9b6eaf3 100644
--- a/mk/lib.mk
-+++ b/mk/lib.mk
-@@ -186,9 +186,9 @@ MINLIBOBJS = \
- #	$(LIBVESA_OBJS)
- 
- CORELIBOBJS = \
-	memcpy.o memset.o memcmp.o printf.o strncmp.o vfprintf.o 	\
-+	memcmp.o printf.o strncmp.o vfprintf.o				\
- 	strlen.o vsnprintf.o snprintf.o stpcpy.o strcmp.o strdup.o 	\
-	strcpy.o strncpy.o setjmp.o fopen.o fread.o fread2.o puts.o 	\
-+	strcpy.o strncpy.o fopen.o fread.o fread2.o puts.o	 	\
- 	strtoul.o strntoumax.o strcasecmp.o 				\
- 	sprintf.o strlcat.o strchr.o strlcpy.o strncasecmp.o ctypes.o 	\
- 	fputs.o fwrite2.o fwrite.o fgetc.o fclose.o lmalloc.o 		\
-@@ -203,6 +203,11 @@ CORELIBOBJS = \
- 	$(LIBENTRY_OBJS) \
- 	$(LIBMODULE_OBJS)
- 
-+ifndef EFI_BUILD
-+# For EFI, these are part of gnu-efi
-+CORELIBOBJS += setjmp.o memcpy.o memset.o
-+endif
-+
- LDFLAGS	= -m elf_$(ARCH) --hash-style=gnu -T $(com32)/lib/$(ARCH)/elf.ld
- 
- .SUFFIXES: .c .o .a .so .lo .i .S .s .ls .ss .lss
-- 
-2.14.5
-
--- a/boot/syslinux/0014-Fix-build-with-binutils-note-gnu-property-section.patch
+++ b/boot/syslinux/0014-Fix-build-with-binutils-note-gnu-property-section.patch
@@ -1,47 +0,0 @@
-From beb526ca925983c7da229043790ecd552d910650 Mon Sep 17 00:00:00 2001
-From: Christian Stewart <christian@paral.in>
-Date: Thu, 4 Apr 2019 23:24:31 -0700
-Subject: [PATCH] Fix build with binutils note gnu property section
-
-This fixes the following build error with newer binutils:
-
-  objcopy -O binary mbr.elf mbr.bin
-  perl /build/syslinux/src/syslinux/mbr/checksize.pl mbr.bin
-  mbr.bin: too big (452 > 440)
-
-Corresponding bug reports:
-
- - https://bugs.archlinux.org/task/60405
- - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=906414
-
-Strips the .note.gnu.property in the linker scripts for the MBRs.
-
-Signed-off-by: Christian Stewart <christian@paral.in>
---
- mbr/i386/mbr.ld   | 1 +
- mbr/x86_64/mbr.ld | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/mbr/i386/mbr.ld b/mbr/i386/mbr.ld
-index d14ba802..53683461 100644
--- a/mbr/i386/mbr.ld
-+++ b/mbr/i386/mbr.ld
-@@ -70,4 +70,5 @@ SECTIONS
-   .debug_typenames 0 : { *(.debug_typenames) }
-   .debug_varnames  0 : { *(.debug_varnames) }
-   /DISCARD/ : { *(.note.GNU-stack) }
-+  /DISCARD/ : { *(.note.gnu.property) }
- }
-diff --git a/mbr/x86_64/mbr.ld b/mbr/x86_64/mbr.ld
-index ae27d49a..b8c0d895 100644
--- a/mbr/x86_64/mbr.ld
-+++ b/mbr/x86_64/mbr.ld
-@@ -69,4 +69,5 @@ SECTIONS
-   .debug_typenames 0 : { *(.debug_typenames) }
-   .debug_varnames  0 : { *(.debug_varnames) }
-   /DISCARD/ : { *(.note.GNU-stack) }
-+  /DISCARD/ : { *(.note.gnu.property) }
- }
-- 
-2.21.0
-
--- a/boot/syslinux/Config.in
+++ b/boot/syslinux/Config.in
@@ -44,7 +44,6 @@ config BR2_TARGET_SYSLINUX_MBR

 config BR2_TARGET_SYSLINUX_EFI
 	bool "install efi"
-	depends on BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS
 	select BR2_PACKAGE_GNU_EFI
 	help
 	  Install the 'efi' image, to boot from an EFI environment.
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -179,19 +179,6 @@ config BR2_TARGET_UBOOT_NEEDS_ATF_BL31
 	  variable pointing to ATF's BL31 binary, is passed during the
 	  Buildroot build.

-choice
-	prompt "U-Boot ATF BL31 format"
-	default BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN
-	depends on BR2_TARGET_UBOOT_NEEDS_ATF_BL31
-
-config BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN
-	bool "bl31.bin"
-
-config BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF
-	bool "bl31.elf"
-
-endchoice
-
 menu "U-Boot binary format"

 config BR2_TARGET_UBOOT_FORMAT_AIS
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -137,12 +137,8 @@ UBOOT_MAKE_OPTS += \

 ifeq ($(BR2_TARGET_UBOOT_NEEDS_ATF_BL31),y)
 UBOOT_DEPENDENCIES += arm-trusted-firmware
-ifeq ($(BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF),y)
-UBOOT_MAKE_OPTS += BL31=$(BINARIES_DIR)/bl31.elf
-else
 UBOOT_MAKE_OPTS += BL31=$(BINARIES_DIR)/bl31.bin
 endif
-endif

 ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y)
 UBOOT_DEPENDENCIES += host-dtc
--- a/Show More
+++ b/Show More