Update for 2024.05.1

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/xfsprogs: update Kconfig package homepage URL
2024-07-13 13:48:13 +02:00 · 2024-07-13 13:12:02 +02:00 · 2024-07-13 12:59:38 +02:00 · 2024-07-11 23:26:12 +02:00 · 2024-07-11 20:43:59 +02:00 · 2024-07-11 20:42:31 +02:00
7128 changed files with 76124 additions and 105334 deletions
@@ -1,8 +0,0 @@
-# Configuration for the `b4` tool
-# See https://b4.docs.kernel.org/en/latest/config.html
-[b4]
-    send-series-to = buildroot@buildroot.org
-    send-auto-cc-cmd = "./utils/get-developers -e -"
-    prep-perpatch-check-cmd = "./utils/check-package -q -p -"
-
-# vim: set filetype=gitconfig:
@@ -12,6 +12,7 @@ BR2_i386=y
 # BR2_m68k is not set
 # BR2_mips is not set
 # BR2_mipsel is not set
+# BR2_nios2 is not set
 # BR2_powerpc is not set
 # BR2_sh is not set
 # BR2_sparc is not set
@@ -1,25 +0,0 @@
-name: 'Repo Lockdown'
-
-on:
-  pull_request_target:
-    types: opened
-
-permissions:
-  pull-requests: write
-
-jobs:
-  action:
-    if: github.repository == 'buildroot/buildroot'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/repo-lockdown@v4
-        with:
-          pr-comment: |
-            Please do not submit a Pull Request via GitHub. Buildroot makes use of a
-            [mailing list](http://lists.buildroot.org/mailman/listinfo/buildroot) for patch submission and review.
-            See [submitting your own patches](http://buildroot.org/manual.html#submitting-patches) for more info.
-
-            Thanks for your help!
-          lock-pr: true
-          close-pr: true
-
@@ -1,4 +1,4 @@
-/output*
+/output
 /dl
 /.auto.deps
 /.config.cmd
@@ -1,7 +1,7 @@
 # Configuration for Gitlab-CI.
 # Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines

-image: $CI_REGISTRY/buildroot.org/buildroot/base:20250218.2110
+image: $CI_REGISTRY/buildroot.org/buildroot/base:20230207.1123

 stages:
  - generate-gitlab-ci
@@ -33,8 +33,8 @@ _Note: issues missing any information may get closed without further ado._
 ---
 ### What I did

- **Buildroot commit sha1**: _get this with `git describe HEAD`_
- **Distribution of the build machine**: _get this with `NAME` and `VERSION` from `/etc/os-release`_
+**Buildroot commit sha1**: _get this with `git describe HEAD`_
+**Distribution of the build machine**: _get this with `NAME` and `VERSION` from `/etc/os-release`_

 _Here, describe what you did:_
 - _any special environment variables: CC, CXX, TARGET, CROSS_COMPILE, etc…_
@@ -6,15 +6,6 @@ config BR2_HAVE_DOT_CONFIG
 	bool
 	default y

-# Hidden symbol kept to false, to temporarily mark a configuration
-# known to be broken (by depending on it). Ideally, we don't want to
-# keep broken parts for too long. The intended use of this symbol is
-# to give some time to a developer to fix the feature. Features marked
-# as broken will be removed if they are not fixed in a reasonable
-# amount of time.
-config BR2_BROKEN
-	bool
-
 config BR2_VERSION
 	string
 	option env="BR2_VERSION_FULL"
@@ -74,26 +65,6 @@ config BR2_HOST_GCC_AT_LEAST_11
 	default y if BR2_HOST_GCC_VERSION = "11"
 	select BR2_HOST_GCC_AT_LEAST_10

-config BR2_HOST_GCC_AT_LEAST_12
-	bool
-	default y if BR2_HOST_GCC_VERSION = "12"
-	select BR2_HOST_GCC_AT_LEAST_11
-
-config BR2_HOST_GCC_AT_LEAST_13
-	bool
-	default y if BR2_HOST_GCC_VERSION = "13"
-	select BR2_HOST_GCC_AT_LEAST_12
-
-config BR2_HOST_GCC_AT_LEAST_14
-	bool
-	default y if BR2_HOST_GCC_VERSION = "14"
-	select BR2_HOST_GCC_AT_LEAST_13
-
-config BR2_HOST_GCC_AT_LEAST_15
-	bool
-	default y if BR2_HOST_GCC_VERSION = "15"
-	select BR2_HOST_GCC_AT_LEAST_14
-
 # When adding new entries above, be sure to update
 # the HOSTCC_MAX_VERSION variable in the Makefile.

@@ -132,17 +103,13 @@ menu "Build options"

 menu "Commands"

-config BR2_CURL
-	string "Curl command"
-	default "curl -q --ftp-pasv --retry 3 --connect-timeout 10"
-
 config BR2_WGET
 	string "Wget command"
-	default "wget -nd -t 3 --connect-timeout=10"
+	default "wget -nd -t 3"

 config BR2_SVN
 	string "Subversion (svn) command"
-	default "svn --non-interactive --config-option servers:global:http-timeout=10"
+	default "svn --non-interactive"

 config BR2_BZR
 	string "Bazaar (bzr) command"
@@ -162,11 +129,11 @@ config BR2_LOCALFILES

 config BR2_SCP
 	string "Secure copy (scp) command"
-	default "scp -o ConnectTimeout=10"
+	default "scp"

 config BR2_SFTP
 	string "Secure file transfer (sftp) command"
-	default "sftp -o ConnectTimeout=10"
+	default "sftp"

 config BR2_HG
 	string "Mercurial (hg) command"
@@ -206,13 +173,6 @@ config BR2_LZCAT
 	  Command to be used to extract a lzip'ed file to stdout.
 	  Default is "lzip -d -c"

-config BR2_ZSTDCAT
-	string "zstdcat command"
-	default "zstdcat"
-	help
-	  Command to be used to extract a zstd'ed file to stdout.
-	  Default is "zstdcat"
-
 config BR2_TAR_OPTIONS
 	string "Tar options"
 	default ""
@@ -314,7 +274,7 @@ config BR2_KERNEL_MIRROR

 config BR2_GNU_MIRROR
 	string "GNU Software mirror"
-	default "https://ftpmirror.gnu.org"
+	default "http://ftpmirror.gnu.org"
 	help
 	  GNU has multiple software mirrors scattered around the
 	  world. The following allows you to select your preferred
@@ -828,6 +788,8 @@ config BR2_PIC_PIE_ARCH_SUPPORTS
 	default y
 	# Microblaze glibc toolchains don't work with PIC/PIE enabled
 	depends on !BR2_microblaze
+	# Nios2 toolchains produce non working binaries with -fPIC
+	depends on !BR2_nios2

 config BR2_PIC_PIE
 	bool "Build code with PIC/PIE"
@@ -990,7 +952,7 @@ config BR2_FORTIFY_SOURCE_2
 	# gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61164
 	depends on !BR2_TOOLCHAIN_BUILDROOT || BR2_TOOLCHAIN_GCC_AT_LEAST_6
 	help
-	  This option sets _FORTIFY_SOURCE to 2 and some more
+	  This option sets _FORTIFY_SOURCES to 2 and some more
 	  checking is added, but some conforming programs might fail.
 	  Also adds checks at run-time (detected buffer overflow
 	  terminates the program)
@@ -999,7 +961,7 @@ config BR2_FORTIFY_SOURCE_3
 	bool "Extended"
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_12
 	help
-	  This option sets _FORTIFY_SOURCE to 3 and even more
+	  This option sets _FORTIFY_SOURCES to 3 and even more
 	  checking is added compared to level 2. Extends checks at
 	  run-time that can introduce an additional performance
 	  overhead.
@@ -144,934 +144,7 @@ endif

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

-comment "Legacy options removed in 2025.11"
-
-config BR2_PACKAGE_OLA
-	bool "ola has been removed"
-	select BR2_LEGACY
-	help
-	  ola is incompatible with current versions of protobuf
-
-config BR2_PACKAGE_BATMAN_ADV_NC
-	bool "batman-adv removed network coding"
-	select BR2_LEGACY
-	help
-	  batman-adv removed B.A.T.M.A.N. network coding
-
-config BR2_PACKAGE_DVBSNOOP
-	bool "dvbsnoop has been removed"
-	select BR2_LEGACY
-	help
-	  dvbsnoop is unmaintained and has been removed
-
-config BR2_PACKAGE_PROCRANK_LINUX
-	bool "procrank_linux has been removed"
-	select BR2_LEGACY
-	help
-	  procrank_linux is unmaintained and has been removed
-
-config BR2_PACKAGE_MONGREL2
-	bool "mongrel2 has been removed"
-	select BR2_LEGACY
-	help
-	  mongrel2 is incompatible with MbedTLS 3.6 and has been removed
-
-config BR2_PACKAGE_EXPECT
-	bool "expect has been removed"
-	select BR2_LEGACY
-	help
-	  expect is unmaintained and has been removed
-
-config BR2_PACKAGE_BCTOOLBOX
-	bool "bctoolbox has been removed"
-	select BR2_LEGACY
-	help
-	  This package has been removed as part of the linphone
-	  removal. In addition, newer version of linphone directly
-	  bundle bctoolbox making a separate package unnecessary.
-
-config BR2_PACKAGE_ORTP
-	bool "ortp has been removed"
-	select BR2_LEGACY
-	help
-	  This package has been removed as part of the linphone
-	  removal. In addition, newer version of linphone directly
-	  bundle ortp making a separate package unnecessary.
-
-config BR2_PACKAGE_MEDIASTREAMER
-	bool "mediastreamer has been removed"
-	select BR2_LEGACY
-	help
-	  This package has been removed as part of the linphone
-	  removal. In addition, newer version of linphone directly
-	  bundle mediastreamer making a separate package unnecessary.
-
-config BR2_PACKAGE_BELR
-	bool "belr has been removed"
-	select BR2_LEGACY
-	help
-	  This package has been removed as part of the linphone
-	  removal. In addition, newer version of linphone directly
-	  bundle belr making a separate package unnecessary.
-
-config BR2_PACKAGE_BELLE_SIP
-	bool "belle-sip has been removed"
-	select BR2_LEGACY
-	help
-	  This package has been removed as part of the linphone
-	  removal. In addition, newer version of linphone directly
-	  bundle belle-sip making a separate package unnecessary.
-
-config BR2_PACKAGE_LINPHONE
-	bool "linphone has been removed"
-	select BR2_LEGACY
-	help
-	  This package was no longer maintained in Buildroot and was
-	  no longer building. It can be re-added if someone volunteers
-	  to fix the issues, update the package and maintain it.
-
-config BR2_PACKAGE_LIBJWT
-	bool "libjwt has been removed"
-	select BR2_LEGACY
-	help
-	  The only dependee of libjwt, asterisk, is incompatible with
-	  version 3 so the version bundled with asterisk is used and
-	  this package has been removed.
-
-config BR2_PACKAGE_RAMSPEED
-	bool "ramspeed has been removed"
-	select BR2_LEGACY
-	help
-	  The ramspeed package was removed as it is not maintained
-	  anymore and the upstream repo is gone.
-
-config BR2_PACKAGE_LESSTIF
-	bool "lesstif has been removed"
-	select BR2_LEGACY
-	help
-	  lesstif is unmaintained and has been removed
-
-config BR2_KERNEL_HEADERS_6_16
-	bool "kernel headers version 6.16.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 6.16.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_PACKAGE_MURATA_CYW_FW_CYW4339_1CK
-	bool "This firmware has been removed"
-	select BR2_LEGACY
-	help
-	  This firmware has been removed from Murata package
-
-config BR2_PACKAGE_MURATA_CYW_FW_CYW4339_ZP
-	bool "BR2_PACKAGE_MURATA_CYW_FW_CYW4339_ZP has been renamed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_MURATA_CYW_FW_CYW4339
-	help
-	  The option has been renamed to
-	  BR2_PACKAGE_MURATA_CYW_FW_CYW4339
-
-config BR2_PACKAGE_LIBBSON
-	bool "libbson has been removed"
-	select BR2_LEGACY
-	help
-	  libbson is officially deprecated upstream and has been removed
-
-config BR2_TARGET_ROOTFS_AXFS
-	bool "AXFS root filesystem has been removed"
-	select BR2_LEGACY
-	help
-	  AXFS root filesystem support has been removed.
-
-config BR2_PACKAGE_LOGSURFER
-	bool "logsurfer has been removed"
-	select BR2_LEGACY
-	help
-	  Logsurfer last updates was on 2011 and fails to build with
-	  GCC14.
-
-config BR2_LINUX_KERNEL_EXT_FBTFT
-	bool "FB TFT drivers are deprecated"
-	select BR2_LEGACY
-	help
-	  FB TFT drivers were only needed for linux kernels until v3.19,
-	  since v4.0 the drivers are included in the staging area.
-
-config BR2_PACKAGE_DMENU_WAYLAND
-	bool "dmenu-wayland has been removed"
-	select BR2_LEGACY
-	help
-	  The package has been abandoned for several years.
-	  The only package that previously relied on dmenu-wayland
-	  was sway, and that now relies on wmenu. Please select
-	  wmenu instead.
-
-config BR2_PACKAGE_SYLPHEED
-	bool "sylpheed has been removed"
-	select BR2_LEGACY
-	help
-	  Due to the removal of libgtk2, the sylpheed package has been
-	  removed.
-
-config BR2_PACKAGE_PINENTRY_GTK2
-	bool "gtk2 backend of pinentry has been removed"
-	select BR2_LEGACY
-	help
-	  Due to the removal of libgtk2, the gtk2 backend of pinentry
-	  has been removed.
-
-config BR2_PACKAGE_OPENCV4_WITH_GTK
-	bool "opencv4 gtk support has been removed"
-	select BR2_LEGACY
-	help
-	  Due to the removal of libgtk2, the gtk support of opencv4
-	  has been removed. gtk3 support is still available.
-
-config BR2_PACKAGE_OPENCV3_WITH_GTK
-	bool "opencv3 gtk support has been removed"
-	select BR2_LEGACY
-	help
-	  Due to the removal of libgtk2, the gtk support of opencv3
-	  has been removed. gtk3 support is still available.
-
-config BR2_PACKAGE_NETSURF_GTK
-	bool "gtk frontend of netsurf has been removed"
-	select BR2_LEGACY
-	help
-	  Due to the removal of libgtk2, the gtk frontend of netsurf
-	  has been removed. The gtk3 frontend can be used instead for
-	  example.
-
-config BR2_PACKAGE_METACITY
-	bool "metacity has been removed"
-	select BR2_LEGACY
-	help
-	  The metacity package has been removed, as libgtk2 has been
-	  removed as well.
-
-config BR2_PACKAGE_LIBSEXY
-	bool "libsexy has been removed"
-	select BR2_LEGACY
-	help
-	  The libsexy package has been removed, as libgtk2 has been
-	  removed as well.
-
-config BR2_PACKAGE_LIBGLADE
-	bool "libglade has been removed"
-	select BR2_LEGACY
-	help
-	  The libglade package has been removed, as libgtk2 has been
-	  removed as well.
-
-config BR2_PACKAGE_LEAFPAD
-	bool "leafpad has been removed"
-	select BR2_LEGACY
-	help
-	  The leafpad package has been removed, as libgtk2 has been
-	  removed as well.
-
-config BR2_PACKAGE_GTKPERF
-	bool "gtkperf has been removed"
-	select BR2_LEGACY
-	help
-	  The gtkperf package has been removed, as libgtk2 has been
-	  removed as well.
-
-config BR2_PACKAGE_GTK2_ENGINES
-	bool "gtk2-engines has been removed"
-	select BR2_LEGACY
-	help
-	  The gtk2-engines package has been removed, as libgtk2 has
-	  been removed as well.
-
-config BR2_PACKAGE_GKRELLM_CLIENT
-	bool "gkrellm client has been removed"
-	select BR2_LEGACY
-	help
-	  The gkrellm client option has been removed, as it required
-	  libgtk2, which was removed from Buildroot.
-
-config BR2_PACKAGE_CWIID_WMGUI
-	bool "cwiid wmgui has been removed"
-	select BR2_LEGACY
-	help
-	  The wmgui part of cwiid required libgtk2, which has been
-	  removed from Buildroot.
-
-config BR2_LINUX_KERNEL_EXT_AUFS
-	bool "Aufs Filesystem Module patch has been removed"
-	select BR2_LEGACY
-	help
-	  aufs kernel module patch is unmaintained and has been
-	  removed.
-
-config BR2_PACKAGE_AUFS_UTIL
-	bool "aufs-util has been removed"
-	select BR2_LEGACY
-	help
-	  aufs-util package is unmaintained and has been removed.
-
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB
-	bool "Linaro armeb 2018.05 external toolchain is deprecated"
-	select BR2_LEGACY
-	help
-	  Linaro armeb 2018.05 is no longer maintained and has been
-	  removed from Buildroot.
-
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM
-	bool "Linaro ARM 2018.05 external toolchain is deprecated"
-	select BR2_LEGACY
-	help
-	  Linaro ARM 2018.05 is no longer maintained and has been
-	  removed from Buildroot.
-
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE
-	bool "Linaro AArch64 BE 2018.05 external toolchain is deprecated"
-	select BR2_LEGACY
-	help
-	  Linaro AArch64 2018.05 BE is no longer maintained and has been
-	  removed from Buildroot.
-
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64
-	bool "Linaro AArch64 2018.05 external toolchain is deprecated"
-	select BR2_LEGACY
-	help
-	  Linaro AArch64 2018.05 is no longer maintained and has been
-	  removed from Buildroot.
-
-config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS
-	bool "Sourcery CodeBench MIPS external toolchain is deprecated"
-	select BR2_LEGACY
-	help
-	  Sourcery CodeBench MIPS 2016.05 is no longer maintained
-	  and has been removed from Buildroot.
-
-config BR2_LINUX_KERNEL_EXT_EV3DEV_LINUX_DRIVERS
-	bool "ev3dev Linux drivers have been removed"
-	select BR2_LEGACY
-	help
-	  Linux drivers for LEGO MINDSTORMS EV3 from the ev3dev project
-	  are targeting an outdated kernel which is no longer supported.
-
-comment "Legacy options removed in 2025.08"
-
-config BR2_PACKAGE_NETSTAT_NAT
-	bool "netstat-nat has been removed"
-	select BR2_LEGACY
-	help
-	  The upstream URL is gone and netstat-nat has been removed
-	  from Buildroot.
-
-config BR2_PACKAGE_LIGHTTPD_LIBEV
-	bool "lighttpd removed libev support"
-	select BR2_LEGACY
-	help
-	  Lighttpd 1.4.80 removed optional libev support.
-
-config BR2_PACKAGE_LIBSVGTINY
-	bool "libsvgtiny has been removed"
-	select BR2_LEGACY
-	help
-	  Libsvgtiny has been removed from Buildroot.
-
-config BR2_PACKAGE_THTTPD
-	bool "thttpd has been removed"
-	select BR2_LEGACY
-	help
-	  thttpd is no longer maintained actively by upstream and has
-	  been removed from Buildroot.
-
-config BR2_KERNEL_HEADERS_6_15
-	bool "kernel headers version 6.15.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 6.15.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_PACKAGE_LIBCURL_BEARSSL
-	bool "libcurl removed BearSSL support"
-	select BR2_LEGACY
-	help
-	  Libcurl removed optional BearSSL support.
-
-config BR2_PACKAGE_LIBOLM
-	bool "libolm has been removed"
-	select BR2_LEGACY
-	help
-	  libolm is deprecated and has been removed from Buildroot.
-	  https://gitlab.matrix.org/matrix-org/olm#important-libolm-is-now-deprecated
-
-config BR2_PACKAGE_LIBWEBSOCK
-	bool "libwebsock has been removed"
-	select BR2_LEGACY
-	help
-	  The upstream Github repository payden/libwebsock is no
-	  longer available, and has been removed from Buildroot.
-
-config BR2_TARGET_EDK2_PLATFORM_SOCIONEXT_DEVELOPERBOX
-	bool "EDK2 Socionext DeveloperBox support has been removed"
-	select BR2_LEGACY
-	help
-	  The Socionext DeveloperBox support has been removed upstream
-	  in EDK2 version edk2-stable202505.
-
-config BR2_PACKAGE_LIBEBUR128
-	bool "libebur128 has been removed"
-	select BR2_LEGACY
-	help
-	  The libebur128 package has been removed from Buildroot.
-
-config BR2_KERNEL_HEADERS_6_14
-	bool "kernel headers version 6.14.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 6.14.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_PACKAGE_GPSD_OCEANSERVER
-	bool "gpsd OceanServer removed upstream"
-	select BR2_LEGACY
-	help
-	  Support for OceanServer has been removed upstream in gpsd
-	  v3.26.
-
-config BR2_PACKAGE_MESA3D_OSMESA_GALLIUM
-	bool "mesa3d OSMesa (Gallium) library support removed"
-	select BR2_LEGACY
-	help
-	  Mesa3d removed the OSMesa (Off-Screen) interface library.
-
-config BR2_PACKAGE_ALSA_LIB_ALISP
-	bool "alsa-lib alisp support removed"
-	select BR2_LEGACY
-	help
-	  Support for alisp was removed from alsa-lib v1.12.14.
-
-comment "Legacy options removed in 2025.05"
-
-config BR2_GCC_VERSION_12_X
-	bool "gcc 12.x support removed"
-	select BR2_LEGACY
-	help
-	  Support for building a toolchain based on GCC 12.x has been
-	  removed, chose a newer GCC version instead.
-
-config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST
-	bool "mesa Gallium swrast driver was replaced by softpipe"
-	select BR2_LEGACY
-	select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE
-	help
-	  The Gallium swrast driver was replaced by softpipe.
-
-config BR2_PACKAGE_MBEDTLS_COMPRESSION
-	bool "mbedtls compression support removed"
-	select BR2_LEGACY
-	help
-	  MbedTLS has dropped support for TLS record-level
-	  compression.
-
-config BR2_KERNEL_HEADERS_6_13
-	bool "kernel headers version 6.13.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 6.13.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_PACKAGE_MPD_SOUNDCLOUD
-	bool "mpd soundcloud support has been removed"
-	select BR2_LEGACY
-	help
-	  MPD SoundCloud support has been removed.
-
-# BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT is still referenced in docker-engine
-config BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT
-	bool "docker-engine init support is now a choice"
-	select BR2_LEGACY
-	help
-	  docker-engine init support is now a choice. The original
-	  setting has been adapted; be sure to review it in the
-	  docker-engine package.
-
-comment "Legacy options removed in 2025.02"
-
-config BR2_PACKAGE_SQLITE_ENABLE_JSON1
-	bool "Enable the JSON extensions for SQLite has been removed"
-	select BR2_LEGACY
-	help
-	  Since SQLite 3.38 the JSON Extension is enabled by default.
-
-config BR2_PACKAGE_ANGULARJS
-	bool "angularjs has been removed"
-	select BR2_LEGACY
-	help
-	  The angularjs package was removed as the upstream
-	  project has been archived.
-
-config BR2_PACKAGE_ANGULAR_WEBSOCKET
-	bool "angular-websocket has been removed"
-	select BR2_LEGACY
-	help
-	  The angular-websocket package was removed as the upstream
-	  project has been archived.
-
-config BR2_PACKAGE_LATENCYTOP
-	bool "latencytop has been removed"
-	select BR2_LEGACY
-	help
-	  The latencytop package is no longer available for download.
-
-config BR2_PACKAGE_OBSIDIAN_CURSORS
-	bool "obsidian-cursors has been removed"
-	select BR2_LEGACY
-	help
-	  The obsidian cursors package is no longer available for
-	  direct download.
-
-config BR2_PACKAGE_W_SCAN
-	bool "w_scan has been removed"
-	select BR2_LEGACY
-	help
-	  The w_scan package was removed as it is not maintained
-	  anymore and the upstream URL is gone.
-
-config BR2_PACKAGE_GENROMFS
-	bool "genromfs"
-	select BR2_LEGACY
-	help
-	  Romfs root filesystem support has been removed.
-
-config BR2_TARGET_ROOTFS_ROMFS
-	bool "romfs root filesystem has been removed"
-	select BR2_LEGACY
-	help
-	  Romfs root filesystem support has been removed.
-
-config BR2_BINUTILS_VERSION_2_41_X
-	bool "binutils 2.41 has been removed"
-	select BR2_LEGACY
-	help
-	  binutils 2.41 has been removed, use a newer version.
-
-config BR2_TARGET_ROOTFS_EXT2_2r0
-	bool "ext2 rev0 support been removed"
-	select BR2_LEGACY
-	help
-	  Support for ext2 revision 0 format has been removed and
-	  revision 1 is now unconditionally used.
-
-config BR2_GDB_VERSION_13
-	bool "gdb 13.x has been removed"
-	select BR2_LEGACY
-	help
-	  GDB 13.x support has been removed, a newer version should be
-	  used instead.
-
-config BR2_nios2
-	bool "nios2 architecture removed"
-	select BR2_LEGACY
-	help
-	  The nios2 architecture was removed, by lack of toolchain
-	  support.
-
-config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE
-	bool "Bootlin nios2 glibc bleeding-edge toolchain removed"
-	select BR2_LEGACY
-	help
-	  The nios2 Bootlin toolchains have been removed.
-
-config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE
-	bool "Bootlin nios2 glibc stable toolchain removed"
-	select BR2_LEGACY
-	help
-	  The nios2 Bootlin toolchains have been removed.
-
-config BR2_PACKAGE_DIRECTFB
-	bool "directfb has been removed"
-	select BR2_LEGACY
-	help
-	  This package was no longer maintained upstream, so it was
-	  dropped from Buildroot.
-
-config BR2_PACKAGE_GST_OMX
-	bool "gst-omx has been removed"
-	select BR2_LEGACY
-	help
-	  The gst-omx module has been removed from Gstreamer in
-	  release 1.24 in favor of Video4Linux-based video encoders.
-
-config BR2_PACKAGE_MIMIC
-	bool "mimic has been removed"
-	select BR2_LEGACY
-	help
-	  The mimic package has been removed from Buildroot.
-
-config BR2_PACKAGE_SDL2_DIRECTFB
-	bool "sdl2 directfb support removed"
-	select BR2_LEGACY
-	help
-	  The directfb support from SDL2 is no longer available, as
-	  directfb is no longer packaged in Buildroot.
-
-config BR2_PACKAGE_SDL_DIRECTFB
-	bool "sdl directfb support removed"
-	select BR2_LEGACY
-	help
-	  The directfb support from SDL is no longer available, as
-	  directfb is no longer packaged in Buildroot.
-
-config BR2_PACKAGE_QT5BASE_DIRECTFB
-	bool "qt5base directfb support removed"
-	select BR2_LEGACY
-	help
-	  The directfb support from qt5base is no longer available, as
-	  directfb is no longer packaged in Buildroot.
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB
-	bool "gstreamer directfb plugin removed"
-	select BR2_LEGACY
-	help
-	  The directfb plugin from GStreamer is no longer supported,
-	  as directfb is no longer packaged in Buildroot.
-
-config BR2_PACKAGE_LITE
-	bool "lite has been removed"
-	select BR2_LEGACY
-	help
-	  This package was no longer maintained upstream, so it was
-	  dropped from Buildroot.
-
-config BR2_PACKAGE_LINUX_FUSION
-	bool "linux-fusion has been removed"
-	select BR2_LEGACY
-	help
-	  This package was no longer maintained upstream, so it was
-	  dropped from Buildroot.
-
-config BR2_PACKAGE_DIRECTFB_EXAMPLES
-	bool "directfb-examples has been removed"
-	select BR2_LEGACY
-	help
-	  This package was no longer maintained upstream, so it was
-	  dropped from Buildroot.
-
-config BR2_PACKAGE_HIAWATHA
-	bool "hiwatha has been removed"
-	select BR2_LEGACY
-	help
-	  This package is no longer maintained upstream, has no bug
-	  tracker, and the latest versions cause build
-	  failures. Therefore, it has been removed.
-
-config BR2_PACKAGE_MONGODB
-	bool "mongodb has been removed"
-	select BR2_LEGACY
-	help
-	  The mongodb package has been removed as it was unmaintained.
-
-config BR2_PACKAGE_PYTHON_M2CRYPTO
-	bool "python-m2crypto has been removed"
-	select BR2_LEGACY
-	help
-	  The python-m2crypto package was removed as it is in maintained
-	  only mode and is not recommended for new projects.
-
-config BR2_KERNEL_HEADERS_4_19
-	bool "kernel headers version 4.19.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 4.19.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_KERNEL_HEADERS_6_11
-	bool "kernel headers version 6.11.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 6.11.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_PACKAGE_GIBLIB
-	bool "giblib has been removed"
-	select BR2_LEGACY
-	help
-	  The giblib package was removed as it is not maintained
-	  anymore and the upstream URL is gone.
-
-config BR2_PACKAGE_FCONFIG
-	bool "fconfig has been removed"
-	select BR2_LEGACY
-	help
-	  The fconfig package was removed as it is not maintained
-	  anymore and the upstream URL is gone.
-
-config BR2_PACKAGE_LIBHID
-	bool "libhid has been removed"
-	select BR2_LEGACY
-	help
-	  The libhid package was removed as it is not maintained
-	  anymore and the upstream URL is gone. Consider using hidapi
-	  instead.
-
-config BR2_PACKAGE_QUAGGA
-	bool "quagga has been removed"
-	select BR2_LEGACY
-	help
-	  The quagga package was removed as it is not maintained
-	  anymore and the upstream repo is gone.
-
-config BR2_PACKAGE_RAMSMP
-	bool "ramsmp has been removed"
-	select BR2_LEGACY
-	help
-	  The ramsmp package was removed as it is not maintained
-	  anymore and the upstream repo is gone.
-
-comment "Legacy options removed in 2024.11"
-
-config BR2_PACKAGE_BSDIFF
-	bool "bsdiff has been removed"
-	select BR2_LEGACY
-	help
-	  The bsdiff package was removed as it is not maintained
-	  anymore (no commit since 2014).
-
-config BR2_PACKAGE_PROCPS_NS_ORIGINAL_TOP
-	bool "BR2_PACKAGE_PROCPS_NS_ORIGINAL_TOP has been renamed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_PROCPS_NG_ORIGINAL_TOP
-	help
-	  The option has been renamed to
-	  BR2_PACKAGE_PROCPS_NG_ORIGINAL_TOP.
-
-config BR2_PACKAGE_QEMU_TARGET_NIOS2
-	bool "qemu nios2 support has been removed"
-	select BR2_LEGACY
-	help
-	  NIOS2 support has been removed since Qemu 9.1.0.
-
-config BR2_PACKAGE_POPPERJS
-	bool "popperjs has been removed"
-	select BR2_LEGACY
-	help
-	  The project has been renamed to floating-ui.
-
-config BR2_KERNEL_HEADERS_6_10
-	bool "kernel headers version 6.10.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 6.10.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_PACKAGE_IPMITOOL_PEN_REG_URI
-	string "IANA PEN registry moved to iana-assignment package"
-	help
-	  Installation of the IANA PEN is now handled by the
-	  iana-assignment package; to install a custom PEN,
-	  use a rootfs-overlay for example.
-
-config BR2_PACKAGE_IPMITOOL_PEN_REG_URI_WRAP
-	bool
-	default y if BR2_PACKAGE_IPMITOOL_PEN_REG_URI != ""
-	select BR2_LEGACY
-
-config BR2_PACKAGE_ERLANG_P1_YAML
-	bool "erlang-p1-yaml has been renamed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_ERLANG_FAST_YAML
-	help
-	  The erlang-p1-yaml package has been renamed to
-	  erlang-fast-yaml.
-
-config BR2_PACKAGE_ERLANG_P1_XMPP
-	bool "erlang-p1-xmpp has been renamed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_ERLANG_XMPP
-	help
-	  The erlang-p1-xmpp package has been renamed to erlang-xmpp.
-
-config BR2_PACKAGE_ERLANG_P1_XML
-	bool "erlang-p1-xml has been renamed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_ERLANG_FAST_XML
-	help
-	  The erlang-p1-xml package has been renamed to erlang-fast-xml.
-
-config BR2_PACKAGE_ERLANG_P1_STUN
-	bool "erlang-p1-stun has been renamed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_ERLANG_STUN
-	help
-	  The erlang-p1-stun package has been renamed to erlang-stun.
-
-config BR2_PACKAGE_FBV_GIF
-	bool "fbv GIF support has been removed"
-	select BR2_LEGACY
-	help
-	  Fbv GIF support has been removed, use PNG, BMP or JPEG.
-
-config BR2_BINUTILS_VERSION_2_40_X
-	bool "binutils 2.40 has been removed"
-	select BR2_LEGACY
-	help
-	  binutils 2.40 has been removed, use a newer version.
-
-comment "Legacy options removed in 2024.08"
-
-config BR2_PACKAGE_MIDORI
-	bool "midori has been removed"
-	select BR2_LEGACY
-	help
-	  The original WebKitGTK-based Midori is no longer maintained
-	  and doesn't build since WebKitGTK moved to libsoup3 as of
-	  commit 38a098df133aaa2ebf09742054b02db5a44f58e5.
-
-config BR2_PACKAGE_FROTZ
-	bool "frotz has been removed"
-	select BR2_LEGACY
-	help
-	  This package was causing build breakage, and was no longer
-	  maintained in Buildroot.
-
-config BR2_PACKAGE_FAN_CTRL
-	bool "fan-ctrl has been removed"
-	select BR2_LEGACY
-	help
-	  This package was no longer available from SourceForge, the
-	  upstream is completely dead.
-
-config BR2_PACKAGE_FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE
-	bool "flutter-dynamic-layouts-example has been removed"
-	select BR2_LEGACY
-	help
-	  flutter-dynamic-layouts was removed from flutter-packages
-	  as of commit e35f29177495131f0f598fc7ae1ffd74d89edf15.
-
-config BR2_KERNEL_HEADERS_6_9
-	bool "kernel headers version 6.9.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 6.9.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_x86_knightslanding
-	bool "knightslanding x86 architecture support dropped"
-	select BR2_LEGACY
-	help
-	  GCC 14.x has marked this architecture as obsolete, and emits
-	  a warning causing build failures.
-
-config BR2_x86_knightsmill
-	bool "knightsmill x86 architecture support dropped"
-	select BR2_LEGACY
-	help
-	  GCC 14.x has marked this architecture as obsolete, and emits
-	  a warning causing build failures.
-
-config BR2_PACKAGE_DVB_APPS
-	bool "dvb-apps package removed"
-	select BR2_LEGACY
-	help
-	  The dvb-apps package was removed as it is not maintained
-	  anymore (no commit since 2014).
-
-config BR2_PACKAGE_GAMIN
-	bool "gamin package removed"
-	select BR2_LEGACY
-	help
-	  The gamin package was removed as it is not maintained
-	  anymore (no commit since 2016).
-
-config BR2_PACKAGE_CAIRO_SVG
-	bool "cairo svg support"
-	select BR2_LEGACY
-	select BR2_PACKAGE_CAIRO_PNG
-	help
-	  Cairo SVG is compiled together with PNG.
-
-config BR2_PACKAGE_CAIRO_SCRIPT
-	bool "cairo script support"
-	select BR2_LEGACY
-	select BR2_PACKAGE_CAIRO_ZLIB
-	help
-	  Cairo script got merged into cairo zlib.
-
-config BR2_PACKAGE_CAIRO_PS
-	bool "cairo postscript support"
-	select BR2_LEGACY
-	select BR2_PACKAGE_CAIRO_ZLIB
-	help
-	  Cairo PS got merged into cairo zlib.
-
-config BR2_PACKAGE_CAIRO_PDF
-	bool "cairo pdf support"
-	select BR2_LEGACY
-	select BR2_PACKAGE_CAIRO_ZLIB
-	help
-	  Cairo PDF got merged into cairo zlib.
-
-config BR2_PACKAGE_CAIRO_XML
-	bool "cairo xml support"
-	select BR2_LEGACY
-	select BR2_PACKAGE_CAIRO_ZLIB
-	help
-	  Cairo XML got merged into cairo zlib.
-
-config BR2_GDB_VERSION_12
-	bool "gdb 12.x has been removed"
-	select BR2_LEGACY
-	help
-	  GDB 12.x has been removed. The new default version of GDB
-	  14.x has been automatically selected instead.
-
-config BR2_TARGET_BEAGLEV_DDRINIT
-	bool "beaglev-ddrinit has been removed"
-	select BR2_LEGACY
-	help
-	  The beaglev-secondboot package has been removed after
-	  the beaglev_defconfig removal.
-
-config BR2_TARGET_BEAGLEV_SECONDBOOT
-	bool "beaglev-secondboot has been removed"
-	select BR2_LEGACY
-	help
-	  The beaglev-secondboot package has been removed after
-	  the beaglev_defconfig removal.
-
-config BR2_PACKAGE_ONEVPL_INTEL_GPU
-	bool "onevpl-intel-gpu has been renamed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_INTEL_VPL_GPU_RT
-	help
-	  The onevpl-intel-gpu package has been renamed to
-	  intel-vpl-gpu-rt.
-
-config BR2_PACKAGE_CGIC
-	bool "cgic has been removed"
-	select BR2_LEGACY
-	help
-	  the cgic upstream no longer exists.
-
-config BR2_PACKAGE_BEECRYPT
-	bool "beecrypt package removed"
-	select BR2_LEGACY
-	help
-	  The beecrypt package was removed as it is not maintained
-	  anymore (no release since 2015).
-
-config BR2_PACKAGE_VERSAL_FIRMWARE
-	bool "versal-firmware has been replaced by xilinx-prebuilt"
-	select BR2_TARGET_XILINX_PREBUILT
-	select BR2_LEGACY
-	help
-	  The versal-firmware package has been replaced by the more
-	  generic xilinx-prebuilt package.
-
-config BR2_KERNEL_HEADERS_6_8
-	bool "kernel headers version 6.8.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 6.8.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
+comment "Legacy options removed in 2024.05"

 config BR2_TARGET_AT91BOOTSTRAP
 	bool "at91bootstrap removed"
@@ -1964,6 +1037,12 @@ config BR2_PACKAGE_PYTHON_DIALOG
 	help
 	  Package was removed together with python 2.7 support.

+config BR2_PACKAGE_PYTHON_CONFIGOBJ
+	bool "python-configobj removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_YIELDFROM
 	bool "python-yieldfrom removed"
 	select BR2_LEGACY
@@ -6389,6 +5468,7 @@ config BR2_PACKAGE_KOBS_NG
 config BR2_PACKAGE_SAWMAN
 	bool "sawman package removed"
 	select BR2_LEGACY
+	select BR2_PACKAGE_DIRECTFB_SAWMAN
 	help
 	  This option has been removed because the sawman package no
 	  longer exists: it was merged inside DirectFB itself. This
@@ -6398,6 +5478,7 @@ config BR2_PACKAGE_SAWMAN
 config BR2_PACKAGE_DIVINE
 	bool "divine package removed"
 	select BR2_LEGACY
+	select BR2_PACKAGE_DIRECTFB_DIVINE
 	help
 	  This option has been removed because the divine package no
 	  longer exists: it was merged inside DirectFB itself. This
@@ -66,14 +66,13 @@ endif
 CANONICAL_CURDIR = $(realpath $(CURDIR))

 REQ_UMASK = 0022
-CUR_UMASK := $(shell umask)

 # Make sure O= is passed (with its absolute canonical path) everywhere the
 # toplevel makefile is called back.
 EXTRAMAKEARGS := O=$(CANONICAL_O)

 # Check Buildroot execution pre-requisites here.
-ifneq ($(CUR_UMASK):$(CURDIR):$(O),$(REQ_UMASK):$(CANONICAL_CURDIR):$(CANONICAL_O))
+ifneq ($(shell umask):$(CURDIR):$(O),$(REQ_UMASK):$(CANONICAL_CURDIR):$(CANONICAL_O))
 .PHONY: _all $(MAKECMDGOALS)

 $(MAKECMDGOALS): _all
@@ -82,7 +81,6 @@ $(MAKECMDGOALS): _all
 _all:
 	@umask $(REQ_UMASK) && \
 		$(MAKE) -C $(CANONICAL_CURDIR) --no-print-directory \
-			BR_ORIG_UMASK=$(CUR_UMASK) \
 			$(MAKECMDGOALS) $(EXTRAMAKEARGS)

 else # umask / $(CURDIR) / $(O)
@@ -92,9 +90,9 @@ all:
 .PHONY: all

 # Set and export the version string
-export BR2_VERSION := 2025.11-rc1
+export BR2_VERSION := 2024.05.1
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1763670000
+BR2_VERSION_EPOCH = 1720871000

 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)
@@ -353,7 +351,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 := 15
+HOSTCC_MAX_VERSION := 11

 HOSTCC_VERSION := $(shell V=$$($(HOSTCC_NOCCACHE) --version | \
 	sed -n -r 's/^.* ([0-9]*)\.([0-9]*)\.([0-9]*)[ ]*.*/\1 \2/p'); \
@@ -407,28 +405,27 @@ ifeq ($(BR2_HAVE_DOT_CONFIG),y)
 # Hide troublesome environment variables from sub processes
 #
 ################################################################################
-unexport AR
+unexport CROSS_COMPILE
 unexport ARCH
 unexport CC
-unexport CFLAGS
-unexport CONFIG_SITE
-unexport CPP
-unexport CROSS_COMPILE
-unexport CXX
-unexport CXXFLAGS
-unexport DEVICE_TREE
-unexport GCC_COLORS
-unexport GREP_OPTIONS
 unexport LD
+unexport AR
+unexport CXX
+unexport CPP
+unexport RANLIB
+unexport CFLAGS
+unexport CXXFLAGS
+unexport GREP_OPTIONS
+unexport TAR_OPTIONS
+unexport CONFIG_SITE
+unexport QMAKESPEC
+unexport TERMINFO
 unexport MACHINE
 unexport O
-unexport OS
+unexport GCC_COLORS
 unexport PLATFORM
-unexport QMAKESPEC
-unexport RANLIB
-unexport TAR_OPTIONS
-unexport TERMINFO
-unexport TOPDIR
+unexport OS
+unexport DEVICE_TREE

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

@@ -447,7 +444,6 @@ ZCAT := $(call qstrip,$(BR2_ZCAT))
 BZCAT := $(call qstrip,$(BR2_BZCAT))
 XZCAT := $(call qstrip,$(BR2_XZCAT))
 LZCAT := $(call qstrip,$(BR2_LZCAT))
-ZSTDCAT := $(call qstrip,$(BR2_ZSTDCAT))
 TAR_OPTIONS = $(call qstrip,$(BR2_TAR_OPTIONS)) -xf

 ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
@@ -598,7 +594,14 @@ world: target-post-image

 .PHONY: prepare-sdk
 prepare-sdk: world
-	@$(call MESSAGE,"Preparing the SDK")
+	@$(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))
 	$(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
@@ -716,13 +719,6 @@ STAGING_DIR_FILES_LISTS = $(sort $(wildcard $(BUILD_DIR)/*/.files-list-staging.t
 host-finalize: $(PACKAGES) $(HOST_DIR) $(HOST_DIR_SYMLINK)
 	@$(call MESSAGE,"Finalizing host directory")
 	$(call per-package-rsync,$(sort $(PACKAGES)),host,$(HOST_DIR),copy)
-	$(Q)PARALLEL_JOBS=$(PARALLEL_JOBS) \
-		PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) \
-		$(TOPDIR)/support/scripts/fix-rpath host
-	$(Q)PARALLEL_JOBS=$(PARALLEL_JOBS) \
-		PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) \
-		$(TOPDIR)/support/scripts/fix-rpath staging
-	$(call ppd-fixup-paths,$(BASE_DIR))

 .PHONY: staging-finalize
 staging-finalize: $(STAGING_DIR_SYMLINK)
@@ -781,12 +777,19 @@ endif

 # For a merged /usr, ensure that /lib, /bin and /sbin and their /usr
 # counterparts are appropriately setup as symlinks ones to the others.
-	@$(call MESSAGE,"Sanity check in overlays $(call qstrip,$(BR2_ROOTFS_OVERLAY))")
-	support/scripts/check-merged \
-		--type overlay \
-		$(if $(BR2_ROOTFS_MERGED_USR),--merged-usr) \
-		$(if $(BR2_ROOTFS_MERGED_BIN),--merged-bin) \
-		$(call qstrip,$(BR2_ROOTFS_OVERLAY))
+ifeq ($(BR2_ROOTFS_MERGED_USR),y)
+
+	$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \
+		@$(call MESSAGE,"Sanity check in overlay $(d)")$(sep) \
+		$(Q)not_merged_dirs="$$(support/scripts/check-merged-usr.sh $(d))"; \
+		test -n "$$not_merged_dirs" && { \
+			echo "ERROR: The overlay in $(d) is not" \
+				"using a merged /usr for the following directories:" \
+				$$not_merged_dirs; \
+			exit 1; \
+		} || true$(sep))
+
+endif # merged /usr

 	$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \
 		@$(call MESSAGE,"Copying overlay $(d)")$(sep) \
@@ -1166,9 +1169,6 @@ help:
 	@echo '                         - Recursively list packages which have <pkg> as a dependency'
 	@echo '  <pkg>-graph-depends    - Generate a graph of <pkg>'\''s dependencies'
 	@echo '  <pkg>-graph-rdepends   - Generate a graph of <pkg>'\''s reverse dependencies'
-	@echo '  <pkg>-graph-both-depends'
-	@echo '                         - Generate a graph of both <pkg>'\''s forward and'
-	@echo '                           reverse dependencies.'
 	@echo '  <pkg>-dirclean         - Remove <pkg> build directory'
 	@echo '  <pkg>-reconfigure      - Restart the build from the configure step'
 	@echo '  <pkg>-rebuild          - Restart the build from the build step'
@@ -1212,17 +1212,17 @@ help:
 # $(2): br2-external name, empty for bundled
 define list-defconfigs
 	@first=true; \
-	for defconfig in $$([ -d $(1)/configs ] && find $(1)/configs -name '*_defconfig' |sort); do \
+	for defconfig in $(1)/configs/*_defconfig; do \
 		[ -f "$${defconfig}" ] || continue; \
 		if $${first}; then \
 			if [ "$(2)" ]; then \
-				printf 'External configs in "%s":\n' "$(call qstrip,$(2))"; \
+				printf 'External configs in "$(call qstrip,$(2))":\n'; \
 			else \
 				printf "Built-in configs:\n"; \
 			fi; \
 			first=false; \
 		fi; \
-		defconfig="$${defconfig#$(1)/configs/}"; \
+		defconfig="$${defconfig##*/}"; \
 		printf "  %-35s - Build for %s\n" "$${defconfig}" "$${defconfig%_defconfig}"; \
 	done; \
 	$${first} || printf "\n"
@@ -1243,12 +1243,10 @@ release: OUT = buildroot-$(BR2_VERSION)
 # documentation to the git output
 release:
 	git archive --format=tar --prefix=$(OUT)/ HEAD > $(OUT).tar
-	SOURCE_DATE_EPOCH=$$(git log -1 --format=%at 2> /dev/null) \
-		$(MAKE) O=$(OUT) manual-html manual-text manual-pdf
+	$(MAKE) O=$(OUT) manual-html manual-text manual-pdf
 	$(MAKE) O=$(OUT) distclean
-	tar rf $(OUT).tar --owner=0 --group=0 \
-		--mtime="$$(git log -1 --pretty=format:%ci)" $(OUT)
-	gzip -9 -n -c < $(OUT).tar > $(OUT).tar.gz
+	tar rf $(OUT).tar $(OUT)
+	gzip -9 -c < $(OUT).tar > $(OUT).tar.gz
 	xz -9 -c < $(OUT).tar > $(OUT).tar.xz
 	rm -rf $(OUT) $(OUT).tar

@@ -12,9 +12,6 @@ config BR2_SOFT_FLOAT
 config BR2_USE_MMU
 	bool

-config BR2_ARCH_HAS_FDPIC_SUPPORT
-	bool
-
 choice
 	prompt "Target Architecture"
 	default BR2_i386
@@ -80,16 +77,6 @@ config BR2_i386
 	  Intel i386 architecture compatible microprocessor
 	  http://en.wikipedia.org/wiki/I386

-config BR2_loongarch64
-	bool "LoongArch64"
-	select BR2_USE_MMU
-	select BR2_ARCH_IS_64
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_12
-	help
-	  LoongArch64 is 64-bit architecture developed by Loongson.
-	  http://www.loongson.cn/
-	  https://en.wikipedia.org/wiki/Loongson
-
 config BR2_m68k
 	bool "m68k"
 	# MMU support is set by the subarchitecture file, arch/Config.in.m68k
@@ -153,6 +140,14 @@ config BR2_mips64el
 	  http://www.mips.com/
 	  http://en.wikipedia.org/wiki/MIPS_Technologies

+config BR2_nios2
+	bool "Nios II"
+	select BR2_USE_MMU
+	help
+	  Nios II is a soft core processor from Altera Corporation.
+	  http://www.altera.com/
+	  http://en.wikipedia.org/wiki/Nios_II
+
 config BR2_or1k
 	bool "OpenRISC"
 	select BR2_USE_MMU
@@ -317,14 +312,6 @@ config BR2_ARCH_NEEDS_GCC_AT_LEAST_14
 	bool
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_13

-config BR2_ARCH_NEEDS_GCC_AT_LEAST_15
-	bool
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_14
-
-config BR2_ARCH_NEEDS_GCC_AT_LEAST_16
-	bool
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_15
-
 # The following string values are defined by the individual
 # Config.in.$ARCH files
 config BR2_ARCH
@@ -363,12 +350,6 @@ config BR2_GCC_TARGET_FPU
 config BR2_GCC_TARGET_FLOAT_ABI
 	string

-# The value of this option will be passed as --with-simd=<value> when
-# building gcc (internal backend) or -simd=<value> in the toolchain
-# wrapper (external toolchain)
-config BR2_GCC_TARGET_SIMD
-	string
-
 # The value of this option will be passed as --with-mode=<value> when
 # building gcc (internal backend) or -m<value> in the toolchain
 # wrapper (external toolchain)
@@ -393,10 +374,6 @@ if BR2_arm || BR2_armeb || BR2_aarch64 || BR2_aarch64_be
 source "arch/Config.in.arm"
 endif

-if BR2_loongarch64
-source "arch/Config.in.loongarch"
-endif
-
 if BR2_m68k
 source "arch/Config.in.m68k"
 endif
@@ -409,6 +386,10 @@ if BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el
 source "arch/Config.in.mips"
 endif

+if BR2_nios2
+source "arch/Config.in.nios2"
+endif
+
 if BR2_or1k
 source "arch/Config.in.or1k"
 endif
@@ -456,16 +437,6 @@ config BR2_BINFMT_ELF
 	  and executables used across different architectures and
 	  operating systems.

-config BR2_BINFMT_FDPIC
-	bool "FDPIC"
-	depends on BR2_ARCH_HAS_FDPIC_SUPPORT
-	select BR2_BINFMT_SUPPORTS_SHARED
-	help
-	  ELF FDPIC binaries are based on ELF, but allow the individual
-	  load segments of a binary to be located in memory
-	  independently of each other. This makes this format ideal for
-	  use in environments where no MMU is available.
-
 config BR2_BINFMT_FLAT
 	bool "FLAT"
 	depends on !BR2_USE_MMU
@@ -3,7 +3,7 @@ choice
 	default BR2_arc770d
 	depends on BR2_arc
 	help
-	  Specific CPU to use
+	    Specific CPU to use

 config BR2_arc750d
 	bool "ARC 750D"
@@ -40,12 +40,12 @@ config BR2_archs38_full
 config BR2_archs4x_rel31
 	bool "ARC HS48 rel 31"
 	help
-	  Build for HS48 release 3.1
+	   Build for HS48 release 3.1

 config BR2_archs4x
 	bool "ARC HS48"
 	help
-	  Latest release of HS48 processor
+	   Latest release of HS48 processor
 	   - Dual and Quad multiply and MAC operations
 	   - Double-precision FPU

@@ -89,20 +89,11 @@ config BR2_ARM_CPU_ARMV7A

 config BR2_ARM_CPU_ARMV7M
 	bool
-	select BR2_ARCH_HAS_FDPIC_SUPPORT

 config BR2_ARM_CPU_ARMV8A
 	bool
 	select BR2_USE_MMU

-# Armv9.0-A base specification is a super-set of Armv8.5-A. It is
-# fully compatible with Armv8. This symbol is defined to allow checks
-# for doing Armv9 optimization. Armv8 is also selected for
-# compatibility.
-config BR2_ARM_CPU_ARMV9A
-	bool
-	select BR2_ARM_CPU_ARMV8A
-
 choice
 	prompt "Target Architecture Variant"
 	default BR2_cortex_a53 if BR2_ARCH_IS_64
@@ -474,14 +465,6 @@ config BR2_cortex_a76_a55
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
-config BR2_cortex_a78
-	bool "cortex-A78"
-	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_11
 config BR2_neoverse_n1
 	bool "neoverse-N1 (aka ares)"
 	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
@@ -504,28 +487,6 @@ config BR2_saphira
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_8
-
-comment "armv9.0a cores"
-config BR2_cortex_a710
-	bool "Cortex-A710 (aka matterhorn)"
-	depends on BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV9A
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_12
-config BR2_neoverse_n2
-	bool "neoverse-N2 (aka perseus)"
-	depends on BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV9A
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_11
-
-comment "armv9.2a cores"
-config BR2_cortex_a720
-	bool "Cortex-A720 (aka hunter)"
-	depends on BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV9A
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_14
 endchoice

 config BR2_ARM_ENABLE_NEON
@@ -785,7 +746,7 @@ config BR2_ARM_INSTRUCTIONS_THUMB
 	# Thumb-1 and VFP are not compatible
 	depends on BR2_ARM_SOFT_FLOAT
 	help
-	  This option instructs the compiler to generate Thumb
+	  This option instructions the compiler to generate Thumb
 	  instructions, which allows to mix 16 bits instructions and
 	  32 bits instructions. This generally provides a much smaller
 	  compiled binary size.
@@ -798,7 +759,7 @@ config BR2_ARM_INSTRUCTIONS_THUMB2
 	bool "Thumb2"
 	depends on BR2_ARM_CPU_HAS_THUMB2
 	help
-	  This option instructs the compiler to generate Thumb2
+	  This option instructions the compiler to generate Thumb2
 	  instructions, which allows to mix 16 bits instructions and
 	  32 bits instructions. This generally provides a much smaller
 	  compiled binary size.
@@ -914,16 +875,10 @@ config BR2_GCC_TARGET_CPU
 	default "cortex-a75.cortex-a55"	if BR2_cortex_a75_a55
 	default "cortex-a76"	if BR2_cortex_a76
 	default "cortex-a76.cortex-a55"	if BR2_cortex_a76_a55
-	default "cortex-a78"	if BR2_cortex_a78
 	default "neoverse-n1"	if BR2_neoverse_n1
 	default "tsv110"	if BR2_tsv110
 	# armv8.4a
 	default "saphira"	if BR2_saphira
-	# armv9.0a
-	default "cortex-a710"	if BR2_cortex_a710
-	default "neoverse-n2"	if BR2_neoverse_n2
-	# armv9.2a
-	default "cortex-a720"	if BR2_cortex_a720

 config BR2_GCC_TARGET_ABI
 	default "aapcs-linux"	if BR2_arm || BR2_armeb
@@ -1,138 +0,0 @@
-# LoongArch CPU
-
-choice
-	prompt "Target Architecture Variant"
-	default BR2_loongarch64_generic if BR2_ARCH_IS_64
-
-config BR2_loongarch64_generic
-	bool "Generic LoongArch 64-bit"
-	depends on BR2_ARCH_IS_64
-	help
-	  Generic LoongArch 64-bit processor.
-
-config BR2_loongarch64_v1_0
-	bool "LoongArch64 ISA version 1.0"
-	depends on BR2_ARCH_IS_64
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_14
-	help
-	  LoongArch64 ISA version 1.0 processor.
-
-config BR2_loongarch64_v1_1
-	bool "LoongArch64 ISA version 1.1"
-	depends on BR2_ARCH_IS_64
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_14
-	help
-	  LoongArch64 ISA version 1.1 processor.
-
-endchoice
-
-choice
-	prompt "FPU Type"
-	default BR2_LOONGARCH_FPU_64
-
-config BR2_LOONGARCH_FPU_64
-	bool "64"
-	help
-	  Allow the use of hardware floating-point instructions for
-	  32-bit and 64-bit operations.
-
-config BR2_LOONGARCH_FPU_32
-	bool "32"
-	# Only supported by lp64s and lp64f ABIs which are marked as broken
-	depends on BR2_BROKEN
-	help
-	  Allow the use of hardware floating-point instructions for
-	  32-bit operations only.
-
-config BR2_LOONGARCH_FPU_NONE
-	bool "none"
-	# Only supported by lp64s ABI which is marked as broken
-	depends on BR2_BROKEN
-	help
-	  Prevent the use of hardware floating-point instructions.
-endchoice
-
-choice
-	prompt "SIMD Type"
-	default BR2_LOONGARCH_SIMD_NONE
-
-config BR2_LOONGARCH_SIMD_NONE
-	bool "none"
-	help
-	  Prevent the use of hardware SIMD instructions.
-
-config BR2_LOONGARCH_SIMD_LSX
-	bool "LSX"
-	depends on BR2_LOONGARCH_FPU_64
-	help
-	  Enable generating instructions from the 128-bit LoongArch SIMD
-	  Extension (LSX).
-
-config BR2_LOONGARCH_SIMD_LASX
-	bool "LASX"
-	depends on BR2_LOONGARCH_FPU_64
-	help
-	  Enable generating instructions from the 256-bit LoongArch
-	  Advanced SIMD Extension (LASX) and the 128-bit LoongArch
-	  SIMD Extension (LSX).
-endchoice
-
-choice
-	prompt "Target ABI"
-	default BR2_LOONGARCH_ABI_LP64D if BR2_ARCH_IS_64 && BR2_LOONGARCH_FPU_64
-	default BR2_LOONGARCH_ABI_LP64F if BR2_ARCH_IS_64 && BR2_LOONGARCH_FPU_32
-	default BR2_LOONGARCH_ABI_LP64S if BR2_ARCH_IS_64 && BR2_LOONGARCH_SIMD_NONE
-
-config BR2_LOONGARCH_ABI_LP64D
-	bool "lp64d"
-	depends on BR2_ARCH_IS_64
-	depends on BR2_LOONGARCH_FPU_64
-
-config BR2_LOONGARCH_ABI_LP64F
-	bool "lp64f"
-	depends on BR2_ARCH_IS_64
-	# Failed to build host GCC initial, pending investigation
-	depends on BR2_BROKEN
-	depends on BR2_LOONGARCH_FPU_64 || BR2_LOONGARCH_FPU_32
-
-config BR2_LOONGARCH_ABI_LP64S
-	bool "lp64s"
-	depends on BR2_ARCH_IS_64
-	# GCC can't find libraries, pending investigation
-	depends on BR2_BROKEN
-endchoice
-
-config BR2_ARCH
-	default "loongarch64" if BR2_ARCH_IS_64
-
-config BR2_NORMALIZED_ARCH
-	default "loongarch"
-
-config BR2_ENDIAN
-	default "LITTLE"
-
-config BR2_GCC_TARGET_ARCH
-	default "loongarch64" if BR2_loongarch64_generic
-	default "la64v1.0" if BR2_loongarch64_v1_0
-	default "la64v1.1" if BR2_loongarch64_v1_1
-
-config BR2_GCC_TARGET_FPU
-	default "64" if BR2_LOONGARCH_FPU_64
-	default "32" if BR2_LOONGARCH_FPU_32
-	default "none" if BR2_LOONGARCH_FPU_NONE
-
-config BR2_GCC_TARGET_SIMD
-	default "lasx" if BR2_LOONGARCH_SIMD_LASX
-	default "lsx" if BR2_LOONGARCH_SIMD_LSX
-	default "none" if BR2_LOONGARCH_FPU_NONE
-
-config BR2_GCC_TARGET_ABI
-	default "lp64d" if BR2_LOONGARCH_ABI_LP64D
-	default "lp64f" if BR2_LOONGARCH_ABI_LP64F
-	default "lp64s" if BR2_LOONGARCH_ABI_LP64S
-
-config BR2_READELF_ARCH_NAME
-	default "LoongArch"
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-
@@ -23,11 +23,6 @@ choice
 	help
 	  Specific CPU variant to use

-config BR2_m68k_68030
-	bool "68030"
-	select BR2_m68k_m68k
-	select BR2_USE_MMU
-
 config BR2_m68k_68040
 	bool "68040"
 	select BR2_m68k_m68k
@@ -41,7 +36,6 @@ config BR2_m68k_cf5208
 endchoice

 config BR2_GCC_TARGET_CPU
-	default "68030"		if BR2_m68k_68030
 	default "68040"		if BR2_m68k_68040
 	default "5208"		if BR2_m68k_cf5208

@@ -0,0 +1,14 @@
+config BR2_ARCH
+	default "nios2"
+
+config BR2_NORMALIZED_ARCH
+	default "nios2"
+
+config BR2_ENDIAN
+	default "LITTLE"
+
+config BR2_READELF_ARCH_NAME
+	default "Altera Nios II"
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
@@ -379,6 +379,30 @@ config BR2_x86_grandridge
 	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
@@ -767,6 +791,8 @@ config BR2_GCC_TARGET_ARCH
 	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
@@ -16,7 +16,6 @@ GCC_TARGET_FP32_MODE := $(call qstrip,$(BR2_GCC_TARGET_FP32_MODE))
 GCC_TARGET_CPU := $(call qstrip,$(BR2_GCC_TARGET_CPU))
 GCC_TARGET_FPU := $(call qstrip,$(BR2_GCC_TARGET_FPU))
 GCC_TARGET_FLOAT_ABI := $(call qstrip,$(BR2_GCC_TARGET_FLOAT_ABI))
-GCC_TARGET_SIMD := $(call qstrip,$(BR2_GCC_TARGET_SIMD))
 GCC_TARGET_MODE := $(call qstrip,$(BR2_GCC_TARGET_MODE))

 # Explicitly set LD's "max-page-size" instead of relying on some defaults
@@ -1,2 +0,0 @@
-# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
-sha256  62148e7e17f54c4a5ab5e75ad4882682c54bee818948be61a5963234fc0849fc  linux-6.11.11.tar.xz
@@ -1,5 +1,5 @@
 #!/bin/sh

-BOARD_DIR=$(dirname "$0")
+BOARD_DIR="$(dirname $0)"

-cp -f "${BOARD_DIR}/grub.cfg" "${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg"
+cp -f ${BOARD_DIR}/grub.cfg ${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg
@@ -9,7 +9,7 @@
 * Licensed under GPLv2 or later.
 */
 /dts-v1/;
-#include "sama5d31.dtsi"
+#include "microchip/sama5d31.dtsi"

 / {
 	model = "Acme Systems Acqua SOM";
@@ -149,14 +149,8 @@
 					#address-cells = <1>;
 					#size-cells = <1>;

-					nvmem-layout {
-						compatible = "fixed-layout";
-						#address-cells = <1>;
-						#size-cells = <1>;
-
-						eth0_addr: eth-mac-addr@9A {
-							reg = <0x0 0x06>;
-						};
+					eth0_addr: eth-mac-addr@9A {
+						reg = <0x0 0x06>;
 					};
 				};
 				
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  6b19a3ae99423de2416964d67251d745910277af258b4c4c63e88fd87dbf0e27  linux-6.12.41.tar.xz
+sha256  b66a5b863b0f8669448b74ca83bd641a856f164b29956e539bbcb5fdeeab9cc6  linux-6.6.30.tar.xz
@@ -0,0 +1,8 @@
+linux_load_address=0x100000
+linux_dtb_load_address=0x100
+linux_dtb=socfpga_cyclone5_socrates.dtb
+linux_load=mmc rescan; fatload mmc 0:1 ${linux_load_address} zImage; fatload mmc 0:1 ${linux_dtb_load_address} ${linux_dtb}
+bootargs=console=ttyS0,115200 root=/dev/mmcblk0p3 ro rootwait
+source_env=fatload mmc 0:1 0x2000000 boot.scr; source 0x2000000
+bootcmd=run linux_load; bootz ${linux_load_address} - ${linux_dtb_load_address}
+bootdelay=1
@@ -0,0 +1,59 @@
+image boot.vfat {
+	vfat {
+		files = {
+			"zImage",
+			"socfpga_cyclone5_socrates.dtb"
+		}
+	}
+
+	size = 8M
+}
+
+image uboot.img {
+	hdimage {
+		partition-table = "no"
+	}
+
+	partition spl {
+		in-partition-table = "no"
+		image = "u-boot-spl.bin.crc"
+		offset = 0
+		size = 64K
+	}
+
+	partition uboot-full {
+		in-partition-table = "no"
+		image = "u-boot.img"
+		offset = 256K
+	}
+
+	size = 1M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition uboot-env {
+		in-partition-table = "no"
+		image = "uboot-env.bin"
+		offset = 17K # 512 * 34 -> just after gpt
+	}
+
+	partition boot {
+		partition-type = 0xc
+		bootable = "true"
+		image = "boot.vfat"
+	}
+
+	partition uboot {
+		partition-type = 0xa2
+		image = "uboot.img"
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext2"
+		size = 500M
+	}
+}
@@ -0,0 +1,52 @@
+EBV SoCrates Evaluation Board
+
+Intro
+=====
+
+More information about this board can be found here:
+https://rocketboards.org/foswiki/Documentation/EBVSoCratesEvaluationBoard
+
+Build
+=====
+
+First, load socrates config for buildroot
+
+    make socrates_cyclone5_defconfig
+
+Build everything
+
+    make
+
+Following files will be generated in output/images
+
+.
+├── boot.vfat
+├── rootfs.ext2
+├── rootfs.ext4 -> rootfs.ext2
+├── rootfs.tar
+├── sdcard.img
+├── socfpga_cyclone5_socrates.dtb
+├── u-boot-spl.bin
+├── u-boot-spl.bin.crc
+├── u-boot.bin
+├── u-boot.img
+├── uboot-env.bin
+├── uboot.img
+└── zImage
+
+
+Creating bootable SD card
+=========================
+
+Simply invoke
+
+dd if=output/images/sdcard.img of=/dev/sdX
+
+Where X is your SD card device (not partition)
+
+Booting
+=======
+
+Pins 6:8 on P18 selector is used to determine boot device. To boot socrates from
+sdcard set these pins to value 0x5 (101b). Remaining pins are used to determine
+how to configure FPGA and are not associated with booting into Linux kernel.
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  c71af3d2c86c0a0deca4f54b51d1c35217082b030052cc3513dc42e852652733  linux-v6.0.y-andes.tar.gz
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  d11702103f177a2914e94eec57ce5ed820296d874f6b6525c4482e55d71a3667  opensbi-1.6.tar.gz
@@ -0,0 +1,38 @@
+From 16aad5594e08550295ea3c12c1c9ed6f64774748 Mon Sep 17 00:00:00 2001
+From: Rick Chen <rick@andestech.com>
+Date: Tue, 29 Mar 2022 13:41:10 +0800
+Subject: [PATCH] mmc: ftsdc010_mci: Support DTS of ftsdc010 driver for
+ generic dma
+
+The ftsdc010 driver has been implemented for generic dma in Linux
+kernel. And its compatible is andestech,atfsdc010g to distinguish
+the legacy andestech,atfsdc010 which is not for generic dma.
+
+Althought the ftsdc010_mci driver in U-Boot does not use dma, but
+it still can work well with the mmc node for generic dma. So add
+the compatible string to support it.
+
+Signed-off-by: Rick Chen <rick@andestech.com>
+
+Upstream-Status: Pending
+
+Signed-off-by: Yu Chien Peter Lin <peterlin@andestech.com>
+---
+ drivers/mmc/ftsdc010_mci.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c
+index 570d54cf9d..65b1d447a8 100644
+--- a/drivers/mmc/ftsdc010_mci.c
+++ b/drivers/mmc/ftsdc010_mci.c
+@@ -460,6 +460,7 @@ int ftsdc010_mmc_bind(struct udevice *dev)
+ 
+ static const struct udevice_id ftsdc010_mmc_ids[] = {
+ 	{ .compatible = "andestech,atfsdc010" },
+	{ .compatible = "andestech,atfsdc010g" },
+ 	{ }
+ };
+ 
+-- 
+2.34.1
+
@@ -0,0 +1,42 @@
+From 933ad8a59f7fd9b2088badc3e97167d750a40b5a Mon Sep 17 00:00:00 2001
+From: Bin Meng <bmeng.cn@gmail.com>
+Date: Mon, 12 Jul 2021 11:52:31 +0800
+Subject: [PATCH] spl: Align device tree blob address at 8-byte boundary
+
+Since libfdt v1.6.1, a new requirement on the device tree address via:
+
+  commit 5e735860c478 ("libfdt: Check for 8-byte address alignment in fdt_ro_probe_()")
+
+must be met that the device tree must be loaded in to memory at an
+8-byte aligned address.
+
+Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
+
+This patch was imported from U-boot patchwork:
+https://patchwork.ozlabs.org/project/uboot/patch/20210712035231.26475-1-bmeng.cn@gmail.com/
+
+Signed-off-by: Yu Chien Peter Lin <peterlin@andestech.com>
+---
+ common/spl/spl_fit.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
+index a35be529..a76ad14a 100644
+--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
+@@ -382,6 +382,12 @@ static int spl_fit_append_fdt(struct spl_image_info *spl_image,
+ 	 */
+ 	image_info.load_addr = spl_image->load_addr + spl_image->size;
+ 
+	/*
+	 * Since libfdt v1.6.1, the device tree must be loaded in to memory
+	 * at an 8-byte aligned address.
+	 */
+	image_info.load_addr = roundup(image_info.load_addr, 8);
+
+ 	/* Figure out which device tree the board wants to use */
+ 	node = spl_fit_get_image_node(ctx, FIT_FDT_PROP, index++);
+ 	if (node < 0) {
+-- 
+2.34.1
+
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  0f933f6c5a426895bf306e93e6ac53c60870e4b54cda56d95211bec99e63bec7  u-boot-2025.07.tar.bz2
@@ -1,3 +1,3 @@
 #!/bin/sh
-cp "$BINARIES_DIR"/Image "$TARGET_DIR"/boot
-cp "$BINARIES_DIR"/ae350_ax45mp.dtb "$TARGET_DIR"/boot
+cp $BINARIES_DIR/Image $TARGET_DIR/boot
+cp $BINARIES_DIR/ae350_ax45mp.dtb $TARGET_DIR/boot
@@ -41,49 +41,6 @@ After building, you should obtain the following files:
  |-- u-boot-spl.bin
  `-- u-boot.itb

-How to update the bootloader and device-tree
-============================================
-
-To update the bootloader and device tree, make sure you have
-an ICEman (Andes OpenOCD [1]) and AICE [2] connection set up
-as below:
-
-  Local Host                 Local/Remote Host
- .-----------------.          .--------------.
- | buildroot images|          |              |
- |                 |         ICEman host <IP:PORT>
- | .----------.    |          |  .--------.  |
- | | SPI_burn |<---+--socket--+->| ICEman |  |
- | '----------'    |          |  '--.-----'  |
- '-----------------'          '-----|--------'
-                                    |
-                                    USB
-   .--------------.                 |
-   | target       |           .-----v-----.
-   | board        <----JTAG---| AICE      |
-   |              |           '-----------'
-   '--------------'
-
-[1] https://github.com/andestech/ICEman
-[2] https://www.andestech.com/en/products-solutions/andeshape-platforms/aice-micro/
-
-The Andes SPI_burn tool will be located in output/host/bin. Use
-the following commands to update the bootloader and device tree:
-
-  $ SPI_burn --host $ICE_IP --port $ICE_BURNER_PORT --addr 0x0     -i u-boot-spl.bin
-  $ SPI_burn --host $ICE_IP --port $ICE_BURNER_PORT --addr 0x10000 -i u-boot.itb
-  $ SPI_burn --host $ICE_IP --port $ICE_BURNER_PORT --addr 0xf0000 -i ae350_ax45mp.dtb
-
-Note that the --addr option specifies the offset starting from
-the flash base address 0x80000000 and set by U-Boot configurations.
-e.g.
-u-boot-spl.bin  : CONFIG_SPL_TEXT_BASE=0x80000000
-u-boot.itb      : CONFIG_SPL_LOAD_FIT_ADDRESS=0x80010000
-ae350_ax45mp.dtb: CONFIG_SYS_FDT_BASE=0x800f0000
-
-How to write the SD card
-========================
-
 Copy the sdcard.img to a SD card with "dd":

  $ sudo dd if=sdcard.img of=/dev/sdX bs=4096
@@ -1,5 +1,6 @@
 CONFIG_SPL_FS_FAT=y
 CONFIG_SPL_MMC=y
+# CONFIG_SPL_RAM_SUPPORT is not set
 CONFIG_SPL_OPENSBI_LOAD_ADDR=0x0
 CONFIG_SPL_OPENSBI_SCRATCH_OPTIONS=0x0
 CONFIG_DISPLAY_CPUINFO=y
@@ -1,2 +0,0 @@
-# From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
-sha256  3507dd105b0a0e1101bd43d294472fccf853429a259a5fa7c67467bba318f8e9  linux-6.15.7.tar.xz
@@ -1,39 +1,16 @@
-Introduction
-============
-
 This is the support for the ARM Foundation v8 machine emulated by the
 ARM software simulator of the AArch64 architecture.

-Building
-========
+First, one has to download the AArch64 software simulator from:

-  $ make arm_foundationv8_defconfig
-  $ make
+  https://armkeil.blob.core.windows.net/developer/Files/downloads/ecosystem-models/Foundation_Platform_11.20_15_Linux64.tgz

-Generated files under output/images:
-
-* linux-system.axf: An image comprising the boot-wrapper-aarch64 minimal
-                    firmware and bootloader, a Devicetree and the Linux kernel.
-* rootfs.ext2:      The OS root filesystem.
-
-Running on the simulator
-========================
-
-Download the AArch64 software simulator from one of the following sources,
-corresponding to your host computer:
-
- https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Architecture/FM-11.29/Foundation_Platform_11.29_27_Linux64.tgz
- https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Architecture/FM-11.29/Foundation_Platform_11.29_27_Linux64_armv8l.tgz
-
-The model will be located under one of the corresponding folders:
-
- Foundation_Platformpkg/models/Linux64_GCC-9.3
- Foundation_Platformpkg/models/Linux64_armv8l_GCC-9.3
+Then, use the arm_foundationv8_defconfig configuration to build your
+Buildroot system.

 Finally, boot your system with:

- Foundation_Platform \
-    --arm-v8.0 \
+ ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-9.3/Foundation_Platform \
    --image output/images/linux-system.axf \
    --block-device output/images/rootfs.ext2 \
    --network=nat \
@@ -1,15 +0,0 @@
-# Arm A-Profile Base RevC AEM FVP config
-bp.secure_memory=1
-bp.ve_sysregs.exit_on_shutdown=1
-cache_state_modelled=0
-cluster0.NUM_CORES=4
-cluster0.cpu0.enable_crc32=1
-cluster0.cpu1.enable_crc32=1
-cluster0.cpu2.enable_crc32=1
-cluster0.cpu3.enable_crc32=1
-cluster1.NUM_CORES=4
-cluster1.cpu0.enable_crc32=1
-cluster1.cpu1.enable_crc32=1
-cluster1.cpu2.enable_crc32=1
-cluster1.cpu3.enable_crc32=1
-pctl.startup=0.0.0.0
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2024, ARM Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include "fvp-base-gicv3-psci-1t.dts"
-
-/* The TF-A Devicetree does not have the OP-TEE node; let's add it. */
-
-/ {
-	firmware {
-		optee {
-			compatible = "linaro,optee-tz";
-			method = "smc";
-		};
-	};
-};
@@ -1,31 +0,0 @@
-image efi-part.vfat {
-	vfat {
-		file EFI {
-			image = "efi-part/EFI"
-		}
-
-		file Image {
-			image = "Image"
-		}
-	}
-
-	size = 128M
-}
-
-image disk.img {
-	hdimage {
-		partition-table-type = "gpt"
-	}
-
-	partition boot {
-		image = "efi-part.vfat"
-		partition-type-uuid = U
-		offset = 32K
-		bootable = true
-	}
-
-	partition root {
-		partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae
-		image = "rootfs.ext2"
-	}
-}
@@ -1,6 +0,0 @@
-set default="0"
-set timeout="5"
-
-menuentry "Buildroot" {
-	linux /Image root=PARTLABEL=root rootwait
-}
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22  arm-trusted-firmware-v2.11-git4.tar.gz
@@ -1,2 +0,0 @@
-# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
-sha256  524858852f5869a9ef17de8b1e6e7faf05bcb2c462bc96b3c24dbf82ede373cf  linux-6.10.12.tar.xz
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f  u-boot-2024.07.tar.bz2
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -eu
-
-BOARD_DIR=$(dirname "$0")
-
-# Override the default GRUB configuration file with our own.
-cp -f "${BOARD_DIR}/grub.cfg" "${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg"
@@ -1,73 +0,0 @@
-Introduction
-============
-
-The arm_fvp_ebbr_defconfig is meant to illustrate some aspects of the Arm EBBR
-specification[1] and the Arm SystemReady IR[2] compliance program.
-It allows building an AArch64 U-Boot based firmware implementing the subset of
-UEFI defined by EBBR, as well as a Linux OS disk image booting with UEFI, to run
-on the Arm A-Profile Base RevC AEM FVP.
-
-Building
-========
-
-  $ make arm_fvp_ebbr_defconfig
-  $ make
-
-Generated files under output/images:
-
-* bl1.bin: A ROM image built from TF-A.
-* fip.bin: A firmware image comprising TF-A, OP-TEE and the U-Boot bootloader.
-* disk.img: An OS disk image comprising the GRUB bootloader, the Linux kernel
-  and the root filesystem.
-
-Running on the FVP
-==================
-
-Download the FVP from one of the following sources, corresponding to your host
-computer:
-
- https://developer.arm.com/-/cdn-downloads/permalink/Fixed-Virtual-Platforms/FM-11.27/FVP_Base_RevC-2xAEMvA_11.27_19_Linux64.tgz
- https://developer.arm.com/-/cdn-downloads/permalink/Fixed-Virtual-Platforms/FM-11.27/FVP_Base_RevC-2xAEMvA_11.27_19_Linux64_armv8l.tgz
-
-The FVP will be located under one of the corresponding folders:
-
- Base_RevC_AEMvA_pkg/models/Linux64_GCC-9.3
- Base_RevC_AEMvA_pkg/models/Linux64_armv8l_GCC-9.3
-
-Run the simulation with:
-
-  FVP_Base_RevC-2xAEMvA \
-      --config-file board/arm/fvp-ebbr/fvp-config.txt \
-      -C bp.secureflashloader.fname="output/images/bl1.bin" \
-      -C bp.flashloader0.fname="output/images/fip.bin" \
-      -C bp.virtioblockdevice.image_path="output/images/disk.img"
-
-The login prompt will appear in a new X terminal.
-
-Using the EBBR firmware to run another OS on the FVP
----------------------------------------------------
-
-It is possible to use the generated firmware binaries to run another OS
-supporting the EBBR specification.
-
-To run another OS on simulation using a live or pre-installed image, use the
-same FVP command line as for the generated OS but adapt the OS image path in the
-virtioblockdevice stanza.
-The image generated by the aarch64_efi_defconfig or the Arm ACS-IR images[3] are
-examples of pre-installed OS images.
-Linux distributions such as Debian, Fedora, openSUSE or Ubuntu provide a
-pre-installed OS image.
-
-Miscellaneous
-=============
-
-This configuration is inspired by the arm_foundationv8_defconfig, the
-qemu_aarch64_virt_defconfig and the Arm SystemReady IR IoT Integration, Test,
-and Certification Guide[4].
-
-Firmware update, MMC and network are currently not supported.
-
-[1]: https://github.com/ARM-software/ebbr
-[2]: https://developer.arm.com/Architectures/Arm%20SystemReady%20IR
-[3]: https://github.com/ARM-software/arm-systemready/tree/main/IR/prebuilt_images
-[4]: https://developer.arm.com/documentation/DUI1101/latest/
@@ -1,49 +0,0 @@
-# CONFIG_USE_BOOTCOMMAND is not set
-CONFIG_BOOTCOMMAND="bootflow scan -lb"
-CONFIG_BOOTMETH_DISTRO=y
-CONFIG_BOOTM_EFI=y
-CONFIG_BOOTSTD_BOOTCOMMAND=y
-CONFIG_BOOTSTD_DEFAULTS=y
-CONFIG_BOOTSTD_FULL=y
-CONFIG_CMD_BOOTDEV=y
-CONFIG_CMD_BOOTEFI=y
-CONFIG_CMD_BOOTEFI_HELLO=y
-CONFIG_CMD_BOOTEFI_HELLO_COMPILE=y
-CONFIG_CMD_BOOTEFI_SELFTEST=y
-CONFIG_CMD_BOOTMETH=y
-CONFIG_CMD_DM=y
-CONFIG_CMD_EFIDEBUG=y
-CONFIG_CMD_EFI_VARIABLE_FILE_STORE=y
-CONFIG_CMD_GETTIME=y
-CONFIG_CMD_GPT=y
-CONFIG_CMD_NVEDIT_EFI=y
-CONFIG_CMD_RNG=y
-CONFIG_CMD_RTC=y
-CONFIG_CMD_TIME=y
-CONFIG_DM_RNG=y
-CONFIG_DM_RTC=y
-CONFIG_EFI_DEVICE_PATH_TO_TEXT=y
-CONFIG_EFI_GET_TIME=y
-CONFIG_EFI_HAVE_RUNTIME_RESET=y
-CONFIG_EFI_LOADER=y
-CONFIG_EFI_LOADER_HII=y
-CONFIG_EFI_MM_COMM_TEE=y
-CONFIG_EFI_PARTITION=y
-CONFIG_EFI_SECURE_BOOT=y
-CONFIG_EFI_SET_TIME=y
-CONFIG_EFI_UNICODE_CAPITALIZATION=y
-CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=y
-CONFIG_EFI_VARIABLE_FILE_STORE=y
-CONFIG_FAT_WRITE=y
-CONFIG_FIT=y
-CONFIG_FS_FAT=y
-CONFIG_ISO_PARTITION=y
-CONFIG_MISC=y
-CONFIG_OF_CONTROL=y
-CONFIG_OF_LIBFDT=y
-CONFIG_OPTEE=y
-CONFIG_PARTITION_TYPE_GUID=y
-CONFIG_RNG_OPTEE=y
-CONFIG_TEE=y
-CONFIG_USE_BOOTCOMMAND=y
-CONFIG_VEXPRESS_CONFIG=y
@@ -30,11 +30,11 @@ image flash.img {
 	partition fitimage {
 		image = "image.itb"
 		offset = 512K
-		size = 7000K
+		size = 4352K
 	}

 	partition spare {
-		offset = 7512K
-		size =  25256K
+		offset = 4864K
+		size = 27904K
 	}
 }
@@ -1,2 +0,0 @@
-# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
-sha256  5be3daa1f9427b1bdb34c4894d9c1adfac38cff674376fe0611a3065729a1a81  linux-6.16.7.tar.xz
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  0f933f6c5a426895bf306e93e6ac53c60870e4b54cda56d95211bec99e63bec7  u-boot-2025.07.tar.bz2
@@ -1,2 +0,0 @@
-# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
-sha256  5be3daa1f9427b1bdb34c4894d9c1adfac38cff674376fe0611a3065729a1a81  linux-6.16.7.tar.xz
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  16da36d1832f058cf1a6673b6a2eedeef1260576c15e76c4998e30d0fb13d339  uboot-66672e5af36fe294df56f8e7942069e3909f3790-git4.tar.gz
@@ -3,8 +3,8 @@
 BOARD_DIR="$(dirname $0)"
 mkimage=$HOST_DIR/bin/mkimage

-BOARD_DT=$(sed -nr \
-           -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(aspeed/)?([a-z0-9\-]*).*"$|\2|p' \
+BOARD_DT=$(sed -n \
+           's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([a-z0-9\-]*\).*"$/\1/p' \
           ${BR2_CONFIG})

 sed -e "s/%BOARD_DTB%/${BOARD_DT}.dtb/" \
@@ -1 +0,0 @@
-../linux/linux.hash
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f  u-boot-2024.07.tar.bz2
@@ -1 +0,0 @@
-../linux/linux.hash
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  1db327d0743e97ec725fefe05065a6fb779abe3063845fc3b551a4a716247c0a  linux-6.12.34-ti-arm32-r12.tar.gz
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a  u-boot-2025.10.tar.bz2
@@ -1,6 +0,0 @@
-#!/bin/sh
-BOARD_DIR="$(dirname "$0")"
-
-cp "${BOARD_DIR}/uEnv.txt" "${BINARIES_DIR}/uEnv.txt"
-
-install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${BINARIES_DIR}/extlinux/extlinux.conf"
@@ -1 +0,0 @@
-../linux/linux.hash
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  c435bd74d1c21fc5a950781a50d78bae2b93944144694843359948ad3afc72a5  linux-6.12.50.tar.xz
@@ -1,31 +0,0 @@
-From 0b161f8e89a411fe54059cf1d0ba61354ee1e8a2 Mon Sep 17 00:00:00 2001
-From: Robert Nelson <robertcnelson@gmail.com>
-Date: Wed, 3 Aug 2022 11:28:10 -0500
-Subject: [PATCH] am57xx/board.c: assume on failure its a BBONE-AI
-
-Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
-Upstream: https://github.com/beagleboard/u-boot/commit/0b161f8e89a411fe54059cf1d0ba61354ee1e8a2
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
- board/ti/am57xx/board.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
-index cfc825e52a3..f369693f382 100644
--- a/board/ti/am57xx/board.c
-+++ b/board/ti/am57xx/board.c
-@@ -529,8 +529,10 @@ void do_board_detect(void)
- 
- 	rc = ti_i2c_eeprom_am_get(CONFIG_EEPROM_BUS_ADDRESS,
- 				  CONFIG_EEPROM_CHIP_ADDRESS);
-	if (rc)
-+	if (rc) {
- 		printf("ti_i2c_eeprom_init failed %d\n", rc);
-+		ti_i2c_eeprom_am_set("BBONE-AI", "A");
-+	};
- 
- #ifdef CONFIG_SUPPORT_EMMC_BOOT
- 	rc = board_bootmode_has_emmc();
-- 
-2.39.5
-
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  439d3bef296effd54130be6a731c5b118be7fddd7fcc663ccbc5fb18294d8718  u-boot-2025.04.tar.bz2
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-cp board/beagleboard/beagleboneai/uEnv.txt "$BINARIES_DIR/uEnv.txt"
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  7efa89e1b4e4106ee05d68e876c8efbb146364d89cfd5d26bf4647b09c08f32b  arm-trusted-firmware-v2.10-git4.tar.gz
+sha256  2e18b881ada9198173238cca80086c787b1fa3f698944bde1743142823fc511c  arm-trusted-firmware-v2.10.tar.gz
@@ -1,5 +0,0 @@
-label beagleplay-buildroot
-    kernel /Image
-    fdtdir /
-    devicetree /k3-am625-beagleplay.dtb
-    append console=ttyS2,115200n8 root=/dev/mmcblk1p2 rw rootfstype=ext4 rootwait earlycon=ns16550a,mmio32,0x02800000
@@ -1,39 +0,0 @@
-image boot.vfat {
-        vfat {
-            files = {
-                    "Image",
-                    "k3-am625-beagleplay.dtb",
-                    "tiboot3.bin",
-            }
-
-            file tispl.bin {
-                    image = tispl.bin_unsigned
-            }
-
-            file u-boot.img {
-                    image = u-boot.img_unsigned
-            }
-
-            file extlinux/extlinux.conf {
-                    image = extlinux.conf
-            }
-        }
-
-        size = 64M
-}
-
-image sdcard.img {
-        hdimage {
-        }
-
-        partition u-boot {
-                partition-type = 0xC
-                bootable = "true"
-                image = "boot.vfat"
-        }
-
-        partition rootfs {
-                partition-type = 0x83
-                image = "rootfs.ext4"
-        }
-}
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22  arm-trusted-firmware-v2.11-git4.tar.gz
@@ -1 +0,0 @@
-../linux/linux.hash
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  774698422ee54c5f1e704456f37c65c06b51b4e9a8b0866f34580d86fef8e226  linux-6.10.tar.xz
@@ -1 +0,0 @@
-../uboot/uboot.hash
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f  u-boot-2024.07.tar.bz2
@@ -1,5 +0,0 @@
-#!/bin/sh -x
-
-BOARD_DIR="$(dirname "$0")"
-
-install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$BINARIES_DIR"/extlinux.conf
@@ -1,39 +0,0 @@
-BeagleBoard's BeaglePlay
-
-Description
-===========
-
-This configuration will build a complete image for the BeaglePlay
-board: https://www.beagleboard.org/boards/beagleplay
-
-How to Build
-============
-
-Select the default configuration for the target:
-
-    $ make beagleplay_defconfig
-
-Optional: modify the configuration:
-
-    $ make menuconfig
-
-NOTE: The AM625x processor has multiple security variants. You must
-ensure the matching tiboot3.bin is uses or the board will not boot.
-The BeaglePlay uses the General Purpose (GP) variant, ensure you use
-the tiboot3-am62x-gp-evm.bin
-
-Build:
-
-    $ make
-
-To copy the resultimg output image file to an SD card use dd:
-
-    $ dd if=output/images/sdcard.img of=/dev/sdX bs=1M
-
-How to Run
-==========
-
-This configuration has both the boot/ and root/ partitions which is
-capable of booting from the bootloaders embedded in the eMMC as well
-as when using holding the USR button to boot from the SD card.
-
@@ -1,127 +0,0 @@
-Beagle-V Fire
-==============
-
-BeagleV Fire is a low-cost RISC-V 64-bit based platform, powered by
-Microchip's PolarFire SoC. This file describes how to use the
-pre-defined Buildroot configuration for the Beagle-V Fire board.
-
-Further information about the Beagle-V Fire can be found at
-https://docs.beagleboard.org/latest/boards/beaglev/fire/index.html.
-
-
-Building
-========
-
-Configure Buildroot using the default board configuration:
-
-  '$ make beaglev_fire_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
-    +-- Image.gz
-    +-- beaglev_fire.itb
-    +-- beaglev_fire.its
-    +-- mpfs-beaglev-fire.dtb
-    +-- payload.bin
-    +-- rootfs.ext2
-    +-- rootfs.ext4
-    +-- rootfs.tar
-    +-- sdcard.img
-    +-- u-boot.bin
-
-
-Flashing the image to your eMMC
-===============================
-
-By default Buildroot builds an image suitable for the eMMC. 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.
-
-To do so, follow the below steps:
-
-1. Connect to BeagleV-Fire UART debug port using a 3.3v USB to UART bridge.
-
-2. Now you can run `tio <port>` in a terminal window to access the UART debug
-port connection.
-  e.g `tio /dev/ttyUSB4`
-
-3. Once you are connected properly, you can press the Reset button which will
-show you a progress bar.
-
-4. Press any key in the terminal application to stop the HSS from booting. This
-will give you access to the HSS command line interface and a ">>" for input
-will be displayed in the terminal.
-
-5. Type `usbdmsc` in the HSS command line interface. The HSS `usbdmsc` command
-exposes the eMMC as a USB mass storage device using the USB type C connector.
-If successful, a message saying "USB Host connected" will be displayed.
-
-6. The eMMC should now appear as mass storage device/drive on your host PC, as
-it is mounted through your USB type C connector.
-
-7. Now, all you need to do is dd the image to the eMMC, which can be done with
-the following command on your development host:
-
-  '$ sudo dd if=output/images/sdcard.img of=/dev/sdX bs=1M'
-
-You will have to replace /dev/sdX by the actual device name of your eMMC.
-Please, be especially cautious not to overwrite the wrong drive as this cannot
-be undone.
-
-8. Once the image transfer has completed you can type `CTRL+C` to disconnect
-your device.
-
-9. Finally, type `boot` or reset your board to boot your new Linux image.
-
-Customize BeagleV-Fire Cape Gateware Using Verilog (Optional)
-=============================================================
-
-To customize your Beagle-V Fire gateware please follow the guide below to
-create your custom bitstream (steps 1 - 6):
-https://docs.beagleboard.org/latest/boards/beaglev/fire/demos-and-tutorials/gateware/customize-cape-gateware-verilog.html
-
-
-  Program BeagleV-Fire With Your Custom Bitstream with Buildroot
-  ==============================================================
-
-  After following the steps 1-6 from the above tutorial, you should now have a
-  artifacts.zip file on your local host.
-
-  Unzip the downloaded artifacts.zip file.
-
-  Go to the custom FPGA design directory:
-    'cd artifacts/bitstreams/my_custom_fpga_design/LinuxProgramming/'
-
-  On your Linux host development computer, copy the bitstream to BeagleV-Fire
-  board, replacing </path/to/your/> with the path to your BeagleV-Fire root file
-  system.
-    'cp ./* /path/to/your/buildroot/board/beagleboard/beaglev_fire/rootfs-overlay/lib/firmware/'
-
-  To apply these changes to your image, make sure to re-build it with:
-    `make`
-
-  Then, re-flash your image - to ensure you have the necessary firmware files - by
-  following the above section "Flashing the image to your eMMC".
-
-  On BeagleV-Fire initiate the reprogramming of the FPGA with your gateware bitstream:
-    `/usr/share/microchip/update-gateware.sh`
-
-  Wait for a couple of minutes for the BeagleV-Fire to reprogram itself.
@@ -1,55 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Flattened Image Tree file for BVF
- *
- * Copyright (C) 2024 Microchip Technology Inc. and its subsidiaries.
- *
- */
-
-/dts-v1/;
-
-/ {
-	description = "U-Boot fitImage for the BeagleV-Fire";
-	#address-cells = <2>;
-
-		images {
-			kernel {
-				description = "Linux kernel";
-				data = /incbin/("./Image.gz");
-				type = "kernel";
-				arch = "riscv";
-				os = "linux";
-				compression = "gzip";
-				load = <0x80200000>;
-				entry = <0x80200000>;
-				hash-1 {
-					algo = "sha256";
-				};
-			};
-			base_fdt {
-				description = "Flattened Device Tree blob";
-				data = /incbin/("./mpfs-beaglev-fire.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 BeagleV-Fire board";
-				fdt = "base_fdt";
-			};
-		};
-};
@@ -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} beaglev_fire.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@20110000 mac-address ${beaglevfire_mac_addr0};
-run design_overlays;
-bootm go;
@@ -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,35 +0,0 @@
-# Image for eMMC boot on the Microchip PolarFire SOC BeagleV-Fire Board
-#
-image boot.vfat {
-	vfat {
-		files = {
-			 "beaglev_fire.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 {
-		partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition root {
-		image = "rootfs.ext4"
-	}
-}
@@ -1 +0,0 @@
-../linux/linux.hash
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  7bd234a93bc6351d6a830f9ef18e9e780d70c478d280a6513a30bc2f945fb050  linux-linux4microchip+fpga-2024.09.1.tar.gz
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  a2fad7fe7f933fa4679b070e952e1e7a21dbd8b586d7a9a11bfcb99e75ae7ad6  uboot-linux4microchip+fpga-2024.09.tar.gz
@@ -1,14 +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}"/beaglev_fire.its "${BINARIES_DIR}"/beaglev_fire.its
-gzip -9 Image -c > Image.gz
-"${MKIMAGE}" -f beaglev_fire.its beaglev_fire.itb
-popd
-support/scripts/genimage.sh -c "${BOARD_DIR}"/genimage.cfg
@@ -1,66 +0,0 @@
-#!/bin/sh
-
-if [ $# -eq 0 ]; then
-    echo "No gateware location provided. Checking default location."
-    if [ ! -e /lib/firmware/mpfs_bitstream.spi ]; then
-        echo "No gateware file found."
-        exit 1
-    fi
-else
-    echo "Gateware location provided: $1"
-    if [ ! -e "$1"/mpfs_bitstream.spi ]; then
-        echo "No gateware file found."
-        exit 1
-    else
-        if [ ! -d /lib/firmware ]; then
-            mkdir /lib/firmware
-        fi
-        cp "$1"/mpfs_dtbo.spi /lib/firmware/mpfs_dtbo.spi
-        cp "$1"/mpfs_bitstream.spi /lib/firmware/mpfs_bitstream.spi
-    fi
-fi
-
-# Trash existing device tree overlay in case the rest of the process fails:
-flash_erase /dev/mtd0 0 16
-
-# Initiate FPGA update for dtbo
-echo 1 > /sys/class/firmware/mpfs-auto-update/loading
-
-# Write device tree overlay
-cat /lib/firmware/mpfs_dtbo.spi > /sys/class/firmware/mpfs-auto-update/data
-
-# Signal completion for dtbo load
-echo 0 > /sys/class/firmware/mpfs-auto-update/loading
-
-while [ "$(cat /sys/class/firmware/mpfs-auto-update/status)" != "idle" ]; do
-    # Do nothing, just keep checking
-    sleep 1
-done
-
-# Fake the presence of a golden image for now.
-dd if=/dev/zero of=/dev/mtd0 count=1 bs=4
-
-# Initiate FPGA update for bitstream
-echo 1 > /sys/class/firmware/mpfs-auto-update/loading
-
-# Write the firmware image to the data sysfs file
-cat /lib/firmware/mpfs_bitstream.spi > /sys/class/firmware/mpfs-auto-update/data
-
-# Signal completion for bitstream load
-echo 0 > /sys/class/firmware/mpfs-auto-update/loading
-
-while [ "$(cat /sys/class/firmware/mpfs-auto-update/status)" != "idle" ]; do
-    # Do nothing, just keep checking
-    sleep 1
-done
-
-# When the status is 'idle' and no error has occured, reboot the system for
-# the gateware update to take effect. FPGA reprogramming takes places between
-# Linux shut-down and HSS restarting the board.
-if [ "$(cat /sys/class/firmware/mpfs-auto-update/error)" = "" ]; then
-    echo "FPGA update ready. Rebooting."
-    reboot
-else
-    echo "FPGA update failed with status: $(cat /sys/class/firmware/mpfs-auto-update/error)"
-    exit 1
-fi
@@ -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
@@ -1,5 +0,0 @@
-default buildroot
-label buildroot
-   kernel /Image
-   devicetreedir /
-append root=/dev/mmcblk1p2 rootwait rw console=ttyS2,115200n8
@@ -1,32 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"tiboot3.bin",
-			"tispl.bin",
-			"u-boot.img",
-			"Image",
-			"ti",
-			"extlinux",
-		}
-
-		label = "boot"
-	}
-
-	size = 64M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition u-boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
-}
@@ -1 +0,0 @@
-../linux/linux.hash
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  2bb586c954277d070c8fdf6d7275faa93b4807d9bf3353b491d8149cca02b4fc  linux-6.15.6.tar.xz
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  0f933f6c5a426895bf306e93e6ac53c60870e4b54cda56d95211bec99e63bec7  u-boot-2025.07.tar.bz2
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  0f933f6c5a426895bf306e93e6ac53c60870e4b54cda56d95211bec99e63bec7  u-boot-2025.07.tar.bz2
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-BOARD_DIR="$(dirname "$0")"
-
-install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$BINARIES_DIR"/extlinux/extlinux.conf
@@ -1,38 +0,0 @@
-BeagleBoard.org BeagleY-AI Development Board
-
-Description
-===========
-
-This configuration will build a basic image for the BeagleBoard.org
-BeagleY-AI. For more details about the board, visit:
-
-https://www.beagleboard.org/boards/beagley-ai
-
-How to Build
-============
-
-Select the default configuration for the target:
-
-$ make beagley_ai_defconfig
-
-Optional: modify the configuration:
-
-$ make menuconfig
-
-Build:
-
-$ make
-
-To copy the resulting output image file to an SD card use dd:
-
-$ dd if=output/images/sdcard.img of=/dev/sdX bs=1M
-
-How to Run
-==========
-
-Insert the SD card into the BeagleY-AI board, and power it up
-through the USB Type-C connector. The system should come up.
-You can use a USB to serial adapter to connect to the connector
-labeled UART0 (J13) to communicate with the board.
-
-https://docs.beagle.cc/boards/beagley/ai/02-quick-start.html
@@ -0,0 +1,27 @@
+image boot.vfat {
+	vfat {
+		files = {
+			"MLO",
+			"u-boot.img"
+		}
+	}
+
+	size = 4M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition u-boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+		size = 512M
+	}
+}
@@ -0,0 +1,49 @@
+BeagleBoard X15
+
+Intro
+=====
+This config currently supports the beagleboard x15,
+and generates a barebone image.
+
+The image must be flashed to a SD card to be used.
+
+How to build it
+===============
+
+  $ make beagleboardx15_defconfig
+
+Then you can edit the build options using
+
+  $ make menuconfig
+
+Compile all and build a sdcard image:
+
+  $ make
+
+Result of the build
+-------------------
+
+After building, you should get a tree like this:
+
+  output/images/
+  +-- am57xx-beagle-x15.dtb
+  +-- am57xx-beagle-x15-revb1.dtb
+  +-- boot.vfat
+  +-- MLO
+  +--rootfs.ext2
+  +-- rootfs.ext4
+  +-- rootfs.tar
+  +-- sdcard.img
+  +-- u-boot.img
+  +-- u-boot-spl.bin
+  +-- zImage
+
+How to write the microSD 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
--- a/Show More
+++ b/Show More