Update for 2023.02.1

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/dnsmasq: fix CVE-2023-28450
2023-05-09 22:38:47 +02:00 · 2023-05-04 21:18:49 +02:00 · 2023-05-04 21:16:44 +02:00 · 2023-05-04 21:09:25 +02:00 · 2023-05-04 21:08:55 +02:00 · 2023-05-04 21:05:28 +02:00
5040 changed files with 47630 additions and 69295 deletions
@@ -1,37 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-indent_style = space
-indent_size = 4
-tab_width = 8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[DEVELOPERS]
-indent_style = tab
-indent_size = tab
-
-[Config*.in*]
-indent_style = tab
-indent_size = tab
-
-[linux/Config.ext.in]
-indent_style = tab
-indent_size = tab
-
-[Makefile*]
-indent_style = tab
-indent_size = tab
-
-[*.mk]
-indent_style = tab
-indent_size = tab
-
-[S{0..9}{0..9}*]
-indent_style = tab
-indent_size = tab
-
-[*.adoc]
-trim_trailing_whitespace = false
@@ -10,11 +10,6 @@ stages:
 generate-gitlab-ci-yml:
  stage: generate-gitlab-ci
  script: ./support/scripts/generate-gitlab-ci-yml support/misc/gitlab-ci.yml.in > generated-gitlab-ci.yml
-  retry:
-    max: 2
-    when:
-      - runner_system_failure
-      - stuck_or_timeout_failure
  artifacts:
    when: always
    paths:
@@ -55,16 +55,6 @@ config BR2_HOST_GCC_AT_LEAST_9
 	default y if BR2_HOST_GCC_VERSION = "9"
 	select BR2_HOST_GCC_AT_LEAST_8

-config BR2_HOST_GCC_AT_LEAST_10
-	bool
-	default y if BR2_HOST_GCC_VERSION = "10"
-	select BR2_HOST_GCC_AT_LEAST_9
-
-config BR2_HOST_GCC_AT_LEAST_11
-	bool
-	default y if BR2_HOST_GCC_VERSION = "11"
-	select BR2_HOST_GCC_AT_LEAST_10
-
 # When adding new entries above, be sure to update
 # the HOSTCC_MAX_VERSION variable in the Makefile.

@@ -75,7 +65,7 @@ config BR2_NEEDS_HOST_JAVA

 # Hidden boolean selected by pre-built packages for x86, when they
 # need to run on x86-64 machines (example: pre-built external
-# toolchains, binary tools, etc.).
+# toolchains, binary tools like SAM-BA, etc.).
 config BR2_HOSTARCH_NEEDS_IA32_LIBS
 	bool

@@ -251,7 +241,7 @@ if !BR2_PRIMARY_SITE_ONLY

 config BR2_BACKUP_SITE
 	string "Backup download site"
-	default "https://sources.buildroot.net"
+	default "http://sources.buildroot.net"
 	help
 	  Backup site to download from. If this option is set then
 	  buildroot will fall back to download package sources from here
@@ -474,7 +464,7 @@ config BR2_STRIP_EXCLUDE_DIRS

 choice
 	prompt "gcc optimization level"
-	default BR2_OPTIMIZE_2
+	default BR2_OPTIMIZE_S
 	help
 	  Set the optimization level for gcc

@@ -520,7 +510,6 @@ config BR2_OPTIMIZE_2
 	  -falign-loops -falign-labels -ftree-vrp -ftree-pre. Please
 	  note the warning under -fgcse about invoking -O2 on programs
 	  that use computed gotos.
-	  This is the default.

 config BR2_OPTIMIZE_3
 	bool "optimization level 3"
@@ -549,6 +538,7 @@ config BR2_OPTIMIZE_S
 	  -falign-loops -falign-labels -freorder-blocks
 	  -freorder-blocks-and-partition -fprefetch-loop-arrays
 	  -ftree-vect-loop-version
+	  This is the default.

 config BR2_OPTIMIZE_FAST
 	bool "optimize for fast (may break packages!)"
@@ -586,10 +576,10 @@ config BR2_ENABLE_LTO
 config BR2_GOOGLE_BREAKPAD_ENABLE
 	bool "Enable google-breakpad support"
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on BR2_TOOLCHAIN_USES_GLIBC
+	depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC)
 	depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS
 	select BR2_PACKAGE_GOOGLE_BREAKPAD
@@ -674,12 +664,12 @@ config BR2_PACKAGE_OVERRIDE_FILE
 	  documentation for more details on this feature.

 config BR2_GLOBAL_PATCH_DIR
-	string "global patch and hash directories"
+	string "global patch directories"
 	help
 	  You may specify a space separated list of one or more
-	  directories containing global package patches and/or hashes.
-	  For a specific version <packageversion> of a specific package
-	  <packagename>, patches are looked up as follows:
+	  directories containing global package patches. For a specific
+	  version <packageversion> of a specific package <packagename>,
+	  patches are applied as follows:

 	  First, the default Buildroot patch set for the package is
 	  applied from the package's directory in Buildroot.
@@ -693,8 +683,6 @@ config BR2_GLOBAL_PATCH_DIR
 	  exists, then all *.patch files in the directory will be
 	  applied.

-	  The hash files are looked up similarly to the patches.
-
 menu "Advanced"

 config BR2_FORCE_HOST_BUILD
@@ -709,21 +697,6 @@ config BR2_FORCE_HOST_BUILD

 	  This option will increase build time.

-config BR2_DOWNLOAD_FORCE_CHECK_HASHES
-	bool "Force all downloads to have a valid hash"
-	help
-	  Say 'y' here to enforce downloads to have at least one valid
-	  hash (and of course, that all hashes be valid).
-
-	  By default, Buildroot checks hashes of all packages
-	  downloaded, except those for which a custom version is
-	  used.
-
-	  With this option turned on, Buildroot will check hashes of
-	  all packages, including those that use a custom version. In
-	  order to provide hashes for such packages, place additional
-	  hash files in BR2_GLOBAL_PATCH_DIR directories.
-
 config BR2_REPRODUCIBLE
 	bool "Make the build reproducible (experimental)"
 	# SOURCE_DATE_EPOCH support in toolchain-wrapper requires GCC 4.4
@@ -763,20 +736,6 @@ config BR2_PER_PACKAGE_DIRECTORIES

 endmenu

-config BR2_TIME_BITS_64
-	bool "Build Y2038-ready code"
-	depends on BR2_TOOLCHAIN_USES_GLIBC && !BR2_ARCH_IS_64
-	help
-	  This option will pass -D_TIME_BITS=64 in the compiler flags
-	  to ensure the glibc C library uses a 64-bit representation
-	  for time_t and other time types, which ensures that
-	  programs/libraries will correctly handle time past year
-	  2038.
-
-	  This option only has an effect with glibc >= 2.34, as
-	  earlier glibc versions did not have support for 64-bit
-	  time_t.
-
 comment "Security Hardening Options"

 config BR2_PIC_PIE_ARCH_SUPPORTS
@@ -144,341 +144,6 @@ endif

 ###############################################################################

-comment "Legacy options removed in 2024.02"
-
-config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS
-	bool "Codescape IMG GNU Linux Toolchain 2018.09 has been removed"
-	select BR2_LEGACY
-	help
-	  The Codescape IMG GNU Linux toolchain has been removed, use a
-	  Bootlin toolchain instead.
-
-config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS
-	bool "Codescape MTI GNU Linux Toolchain 2018.09 has been removed"
-	select BR2_LEGACY
-	help
-	  The Codescape MTI GNU Linux toolchain has been removed, use a
-	  Bootlin toolchain instead.
-
-config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64
-	bool "CodeSourcery AArch64 2014.11 has been removed"
-	select BR2_LEGACY
-	help
-	  The Sourcery CodeBench AArch64 toolchain has been removed,
-	  use an ARM/Bootlin/Linaro toolchain instead.
-
-config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM
-	bool "Sourcery CodeBench ARM 2014.05 has been removed"
-	select BR2_LEGACY
-	help
-	  The Sourcery CodeBench ARM toolchain has been removed, use
-	  an ARM/Bootlin/Linaro toolchain instead.
-
-config BR2_PACKAGE_MYSQL
-	bool "mysql virtual package removed"
-	select BR2_LEGACY
-	help
-	  The mysql virtual package has been removed as mariadb is the
-	  only supported mysql variant. Use the mariadb package
-	  instead.
-
-config BR2_PACKAGE_ORACLE_MYSQL
-	bool "oracle mysql removed"
-	select BR2_LEGACY
-	help
-	  Oracle mysql has been removed as the package was
-	  unmaintained. Consider using mariadb instead.
-
-config BR2_PACKAGE_STRONGSWAN_SCEP
-	bool "strongswan SCEP client tool removed"
-	select BR2_LEGACY
-	help
-	  "ipsec scepclient" tool has been removed and replaced by the
-	  pki subcommands "pki --scep" and "pki --scepca" which
-	  implement the new SCEP RFC 8894 standard that was released in
-	  September 2020 and which supports trusted "certificate
-	  renewal" based on the existing client certificate.
-
-config BR2_PACKAGE_SHADOW_UTMPX
-	bool "shadow utmpx removed"
-	select BR2_LEGACY
-	help
-	  UTMPX has been dropped by upstream.
-
-config BR2_PACKAGE_TINYMEMBENCH
-	bool "tinymembench removed"
-	select BR2_LEGACY
-	help
-	  tinymembench has been removed due to being abandoned.
-
-config BR2_PACKAGE_DAVINCI_BOOTCOUNT
-	bool "davinci-bootcount has been renamed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_UBOOT_BOOTCOUNT
-	help
-	  The davinci-bootcount package has been renamed to
-	  uboot-bootcount.
-
-config BR2_PACKAGE_PYTHON_CROSSBAR
-	bool "python-crossbar removed"
-	select BR2_LEGACY
-	help
-	  python-crossbar has been removed. The current package has
-	  not received an update since Sat Oct 9 13:55:06 2021 commit:
-	  33ece2446e25e20929d1c7eefa9f3244a3b79a92 and is not python
-	  3.12.0 compatible.
-
-	  Furthermore, the current version requires at least 42 new
-	  packages worth of depedencies of which several require
-	  patches to be python 3.12.0 compatible. As nobody has
-	  stepped up to maintain the package and its ever-growing list
-	  of dependencies, along with the other problems, it was time
-	  to drop the package.
-
-config BR2_PACKAGE_PYTHON_PYGAME
-	bool "python-pygame removed"
-	select BR2_LEGACY
-	help
-	  python-pygame has been removed due to being abandoned and
-	  the old version no longer building with python 3.12.0.
-
-config BR2_KERNEL_HEADERS_4_14
-	bool "kernel headers version 4.14.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 4.14.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_PACKAGE_LIBCAMERA_PIPELINE_RASPBERRYPI
-	bool "libcamera pipeline 'raspberrypi' was renamed to 'rpi/vc4'"
-	depends on BR2_arm || BR2_aarch64
-	depends on BR2_USE_WCHAR
-	select BR2_LEGACY
-	select BR2_PACKAGE_LIBCAMERA_PIPELINE_RPI_VC4
-	help
-	  Since version 0.1.0, the pipeline option 'raspberrypi' was
-	  renamed to 'rpi/vc4'.
-
-config BR2_GDB_VERSION_11
-	bool "gdb 11.x removed"
-	select BR2_LEGACY
-	help
-	  GDB 11.x has been removed, use a newer version.
-
-config BR2_PACKAGE_LIBMPD
-	bool "libmpd package was removed"
-	select BR2_LEGACY
-	help
-	  The libmpd package was only used by gmpc, both of which are
-	  no longer maintained upstream.
-
-config BR2_PACKAGE_GMPC
-	bool "gmpc package was removed"
-	select BR2_LEGACY
-	help
-	  The gmpc package was removed because it was unmaintained,
-	  and still using the old libsoup2 library.
-
-config BR2_PACKAGE_FLICKCURL
-	bool "flickcurl package was removed"
-	select BR2_LEGACY
-	help
-	  The flickcurl package was removed because it was
-	  unmaintained upstream and causing build failures.
-
-config BR2_PACKAGE_ONEVPL
-	bool "onevpl package was renamed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_LIBVPL
-
-config BR2_KERNEL_HEADERS_6_5
-	bool "kernel headers version 6.5.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 6.5.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_PACKAGE_WATCHDOGD_GENERIC_POLL
-	int "watchdogd generic poll has been replaced"
-	default 0
-	help
-	  The generic script poll interval has been replaced upstream
-	  with a boolean on/off.  Your configuration has been migrated.
-
-	  Set this legacy option to 0 here to remove the warning.
-
-# Note: BR2_PACKAGE_WATCHDOGD_*_POLL_WRAP referenced in package/watchdogd/Config.in
-config BR2_PACKAGE_WATCHDOGD_GENERIC_POLL_WRAP
-	bool
-	default y if BR2_PACKAGE_WATCHDOGD_GENERIC_POLL != 0
-	select BR2_LEGACY
-
-config BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL
-	int "watchdogd loadavg poll has been replaced"
-	default 0
-	help
-	  The CPU load average poll interval has been replaced upstream
-	  with a boolean on/off.  Your configuration has been migrated.
-
-	  Set this legacy option to 0 here to remove the warning.
-
-# Note: BR2_PACKAGE_WATCHDOGD_*_POLL_WRAP referenced in package/watchdogd/Config.in
-config BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL_WRAP
-	bool
-	default y if BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL != 0
-	select BR2_LEGACY
-
-config BR2_PACKAGE_WATCHDOGD_FILENR_POLL
-	int "watchdogd filenr poll has been replaced"
-	default 0
-	help
-	  The file descriptor leak poll has been replaced upstream with
-	  a boolean on/off.  Your configuration has been migrated.
-
-	  Set this legacy option to 0 here to remove the warning.
-
-# Note: BR2_PACKAGE_WATCHDOGD_*_POLL_WRAP referenced in package/watchdogd/Config.in
-config BR2_PACKAGE_WATCHDOGD_FILENR_POLL_WRAP
-	bool
-	default y if BR2_PACKAGE_WATCHDOGD_FILENR_POLL != 0
-	select BR2_LEGACY
-
-config BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL
-	int "watchdogd meminfo poll has been replaced"
-	default 0
-	help
-	  The memleak detector poll interval has been replaced upstream
-	  with a boolean on/off.  Your configuration has been migrated.
-
-	  Set this legacy option to 0 here to remove the warning.
-
-# Note: BR2_PACKAGE_WATCHDOGD_*_POLL_WRAP referenced in package/watchdogd/Config.in
-config BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL_WRAP
-	bool
-	default y if BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL != 0
-	select BR2_LEGACY
-
-comment "Legacy options removed in 2023.11"
-
-config BR2_PACKAGE_PYTHON_PYXB
-	bool "python-pyxb removed"
-	select BR2_LEGACY
-	help
-	  python-pyxb has been removed due to being abandoned and
-	  distutils no longer being supported in python 3.12.0.
-
-config BR2_PACKAGE_OPENJDK_VERSION_11
-	bool "openjdk 11 has been removed"
-	select BR2_LEGACY
-	help
-	  Version 11 of OpenJDK is no longer supported, version 17
-	  should now be used as the new LTS release.
-
-config BR2_KERNEL_HEADERS_6_4
-	bool "kernel headers version 6.4.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 6.4.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_PACKAGE_GOOGLE_MATERIAL_DESIGN_ICONS
-	bool "google-material-design-icons removed"
-	select BR2_LEGACY
-	help
-	  The google-material-design-icons package has been removed.
-
-config BR2_GDB_VERSION_10
-	bool "gdb 10.x removed"
-	select BR2_LEGACY
-	help
-	  gdb 10.x has been removed, use a newer version.
-
-comment "Legacy options removed in 2023.08"
-
-config BR2_TARGET_LPC32XXCDL
-	bool "lpc32xxcdl has been removed"
-	select BR2_LEGACY
-	help
-	  lpc32xxcdl has been removed, due to licensing concerns.
-
-config BR2_BINUTILS_VERSION_2_38_X
-	bool "binutils 2.38.x has been removed"
-	select BR2_LEGACY
-	help
-	  binutils 2.38 has been removed, use a newer version.
-
-config BR2_GCC_VERSION_10_X
-	bool "gcc 10.x support removed"
-	select BR2_LEGACY
-	help
-	  Support for gcc version 10.x has been removed. The current
-	  default version (12.x or later) has been selected instead.
-
-config BR2_KERNEL_HEADERS_6_3
-	bool "kernel headers version 6.3.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 6.3.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_PACKAGE_TOVID
-	bool "tovid removed"
-	select BR2_LEGACY
-	help
-	  tovid was removed
-
-config BR2_PACKAGE_LIBASPLIB
-	bool "libasplib removed"
-	select BR2_LEGACY
-	help
-	  libasplib is no longer needed.
-
-config BR2_PACKAGE_OCF_LINUX
-	bool "ocf-linux has been removed"
-	select BR2_LEGACY
-	help
-	  ocf-linux is incompatible with newer kernels.
-
-config BR2_BINUTILS_VERSION_2_37_X
-	bool "binutils 2.37.x has been removed"
-	select BR2_LEGACY
-	help
-	  binutils 2.37 has been removed, use a newer version.
-
-comment "Legacy options removed in 2023.05"
-
-config BR2_KERNEL_HEADERS_6_2
-	bool "kernel headers version 6.2.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 6.2.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_PACKAGE_ATK
-	bool "atk removed"
-	select BR2_LEGACY
-	help
-	  atk is now part of at-spi2-core.
-
-config BR2_PACKAGE_AT_SPI2_ATK
-	bool "at-spi2-atk removed"
-	select BR2_LEGACY
-	help
-	  at-spi2-atk is now part of at-spi2-core.
-
-config BR2_PACKAGE_OPTEE_BENCHMARK
-	bool "optee-benchmark has been removed"
-	select BR2_LEGACY
-	help
-	  optee-benchmark is no longer maintained upstream.
-
-config BR2_PACAKGE_OPENFPGALOADER_CMSIS
-	bool "openfpgaloader cmsis option name fixed"
-	select BR2_LEGACY
-	help
-	  A typo on BR2_PACAKGE_OPENFPGALOADER_CMSIS was fixed by
-	  renaming the option to BR2_PACKAGE_OPENFPGALOADER_CMSIS.
-
 comment "Legacy options removed in 2023.02"

 config BR2_PACKAGE_PUGIXML_HEADER_ONLY
@@ -90,9 +90,9 @@ all:
 .PHONY: all

 # Set and export the version string
-export BR2_VERSION := 2024.02.2
+export BR2_VERSION := 2023.02.1
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1715067000
+BR2_VERSION_EPOCH = 1683664000

 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)
@@ -123,7 +123,7 @@ endif
 noconfig_targets := menuconfig nconfig gconfig xconfig config oldconfig randconfig \
 	defconfig %_defconfig allyesconfig allnoconfig alldefconfig syncconfig release \
 	randpackageconfig allyespackageconfig allnopackageconfig \
-	print-version olddefconfig distclean manual manual-% check-package
+	print-version olddefconfig distclean manual manual-% check-package check-flake8

 # Some global targets do not trigger a build, but are used to collect
 # metadata, or do various checks. When such targets are triggered,
@@ -227,6 +227,8 @@ LEGAL_MANIFEST_CSV_HOST = $(LEGAL_INFO_DIR)/host-manifest.csv
 LEGAL_WARNINGS = $(LEGAL_INFO_DIR)/.warnings
 LEGAL_REPORT = $(LEGAL_INFO_DIR)/README

+CPE_UPDATES_DIR = $(BASE_DIR)/cpe-updates
+
 BR2_CONFIG = $(CONFIG_DIR)/.config

 # Pull in the user's configuration file
@@ -351,7 +353,7 @@ export HOSTARCH := $(shell LC_ALL=C $(HOSTCC_NOCCACHE) -v 2>&1 | \

 # When adding a new host gcc version in Config.in,
 # update the HOSTCC_MAX_VERSION variable:
-HOSTCC_MAX_VERSION := 11
+HOSTCC_MAX_VERSION := 9

 HOSTCC_VERSION := $(shell V=$$($(HOSTCC_NOCCACHE) --version | \
 	sed -n -r 's/^.* ([0-9]*)\.([0-9]*)\.([0-9]*)[ ]*.*/\1 \2/p'); \
@@ -592,13 +594,8 @@ world: target-post-image
 .PHONY: prepare-sdk
 prepare-sdk: world
 	@$(call MESSAGE,"Rendering the SDK relocatable")
-	PARALLEL_JOBS=$(PARALLEL_JOBS) \
-		PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) \
-		$(TOPDIR)/support/scripts/fix-rpath host
-	PARALLEL_JOBS=$(PARALLEL_JOBS) \
-		PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) \
-		$(TOPDIR)/support/scripts/fix-rpath staging
-	$(call ppd-fixup-paths,$(BASE_DIR))
+	PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) $(TOPDIR)/support/scripts/fix-rpath host
+	PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) $(TOPDIR)/support/scripts/fix-rpath staging
 	$(INSTALL) -m 755 $(TOPDIR)/support/misc/relocate-sdk.sh $(HOST_DIR)/relocate-sdk.sh
 	mkdir -p $(HOST_DIR)/share/buildroot
 	echo $(HOST_DIR) > $(HOST_DIR)/share/buildroot/sdk-location
@@ -715,7 +712,7 @@ STAGING_DIR_FILES_LISTS = $(sort $(wildcard $(BUILD_DIR)/*/.files-list-staging.t
 .PHONY: host-finalize
 host-finalize: $(PACKAGES) $(HOST_DIR) $(HOST_DIR_SYMLINK)
 	@$(call MESSAGE,"Finalizing host directory")
-	$(call per-package-rsync,$(sort $(PACKAGES)),host,$(HOST_DIR),copy)
+	$(call per-package-rsync,$(sort $(PACKAGES)),host,$(HOST_DIR))

 .PHONY: staging-finalize
 staging-finalize: $(STAGING_DIR_SYMLINK)
@@ -723,7 +720,7 @@ staging-finalize: $(STAGING_DIR_SYMLINK)
 .PHONY: target-finalize
 target-finalize: $(PACKAGES) $(TARGET_DIR) host-finalize
 	@$(call MESSAGE,"Finalizing target directory")
-	$(call per-package-rsync,$(sort $(PACKAGES)),target,$(TARGET_DIR),copy)
+	$(call per-package-rsync,$(sort $(PACKAGES)),target,$(TARGET_DIR))
 	$(foreach hook,$(TARGET_FINALIZE_HOOKS),$($(hook))$(sep))
 	rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/share/aclocal \
 		$(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/pkgconfig \
@@ -768,9 +765,7 @@ endif
 	ln -sf ../usr/lib/os-release $(TARGET_DIR)/etc

 	@$(call MESSAGE,"Sanitizing RPATH in target tree")
-	PARALLEL_JOBS=$(PARALLEL_JOBS) \
-		PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) \
-		$(TOPDIR)/support/scripts/fix-rpath target
+	PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) $(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.
@@ -836,7 +831,7 @@ legal-info-clean:
 .PHONY: legal-info-prepare
 legal-info-prepare: $(LEGAL_INFO_DIR)
 	@$(call MESSAGE,"Buildroot $(BR2_VERSION_FULL) Collecting legal info")
-	@$(call legal-license-file,HOST,buildroot,buildroot,COPYING,COPYING,support/legal-info/buildroot.hash)
+	@$(call legal-license-file,buildroot,buildroot,support/legal-info/buildroot.hash,COPYING,COPYING,HOST)
 	@$(call legal-manifest,TARGET,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE,SOURCE SITE,DEPENDENCIES WITH LICENSES)
 	@$(call legal-manifest,HOST,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE,SOURCE SITE,DEPENDENCIES WITH LICENSES)
 	@$(call legal-manifest,HOST,buildroot,$(BR2_VERSION_FULL),GPL-2.0+,COPYING,not saved,not saved)
@@ -932,6 +927,14 @@ pkg-stats:
 		--html $(O)/pkg-stats.html \
 		--nvd-path $(DL_DIR)/buildroot-nvd

+.PHONY: missing-cpe
+missing-cpe:
+	$(Q)mkdir -p $(CPE_UPDATES_DIR)
+	$(Q)cd "$(CONFIG_DIR)" ; \
+	$(TOPDIR)/support/scripts/gen-missing-cpe \
+		--nvd-path $(DL_DIR)/buildroot-nvd \
+		--output $(CPE_UPDATES_DIR)
+
 else # ifeq ($(BR2_HAVE_DOT_CONFIG),y)

 # Some subdirectories are also package names. To avoid that "make linux"
@@ -1102,7 +1105,8 @@ show-vars:
 clean:
 	rm -rf $(BASE_TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) $(HOST_DIR_SYMLINK) \
 		$(BUILD_DIR) $(BASE_DIR)/staging \
-		$(LEGAL_INFO_DIR) $(GRAPHS_DIR) $(PER_PACKAGE_DIR) $(O)/pkg-stats.*
+		$(LEGAL_INFO_DIR) $(GRAPHS_DIR) $(PER_PACKAGE_DIR) $(CPE_UPDATES_DIR) \
+		$(O)/pkg-stats.*

 .PHONY: distclean
 distclean: clean
@@ -1187,6 +1191,7 @@ help:
 	@echo '  legal-info             - generate info about license compliance'
 	@echo '  show-info              - generate info about packages, as a JSON blurb'
 	@echo '  pkg-stats              - generate info about packages as JSON and HTML'
+	@echo '  missing-cpe            - generate XML snippets for missing CPE identifiers'
 	@echo '  printvars              - dump internal variables selected with VARS=...'
 	@echo '  show-vars              - dump all internal variables as a JSON blurb; use VARS=...'
 	@echo '                           to limit the list to variables names matching that pattern'
@@ -1244,6 +1249,13 @@ release:
 print-version:
 	@echo $(BR2_VERSION_FULL)

+check-flake8:
+	$(Q)git ls-tree -r --name-only HEAD \
+	| xargs file \
+	| grep 'Python script' \
+	| cut -d':' -f1 \
+	| xargs -- python3 -m flake8 --statistics
+
 check-package:
 	$(Q)./utils/check-package `git ls-tree -r --name-only HEAD` \
 		--ignore-list=$(TOPDIR)/.checkpackageignore
@@ -1258,7 +1270,4 @@ include docs/manual/manual.mk

 .PHONY: $(noconfig_targets)

-# .WAIT was introduced in make 4.4. For older make, define it as phony.
-.PHONY: .WAIT
-
 endif #umask / $(CURDIR) / $(O)
@@ -216,11 +216,6 @@ config BR2_sh
 config BR2_sparc
 	bool "SPARC"
 	select BR2_USE_MMU
-	# uClibc-ng broken on sparc due to recent gcc changes
-	# that need to be reverted since gcc 8.4, 9.3 and 10.1.
-	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98784
-	# gcc <= 10.x has been removed from Buildroot.
-	select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
 	help
 	  SPARC (from Scalable Processor Architecture) is a RISC
 	  instruction set architecture (ISA) developed by Sun
@@ -309,14 +304,6 @@ config BR2_ARCH_NEEDS_GCC_AT_LEAST_12
 	bool
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_11

-config BR2_ARCH_NEEDS_GCC_AT_LEAST_13
-	bool
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_12
-
-config BR2_ARCH_NEEDS_GCC_AT_LEAST_14
-	bool
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_13
-
 # The following string values are defined by the individual
 # Config.in.$ARCH files
 config BR2_ARCH
@@ -781,9 +781,6 @@ choice
 config BR2_ARM64_PAGE_SIZE_4K
 	bool "4KB"

-config BR2_ARM64_PAGE_SIZE_16K
-	bool "16KB"
-
 config BR2_ARM64_PAGE_SIZE_64K
 	bool "64KB"

@@ -792,7 +789,6 @@ endchoice
 config BR2_ARM64_PAGE_SIZE
 	string
 	default "4K" if BR2_ARM64_PAGE_SIZE_4K
-	default "16K" if BR2_ARM64_PAGE_SIZE_16K
 	default "64K" if BR2_ARM64_PAGE_SIZE_64K

 config BR2_ARCH
@@ -40,8 +40,8 @@ choice
 	help
 	  Specific CPU variant to use

-	  64bit capable: mips4, 64, 64r2, 64r3, 64r5, 64r6
-	  non-64bit capable: mips4, 32, 32r2, 32r3, 32r5, 32r6
+	  64bit capable: 64, 64r2, 64r3, 64r5, 64r6
+	  non-64bit capable: 32, 32r2, 32r3, 32r5, 32r6

 config BR2_mips_32
 	bool "Generic MIPS32"
@@ -97,8 +97,6 @@ config BR2_mips_xburst
 	  to be used in order to prevent emitting these instructions.

 	  See http://www.ingenic.com/en/?xburst.html
-config BR2_mips4
-	bool "MIPS IV"
 config BR2_mips_64
 	bool "Generic MIPS64"
 	depends on BR2_ARCH_IS_64
@@ -264,7 +262,6 @@ config BR2_GCC_TARGET_ARCH
 	default "octeon2"	if BR2_mips_octeon2
 	default "octeon3"	if BR2_mips_octeon3
 	default "p6600"		if BR2_mips_p6600
-	default "mips4"		if BR2_mips4

 config BR2_MIPS_OABI32
 	bool
@@ -146,6 +146,21 @@ config BR2_powerpc_power9
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
 endchoice

+choice
+	prompt "Target ABI"
+	default BR2_powerpc_SPE if BR2_POWERPC_CPU_HAS_SPE
+	default BR2_powerpc_CLASSIC
+	help
+	  Application Binary Interface to use
+
+config BR2_powerpc_CLASSIC
+	bool "Classic"
+	depends on !BR2_POWERPC_CPU_HAS_SPE
+config BR2_powerpc_SPE
+	bool "SPE"
+	depends on BR2_POWERPC_CPU_HAS_SPE
+endchoice
+
 config BR2_POWERPC_SOFT_FLOAT
 	bool "Use soft-float"
 	select BR2_SOFT_FLOAT
@@ -1,5 +1,23 @@
 # RISC-V CPU ISA extensions.

+config BR2_RISCV_ISA_RVI
+	bool
+
+config BR2_RISCV_ISA_RVM
+	bool
+
+config BR2_RISCV_ISA_RVA
+	bool
+
+config BR2_RISCV_ISA_RVF
+	bool
+
+config BR2_RISCV_ISA_RVD
+	bool
+
+config BR2_RISCV_ISA_RVC
+	bool
+
 choice
 	prompt "Target Architecture Variant"
 	default BR2_riscv_g
@@ -17,33 +35,35 @@ config BR2_riscv_g
 config BR2_riscv_custom
 	bool "Custom architecture"
 	select BR2_RISCV_ISA_RVI
+	select BR2_RISCV_ISA_CUSTOM_RVA

 endchoice

+if BR2_riscv_custom
+
 comment "Instruction Set Extensions"

-config BR2_RISCV_ISA_RVI
-	bool "Base Integer (I)"
-
-config BR2_RISCV_ISA_RVM
+config BR2_RISCV_ISA_CUSTOM_RVM
 	bool "Integer Multiplication and Division (M)"
+	select BR2_RISCV_ISA_RVM

-config BR2_RISCV_ISA_RVA
+config BR2_RISCV_ISA_CUSTOM_RVA
 	bool "Atomic Instructions (A)"
+	select BR2_RISCV_ISA_RVA

-config BR2_RISCV_ISA_RVF
+config BR2_RISCV_ISA_CUSTOM_RVF
 	bool "Single-precision Floating-point (F)"
+	select BR2_RISCV_ISA_RVF

-config BR2_RISCV_ISA_RVD
+config BR2_RISCV_ISA_CUSTOM_RVD
 	bool "Double-precision Floating-point (D)"
 	depends on BR2_RISCV_ISA_RVF
+	select BR2_RISCV_ISA_RVD

-config BR2_RISCV_ISA_RVC
+config BR2_RISCV_ISA_CUSTOM_RVC
 	bool "Compressed Instructions (C)"
-
-config BR2_RISCV_ISA_RVV
-	bool "Vector Instructions (V)"
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_12
+	select BR2_RISCV_ISA_RVC
+endif

 choice
 	prompt "Target Architecture Size"
@@ -19,20 +19,12 @@ config BR2_X86_CPU_HAS_AVX
 	bool
 config BR2_X86_CPU_HAS_AVX2
 	bool
-
-# BR2_X86_CPU_HAS_AVX512 implies the following AVX512 extensions:
-#   AVX512F, AVX512BW, AVX512CD, AVX512DQ, AVX512VL
-# This subset is common to Intel Xeon (excl Xeon Phi), AMD Zen 4, and
-# the x86-64-v4 psABI.
-#
-# Only select BR2_X86_CPU_HAS_AVX512 if the CPU supports this entire
-# subset of extensions.
 config BR2_X86_CPU_HAS_AVX512
 	bool

 # This list of CPU architecture variant is (loosely) ordered according
 # to the gcc documentation at
-# https://gcc.gnu.org/onlinedocs/gcc-13.2.0/gcc/x86-Options.html
+# https://gcc.gnu.org/onlinedocs/gcc-11.2.0/gcc/x86-Options.html
 choice
 	prompt "Target Architecture Variant"
 	default BR2_x86_i586 if BR2_i386
@@ -235,17 +227,6 @@ config BR2_x86_sandybridge
 	select BR2_X86_CPU_HAS_SSE42
 	select BR2_X86_CPU_HAS_AVX
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9
-config BR2_x86_ivybridge
-	bool "ivybridge"
-	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
-	select BR2_X86_CPU_HAS_AVX
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9
 config BR2_x86_core_avx2
 	bool "core-avx2"
 	select BR2_X86_CPU_HAS_MMX
@@ -354,54 +335,6 @@ config BR2_x86_tremont
 	select BR2_X86_CPU_HAS_SSE4
 	select BR2_X86_CPU_HAS_SSE42
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
-config BR2_x86_sierraforest
-	bool "sierraforest"
-	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
-	select BR2_X86_CPU_HAS_AVX
-	select BR2_X86_CPU_HAS_AVX2
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_13
-config BR2_x86_grandridge
-	bool "grandridge"
-	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
-	select BR2_X86_CPU_HAS_AVX
-	select BR2_X86_CPU_HAS_AVX2
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_13
-config BR2_x86_knightslanding
-	bool "knightslanding"
-	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
-	select BR2_X86_CPU_HAS_AVX
-	select BR2_X86_CPU_HAS_AVX2
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
-config BR2_x86_knightsmill
-	bool "knightsmill"
-	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
-	select BR2_X86_CPU_HAS_AVX
-	select BR2_X86_CPU_HAS_AVX2
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_8
 config BR2_x86_skylake_avx512
 	bool "skylake-avx512"
 	select BR2_X86_CPU_HAS_MMX
@@ -506,8 +439,6 @@ config BR2_x86_sapphirerapids
 	select BR2_X86_CPU_HAS_AVX2
 	select BR2_X86_CPU_HAS_AVX512
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_11
-	help
-	  Use for Sapphire Rapids, Emerald Rapids
 config BR2_x86_alderlake
 	bool "alderlake"
 	select BR2_X86_CPU_HAS_MMX
@@ -519,9 +450,8 @@ config BR2_x86_alderlake
 	select BR2_X86_CPU_HAS_SSE42
 	select BR2_X86_CPU_HAS_AVX
 	select BR2_X86_CPU_HAS_AVX2
+	select BR2_X86_CPU_HAS_AVX512
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_11
-	help
-	  Use for Alder Lake, Raptor Lake, Meteor Lake
 config BR2_x86_rocketlake
 	bool "rocketlake"
 	select BR2_X86_CPU_HAS_MMX
@@ -535,32 +465,6 @@ config BR2_x86_rocketlake
 	select BR2_X86_CPU_HAS_AVX2
 	select BR2_X86_CPU_HAS_AVX512
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_11
-config BR2_x86_graniterapids
-	bool "graniterapids"
-	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
-	select BR2_X86_CPU_HAS_AVX
-	select BR2_X86_CPU_HAS_AVX2
-	select BR2_X86_CPU_HAS_AVX512
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_13
-config BR2_x86_graniterapids_d
-	bool "graniterapids-d"
-	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
-	select BR2_X86_CPU_HAS_AVX
-	select BR2_X86_CPU_HAS_AVX2
-	select BR2_X86_CPU_HAS_AVX512
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_13
 config BR2_x86_k6
 	bool "k6"
 	depends on !BR2_x86_64
@@ -598,13 +502,6 @@ config BR2_x86_barcelona
 	select BR2_X86_CPU_HAS_SSE
 	select BR2_X86_CPU_HAS_SSE2
 	select BR2_X86_CPU_HAS_SSE3
-config BR2_x86_bobcat
-	bool "bobcat"
-	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
 config BR2_x86_jaguar
 	bool "jaguar"
 	select BR2_X86_CPU_HAS_MMX
@@ -614,25 +511,6 @@ config BR2_x86_jaguar
 	select BR2_X86_CPU_HAS_SSSE3
 	select BR2_X86_CPU_HAS_SSE4
 	select BR2_X86_CPU_HAS_SSE42
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8
-config BR2_x86_bulldozer
-	bool "bulldozer"
-	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_piledriver
-	bool "piledriver"
-	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_steamroller
 	bool "steamroller"
 	select BR2_X86_CPU_HAS_MMX
@@ -642,73 +520,12 @@ config BR2_x86_steamroller
 	select BR2_X86_CPU_HAS_SSSE3
 	select BR2_X86_CPU_HAS_SSE4
 	select BR2_X86_CPU_HAS_SSE42
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8
-config BR2_x86_excavator
-	bool "excavator"
-	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
-	select BR2_X86_CPU_HAS_AVX
-	select BR2_X86_CPU_HAS_AVX2
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9
-config BR2_x86_zen
-	bool "zen"
-	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
-	select BR2_X86_CPU_HAS_AVX
-	select BR2_X86_CPU_HAS_AVX2
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
-config BR2_x86_zen2
-	bool "zen 2"
-	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
-	select BR2_X86_CPU_HAS_AVX
-	select BR2_X86_CPU_HAS_AVX2
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
-config BR2_x86_zen3
-	bool "zen 3"
-	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
-	select BR2_X86_CPU_HAS_AVX
-	select BR2_X86_CPU_HAS_AVX2
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_11
-config BR2_x86_zen4
-	bool "zen 4"
-	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
-	select BR2_X86_CPU_HAS_AVX
-	select BR2_X86_CPU_HAS_AVX2
-	select BR2_X86_CPU_HAS_AVX512
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_13
 config BR2_x86_geode
-	bool "AMD Geode"
+	bool "geode"
+	# Don't include MMX support because there several variant of geode
+	# processor, some with MMX support, some without.
+	# See: http://en.wikipedia.org/wiki/Geode_%28processor%29
 	depends on !BR2_x86_64
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_3DNOW
 config BR2_x86_c3
 	bool "Via/Cyrix C3 (Samuel/Ezra cores)"
 	depends on !BR2_x86_64
@@ -776,7 +593,6 @@ config BR2_GCC_TARGET_ARCH
 	default "nehalem"	if BR2_x86_nehalem
 	default "corei7-avx"	if BR2_x86_corei7_avx
 	default "sandybridge"	if BR2_x86_sandybridge
-	default "ivybridge"	if BR2_x86_ivybridge
 	default "core-avx2"	if BR2_x86_core_avx2
 	default "haswell"	if BR2_x86_haswell
 	default "broadwell"	if BR2_x86_broadwell
@@ -788,10 +604,6 @@ config BR2_GCC_TARGET_ARCH
 	default "goldmont"	if BR2_x86_goldmont
 	default "goldmont-plus"	if BR2_x86_goldmont_plus
 	default "tremont"	if BR2_x86_tremont
-	default "sierraforest"	if BR2_x86_sierraforest
-	default "grandridge"	if BR2_x86_grandridge
-	default "knl"		if BR2_x86_knightslanding
-	default "knm"		if BR2_x86_knightsmill
 	default "skylake-avx512" if BR2_x86_skylake_avx512
 	default "cannonlake"	if BR2_x86_cannonlake
 	default "icelake-client" if BR2_x86_icelake_client
@@ -802,21 +614,11 @@ config BR2_GCC_TARGET_ARCH
 	default "sapphirerapids" if BR2_x86_sapphirerapids
 	default "alderlake"	if BR2_x86_alderlake
 	default "rocketlake"	if BR2_x86_rocketlake
-	default "graniterapids"	if BR2_x86_graniterapids
-	default "graniterapids-d"	if BR2_x86_graniterapids_d
 	default "k8"		if BR2_x86_opteron
 	default "k8-sse3"	if BR2_x86_opteron_sse3
 	default "barcelona"	if BR2_x86_barcelona
-	default "btver1"	if BR2_x86_bobcat
 	default "btver2"	if BR2_x86_jaguar
-	default "bdver1"	if BR2_x86_bulldozer
-	default "bdver2"	if BR2_x86_piledriver
 	default "bdver3"	if BR2_x86_steamroller
-	default "bdver4"	if BR2_x86_excavator
-	default "znver1"	if BR2_x86_zen
-	default "znver2"	if BR2_x86_zen2
-	default "znver3"	if BR2_x86_zen3
-	default "znver4"	if BR2_x86_zen4
 	default "k6"		if BR2_x86_k6
 	default "k6-2"		if BR2_x86_k6_2
 	default "athlon"	if BR2_x86_athlon
@@ -23,7 +23,7 @@ ifeq ($(BR2_ARC_PAGE_SIZE_4K)$(BR2_ARM64_PAGE_SIZE_4K),y)
 ARCH_TOOLCHAIN_WRAPPER_OPTS += -Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096
 else ifeq ($(BR2_ARC_PAGE_SIZE_8K),y)
 ARCH_TOOLCHAIN_WRAPPER_OPTS += -Wl,-z,max-page-size=8192 -Wl,-z,common-page-size=8192
-else ifeq ($(BR2_ARC_PAGE_SIZE_16K)$(BR2_ARM64_PAGE_SIZE_16K),y)
+else ifeq ($(BR2_ARC_PAGE_SIZE_16K),y)
 ARCH_TOOLCHAIN_WRAPPER_OPTS += -Wl,-z,max-page-size=16384 -Wl,-z,common-page-size=16384
 else ifeq ($(BR2_ARM64_PAGE_SIZE_64K),y)
 ARCH_TOOLCHAIN_WRAPPER_OPTS += -Wl,-z,max-page-size=65536 -Wl,-z,common-page-size=65536
@@ -26,9 +26,6 @@ endif
 ifeq ($(BR2_RISCV_ISA_RVC),y)
 GCC_TARGET_ARCH := $(GCC_TARGET_ARCH)c
 endif
-ifeq ($(BR2_RISCV_ISA_RVV),y)
-GCC_TARGET_ARCH := $(GCC_TARGET_ARCH)v
-endif

 # Starting from gcc 12.x, csr and fence instructions have been
 # separated from the base I instruction set, and special -march
@@ -9,7 +9,7 @@
 * Licensed under GPLv2 or later.
 */
 /dts-v1/;
-#include "microchip/sama5d31.dtsi"
+#include "sama5d31.dtsi"

 / {
 	model = "Acme Systems Acqua SOM";
@@ -3,14 +3,14 @@ ARM software simulator of the AArch64 architecture.

 First, one has to download the AArch64 software simulator from:

-  https://armkeil.blob.core.windows.net/developer/Files/downloads/ecosystem-models/Foundation_Platform_11.20_15_Linux64.tgz
+  https://silver.arm.com/download/download.tm?pv=4807186

 Then, use the arm_foundationv8_defconfig configuration to build your
 Buildroot system.

 Finally, boot your system with:

- ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-9.3/Foundation_Platform \
+ ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-6.4/Foundation_Platform \
    --image output/images/linux-system.axf \
    --block-device output/images/rootfs.ext2 \
    --network=nat \
@@ -1,51 +0,0 @@
-From 336dc301e02d64507447f82020ce7a349797bef3 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <peter@korsgaard.com>
-Date: Sun, 5 Nov 2023 14:59:16 +0100
-Subject: [PATCH] stm32mp157a-avenger96.dts: enable hash device to unbreak boot
- issue
-
-The avenger96 board was forgotten when authentication support was added with
-commit 4bdb1a7a6a1325343 (stm32mp1: add authentication support for
-stm32image), causing a panic when stm32mp_init_auth() is called, so fix it
-similar to how it was done for the STM32MP157C-ED1 board with:
-
-commit b37b52ef8bc05bfd8dcca992d4ba84cd7c5d23bb
-Author: Yann Gautier <yann.gautier@st.com>
-Date:   Tue Oct 13 18:05:06 2020 +0200
-
-    fdts: add missing hash node in STM32MP157C-ED1 board DT
-
-    Without this node, the board fails to boot and panics in the function
-    stm32mp_init_auth().
-
-    Change-Id: Ia54924410dac2a8c94dd6e45d7e93977fe7d87e2
-    Signed-off-by: Yann Gautier <yann.gautier@st.com>
-
-Upstream: N/A - Upstream reworked authentication to skip it for MP157A
- variant since v2.7, see "feat(st): disable authentication based on
- part_number"
- (https://github.com/ARM-software/arm-trusted-firmware/commit/49abdfd8cececb91a4bc7e7b29a30c09dce461c7)
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
- fdts/stm32mp157a-avenger96.dts | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/fdts/stm32mp157a-avenger96.dts b/fdts/stm32mp157a-avenger96.dts
-index b967736e4..76edecb83 100644
--- a/fdts/stm32mp157a-avenger96.dts
-+++ b/fdts/stm32mp157a-avenger96.dts
-@@ -271,6 +271,10 @@
- 	};
- };
- 
-+&hash1 {
-+	status = "okay";
-+};
-+
- &rng1 {
- 	status = "okay";
- };
-- 
-2.39.2
-
@@ -1,4 +0,0 @@
-label Tinker linux
-  kernel /boot/zImage
-  devicetree /boot/rk3288-tinker-s.dtb
-  append console=ttyS2,115200n8 root=179:1 rootwait
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-MKIMAGE=$HOST_DIR/bin/mkimage
-BOARD_DIR="$(dirname "$0")"
-
-$MKIMAGE -n rk3288 -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-dtb.bin > "$BINARIES_DIR"/u-boot-tpl-spl-dtb.img
-
-install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$TARGET_DIR"/boot/extlinux/extlinux.conf
@@ -1,43 +0,0 @@
-Tinker S RK3288
-=============
-
-Tinker Board is a Single Board Computer (SBC) in an ultra-small form
-factor that offers class-leading performance while leveraging outstanding
-mechanical compatibility. The "S" variant of the Tinker Board has eMMC
-
-Tinker link:
-https://www.asus.com/br/motherboards-components/single-board-computer/all-series/tinker-board-s/
-
-Wiki link:
-https://openedev.amarulasolutions.com/display/ODWIKI/Tinker+RK3288
-
-How to build it
-===============
-
-  $ make asus_tinker-s_rk3288_defconfig
-
-Then you can edit the build options using
-
-  $ make menuconfig
-
-Compile all and build rootfs image:
-
-  $ make
-
-Prepare your SDCard
-===================
-
-Buildroot generates a ready-to-use SD card image that you can flash directly to
-the card. The image will be in output/images/sdcard.img.
-You can write this image directly to an SD card device (i.e. /dev/xxx):
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/xxx
-  $ sudo sync
-
-Finally, you can insert the SD card to the Tinker RK3288 board and boot it.
-
-NOTE:
-USB power supply requires more than the standard 500mA USB current, so
-this board must be supplied from a capable port or from an external
-AC/DC adapter. Otherwise it will hang forever while loading the kernel
-image.
@@ -1,4 +1,4 @@
 label Tinker linux
-  kernel /boot/zImage
+  kernel /boot/uImage
  devicetree /boot/rk3288-tinker.dtb
  append console=ttyS2,115200n8 root=/dev/mmcblk0p1 rootwait
@@ -1,29 +0,0 @@
-# SD card image for RZBoard V2L
-
-image boot.vfat {
-	vfat {
-		files = {
-			"Image",
-			"rzboard.dtb",
-			"uEnv.txt"
-		}
-	}
-	size = 24M
-}
-
-image sdcard.img {
-	hdimage {
-		partition-table-type = "hybrid"
-	}
-
-	partition boot {
-		partition-type = "0xC"
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext2"
-	}
-}
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-cp board/avnet/rzboard_v2l/uEnv.txt "${BINARIES_DIR}"
-support/scripts/genimage.sh -c board/avnet/rzboard_v2l/genimage.cfg
@@ -1,71 +0,0 @@
-RZBoard V2L
-===========
-
-https://www.avnet.com/wps/portal/us/products/avnet-boards/avnet-board-families/rzboard-v2l/
-
-This board support creates a bootable sd card image for the AVNET RZBoard V2L.
-This board is shipped with a u-boot inside its eMMC. This board support uses
-that u-boot and only puts uEnv.txt, kernel image and rootfs onto the sd card.
-
-Build:
-======
-
-  $ make rzboard_v2l_defconfig
-  $ make
-
-Files created in output directory
-=================================
-
-output/images
-.
-├── Image
-├── boot.vfat
-├── rootfs.ext2
-├── rootfs.ext4
-├── rootfs.tar
-├── rzboard.dtb
-├── sdcard.img
-└── uEnv.txt
-
-Creating bootable SD card:
-==========================
-
-Simply invoke (as root)
-
-sudo dd if=output/images/sdcard.img of=/dev/sdX && sync
-
-Where X is your SD card device.
-
-Booting:
-========
-
-Configure board for sd card boot:
---------------------------------
-Set the 'BOOT1' switch (next to the audio jack) to '1' (away from 'ON') in
-order to let the board boot kernel and rootfs from SD card.
-
-Serial console:
---------------
-The RZBoard V2L has a 4-pin header "J19" right next to the micro USB. Its
-layout can be seen in the Quick-Start Guide, or the Hardware User Guide,
-obtainable from:
-https://www.avnet.com/wps/portal/us/products/avnet-boards/avnet-board-families/rzboard-v2l/
-
-The uart pins are as follows (from left to right - orientation according to the
-board's labeling):
-
-pin 1: n/a  (most away from the board's corner)
-pin 2: tx
-pin 3: rx
-pin 4: gnd  (nearest to the board's corner)
-
-Baudrate for this board is 115200.
-
-Power-Up:
---------
-Plug in a suitable USB-C power supply and press the button 'S1' (next to the
-USB-C port) for 2 seconds until the LED goes on.
-
-Login:
------
-Enter 'root' as login user, and the prompt is ready.
@@ -1,3 +0,0 @@
-bootcmd=booti ${kernel_addr_r} - ${fdt_addr_r}
-uenvcmd=fatload mmc 0:1 ${kernel_addr_r} Image; fatload mmc 0:1 ${fdt_addr_r} rzboard.dtb
-bootargs=root=/dev/mmcblk0p2 rw rootfstype=ext4 earlyprintk console=ttyS0,115200 rootwait earlycon clk_ignore_unused debug
@@ -1,4 +0,0 @@
-label Bananapi M2 Berry linux
-  kernel /boot/zImage
-  devicetree /boot/sun8i-v40-bananapi-m2-berry.dtb
-  append console=ttyS0,115200n8 root=/dev/mmcblk0p1 rootwait
@@ -1,16 +0,0 @@
-image sdcard.img {
-	hdimage {
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
-}
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-BOARD_DIR="$(dirname "$0")"
-
-install -m 644 -D "${BOARD_DIR}"/extlinux.conf \
-	"${TARGET_DIR}"/boot/extlinux/extlinux.conf
@@ -1,35 +0,0 @@
-Intro
-=====
-
-This default configuration will allow you to start experimenting with the
-buildroot environment for the Bananapi M2 Berry. With the current
-configuration it will bring-up the board, and allow access through the
-serial console.
-
-Bananapi M2 Berry link:
-https://wiki.banana-pi.org/Banana_Pi_BPI-M2_Berry
-
-This configuration uses U-Boot mainline and kernel mainline.
-
-How to build
-============
-
-    $ make bananapi_m2_berry_defconfig
-    $ make
-
-Note: you will need access to the internet to download the required
-sources.
-
-How to write the SD card
-========================
-
-Once the build process is finished you will have an image called "sdcard.img"
-in the output/images/ directory.
-
-Copy the bootable "sdcard.img" onto an SD card with "dd":
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
-  $ sudo sync
-
-Insert the micro SDcard in your Bananapi M2 Berry and power it up. The console
-is on the serial line, 115200 8N1.
@@ -1,5 +1,7 @@
-setenv fdt_high ffffffff
 setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+
+mmc dev 0
 fatload mmc 0 $kernel_addr_r zImage
-fatload mmc 0 $fdt_addr_r sun7i-a20-icnova-a20-adb4006.dtb
+fatload mmc 0 $fdt_addr_r sun8i-r40-bananapi-m2-ultra.dtb
+
 bootz $kernel_addr_r - $fdt_addr_r
@@ -1,4 +0,0 @@
-label Bananapi M2 Ultra linux
-  kernel /boot/zImage
-  devicetree /boot/sun8i-r40-bananapi-m2-ultra.dtb
-  append console=ttyS0,115200n8 root=/dev/mmcblk0p1 rootwait
@@ -1,3 +1,15 @@
+image boot.vfat {
+	vfat {
+		files = {
+			"zImage",
+			"sun8i-r40-bananapi-m2-ultra.dtb",
+			"boot.scr"
+		}
+	}
+
+	size = 64M
+}
+
 image sdcard.img {
 	hdimage {
 	}
@@ -9,6 +21,12 @@ image sdcard.img {
 		size = 1016K # 1MB - 8KB
 	}

+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+	}
+
 	partition rootfs {
 		partition-type = 0x83
 		image = "rootfs.ext4"
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-BOARD_DIR="$(dirname "$0")"
-
-install -m 644 -D "${BOARD_DIR}"/extlinux.conf \
-	"${TARGET_DIR}"/boot/extlinux/extlinux.conf
@@ -1,58 +0,0 @@
-From 0cf11f3c0478f4286adcfb09bf9137f8b00212e3 Mon Sep 17 00:00:00 2001
-From: Alexandre Ghiti <alexandre.ghiti@canonical.com>
-Date: Mon, 3 Oct 2022 18:07:54 +0200
-Subject: [PATCH] riscv: Fix build against binutils 2.38
-
-The following description is copied from the equivalent patch for the
-Linux Kernel proposed by Aurelien Jarno:
-
->From version 2.38, binutils default to ISA spec version 20191213. This
-means that the csr read/write (csrr*/csrw*) instructions and fence.i
-instruction has separated from the `I` extension, become two standalone
-extensions: Zicsr and Zifencei. As the kernel uses those instruction,
-this causes the following build failure:
-
-arch/riscv/cpu/mtrap.S: Assembler messages:
-arch/riscv/cpu/mtrap.S:65: Error: unrecognized opcode `csrr a0,scause'
-arch/riscv/cpu/mtrap.S:66: Error: unrecognized opcode `csrr a1,sepc'
-arch/riscv/cpu/mtrap.S:67: Error: unrecognized opcode `csrr a2,stval'
-arch/riscv/cpu/mtrap.S:70: Error: unrecognized opcode `csrw sepc,a0'
-
-Signed-off-by: Alexandre Ghiti <alexandre.ghiti@canonical.com>
-Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
-Tested-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
-Tested-by: Heiko Stuebner <heiko@sntech.de>
-Tested-by: Christian Stewart <christian@paral.in>
-Reviewed-by: Rick Chen <rick@andestech.com>
-(cherry picked from commit 1dde977518f13824b847e23275001191139bc384)
-Upstream: https://gitlab.com/u-boot/u-boot/-/commit/1dde977518f13824b847e23275001191139bc384
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
- arch/riscv/Makefile | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
-index 0b80eb8d864..53d1194ffb6 100644
--- a/arch/riscv/Makefile
-+++ b/arch/riscv/Makefile
-@@ -24,7 +24,16 @@ ifeq ($(CONFIG_CMODEL_MEDANY),y)
- 	CMODEL = medany
- endif
- 
-ARCH_FLAGS = -march=$(ARCH_BASE)$(ARCH_A)$(ARCH_C) -mabi=$(ABI) \
-+RISCV_MARCH = $(ARCH_BASE)$(ARCH_A)$(ARCH_C)
-+
-+# Newer binutils versions default to ISA spec version 20191213 which moves some
-+# instructions from the I extension to the Zicsr and Zifencei extensions.
-+toolchain-need-zicsr-zifencei := $(call cc-option-yn, -mabi=$(ABI) -march=$(RISCV_MARCH)_zicsr_zifencei)
-+ifeq ($(toolchain-need-zicsr-zifencei),y)
-+	RISCV_MARCH := $(RISCV_MARCH)_zicsr_zifencei
-+endif
-+
-+ARCH_FLAGS = -march=$(RISCV_MARCH) -mabi=$(ABI) \
- 	     -mcmodel=$(CMODEL)
- 
- PLATFORM_CPPFLAGS	+= $(ARCH_FLAGS)
-- 
-2.41.0
-
@@ -27,9 +27,8 @@ build_trx() {
 	rm -f $images/zImage.$device.lzma
 }

-devices="$(sed -n 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([^"]*\)"$/\1/p' ${BR2_CONFIG})"
+devices="$(sed -n 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([a-z0-9 \-]*\)"$/\1/p' ${BR2_CONFIG})"
 for device in $devices; do
-	device="${device#broadcom/}"
 	case "$device" in
 		"bcm4708-smartrg-sr400ac")
 			build_trx "$1" "$device"
@@ -0,0 +1,160 @@
+From 3878b941c6bde84e29b2725e4261d85bea828752 Mon Sep 17 00:00:00 2001
+From: Michael Trimarchi <michael@amarulasolutions.com>
+Date: Sun, 22 May 2022 15:22:08 +0200
+Subject: [PATCH] include/configs: Remove rootwait=1 to all the affected boards
+
+rootwait=1 is not a valid kernel boot parameters. According
+to the documenation is only rootwait
+
+rootwait	[KNL]	Wait (indefinitely) for root device to show up.
+			Useful for devices that are detected asynchronously
+			(e.g. USB and MMC devices).
+
+Fix:
+Unknown kernel command line parameters "rootwait=1", will be passed to user space.
+
+Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
+Reviewed-by: Heiko Schocher <hs@denx.de>
+Link: https://patchwork.ozlabs.org/project/uboot/patch/20220520110013.32811-1-michael@amarulasolutions.com/
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
+---
+ include/configs/am335x_evm.h           | 2 +-
+ include/configs/am43xx_evm.h           | 2 +-
+ include/configs/baltos.h               | 2 +-
+ include/configs/chiliboard.h           | 2 +-
+ include/configs/etamin.h               | 2 +-
+ include/configs/imx8mn_bsh_smm_s2.h    | 2 +-
+ include/configs/siemens-am33x-common.h | 4 ++--
+ include/configs/ti_armv7_keystone2.h   | 2 +-
+ include/environment/ti/nand.h          | 2 +-
+ 9 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
+index fd5b209a52db..f301a6dc835b 100644
+--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
+@@ -34,7 +34,7 @@
+ 		"root=${nandroot} " \
+ 		"rootfstype=${nandrootfstype}\0" \
+ 	"nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system,2048\0" \
+-	"nandrootfstype=ubifs rootwait=1\0" \
+	"nandrootfstype=ubifs rootwait\0" \
+ 	"nandboot=echo Booting from nand ...; " \
+ 		"run nandargs; " \
+ 		"nand read ${fdtaddr} NAND.u-boot-spl-os; " \
+diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
+index 5057441f7506..1f5c3cd04e88 100644
+--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
+@@ -166,7 +166,7 @@
+ 		"root=${nandroot} " \
+ 		"rootfstype=${nandrootfstype}\0" \
+ 	"nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system,4096\0" \
+-	"nandrootfstype=ubifs rootwait=1\0" \
+	"nandrootfstype=ubifs rootwait\0" \
+ 	"nandboot=echo Booting from nand ...; " \
+ 		"run nandargs; " \
+ 		"nand read ${fdtaddr} NAND.u-boot-spl-os; " \
+diff --git a/include/configs/baltos.h b/include/configs/baltos.h
+index b881d8c03fd7..7b43741fde7c 100644
+--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
+@@ -37,7 +37,7 @@
+ 		"root=${nandroot} " \
+ 		"rootfstype=${nandrootfstype}\0" \
+ 	"nandroot=ubi0:rootfs rw ubi.mtd=5\0" \
+-	"nandrootfstype=ubifs rootwait=1\0" \
+	"nandrootfstype=ubifs rootwait\0" \
+ 	"nandboot=echo Booting from nand ...; " \
+ 		"run nandargs; " \
+ 		"setenv loadaddr 0x84000000; " \
+diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h
+index 82acda595f09..8bad0f9ac4b6 100644
+--- a/include/configs/chiliboard.h
+++ b/include/configs/chiliboard.h
+@@ -20,7 +20,7 @@
+ 		"root=${nandroot} " \
+ 		"rootfstype=${nandrootfstype}\0" \
+ 	"nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system\0" \
+-	"nandrootfstype=ubifs rootwait=1\0" \
+	"nandrootfstype=ubifs rootwait\0" \
+ 	"nandboot=echo Booting from nand ...; " \
+ 		"run nandargs; " \
+ 		"nand read ${fdt_addr} NAND.u-boot-spl-os; " \
+diff --git a/include/configs/etamin.h b/include/configs/etamin.h
+index 9cf93924df93..1c0a86d1ed10 100644
+--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
+@@ -113,7 +113,7 @@
+ 	"nand_active_ubi_vol=rootfs_a\0" \
+ 	"rootfs_name=rootfs\0" \
+ 	"kernel_name=uImage\0"\
+-	"nand_root_fs_type=ubifs rootwait=1\0" \
+	"nand_root_fs_type=ubifs rootwait\0" \
+ 	"nand_args=run bootargs_defaults;" \
+ 		"mtdparts default;" \
+ 		"setenv ${partitionset_active} true;" \
+diff --git a/include/configs/imx8mn_bsh_smm_s2.h b/include/configs/imx8mn_bsh_smm_s2.h
+index d09c2ab01610..0dc514f00684 100644
+--- a/include/configs/imx8mn_bsh_smm_s2.h
+++ b/include/configs/imx8mn_bsh_smm_s2.h
+@@ -22,7 +22,7 @@
+ 		"root=${nandroot} " \
+ 		"rootfstype=${nandrootfstype}\0" \
+ 	"nandroot=ubi0:root rw ubi.mtd=nandrootfs\0" \
+-	"nandrootfstype=ubifs rootwait=1\0" \
+	"nandrootfstype=ubifs rootwait\0" \
+ 	"nandboot=echo Booting from nand ...; " \
+ 		"run nandargs; " \
+ 		"nand read ${fdt_addr_r} nanddtb; " \
+diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
+index 08c4d52d658f..9f1a6cd51b40 100644
+--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
+@@ -237,7 +237,7 @@
+ 	"nand_active_ubi_vol=rootfs_a\0" \
+ 	"nand_active_ubi_vol_A=rootfs_a\0" \
+ 	"nand_active_ubi_vol_B=rootfs_b\0" \
+-	"nand_root_fs_type=ubifs rootwait=1\0" \
+	"nand_root_fs_type=ubifs rootwait\0" \
+ 	"nand_src_addr=0x280000\0" \
+ 	"nand_src_addr_A=0x280000\0" \
+ 	"nand_src_addr_B=0x780000\0" \
+@@ -314,7 +314,7 @@
+ 	"nand_active_ubi_vol=rootfs_a\0" \
+ 	"rootfs_name=rootfs\0" \
+ 	"kernel_name=uImage\0"\
+-	"nand_root_fs_type=ubifs rootwait=1\0" \
+	"nand_root_fs_type=ubifs rootwait\0" \
+ 	"nand_args=run bootargs_defaults;" \
+ 		"mtdparts default;" \
+ 		"setenv ${partitionset_active} true;" \
+diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
+index 57f013cbf846..133daecf7164 100644
+--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
+@@ -180,7 +180,7 @@
+ 		"sf write ${loadaddr} 0 ${filesize}\0"		\
+ 	"burn_uboot_nand=nand erase 0 0x100000; "			\
+ 		"nand write ${loadaddr} 0 ${filesize}\0"		\
+-	"args_all=setenv bootargs console=ttyS0,115200n8 rootwait=1 "	\
+	"args_all=setenv bootargs console=ttyS0,115200n8 rootwait "	\
+ 		KERNEL_MTD_PARTS					\
+ 	"args_net=setenv bootargs ${bootargs} rootfstype=nfs "		\
+ 		"root=/dev/nfs rw nfsroot=${serverip}:${nfs_root},"	\
+diff --git a/include/environment/ti/nand.h b/include/environment/ti/nand.h
+index 11dcefcc41ca..7d00afa2b10f 100644
+--- a/include/environment/ti/nand.h
+++ b/include/environment/ti/nand.h
+@@ -14,7 +14,7 @@
+ 		"root=${nandroot} " \
+ 		"rootfstype=${nandrootfstype}\0" \
+ 	"nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system,2048\0" \
+-	"nandrootfstype=ubifs rootwait=1\0" \
+	"nandrootfstype=ubifs rootwait\0" \
+ 	"nandboot=echo Booting from nand ...; " \
+ 		"run nandargs; " \
+ 		"nand read ${fdtaddr} NAND.u-boot-spl-os; " \
+-- 
+2.32.0
+
@@ -2,7 +2,7 @@ i.MX8MN BSH SMM S2
 ==================

 This tutorial describes how to use the predefined Buildroot
-configuration for the i.MX8MN BSH SMM S2 board.
+configuration for the i.MX8MN BSH SMM S2 PRO board.

 Building
 --------
@@ -1,58 +0,0 @@
-From 0cf11f3c0478f4286adcfb09bf9137f8b00212e3 Mon Sep 17 00:00:00 2001
-From: Alexandre Ghiti <alexandre.ghiti@canonical.com>
-Date: Mon, 3 Oct 2022 18:07:54 +0200
-Subject: [PATCH] riscv: Fix build against binutils 2.38
-
-The following description is copied from the equivalent patch for the
-Linux Kernel proposed by Aurelien Jarno:
-
->From version 2.38, binutils default to ISA spec version 20191213. This
-means that the csr read/write (csrr*/csrw*) instructions and fence.i
-instruction has separated from the `I` extension, become two standalone
-extensions: Zicsr and Zifencei. As the kernel uses those instruction,
-this causes the following build failure:
-
-arch/riscv/cpu/mtrap.S: Assembler messages:
-arch/riscv/cpu/mtrap.S:65: Error: unrecognized opcode `csrr a0,scause'
-arch/riscv/cpu/mtrap.S:66: Error: unrecognized opcode `csrr a1,sepc'
-arch/riscv/cpu/mtrap.S:67: Error: unrecognized opcode `csrr a2,stval'
-arch/riscv/cpu/mtrap.S:70: Error: unrecognized opcode `csrw sepc,a0'
-
-Signed-off-by: Alexandre Ghiti <alexandre.ghiti@canonical.com>
-Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
-Tested-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
-Tested-by: Heiko Stuebner <heiko@sntech.de>
-Tested-by: Christian Stewart <christian@paral.in>
-Reviewed-by: Rick Chen <rick@andestech.com>
-(cherry picked from commit 1dde977518f13824b847e23275001191139bc384)
-Upstream: https://gitlab.com/u-boot/u-boot/-/commit/1dde977518f13824b847e23275001191139bc384
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
- arch/riscv/Makefile | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
-index 0b80eb8d864..53d1194ffb6 100644
--- a/arch/riscv/Makefile
-+++ b/arch/riscv/Makefile
-@@ -24,7 +24,16 @@ ifeq ($(CONFIG_CMODEL_MEDANY),y)
- 	CMODEL = medany
- endif
- 
-ARCH_FLAGS = -march=$(ARCH_BASE)$(ARCH_A)$(ARCH_C) -mabi=$(ABI) \
-+RISCV_MARCH = $(ARCH_BASE)$(ARCH_A)$(ARCH_C)
-+
-+# Newer binutils versions default to ISA spec version 20191213 which moves some
-+# instructions from the I extension to the Zicsr and Zifencei extensions.
-+toolchain-need-zicsr-zifencei := $(call cc-option-yn, -mabi=$(ABI) -march=$(RISCV_MARCH)_zicsr_zifencei)
-+ifeq ($(toolchain-need-zicsr-zifencei),y)
-+	RISCV_MARCH := $(RISCV_MARCH)_zicsr_zifencei
-+endif
-+
-+ARCH_FLAGS = -march=$(RISCV_MARCH) -mabi=$(ABI) \
- 	     -mcmodel=$(CMODEL)
- 
- PLATFORM_CPPFLAGS	+= $(ARCH_FLAGS)
-- 
-2.41.0
-
@@ -1,4 +0,0 @@
-label RK3399RocPC linux
-  kernel /boot/Image
-  devicetree /boot/rk3399-roc-pc.dtb
-  append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk0p1 rootwait
@@ -1,22 +0,0 @@
-image sdcard.img {
-	hdimage {
-	}
-
-	partition u-boot-tpl-spl-dtb {
-		in-partition-table = "no"
-		image = "idbloader.img"
-		offset = 32K
-	}
-
-	partition u-boot-dtb {
-		in-partition-table = "no"
-		image = "u-boot.itb"
-		offset = 8M
-		size = 30M
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
-}
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-BOARD_DIR="$(dirname "$0")"
-
-install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$TARGET_DIR"/boot/extlinux/extlinux.conf
@@ -1,40 +0,0 @@
-Libre Computer Board ROC-RK3399-PC
-===================================
-
-Build:
-
-  $ make roc_pc_rk3399_defconfig
-  $ make
-
-Files created in output directory
-=================================
-
-output/images
-
-├── bl31.elf
-├── idbloader.img
-├── Image
-├── rk3399-roc-pc.dtb
-├── rootfs.ext2
-├── rootfs.ext4 -> rootfs.ext2
-├── rootfs.tar
-├── sdcard.img
-├── u-boot.bin
-└── u-boot.itb
-
-Creating bootable SD card:
-==========================
-
-Simply invoke (as root)
-
-sudo dd if=output/images/sdcard.img of=/dev/sdX && sync
-
-Where X is your SD card device
-
-Serial console
--------------
-
-Baudrate for this board is 1500000
-
-Wiki link:
-https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/roc-rk3399-pc.html
@@ -1,42 +0,0 @@
-# Minimal SD card image for the NXP i.MX9 boards
-#
-# We mimic the .sdcard NXP's image format:
-# * the SD card must have 32 kB free space at the beginning,
-# * U-Boot is integrated into imx9-boot-sd.bin and is dumped as is,
-# * a FAT partition at offset 8MB is containing Image and DTB files
-# * a single root filesystem partition is required (ext2, ext3 or ext4)
-#
-
-image boot.vfat {
-	vfat {
-		label = "boot"
-		files = {
-			%FILES%
-		}
-	}
-
-	size = 64M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition imx-boot {
-		in-partition-table = "no"
-		image = "imx9-boot-sd.bin"
-		offset = %IMXOFFSET%
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-		offset = 8M
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext2"
-	}
-}
@@ -63,8 +63,6 @@ main ()
 		dd if=${BINARIES_DIR}/u-boot-hash.bin of=${BINARIES_DIR}/u-boot-atf.bin bs=1K seek=128
 		if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y$" ${BR2_CONFIG}; then
 			${HOST_DIR}/bin/mkimage_imx8 -soc QM -rev B0 -append ${BINARIES_DIR}/ahab-container.img -c -scfw ${BINARIES_DIR}/mx8qm-mek-scfw-tcm.bin -ap ${BINARIES_DIR}/u-boot-atf.bin a53 0x80000000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
-	        elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL=y$" ${BR2_CONFIG}; then
-			${HOST_DIR}/bin/mkimage_imx8 -soc DXL -rev B0 -append ${BINARIES_DIR}/ahab-container.img -c -scfw ${BINARIES_DIR}/mx8dxl-evk-scfw-tcm.bin -ap ${BINARIES_DIR}/u-boot-atf.bin a35 0x80000000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
 		else
 			${HOST_DIR}/bin/mkimage_imx8 -soc QX -rev B0 -append ${BINARIES_DIR}/ahab-container.img -c -scfw ${BINARIES_DIR}/mx8qx-mek-scfw-tcm.bin -ap ${BINARIES_DIR}/u-boot-atf.bin a35 0x80000000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
 		fi
@@ -73,5 +71,4 @@ main ()
 	exit $?
 }

-set -e
 main $@
@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-
-main ()
-{
-	SPL_LOAD_ADDR=0x2049A000
-	ATF_LOAD_ADDR=0x204E0000
-	if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91=y$" "${BR2_CONFIG}"; then
-		SPL_LOAD_ADDR=0x204A0000
-		ATF_LOAD_ADDR=0x204C0000
-	fi
-
-	dd if="${BINARIES_DIR}/u-boot-spl.bin" of="${BINARIES_DIR}/u-boot-spl-padded.bin" bs=4 conv=sync
-	cat "${BINARIES_DIR}/u-boot-spl-padded.bin" "${BINARIES_DIR}/ddr_fw.bin" > "${BINARIES_DIR}/u-boot-spl-ddr.bin"
-
-	"${HOST_DIR}/bin/mkimage_imx8" -commit > "${BINARIES_DIR}/mkimg.commit"
-	cat "${BINARIES_DIR}/u-boot.bin" "${BINARIES_DIR}/mkimg.commit" > "${BINARIES_DIR}/u-boot-hash.bin"
-	rm -f "${BINARIES_DIR}/mkimg.commit"
-
-	if grep -Eq "^BR2_TARGET_OPTEE_OS=y$" "${BR2_CONFIG}"; then
-		"${HOST_DIR}/bin/mkimage_imx8" -soc IMX9 -c \
-			-ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} \
-			-ap "${BINARIES_DIR}/u-boot-hash.bin" a35 0x80200000 \
-			-ap "${BINARIES_DIR}/tee.bin" a35 0x96000000 \
-			-out "${BINARIES_DIR}/u-boot-atf-container.img"
-	else
-		"${HOST_DIR}/bin/mkimage_imx8" -soc IMX9 -c \
-			-ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} \
-			-ap "${BINARIES_DIR}/u-boot-hash.bin" a35 0x80200000 \
-			-out "${BINARIES_DIR}/u-boot-atf-container.img"
-	fi
-
-	"${HOST_DIR}/bin/mkimage_imx8" -soc IMX9 -append "${BINARIES_DIR}/ahab-container.img" -c \
-		-ap "${BINARIES_DIR}/u-boot-spl-ddr.bin" a35 ${SPL_LOAD_ADDR} \
-		-out "${BINARIES_DIR}/imx9-boot-sd.bin"
-
-	flashbin_size="$(wc -c "${BINARIES_DIR}/imx9-boot-sd.bin" | awk '{print $1}')"
-	pad_cnt=$(($((flashbin_size + 0x400 - 1)) / 0x400))
-	dd if="${BINARIES_DIR}/u-boot-atf-container.img" of="${BINARIES_DIR}/imx9-boot-sd.bin" bs=1K seek=${pad_cnt}
-
-	exit $?
-}
-
-main "$@"
@@ -7,12 +7,10 @@
 #
 dtb_list()
 {
-	local DTB_LIST
-
-	DTB_LIST="$(sed -n 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([\/a-z0-9 \-]*\)"$/\1/p' "${BR2_CONFIG}")"
+	local DTB_LIST="$(sed -n 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([\/a-z0-9 \-]*\)"$/\1/p' ${BR2_CONFIG})"

 	for dt in $DTB_LIST; do
-		echo -n "\"$(basename "${dt}").dtb\", "
+		echo -n "\"`basename $dt`.dtb\", "
 	done
 }

@@ -23,11 +21,11 @@ dtb_list()
 #
 linux_image()
 {
-	if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" "${BR2_CONFIG}"; then
+	if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then
 		echo "\"uImage\""
-	elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" "${BR2_CONFIG}"; then
+	elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" ${BR2_CONFIG}; then
 		echo "\"Image\""
-	elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" "${BR2_CONFIG}"; then
+	elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" ${BR2_CONFIG}; then
 		echo "\"Image.gz\""
 	else
 		echo "\"zImage\""
@@ -36,31 +34,25 @@ linux_image()

 genimage_type()
 {
-	if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y$" "${BR2_CONFIG}"; then
+	if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y$" ${BR2_CONFIG}; then
 		echo "genimage.cfg.template_imx8"
-	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" "${BR2_CONFIG}"; then
+	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then
 		echo "genimage.cfg.template_imx8"
-	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" "${BR2_CONFIG}"; then
+	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" ${BR2_CONFIG}; then
 		echo "genimage.cfg.template_imx8"
-	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y$" "${BR2_CONFIG}"; then
+	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y$" ${BR2_CONFIG}; then
 		echo "genimage.cfg.template_imx8"
-	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP=y$" "${BR2_CONFIG}"; then
+	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP=y$" ${BR2_CONFIG}; then
 		echo "genimage.cfg.template_imx8"
-	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X=y$" "${BR2_CONFIG}"; then
+	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X=y$" ${BR2_CONFIG}; then
 		echo "genimage.cfg.template_imx8"
-	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL=y$" "${BR2_CONFIG}"; then
-		echo "genimage.cfg.template_imx8"
-	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91=y$" "${BR2_CONFIG}"; then
-		echo "genimage.cfg.template_imx9"
-	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93=y$" "${BR2_CONFIG}"; then
-		echo "genimage.cfg.template_imx9"
-	elif grep -Eq "^BR2_LINUX_KERNEL_INSTALL_TARGET=y$" "${BR2_CONFIG}"; then
-		if grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" "${BR2_CONFIG}"; then
+	elif grep -Eq "^BR2_LINUX_KERNEL_INSTALL_TARGET=y$" ${BR2_CONFIG}; then
+		if grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then
 		    echo "genimage.cfg.template_no_boot_part_spl"
 		else
 		    echo "genimage.cfg.template_no_boot_part"
 		fi
-	elif grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" "${BR2_CONFIG}"; then
+	elif grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then
 		echo "genimage.cfg.template_spl"
 	else
 		echo "genimage.cfg.template"
@@ -69,9 +61,9 @@ genimage_type()

 imx_offset()
 {
-	if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" "${BR2_CONFIG}"; then
+	if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then
 		echo "33K"
-	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" "${BR2_CONFIG}"; then
+	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" ${BR2_CONFIG}; then
 		echo "33K"
 	else
 		echo "32K"
@@ -80,30 +72,29 @@ imx_offset()

 uboot_image()
 {
-	if grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y$" "${BR2_CONFIG}"; then
+	if grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y$" ${BR2_CONFIG}; then
 		echo "u-boot-dtb.imx"
-	elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_IMX=y$" "${BR2_CONFIG}"; then
+	elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_IMX=y$" ${BR2_CONFIG}; then
 		echo "u-boot.imx"
-	elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y$" "${BR2_CONFIG}"; then
+	elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y$" ${BR2_CONFIG}; then
 	    echo "u-boot-dtb.img"
-	elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_IMG=y$" "${BR2_CONFIG}"; then
+	elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_IMG=y$" ${BR2_CONFIG}; then
 	    echo "u-boot.img"
 	fi
 }

 main()
 {
-	local FILES IMXOFFSET UBOOTBIN GENIMAGE_CFG GENIMAGE_TMP
-	FILES="$(dtb_list) $(linux_image)"
-	IMXOFFSET="$(imx_offset)"
-	UBOOTBIN="$(uboot_image)"
-	GENIMAGE_CFG="$(mktemp --suffix genimage.cfg)"
-	GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+	local FILES="$(dtb_list) $(linux_image)"
+	local IMXOFFSET="$(imx_offset)"
+	local UBOOTBIN="$(uboot_image)"
+	local GENIMAGE_CFG="$(mktemp --suffix genimage.cfg)"
+	local GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"

 	sed -e "s/%FILES%/${FILES}/" \
 		-e "s/%IMXOFFSET%/${IMXOFFSET}/" \
 		-e "s/%UBOOTBIN%/${UBOOTBIN}/" \
-		"board/freescale/common/imx/$(genimage_type)" > "${GENIMAGE_CFG}"
+		board/freescale/common/imx/$(genimage_type) > ${GENIMAGE_CFG}

 	rm -rf "${GENIMAGE_TMP}"

@@ -114,9 +105,9 @@ main()
 		--outputpath "${BINARIES_DIR}" \
 		--config "${GENIMAGE_CFG}"

-	rm -f "${GENIMAGE_CFG}"
+	rm -f ${GENIMAGE_CFG}

 	exit $?
 }

-main "$@"
+main $@
@@ -1,61 +0,0 @@
-From 0f75b03c008eacb9818af3a56dc088e72a623d17 Mon Sep 17 00:00:00 2001
-From: Marco Felsch <m.felsch@pengutronix.de>
-Date: Wed, 9 Nov 2022 12:59:09 +0100
-Subject: [PATCH] feat(build): add support for new binutils versions
-
-Users of GNU ld (BPF) from binutils 2.39+ will observe multiple instaces
-of a new warning when linking the bl*.elf in the form:
-
-  ld.bfd: warning: stm32mp1_helper.o: missing .note.GNU-stack section implies executable stack
-  ld.bfd: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
-  ld.bfd: warning: bl2.elf has a LOAD segment with RWX permissions
-  ld.bfd: warning: bl32.elf has a LOAD segment with RWX permissions
-
-These new warnings are enbaled by default to secure elf binaries:
- - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107
- - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0d38576a34ec64a1b4500c9277a8e9d0f07e6774
-
-Fix it in a similar way to what the Linux kernel does, see:
-https://lore.kernel.org/all/20220810222442.2296651-1-ndesaulniers@google.com/
-
-Following the reasoning there, we set "-z noexecstack" for all linkers
-(although LLVM's LLD defaults to it) and optional add
--no-warn-rwx-segments since this a ld.bfd related.
-
-Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-Change-Id: I9430f5fa5036ca88da46cd3b945754d62616b617
-Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
-Upstream: https://github.com/ARM-software/arm-trusted-firmware/commit/1f49db5f25cdd4e43825c9bcc0575070b80f628c
---
- Makefile | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 1ddb7b844..470956b19 100644
--- a/Makefile
-+++ b/Makefile
-@@ -416,6 +416,8 @@ endif
- 
- GCC_V_OUTPUT		:=	$(shell $(CC) -v 2>&1)
- 
-+TF_LDFLAGS		+=	-z noexecstack
-+
- # LD = armlink
- ifneq ($(findstring armlink,$(notdir $(LD))),)
- TF_LDFLAGS		+=	--diag_error=warning --lto_level=O1
-@@ -442,7 +444,10 @@ TF_LDFLAGS		+=	$(subst --,-Xlinker --,$(TF_LDFLAGS_$(ARCH)))
- 
- # LD = gcc-ld (ld) or llvm-ld (ld.lld) or other
- else
-TF_LDFLAGS		+=	--fatal-warnings -O1
-+# With ld.bfd version 2.39 and newer new warnings are added. Skip those since we
-+# are not loaded by a elf loader.
-+TF_LDFLAGS		+=	$(call ld_option, --no-warn-rwx-segments)
-+TF_LDFLAGS		+=	-O1
- TF_LDFLAGS		+=	--gc-sections
- # ld.lld doesn't recognize the errata flags,
- # therefore don't add those in that case
-- 
-2.30.2
-
@@ -1,51 +0,0 @@
-From b2a94de52ae4a940a87d569815b19d3fa92dd32a Mon Sep 17 00:00:00 2001
-From: Tom Hochstein <tom.hochstein@nxp.com>
-Date: Mon, 16 May 2022 13:45:16 -0500
-Subject: [PATCH] LF-7968-01 fix(Makefile): Suppress array-bounds error
-
-The array-bounds error is triggered now in cases where it was silent
-before, causing errors like:
-
-```
-plat/imx/imx8m/hab.c: In function 'imx_hab_handler':
-plat/imx/imx8m/hab.c:64:57: error: array subscript 0 is outside array bounds of 'uint32_t[0]' {aka 'unsigned int[]'} [-Werror=array-bounds]
-   64 | #define HAB_RVT_CHECK_TARGET_ARM64      ((unsigned long)*(uint32_t *)(HAB_RVT_BASE + 0x18))
-      |                                                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-```
-
-The error is a false-positive and is entered as a bug [1]. The problem
-is fixed partially in GCC 12 and fully in GCC 13 [2].
-
-The partial fix does not work here because the constant addresses used
-are less than the 4kB boundary chosen for the partial fix, so suppress
-the error until GCC is upgraded to 13.
-
-[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99578
-[2] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99578#c39
-
-Upstream-Status: Inappropriate [other]
-Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
-Signed-off-by: Jacky Bai <ping.bai@nxp.com>
-Reviewed-by: Ye Li <ye.li@nxp.com>
-Signed-off-by: Brandon Maier <brandon.maier@collins.com>
-Upstream: https://github.com/nxp-imx/imx-atf/commit/058bf0f104115037d03e277f079825ef3659c5b9
---
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index c87c3ae08..2d6b90f47 100644
--- a/Makefile
-+++ b/Makefile
-@@ -346,7 +346,7 @@ WARNINGS	+=		-Wshift-overflow -Wshift-sign-overflow \
- endif
- 
- ifneq (${E},0)
-ERRORS := -Werror
-+ERRORS := -Werror -Wno-error=array-bounds
- endif
- 
- CPPFLAGS		=	${DEFINES} ${INCLUDES} ${MBEDTLS_INC} -nostdinc	\
-- 
-2.41.0
-
@@ -1 +0,0 @@
-CONFIG_IMX_SDMA=m
@@ -1,69 +0,0 @@
-******************************
-Freescale i.MX8DXL WEVK board
-******************************
-
-This file documents the Buildroot support for the Freescale i.MX8DXL WEVK
-board.
-
-Build
-=====
-
-First, configure Buildroot for the i.MX8DXL WEVK board:
-
-  make freescale_imx8dxlevk_defconfig
-
-Build all components:
-
-  make
-
-You will find in output/images/ the following files:
-  - ahab-container.img
-  - bl31.bin
-  - boot.vfat
-  - Image
-  - imx8-boot-sd.bin
-  - imx8dxl-evk.dtb
-  - mkimg.commit
-  - mx8dxl-ddr3-evk-scfw-tcm.bin
-  - mx8dxl-evk-scfw-tcm.bin
-  - mx8dxl-phantom-mek-scfw-tcm.bin
-  - mx8dxl-val-scfw-tcm.bin
-  - rootfs.ext2
-  - rootfs.ext4
-  - rootfs.tar
-  - sdcard.img
-  - u-boot-atf.bin
-  - u-boot.bin
-  - u-boot-hash.bin
-
-Create a bootable SD card
-=========================
-
-To determine the device associated to the SD card have a look in the
-/proc/partitions file:
-
-  cat /proc/partitions
-
-Buildroot prepares a bootable "sdcard.img" image in the output/images/
-directory, ready to be dumped on a SD card. Launch the following
-command as root:
-
-  dd if=output/images/sdcard.img of=/dev/<your-sd-device>
-
-*** WARNING! This will destroy all the card content. Use with care! ***
-
-For details about the medium image layout, see the definition in
-board/freescale/common/imx/genimage.cfg.template_imx8.
-
-Boot the i.MX8DXL WEVK board
-============================
-
-To boot your newly created system:
- insert the SD card in the SD slot of the board;
- Configure the boot switch as follows:
-SW1:	ON	ON	OFF	OFF
- put a micro USB cable into the Debug USB Port and connect using a terminal
-  emulator at 115200 bps, 8n1;
- power on the board.
-
-Enjoy!
@@ -1,3 +0,0 @@
-# Use the upstream devicetree name for EVK board
-# Revert https://github.com/nxp-imx/uboot-imx/commit/a60e787a6e35b9c14c391e03d41468e4ad63d598
-CONFIG_DEFAULT_FDT_FILE="imx8mp-evk.dtb"
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  cfb927722272897f850681c78d5f129b0883a8efaba9c52d30e029086524f7ff  imx-atf-lf-6.1.55-2.2.0.tar.gz
@@ -1 +0,0 @@
-../linux/linux.hash
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  eb94414f952444289c0af8ad82afa0dc2d07e08f9000ccd2cc39f11da5b494ea  linux-imx-lf-6.1.55-2.2.0.tar.gz
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  64441ee5bf3d5011e7853c028d06211b6f0439d21e147a8f36972c95a07ae9ac  uboot-imx-lf-6.1.55-2.2.0.tar.gz
@@ -1,77 +0,0 @@
-*********************
-NXP i.MX93 EVK board
-*********************
-
-This file documents the Buildroot support for the i.MX 93 EVK board.
-
-Build
-=====
-
-First, configure Buildroot for the i.MX 93 EVK board:
-
-  make freescale_imx93evk_defconfig
-
-Build all components:
-
-  make
-
-You will find in output/images/ the following files:
-  - ahab-container.img
-  - bl31.bin
-  - boot.vfat
-  - ddr_fw.bin
-  - Image
-  - imx93-11x11-evk.dtb
-  - imx9-boot-sd.bin
-  - lpddr4_pmu_train_fw.bin
-  - rootfs.ext2
-  - rootfs.ext4
-  - rootfs.tar
-  - sdcard.img
-  - u-boot-atf-container.img
-  - u-boot.bin
-  - u-boot-hash.bin
-  - u-boot-spl.bin
-  - u-boot-spl-ddr.bin
-  - u-boot-spl-padded.bin
-
-Create a bootable SD card
-=========================
-
-To determine the device associated to the SD card have a look in the
-/proc/partitions file:
-
-  cat /proc/partitions
-
-Buildroot prepares a bootable "sdcard.img" image in the output/images/
-directory, ready to be dumped on a SD card. Launch the following
-command as root:
-
-  dd if=output/images/sdcard.img of=/dev/<your-sd-device>
-
-*** WARNING! This will destroy all the card content. Use with care! ***
-
-For details about the medium image layout, see the definition in
-board/freescale/common/imx/genimage.cfg.template_imx9.
-
-Boot the i.MX 93 EVK board
-===============================
-
-To boot your newly created system (refer to the i.MX 93 EVK Documentation
-[1] for guidance):
- insert the SD card in the SD slot of the board;
- Configure the switches as follows:
-SW1301: 0100 SW1301[1-4]
- put a micro USB cable into the Debug USB Port and connect using a terminal
-  emulator at 115200 bps, 8n1;
- power on the board.
-
-Note: the debug USB connector presents 4 UARTs (for example /dev/ttyUSB[0-3]),
-the Cortex-A55 UART should be the 3rd one (in the previous example, /dev/ttyUSB2).
-Refer to the documentation [1] for more details.
-
-Enjoy!
-
-References
-==========
-[1] https://www.nxp.com/document/guide/getting-started-with-the-i-mx93-evk:GS-IMX93EVK
@@ -1,40 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"zImage",
-			"imxrt1050-evk.dtb",
-		}
-	}
-
-	size = 8M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition SPL {
-		in-partition-table = "no"
-		image = "SPL"
-		offset = 1K
-		size = 127K
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot.img"
-		offset = 128K
-		size = 512K
-	}
-
-	partition boot {
-		partition-type = 0xc
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
-}
@@ -1,30 +0,0 @@
-NXP i.MXRT1050 EVK board
------------------------
-
-i.MX RT1050 are NXP's crossover MCUs. They combine the high performance and high
-level of integration of an applications processors with the ease-of-use and
-real-time functionality of a microcontroller. The i.MX RT1050 MCU runs on the Arm
-Cortex-M7 core at 600 MHz.
-https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/i-mx-rt1050-evaluation-kit:MIMXRT1050-EVK
-
-To build a minimal support for this board:
-
-$ make imxrt1050-evk_defconfig
-$ make
-
-Buildroot prepares a bootable "sdcard.img" image in the output/images/
-directory, ready to be flashed into the SD card:
-
-$ dd if=output/images/sdcard.img of=/dev/sdX
-Where 'sdX' is the device node of the uSD.
-
-Jumper settings:
-
-   SW7: 1 0 1 0
-
-Where 0 means bottom position and 1 means top position (from the
-switch label numbers reference).
-
-Connect the USB cable between the EVK and the PC for the console.
-
-Insert the micro SD card in the board, power it up and U-Boot messages should come up.
@@ -1,2 +0,0 @@
-CONFIG_USE_BOOTCOMMAND=y
-CONFIG_BOOTCOMMAND="setenv bootargs console=ttyLP0 root=/dev/mmcblk0p2 rw earlycon rootwait;load mmc 0:1 0x80800000 imxrt1050-evk.dtb;load mmc 0:1 0x80000000 zImage;bootz 0x80000000 - 0x80800000"
@@ -1,29 +0,0 @@
-image sdcard.img {
-	hdimage {
-	}
-
-	partition fsbl {
-		offset = 4K
-		in-partition-table = "no"
-		image = "bl2_sd.pbl"
-	}
-
-	partition ssbl {
-		offset = 1M
-		in-partition-table = "no"
-		image = "fip.bin"
-	}
-
-	partition fman {
-		offset = 9M
-		in-partition-table = "no"
-		image = "fsl_fman_ucode_ls1046_r1.0_106_4_18.bin"
-	}
-
-	partition rootfs {
-		offset = 16M
-		partition-type = 0x83
-		bootable = "true"
-		image = "rootfs.ext4"
-	}
-}
@@ -1,90 +0,0 @@
-**************
-NXP LS1046A-FRWY
-**************
-
-This file documents the Buildroot support for the LS1046A Freeway Board.
-
-for more details about the board and the QorIQ Layerscape SoC, see the following pages:
-  - https://www.nxp.com/design/software/qoriq-developer-resources/ls1046a-freeway-board:FRWY-LS1046A
-  - https://www.nxp.com/FRWY-LS1046A
-  - https://www.nxp.com/docs/en/quick-reference-guide/FRWY-LS1046AGSG.pdf
-
-for the software NXP LSDK (Layerscape Software Development Kit), see
-  - https://www.nxp.com/docs/en/user-guide/LSDKUG_Rev21.08.pdf
-
-the components from NXP are:
-  - rcw, LSDK 21.08
-  - atf (fork), LSDK 21.08
-  - uboot (fork), LSDK 21.08
-  - qoriq-fm-ucode (blob), LSDK 21.08
-  - linux (fork), LSDK 21.08
-
-Build
-=====
-
-First, configure Buildroot for the LS1046A-FRWY board:
-
-  make ls1046a-frwy_defconfig
-
-Build all components:
-
-  make
-
-You will find in output/images/ the following files:
-  - bl2_sd.pbl
-  - fip.bin
-  - fsl_fman_ucode_ls1046_r1.0_106_4_18.bin
-  - fsl_fman_ucode_ls1046_r1.0_108_4_9.bin
-  - fsl-ls1046a-frwy.dtb
-  - fsl-ls1046a-frwy-sdk.dtb
-  - Image
-  - PBL.bin
-  - rootfs.ext2
-  - rootfs.ext4
-  - sdcard.img
-  - u-boot.bin
-
-Create a bootable SD card
-=========================
-
-To determine the device associated to the SD card have a look in the
-/proc/partitions file:
-
-  cat /proc/partitions
-
-Buildroot prepares a bootable "sdcard.img" image in the output/images/
-directory, ready to be dumped on a SD card. Launch the following
-command as root:
-
-  dd if=output/images/sdcard.img of=/dev/sdX
-
-*** WARNING! This will destroy all the card content. Use with care! ***
-
-For details about the medium image layout, see the definition in
-board/freescale/ls1046a-frwy/genimage.cfg.
-
-Boot the LS1046A-FRWY board
-=========================
-
-To boot your newly created system:
- insert the SD card in the SD slot of the board;
- Configure the switches SW1[1:9] = 0_0100_0000 (select SD Card boot option)
- put a Micro-USB cable into UART1 Port and connect using a terminal emulator
-  at 115200 bps, 8n1. Or remove the jumper on J72, connect a USB to TTL cable
-  to J73, and connect using a terminal emualtor at 115200 bps, 8n1.
- power on the board.
-
-The front panel Ethernet connectors are off at boot, to bring them up run the
-following commands.
-
-1G PORT1
-  ip link set eth1 up
-
-1G PORT2
-  ip link set eth2 up
-
-1G PORT3
-  ip link set eth0 up
-
-1G PORT4
-  ip link set eth3 up
@@ -1,4 +0,0 @@
-label ls1046afrwy-buildroot
-  kernel /boot/Image
-  devicetree /boot/fsl-ls1046a-frwy-sdk.dtb
-  append console=ttyS0,115200 root=/dev/mmcblk0p1 earlycon=uart8250,mmio,0x21c0500 rootwait
@@ -1,38 +0,0 @@
-# Minimal SD card image for the ICnova A20 SomPi on ADB4006
-# Based in the Cubieboard2 genimage.cfg
-
-image boot.vfat {
-	vfat {
-		files = {
-			"zImage",
-			"sun7i-a20-icnova-a20-adb4006.dtb",
-			"boot.scr"
-		}
-	}
-
-	size = 10M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-		size = 512M
-	}
-}
@@ -1 +0,0 @@
-CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE=y
@@ -154,9 +154,9 @@ CONFIG_TUN=y
 # CONFIG_NET_VENDOR_SILAN is not set
 # CONFIG_NET_VENDOR_SIS is not set
 # CONFIG_NET_VENDOR_SMSC is not set
-CONFIG_STMMAC_ETH=y
+CONFIG_STMMAC_ETH=m
 # CONFIG_STMMAC_PLATFORM is not set
-CONFIG_STMMAC_PCI=y
+CONFIG_STMMAC_PCI=m
 # CONFIG_NET_VENDOR_SUN is not set
 # CONFIG_NET_VENDOR_TEHUTI is not set
 # CONFIG_NET_VENDOR_TI is not set
@@ -306,6 +306,3 @@ CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
 # CONFIG_VIRTUALIZATION is not set
 CONFIG_CRC_T10DIF=y
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-CONFIG_IP_PNP=y
@@ -1,5 +0,0 @@
-default buildroot
-label buildroot
-   kernel /Image
-   devicetree /meson-g12b-a311d-khadas-vim3.dtb
-append root=/dev/mmcblk0p2 rootwait console=ttyAML0,115200
@@ -1,33 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"Image",
-			"meson-g12b-a311d-khadas-vim3.dtb",
-			"extlinux"
-		}
-
-		label = "boot"
-	}
-
-	size = 64M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image="boot.vfat"
-		size = 64M
-		offset = 2M
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext2"
-		size = 128M
-		offset = 0
-	}
-}
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-BOARD_DIR="$(dirname "$0")"
-
-install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$BINARIES_DIR"/extlinux/extlinux.conf
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-BOARD_DIR="$(dirname "$0")"
-
-support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg"
-
-AMLOGIC_DIR=${BINARIES_DIR}/amlogic-boot-fip
-FIP_DIR=${BINARIES_DIR}/fip
-
-mkdir -p "${FIP_DIR}"
-
-(cd "${AMLOGIC_DIR}" && \
-	./build-fip.sh khadas-vim3 \
-	"${BINARIES_DIR}"/u-boot.bin \
-	"${FIP_DIR}")
-
-dd if="${FIP_DIR}"/u-boot.bin.sd.bin \
-   of="${BINARIES_DIR}"/sdcard.img \
-   conv=fsync,notrunc bs=1 count=444
-
-dd if="${FIP_DIR}"/u-boot.bin.sd.bin \
-   of="${BINARIES_DIR}"/sdcard.img \
-   conv=fsync,notrunc bs=512 skip=1 seek=1
@@ -1,71 +0,0 @@
-Khadas VIM3
-
-Description
-===========
-
-This configuration builds a complete image for the Khadas VIM3 to be flashed
-on an SD-card.
-
-How to build it
-===============
-
-Select the default configuration for the target:
-$ make khadas_vim3_defconfig
-
-Optional: modify the configuration:
-$ make menuconfig
-
-Build:
-$ make
-
-Result of the build
-===================
-output/images/
-+-- amlogic-boot-fip
-+   +-- build-fip.sh
-+   +-- g12a.inc
-+   `-- khadas-vim3
-+       +-- acs.bin
-+       +-- acs_tool.py
-+       +-- aml_ddr.fw
-+       +-- aml_encrypt_g12b
-+       +-- bl2.bin
-+       +-- bl301.bin
-+       +-- bl30.bin
-+       +-- bl31.bin
-+       +-- bl31.img
-+       +-- blx_fix.sh
-+       +-- ddr3_1d.fw
-+       +-- ddr4_1d.fw
-+       +-- ddr4_2d.fw
-+       +-- diag_lpddr4.fw
-+       +-- lpddr3_1d.fw
-+       +-- lpddr4_1d.fw
-+       +-- lpddr4_2d.fw
-+       +-- Makefile
-+       `-- piei.fw
-+-- boot.vfat
-+-- extlinux
-+   `-- extlinux.conf
-+-- fip
-+   +-- u-boot.bin
-+   +-- u-boot.bin.sd.bin
-+   +-- u-boot.bin.usb.bl2
-+   `-- u-boot.bin.usb.tpl
-+-- Image
-+-- meson-g12b-a311d-khadas-vim3.dtb
-+-- rootfs.ext2
-+-- rootfs.ext4 -> rootfs.ext2
-+-- rootfs.tar
-+-- sdcard.img
-`-- u-boot.bin
-
-The post-image script uses the files in the amlogic-boot-fip folder to sign
-the bootloader image before integrating it into the sdcard image.
-
-To copy the image file to the sdcard use dd:
-$ dd if=output/images/sdcard.img of=/dev/sdX
-
-Tested hardware
-===============
-Khadas vim3 (rev. 14)
@@ -10,7 +10,7 @@ How to build it
 Configure Buildroot
 -------------------

-  $ make sipeed_licheepi_zero_defconfig
+  $ make licheepi_zero_defconfig

 Build the rootfs
 ----------------
@@ -1,16 +0,0 @@
-image sdcard.img {
-	hdimage {
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
-}
@@ -1,46 +0,0 @@
-MangoPi MQ1RDW2
-===============
-
-MangoPi MQ1RDW2 is a tiny ARM Cortex-A7 based single board computer.
-It's built around Allwinner T113-S3 dual core 1GHz CPU with integrated
-128MB DDR3-1600 RAM.
-Board features:
- USB-OTG Type-C socket
- USB-HOST Type-C socket
- 2x 18 pin GPIO headers
- TF card slot
- RTL8723DS WiFi module with ext. antenna connector
- 40 pin RGB FPC connector
- 6 pin CTP FPC connector
- 24 pin DVP FPC connector
- onboard mic
- onboard audio amplifier
- FEL,reset button
-
-How to build
-============
-
-$ make mangopi_mq1rdw2_defconfig
-$ make
-
-Wifi
-==========
-
-Edit board/mangopi/mq1rdw2/overlay/etc/wpa_supplicant.conf or
-/etc/wpa_supplicant.conf once connected to the board:
-
-* Replace YOURSSID with your AP ssid
-* Replace YOURPASSWD with your AP password
-
-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
-
-Connect a TTL UART to the UART3 on P8 header (unpopulated), insert the microSD card and
-plug in a USB-C cable to the OTG or HOST connector to boot the system.
@@ -1,4 +0,0 @@
-label MANGOPI-MQ1RDW2
-    kernel /boot/zImage
-    devicetree /boot/sun8i-t113s-mangopi-mq-r-t113.dtb
-    append console=ttyS3,115200 root=/dev/mmcblk0p1 rootwait panic=10 ${extra}
@@ -1,6 +0,0 @@
-auto lo
-iface lo inet loopback
-
-auto wlan0
-iface wlan0 inet dhcp
-wpa-conf /etc/wpa_supplicant.conf
@@ -1,8 +0,0 @@
-ap_scan=1
-
-network={
-        ssid="YOURSSID"
-        scan_ssid=1
-        key_mgmt=WPA-PSK
-        psk="YOURPASSWD"
-}
@@ -1,62 +0,0 @@
-Microchip PolarFire SoC Icicle Kit
-==================================
-
-This file describes how to use the pre-defined Buildroot
-configuration for Microchip's PolarFire SoC Icicle Kit.
-
-Further information about the PolarFire SoC Icicle Kit can be found
-at https://github.com/polarfire-soc/polarfire-soc-documentation
-
-Building
-========
-
-Configure Buildroot using the default board configuration:
-
-  '$ make microchip_mpfs_icicle_defconfig'
-
-Customise the build as necessary:
-
-  '$ make menuconfig'
-
-Start the build:
-
-  '$ make'
-
-Result of the build
-===================
-
-Once the build has finished you will have the following files:
-
-    output/images/
-    +-- boot.scr
-    +-- boot.vfat
-    +-- Image
-    +-- mpfs_icicle.itb
-    +-- mpfs_icicle.its
-    +-- mpfs-icicle-kit.dtb
-    +-- payload.bin
-    +-- rootfs.ext2
-    +-- rootfs.ext4
-    +-- rootfs.tar
-    +-- sdcard.img
-    +-- u-boot.bin
-
-
-Creating a bootable SD card with genimage
-=========================================
-
-By default Buildroot builds a SD card image for you. The first partition
-of this image contains a U-Boot binary, embedded in a Hart Software
-Services (HSS) payload. The second partition contains a FAT filesystem
-with a U-Boot env and an ITB file containing the kernel and the device
-tree. The third partition contains the file system. This image can be
-written directly to the eMMC or an SD card. All you need to do is dd the
-image to the eMMC or your SD card, which can be done with the following
-command on your development host:
-
-  '$ sudo dd if=output/images/sdcard.img of=/dev/sdb bs=1M'
-
-For instructions on how to transfer the image to the eMMC/SD, please refer to
-the "Programming the Linux image" section of our guide on updating
-PolarFire SoC dev kits:
-https://github.com/polarfire-soc/polarfire-soc-documentation/blob/master/reference-designs-fpga-and-development-kits/updating-mpfs-kit.md.
@@ -1,28 +0,0 @@
-#
-# HSS Payload Generator - buildroot configuration file
-#
-
-# First, we can optionally set a name for our image, otherwise one will be created dynamically
-set-name: 'PolarFire-SoC-HSS::U-Boot'
-
-#
-# Next, we'll define the entry point addresses for each hart, as follows:
-#
-hart-entry-points: {u54_1: '0x80200000', u54_2: '0x80200000', u54_3: '0x80200000', u54_4: '0x80200000'}
-#
-# Finally, we'll define a payloads (source binary file) that will be placed at certain regions in memory
-# The payload section is defined with the keyword payloads, and then a number of individual
-# payload descriptors.
-#
-# Each payload has a name (path to its ELF/bin file), an owner-hart, and optionally 1-3 secondary-harts.
-#
-# Additionally, it has a privilege mode in which it will start execution.
-#  * Valid privilege modes are PRV_M, PRV_S and PRV_U.
-#
-#
-# In this case, the only payload is the u-boot s-mode binary.
-#
-# Case only matters for the ELF path names, not the keywords.
-#
-payloads:
-  u-boot.bin: {exec-addr: '0x80200000', owner-hart: u54_1, secondary-hart: u54_2, secondary-hart: u54_3, secondary-hart: u54_4, priv-mode: prv_s}
@@ -1,34 +0,0 @@
-# Image for eMMC or SDCard boot on the Microchip PolarFire SOC Icicle Board
-#
-image boot.vfat {
-	vfat {
-		files = {
-			 "mpfs_icicle.itb",
-		}
-
-		file boot.scr {
-			image = "boot.scr"
-		}
-	}
-	size = 60M
-}
-
-image sdcard.img {
-	hdimage {
-		partition-table-type = "gpt"
-	}
-
-	partition uboot {
-		partition-type-uuid = 21686148-6449-6E6F-744E-656564454649
-		image = "payload.bin"
-	}
-
-	partition kernel {
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition root {
-		image = "rootfs.ext4"
-	}
-}
@@ -1 +0,0 @@
-CONFIG_POLARFIRE_SOC_DMA_NONCOHERENT=y
@@ -1,53 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Flattened Image Tree file for Icicle Kit
- *
- */
-
-/dts-v1/;
-
-/ {
-	description = "U-Boot fitImage for the MPFS";
-	address-cells = <1>;
-
-		images {
-			kernel {
-				description = "Linux kernel";
-				data = /incbin/("./Image");
-				type = "kernel";
-				arch = "riscv";
-				os = "linux";
-				compression = "none";
-				load = <0x80200000>;
-				entry = <0x80200000>;
-				hash-1 {
-					algo = "sha256";
-				};
-			};
-			base_fdt {
-				description = "Flattened Device Tree blob";
-				data = /incbin/("./mpfs-icicle-kit.dtb");
-				type = "flat_dt";
-				arch = "riscv";
-				compression = "none";
-				load = <0x8a000000>;
-				hash-1 {
-					algo = "sha256";
-				};
-			};
-		};
-
-		configurations {
-			default = "kernel_dtb";
-			kernel_dtb {
-				description = "1 Linux kernel, FDT blob";
-				kernel = "kernel";
-				fdt = "base_fdt";
-			};
-
-			base_dtb {
-				description = "Base FDT blob for MPFS Icicle board";
-				fdt = "base_fdt";
-			};
-		};
-};
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e
-
-HSS_PAYLOAD_GENERATOR="${HOST_DIR}"/bin/hss-payload-generator
-MKIMAGE="${HOST_DIR}"/bin/mkimage
-BOARD_DIR="$(pwd)"/"${0%/*}"
-
-pushd "${BINARIES_DIR}"
-"${HSS_PAYLOAD_GENERATOR}" -c "${BOARD_DIR}"/config.yaml payload.bin
-cp "${BOARD_DIR}"/mpfs_icicle.its "${BINARIES_DIR}"/mpfs_icicle.its
-"${MKIMAGE}" -f mpfs_icicle.its mpfs_icicle.itb
-popd
-support/scripts/genimage.sh -c "${BOARD_DIR}"/genimage.cfg
@@ -1,16 +0,0 @@
-# this assumes ${scriptaddr} is already set!!
-
-# Try to boot a fitImage from eMMC/SD
-
-setenv fdt_high 0xffffffffffffffff
-setenv initrd_high 0xffffffffffffffff
-
-load mmc 0:${distro_bootpart} ${scriptaddr} mpfs_icicle.itb;
-bootm start ${scriptaddr}#kernel_dtb;
-bootm loados ${scriptaddr};
-# Try to load a ramdisk if available inside fitImage
-bootm ramdisk;
-bootm prep;
-fdt set /soc/ethernet@20112000 mac-address ${icicle_mac_addr0};
-fdt set /soc/ethernet@20110000 mac-address ${icicle_mac_addr1};
-bootm go;
@@ -1,3 +0,0 @@
-CONFIG_USE_BOOTARGS=y
-CONFIG_BOOTARGS="root=/dev/mmcblk0p3 rootwait uio_pdrv_genirq.of_id=generic-uio"
-CONFIG_MPFS_PRIORITISE_QSPI_BOOT=n
@@ -6,7 +6,7 @@ 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/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-Lite-2.html
+http://www.orangepi.org/Orange%20Pi%20Lite%202/

 Wiki link:
 https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+Lite2
@@ -6,7 +6,7 @@ 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/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-One-Plus.html
+http://www.orangepi.org/OrangePiOneplus/

 Wiki link:
 https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+One+Plus
@@ -1,37 +0,0 @@
-Intro
-=====
-
-This default configuration will allow you to start experimenting with the
-buildroot environment for the Orangepi PC2. With the current configuration
-it will bring-up the board, and allow access through the serial console.
-
-Orangepi PC2 link:
-http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-PC-2.html
-
-Sunxi Wiki link:
-https://linux-sunxi.org/Xunlong_Orange_Pi_PC_2
-
-This configuration uses U-Boot mainline and kernel mainline.
-
-How to build
-============
-
-    $ make orangepi_pc2_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 PC2 and power it up. The console
-is on the serial line, 115200 8N1.
@@ -6,7 +6,7 @@ buildroot environment for the Orangepi Zero Plus. With the current configuration
 it will bring-up the board, and allow access through the serial console.

 Orangepi Zero Plus link:
-http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-Zero-Plus.html
+http://www.orangepi.org/OrangePiZeroPlus/

 This configuration uses U-Boot mainline and kernel mainline.

@@ -6,7 +6,7 @@ buildroot environment for the Orangepi Zero Plus2. With the current configuratio
 it will bring-up the board, and allow access through the serial console.

 Orangepi Zero Plus2 link:
-http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-Zero-Plus-2.html
+http://www.orangepi.org/OrangePiZeroPlus2/

 Wiki link:
 https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+Zero+Plus2
@@ -13,13 +13,13 @@ This commit specifies XR819 interrupt configuration for the driver.

 Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
 ---
- arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 3 +++
+ arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 3 +++
 1 file changed, 3 insertions(+)

-diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts
+diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
 index b7ca916d871d..4e1a9050c6b4 100644
--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts
-+++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts
+--- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
@@ -125,6 +125,9 @@
 	 */
 	xr819: sdio_wifi@1 {
@@ -10,13 +10,13 @@ For more information see:

 Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
 ---
- arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 16 ++++++++++++++++
+ arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

-diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts
+diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
 index 4e1a9050c6b4..cdf19821b1f3 100644
--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts
-+++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts
+--- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
@@ -161,3 +161,19 @@
 	/* USB VBUS is always on */
 	status = "okay";
@@ -8,13 +8,13 @@ This patch enables spidev driver for SPI1.

 Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
 ---
- arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 11 +++++++++++
+ arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 11 +++++++++++
 1 file changed, 11 insertions(+)

-diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts
+diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
 index cdf19821b1f3..7242aaecb14f 100644
--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts
-+++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts
+--- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
@@ -59,6 +59,7 @@
 		serial0 = &uart0;
 		/* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */
@@ -7,13 +7,13 @@ Enable uart1 and uart2 on orange-pi-zero board.

 Signed-off-by: Sergey Kuzminov <kuzminov.sergey81@gmail.com>
 ---
- arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 4 ++--
+ arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts
+diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
 index f19ed981da9d..03acf166ab70 100644
--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts
-+++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts
+--- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
@@ -184,13 +184,13 @@ &uart0 {
 &uart1 {
 	pinctrl-names = "default";
@@ -1,34 +0,0 @@
-Intro
-=====
-
-This default configuration will allow you to start experimenting with the
-buildroot environment for the Orangepi Zero3. With the current configuration
-it will bring-up the board, and allow access through the serial console.
-
-Orangepi Zero3 link:
-http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-Zero-3.html
-
-This configuration uses Orangepi's fork of U-Boot and Linux kernel.
-
-How to build
-============
-
-    $ make orangepi_zero3_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 Zero3 and power it up. The console
-is on the serial line, 115200 8N1.
@@ -15,7 +15,6 @@ CONFIG_IP_NF_FILTER=y
 CONFIG_CFG80211=m
 CONFIG_CFG80211_WEXT=y
 CONFIG_MAC80211=m
-CONFIG_PCI=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_VIRTIO_BLK=y
@@ -64,10 +63,7 @@ CONFIG_DRM_I915=y
 CONFIG_DRM_QXL=y
 CONFIG_DRM_BOCHS=y
 CONFIG_DRM_VIRTIO_GPU=y
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_VESA=y
-CONFIG_FB_EFI=y
 CONFIG_SOUND=y
 CONFIG_SND=y
 CONFIG_SND_HDA_INTEL=y
@@ -1,4 +0,0 @@
-label buildroot
-  kernel /zImage
-  devicetree /sun8i-s3-pinecube.dtb
-  append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait rw
--- a/Show More
+++ b/Show More