During the hackathon in Vienna, it was decided [0] to stop requiring
annotated defconfig files, and that they should all be regenerated.
This commit does just that.
This is a mechanical change, achieved by running (the defcfg script is
repriducedc at the end of the commit log):
$ for cfg in configs/*_defconfig; do
./defcfg "${cfg##*/}" || break
done
Out of our 302 defconfig files, only 247 needed regenerating, which
means that about 1 in 5 was already not providing the requested
annotations.
To be noted: three defconfig files had duplicate definitions, which this
commit resolves:
nitrogen6sx_defconfig
nitrogen7_defconfig
olimex_a33_olinuxino_defconfig
warning: override: reassigning to symbol BR2_PACKAGE_HOST_UBOOT_TOOLS
[0] https://elinux.org/Buildroot:DeveloperDaysELCE2024#Rules_for_defconfigs
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Edgar Bonet <bonet@grenoble.cnrs.fr>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
====
Below is the script to reproduce the commmit. What it does is regenerate
the configuration first, then applies a patch to update kernel headers
to 3.11, and then recalls the defconfig again, and finally verifies that
the 3.11 headers are not selected (and ignores whether the latest are
selected or not): we want to catch whether defconfig that were using
3.10, currently the latest we support, would stioll get those headers
after we regeerate those.
--->8------>8------>8------>8------>8---
#!/bin/sh
cfg="${1}"
git checkout -- package/linux-headers/Config.in.host toolchain/Config.in
make "${cfg}"
make savedefconfig
patch -p1 <<_EOF_
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 2ae4077ffe..e669f89267 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -129,8 +129,12 @@ choice
If your kernel headers are more recent than the latest version
in the choice, then select the latest version.
+config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_11
+ bool "6.11.x or later"
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11
+
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10
- bool "6.10.x or later"
+ bool "6.10.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_9
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 6e91ab756c..c2522aca7f 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -656,6 +656,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9
config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10
bool
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11
+ bool
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10
select BR2_TOOLCHAIN_HEADERS_LATEST
# This should be selected by the latest version, above, to indicate that
@@ -669,6 +673,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST
# stops affecting a value on the first matching default.
config BR2_TOOLCHAIN_HEADERS_AT_LEAST
string
+ default "6.11" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11
default "6.10" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10
default "6.9" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9
default "6.8" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8
_EOF_
make "${cfg}"
git checkout -- package/linux-headers/Config.in.host toolchain/Config.in
diff="$(
diff -I '_6_11\|BR2_TOOLCHAIN_HEADERS_LATEST=y' -du \
<( tail -n +5 .config.old ) \
<( tail -n +5 .config )
)"
if [ "${diff}" ]; then
printf 'Not idempotent for "%s"\n' "${cfg}" >&2
exit 1
fi
---8<------8<------8<------8<------8<---
====
To verify that no other changes are made to the defconfigs that are
risky when the defaults change, we ran the following simple script
(where buildroot-prev is a checkout just before this commit). It shows
that there are many settings removed because they are default, but none
of them run the same risk that the default is going to be changed in the
future.
for i in configs/*_defconfig; do
diff="$(diffconfig ../buildroot-next/$i $i)"
if [ -n "$diff" ]; then
echo "==> $i"
echo "$diff"
echo
fi
done
--->8------>8------>8------>8------>8---
==> configs/aarch64_efi_defconfig
-BR2_TARGET_GRUB2_ARM64_EFI y
==> configs/acmesystems_aria_g25_128mb_defconfig
-BR2_arm926t y
==> configs/acmesystems_aria_g25_256mb_defconfig
-BR2_arm926t y
==> configs/acmesystems_arietta_g25_128mb_defconfig
-BR2_arm926t y
==> configs/acmesystems_arietta_g25_256mb_defconfig
-BR2_arm926t y
==> configs/amarula_vyasa_rk3288_defconfig
-BR2_PACKAGE_HOST_UBOOT_TOOLS y
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
==> configs/armadeus_apf27_defconfig
-BR2_TARGET_ROOTFS_UBIFS y
-BR2_arm926t y
==> configs/armadeus_apf28_defconfig
-BR2_TARGET_ROOTFS_UBIFS y
-BR2_arm926t y
==> configs/armadeus_apf51_defconfig
-BR2_TARGET_ROOTFS_UBIFS y
==> configs/aspeed_ast2600evb_defconfig
-BR2_ARM_FPU_VFPV4D16 y
==> configs/asus_tinker-s_rk3288_defconfig
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
==> configs/at91sam9260eknf_defconfig
-BR2_TARGET_ROOTFS_UBIFS y
-BR2_arm926t y
==> configs/at91sam9g20dfc_defconfig
-BR2_TARGET_ROOTFS_TAR y
-BR2_TARGET_ROOTFS_UBIFS y
-BR2_TARGET_ROOTFS_UBIFS_LEBSIZE 0x1f800
-BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE 0x800
-BR2_TARGET_ROOTFS_UBI_PEBSIZE 0x20000
-BR2_TARGET_ROOTFS_UBI_SUBSIZE 512
-BR2_arm926t y
==> configs/at91sam9g45m10ek_defconfig
-BR2_TARGET_ROOTFS_UBIFS y
-BR2_arm926t y
==> configs/at91sam9rlek_defconfig
-BR2_TARGET_ROOTFS_UBIFS y
-BR2_arm926t y
==> configs/at91sam9x5ek_defconfig
-BR2_TARGET_ROOTFS_UBIFS y
-BR2_arm926t y
==> configs/at91sam9x5ek_dev_defconfig
-BR2_TARGET_ROOTFS_UBIFS y
-BR2_arm926t y
==> configs/at91sam9x5ek_mmc_defconfig
-BR2_arm926t y
==> configs/at91sam9x5ek_mmc_dev_defconfig
-BR2_arm926t y
==> configs/atmel_sama5d3_xplained_defconfig
-BR2_TARGET_ROOTFS_UBIFS y
==> configs/atmel_sama5d3_xplained_dev_defconfig
-BR2_TARGET_ROOTFS_UBIFS y
==> configs/atmel_sama5d3xek_defconfig
-BR2_TARGET_ROOTFS_UBIFS y
==> configs/atmel_sama5d4_xplained_defconfig
-BR2_TARGET_ROOTFS_UBIFS y
==> configs/atmel_sama5d4_xplained_dev_defconfig
-BR2_TARGET_ROOTFS_UBIFS y
==> configs/bananapi_m2_ultra_defconfig
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
==> configs/bananapro_defconfig
-BR2_ARM_EABIHF y
-BR2_LINUX_KERNEL_USE_DEFCONFIG y
-BR2_TARGET_GENERIC_GETTY y
-BR2_TARGET_UBOOT_FORMAT_BIN y
==> configs/beaglebone_qt5_defconfig
-BR2_PACKAGE_TI_SGX_KM y
-BR2_TOOLCHAIN_BUILDROOT_GLIBC y
==> configs/beagleboneai64_defconfig
-BR2_TARGET_TI_K3_BOOT_FIRMWARE y
-BR2_TARGET_UBOOT_NEEDS_PYLIBFDT y
==> configs/beelink_gs1_defconfig
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
==> configs/canaan_kd233_defconfig
-BR2_BINFMT_FLAT y
-BR2_RISCV_64 y
-BR2_RISCV_ABI_LP64D y
==> configs/ci20_defconfig
-BR2_KERNEL_HEADERS_AS_KERNEL y
-BR2_PACKAGE_HOST_UBOOT_TOOLS y
-BR2_TARGET_UBOOT_SPL_NAME "spl/u-boot-spl.bin"
==> configs/cubieboard2_defconfig
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
==> configs/freescale_imx28evk_defconfig
-BR2_arm926t y
==> configs/friendlyarm_nanopi_r2s_defconfig
-BR2_cortex_a53 y
==> configs/globalscale_espressobin_defconfig
-BR2_cortex_a53 y
==> configs/hifive_unleashed_defconfig
-BR2_LINUX_KERNEL_IMAGE y
-BR2_RISCV_64 y
-BR2_RISCV_ABI_LP64D y
-BR2_TARGET_GENERIC_GETTY y
==> configs/imx23evk_defconfig
-BR2_arm926t y
==> configs/imxrt1050-evk_defconfig
-BR2_LINUX_KERNEL_ZIMAGE y
==> configs/khadas_vim3_defconfig
-BR2_PACKAGE_HOST_AMLOGIC_BOOT_FIP_DEVICE "khadas-vim3"
==> configs/kontron_bl_imx8mm_defconfig
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31 y
-BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN y
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
-BR2_cortex_a53 y
==> configs/kontron_pitx_imx8m_defconfig
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31 y
-BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN y
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
==> configs/kontron_smarc_sal28_defconfig
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
==> configs/lafrite_defconfig
-BR2_cortex_a53 y
==> configs/lego_ev3_defconfig
-BR2_TARGET_GENERIC_GETTY y
-BR2_arm926t y
==> configs/linksprite_pcduino_defconfig
-BR2_PACKAGE_WPA_SUPPLICANT_NL80211 y
-BR2_TARGET_GENERIC_GETTY y
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
==> configs/ls1046a-frwy_defconfig
-BR2_PACKAGE_QORIQ_FM_UCODE_PLATFORM "ls1046"
==> configs/mx6cubox_defconfig
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
==> configs/nexbox_a95x_defconfig
-BR2_cortex_a53 y
==> configs/nitrogen6sx_defconfig
-BR2_TARGET_GENERIC_GETTY y
==> configs/nitrogen6x_defconfig
-BR2_TARGET_GENERIC_GETTY y
==> configs/nitrogen7_defconfig
-BR2_TARGET_GENERIC_GETTY y
==> configs/nitrogen8m_defconfig
-BR2_TARGET_GENERIC_GETTY y
-BR2_cortex_a53 y
==> configs/nitrogen8mm_defconfig
-BR2_TARGET_GENERIC_GETTY y
-BR2_cortex_a53 y
==> configs/nitrogen8mn_defconfig
-BR2_TARGET_GENERIC_GETTY y
-BR2_cortex_a53 y
==> configs/nitrogen8mp_defconfig
-BR2_TARGET_GENERIC_GETTY y
-BR2_cortex_a53 y
==> configs/odroidc2_defconfig
-BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY y
==> configs/olimex_a10_olinuxino_lime_defconfig
-BR2_LINUX_KERNEL_USE_DEFCONFIG y
-BR2_TARGET_GENERIC_GETTY y
-BR2_TARGET_UBOOT_FORMAT_BIN y
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
==> configs/olimex_a13_olinuxino_defconfig
-BR2_LINUX_KERNEL_USE_DEFCONFIG y
-BR2_TARGET_GENERIC_GETTY y
-BR2_TARGET_UBOOT_FORMAT_BIN y
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
==> configs/olimex_a20_olinuxino_lime2_defconfig
-BR2_ARM_EABIHF y
-BR2_LINUX_KERNEL_USE_DEFCONFIG y
-BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER y
-BR2_TARGET_GENERIC_GETTY y
-BR2_TARGET_UBOOT_FORMAT_BIN y
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
-BR2_TOOLCHAIN_BUILDROOT_GLIBC y
==> configs/olimex_a20_olinuxino_lime_defconfig
-BR2_ARM_EABIHF y
-BR2_LINUX_KERNEL_USE_DEFCONFIG y
-BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER y
-BR2_TARGET_GENERIC_GETTY y
-BR2_TARGET_UBOOT_FORMAT_BIN y
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
-BR2_TOOLCHAIN_BUILDROOT_GLIBC y
==> configs/olimex_a20_olinuxino_micro_defconfig
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
==> configs/olimex_a33_olinuxino_defconfig
-BR2_LINUX_KERNEL_USE_DEFCONFIG y
-BR2_TARGET_GENERIC_GETTY y
-BR2_TARGET_UBOOT_FORMAT_BIN y
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
==> configs/olimex_a64_olinuxino_defconfig
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31 y
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
-BR2_cortex_a53 y
==> configs/olimex_imx233_olinuxino_defconfig
-BR2_arm926t y
==> configs/openblocks_a6_defconfig
-BR2_arm926t y
==> configs/orangepi_lite2_defconfig
-BR2_PACKAGE_WPA_SUPPLICANT_NL80211 y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31 y
-BR2_cortex_a53 y
==> configs/orangepi_one_defconfig
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
==> configs/orangepi_one_plus_defconfig
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31 y
-BR2_cortex_a53 y
==> configs/orangepi_pc_defconfig
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
==> configs/orangepi_pc_plus_defconfig
-BR2_PACKAGE_WPA_SUPPLICANT_NL80211 y
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
==> configs/orangepi_r1_defconfig
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
==> configs/orangepi_zero2w_defconfig
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31 y
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
-BR2_cortex_a53 y
==> configs/orangepi_zero3_defconfig
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31 y
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
-BR2_cortex_a53 y
==> configs/orangepi_zero_defconfig
-BR2_PACKAGE_WPA_SUPPLICANT_NL80211 y
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
==> configs/orangepi_zero_plus2_defconfig
-BR2_PACKAGE_WPA_SUPPLICANT_NL80211 y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31 y
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
-BR2_cortex_a53 y
==> configs/orangepi_zero_plus_defconfig
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31 y
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
-BR2_cortex_a53 y
==> configs/pine64_defconfig
-BR2_cortex_a53 y
==> configs/pine64_sopine_defconfig
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31 y
-BR2_cortex_a53 y
==> configs/qemu_aarch64_sbsa_defconfig
-BR2_TARGET_GRUB2_ARM64_EFI y
==> configs/qemu_aarch64_virt_defconfig
-BR2_cortex_a53 y
==> configs/qemu_arm_versatile_defconfig
-BR2_arm926t y
==> configs/qemu_arm_vexpress_defconfig
-BR2_ARM_FPU_VFPV3D16 y
==> configs/qemu_arm_vexpress_tz_defconfig
-BR2_PACKAGE_LIBOPENSSL y
==> configs/qemu_m68k_mcf5208_defconfig
-BR2_LINUX_KERNEL_VMLINUX y
-BR2_TARGET_GENERIC_GETTY y
==> configs/qemu_m68k_q800_defconfig
-BR2_LINUX_KERNEL_VMLINUX y
-BR2_TARGET_GENERIC_GETTY y
-BR2_m68k_68040 y
==> configs/qemu_microblazebe_mmu_defconfig
-BR2_microblaze y
==> configs/qemu_microblazeel_mmu_defconfig
-BR2_microblaze y
==> configs/qemu_mips32r2_malta_defconfig
-BR2_TARGET_GENERIC_GETTY y
==> configs/qemu_mips32r2el_malta_defconfig
-BR2_TARGET_GENERIC_GETTY y
==> configs/qemu_mips32r6_malta_defconfig
-BR2_TARGET_GENERIC_GETTY y
==> configs/qemu_mips32r6el_malta_defconfig
-BR2_TARGET_GENERIC_GETTY y
==> configs/qemu_mips64_malta_defconfig
-BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE y
-BR2_TARGET_GENERIC_GETTY y
==> configs/qemu_mips64el_malta_defconfig
-BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE y
-BR2_TARGET_GENERIC_GETTY y
==> configs/qemu_mips64r6_malta_defconfig
-BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE y
-BR2_TARGET_GENERIC_GETTY y
==> configs/qemu_mips64r6el_malta_defconfig
-BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE y
-BR2_TARGET_GENERIC_GETTY y
==> configs/qemu_ppc64le_powernv8_defconfig
-BR2_powerpc_power8 y
==> configs/qemu_ppc64le_pseries_defconfig
-BR2_powerpc_power8 y
==> configs/qemu_ppc_bamboo_defconfig
-BR2_TARGET_GENERIC_GETTY y
==> configs/qemu_ppc_g3beige_defconfig
-BR2_TARGET_GENERIC_GETTY y
==> configs/qemu_ppc_mpc8544ds_defconfig
-BR2_TARGET_GENERIC_GETTY y
==> configs/qemu_riscv32_nommu_virt_defconfig
-BR2_LINUX_KERNEL_IMAGE y
-BR2_TARGET_GENERIC_GETTY y
==> configs/qemu_riscv32_virt_defconfig
-BR2_LINUX_KERNEL_IMAGE y
-BR2_TARGET_GENERIC_GETTY y
==> configs/qemu_riscv64_nommu_virt_defconfig
-BR2_LINUX_KERNEL_IMAGE y
-BR2_RISCV_64 y
-BR2_TARGET_GENERIC_GETTY y
==> configs/qemu_riscv64_virt_defconfig
-BR2_LINUX_KERNEL_IMAGE y
-BR2_RISCV_64 y
-BR2_TARGET_GENERIC_GETTY y
==> configs/qemu_sh4_r2d_defconfig
-BR2_sh4 y
==> configs/qemu_sparc64_sun4u_defconfig
-BR2_sparc_v9 y
==> configs/qemu_sparc_ss10_defconfig
-BR2_sparc_v8 y
==> configs/qemu_x86_defconfig
-BR2_i386 y
==> configs/raspberrypi0_defconfig
-BR2_ARM_EABIHF y
==> configs/raspberrypi0w_defconfig
-BR2_ARM_EABIHF y
==> configs/raspberrypi2_defconfig
-BR2_ARM_EABIHF y
==> configs/raspberrypi3_64_defconfig
-BR2_cortex_a53 y
==> configs/raspberrypi3_qt5we_defconfig
-BR2_PACKAGE_KMOD y
-BR2_PACKAGE_QT5BASE_JPEG y
-BR2_PACKAGE_QT5BASE_PNG y
-BR2_TOOLCHAIN_BUILDROOT_GLIBC y
==> configs/raspberrypi_defconfig
-BR2_ARM_EABIHF y
==> configs/riotboard_defconfig
-BR2_TARGET_GENERIC_GETTY y
==> configs/rock64_defconfig
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
==> configs/rock_pi_n8_defconfig
-BR2_LINUX_KERNEL_USE_DEFCONFIG y
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
==> configs/rockpro64_defconfig
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31 y
-BR2_TARGET_UBOOT_NEEDS_PYTHON3 y
==> configs/s6lx9_microboard_defconfig
-BR2_microblaze y
==> configs/sheevaplug_defconfig
-BR2_TARGET_GENERIC_GETTY y
-BR2_TARGET_UBOOT_NETWORK n
-BR2_arm926t y
==> configs/sipeed_maix_bit_defconfig
-BR2_BINFMT_FLAT y
-BR2_RISCV_64 y
-BR2_RISCV_ABI_LP64D y
==> configs/sipeed_maix_bit_sdcard_defconfig
-BR2_BINFMT_FLAT y
-BR2_RISCV_64 y
-BR2_RISCV_ABI_LP64D y
-BR2_TARGET_UBOOT_FORMAT_BIN y
==> configs/sipeed_maix_dock_defconfig
-BR2_BINFMT_FLAT y
-BR2_RISCV_64 y
-BR2_RISCV_ABI_LP64D y
==> configs/sipeed_maix_dock_sdcard_defconfig
-BR2_BINFMT_FLAT y
-BR2_RISCV_64 y
-BR2_RISCV_ABI_LP64D y
-BR2_TARGET_UBOOT_FORMAT_BIN y
==> configs/sipeed_maix_go_defconfig
-BR2_BINFMT_FLAT y
-BR2_RISCV_64 y
-BR2_RISCV_ABI_LP64D y
==> configs/sipeed_maix_go_sdcard_defconfig
-BR2_BINFMT_FLAT y
-BR2_RISCV_64 y
-BR2_RISCV_ABI_LP64D y
-BR2_TARGET_UBOOT_FORMAT_BIN y
==> configs/sipeed_maixduino_defconfig
-BR2_BINFMT_FLAT y
-BR2_RISCV_64 y
-BR2_RISCV_ABI_LP64D y
==> configs/sipeed_maixduino_sdcard_defconfig
-BR2_BINFMT_FLAT y
-BR2_RISCV_64 y
-BR2_RISCV_ABI_LP64D y
-BR2_TARGET_UBOOT_FORMAT_BIN y
==> configs/snps_archs38_hsdk_defconfig
-BR2_TOOLCHAIN_BUILDROOT_GLIBC y
==> configs/solidrun_clearfog_gt_8k_defconfig
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP n
==> configs/solidrun_macchiatobin_defconfig
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP n
-BR2_TARGET_ROOTFS_TAR y
-BR2_TARGET_UBOOT_USE_DEFCONFIG y
==> configs/spike_riscv64_defconfig
-BR2_RISCV_64 y
==> configs/ts5500_defconfig
-BR2_i386 y
-BR2_x86_i586 y
==> configs/versal_vck190_defconfig
-BR2_TARGET_XILINX_PREBUILT_VERSION "xilinx_v2024.1"
==> configs/versal_vpk180_defconfig
-BR2_TARGET_XILINX_PREBUILT_VERSION "xilinx_v2024.1"
==> configs/zynqmp_kria_kd240_defconfig
-BR2_TARGET_XILINX_PREBUILT_VERSION "xilinx_v2024.1"
==> configs/zynqmp_kria_kr260_defconfig
-BR2_TARGET_XILINX_PREBUILT_VERSION "xilinx_v2024.1"
==> configs/zynqmp_kria_kv260_defconfig
-BR2_TARGET_XILINX_PREBUILT_VERSION "xilinx_v2024.1"
==> configs/zynqmp_zcu102_defconfig
-BR2_TARGET_XILINX_PREBUILT_VERSION "xilinx_v2024.1"
==> configs/zynqmp_zcu104_defconfig
-BR2_TARGET_XILINX_PREBUILT_VERSION "xilinx_v2024.1"
==> configs/zynqmp_zcu106_defconfig
-BR2_TARGET_XILINX_PREBUILT_VERSION "xilinx_v2024.1"
---8<------8<------8<------8<------8<---
When building these boards with BR2_PER_PACKAGE_DIRECTORIES enabled,
the following error occurs from U-Boot.
tools/mkeficapsule.c:18:10: fatal error: uuid/uuid.h: No such file or directory
18 | #include <uuid/uuid.h>
| ^~~~~~~~~~~~~
The U-Boot defconfig these boards use 'xilinx_zynqmp_kria' enables
CONFIG_EFI_CAPSULE_ON_DISK, which requires util-linux.
This doesn't fail when BR2_PER_PACKAGE_DIRECTORIES is disabled. This
is because host-e2fsprogs requires host-util-linux, and
host-util-linux always builds before host-uboot when single-threaded.
Signed-off-by: Brandon Maier <brandon.maier@collins.com>
Reviewed-by: Neal Frager <neal.frager@amd.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This patch bumps the zynqmp_kria_kv260_defconfig to xilinx-v2024.1 which includes
the following updates:
- Linux v6.6.10
- U-Boot v2024.01
- ATF v2.10
- PMUFW xilinx-v2024.1
Migrated u-boot to xilinx_zynqmp_kria_defconfig, so uboot.fragment no longer
needed.
With u-boot 2024.1, CONFIG_SYS_SPI_U_BOOT_OFFS has a new meaning. It is now
the offset between the base address of the boot.bin and u-boot.itb instead of
a raw base address of u-boot.itb. This allows for A/B firmware updates since
the u-boot.itb is set by default to a 0x80000 offset of the boot.bin.
Thus, Kria SOMs come with the following QSPI address table.
Partition A:
0x200000 - boot.bin
0x280000 - u-boot.itb
Partition B:
0xF80000 - boot.bin
0x1000000 - u-boot.itb
This patch updates the addressing in the readme.txt accordingly.
Signed-off-by: Neal Frager <neal.frager@amd.com>
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This patch bumps the zynqmp_kria_kv260_defconfig to xilinx-v2023.2 which includes
the following updates:
- Linux v6.1.30 with additional bug fixes
- U-Boot v2023.01 with additional bug fixes
- ATF v2.8 with additional bug fixes
- PMUFW xilinx_v2023.2
Signed-off-by: Neal Frager <neal.frager@amd.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This patch bumps the zynqmp defconfigs to xilinx-v2023.1 which includes
the following updates:
- Linux v6.1.5
- U-Boot v2023.01
- ATF v2.8 (including mainline buildroot patches)
- PMUFW xilinx_v2023.1
- Updated pm_cfg_obj.c from Vitis v2023.1
- Removed kria u-boot patch which is included with xilinx-v2023.1
Signed-off-by: Neal Frager <neal.frager@amd.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Migrate kv260_pmufw.elf location from nealfrager github to Xilinx github.
The image is identical, so this patch has zero impact on functionality.
Signed-off-by: Neal Frager <neal.frager@amd.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
The Linux DTS name has changed for the zynqmp_kria_kv260 with Xilinx 2022.2.
smk-k26-revA-sck-kv-g-revB has become zynqmp-smk-k26-revA-sck-kv-g-revB.
This DTS corresponds to generating the zynqmp-smk-k26-revA.dtb for the k26 som
and applying the zynqmp-sck-kv-g-revB.dtbo for the kv260 carrier board.
Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/3477506541
Signed-off-by: Neal Frager <neal.frager@amd.com>
Signed-off-by: Neal Frager <neal.frager@amd.com>
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
When using the buildroot compiler, it builds the u-boot.itb immediately
after building the fit-dtb.blob. This causes a build failure when using
the CONFIG_MULTI_DTB_FIT build configuration. This patch adds the necessary
dependency to guarantee that the fit-dtb.blob has finished building before
trying to build the u-boot.itb.
Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/3310463281
This patch has been submitted to u-boot mainline:
https://lore.kernel.org/all/20221221075446.47141-1-neal.frager@amd.com/
Signed-off-by: Neal Frager <neal.frager@amd.com>
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Since commit
5bbc20154e ("configs/zynqmp_kria_kv260_defconfig:
bump to Xilinx 2022.2"), we're using U-Boot version Xilinx 2022.2,
which already carries the psu_init_gpl.c, causing the build to fail as
our patch doesn't apply.
Fix this by dropping the no longer needed patch.
Fixes: 5bbc20154e ("configs/zynqmp_kria_kv260_defconfig: bump to Xilinx 2022.2")
Signed-off-by: Neal Frager <neal.frager@amd.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This patch moves the board/zynqmp/kria/kv260/uboot.fragment file
to the board/zynqmp/kria directory. The reason is that this file
is the same for any kria starter kit and is not specific to the kv260.
By moving the file, it can be logically re-used with the kr260 when
support for this starter kit is added to buildroot.
KR260 Starter Kit:
https://www.xilinx.com/products/som/kria/kr260-robotics-starter-kit.html
Signed-off-by: Neal Frager <neal.frager@amd.com>
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This patch migrates the u-boot device tree definition
from uboot.fragment files to use BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS
instead for the zynqmp_kria_kv260_defconfig.
Signed-off-by: Neal Frager <neal.frager@amd.com>
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This patch fixes the DP audio and video PLL configurations for the zynqmp-sm-k26-revA som.
It needs to be applied for both the kv260 and kr260 starter kits.
The Linux DP driver expects the DP to be using the following PLL config:
- DP video PLL should use the VPLL (0x0)
- DP audio PLL should use the RPLL (0x3)
- DP system time clock PLL should use RPLL (0x3)
Register 0xFD1A0070 configures the DP video PLL.
Register 0xFD1A0074 configures the DP audio PLL.
Register 0xFD1A007C configures the DP system time clock PLL.
This patch was build and run tested on a zynqmp-kria-kv260 target board.
Upstream-Status: submitted (https://lore.kernel.org/all/fa7e9abc419c9d7648405d1c62367dbe701d09b8.1652709736.git.michal.simek@amd.com/)
This patch will be removed from buildroot in a future release when no longer necessary.
Signed-off-by: Neal Frager <neal.frager@amd.com>
Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This patch fixes an ATF issue by building the ATF for uart1 instead
of uart0 for the Kria KV260 Starter Kit.
Signed-off-by: Neal Frager <neal.frager@amd.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This patch is a temporary fix for the kv260 u-boot.itb generation
until a proper fix has been implemented within u-boot.
The problem is u-boot can only be configured to use the kria k26
som dts configuration at build time, and the kv260 carrier board
overlay is missing from the build. Without this, all of the carrier
board drivers are missing.
This patch will be removed from buildroot once u-boot can build a
correct u-boot.itb for the kria kv260 starter kit including the
carrier board overlay and corresponding drivers:
https://lore.kernel.org/all/20920b0df6b067aca4040459a9677d7d1d6d766a.1615354376.git.viresh.kumar@linaro.org/
Signed-off-by: Neal Frager <neal.frager@xilinx.com>
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
[yann.morin.1998@free.fr: add URL provided by Luca]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This patch enables the zynqmp_kria_kv260_defconfig to auto-generate the
extlinux.conf file.
The board/zynqmp/kria/extlinux.conf and board/zynqmp/kria/post-build.sh have
been removed as they are no longer necessary.
Signed-off-by: Neal Frager <neal.frager@amd.com>
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This patch adds support for Xilinx Kria KV260 starter kit.
KV260 features can be found here:
https://www.xilinx.com/products/boards-and-kits/kv260.html
While the Kria SOM is based on a ZynqMP SoC, there are some key
boot config differences from the other ZynqMP evaluation boards.
1. There are no boot switches on Kria SOMs. The boot mode is thus
hard configured for QSPI flash. A pre-programmed boot.bin comes
with every Starter Kit. U-Boot can then find the Linux kernel and
file system on the SD card.
Optional instructions for updating the boot.bin in the QSPI flash
can be found in the readme.txt file and the link below.
https://xilinx-wiki.atlassian.net/wiki/spaces/A/pages/1641152513/Kria+K26+SOM
2. Kria SOMs use UART1 for the console instead of UART0. For this
reason, Kria Starter Kits will use a separate extlinux.conf file
from other ZynqMP evaluation boards.
Signed-off-by: Neal Frager <neal.frager@amd.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
