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<---
Those defconfigs were recently bumped to NXP BSP lf-6.6.23-2.0.0.
NXP BSP U-Boot version lf-6.6.23-2.0.0 is based on upstream
version 2024.04. This version now requires OpenSSL.
Those defconfigs are failing in uboot build, with output:
In file included from tools/imagetool.h:24,
from tools/imagetool.c:8:
include/image.h:1471:12: fatal error: openssl/evp.h: No such file or directory
1471 | # include <openssl/evp.h>
| ^~~~~~~~~~~~~~~
This commit fixes the issue by adding
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y in all the impacted defconfigs.
Signed-off-by: Julien Olivain <ju.o@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Note: configs/freescale_imx6{dl,q,sx}* corresponds to the five:
freescale_imx6dlsabreauto_defconfig
freescale_imx6dlsabresd_defconfig
freescale_imx6qsabreauto_defconfig
freescale_imx6qsabresd_defconfig
freescale_imx6sxsabresd_defconfig
Those i.MX6 Sabre defconfigs have a lot in common. This is why they are
all updated at once in this single commit.
This commit bumps U-Boot and Linux kernel to the NXP BSP
lf-6.6.23-2.0.0 versions. The imx6sabre uboot patch is also rebased on
the new version, and the "Upstream:" tag is added to flag this patch
as Buildroot-specific. The ".checkpackageignore" entry for this patch
is also removed.
While bumping those BSP components, this commit also adds the custom
hashes by enabling BR2_DOWNLOAD_FORCE_CHECK_HASHES=y in those
defconfigs. Hash files are added in the _PATCH_DIR. The
".checkpackageignore" entries for those defconfigs are also removed.
Also, since commit dc0f721 "package/gcc: switch to 13.x as default",
those freescale_imx6{dl,q,sx}* are failing to build the Kernel
with output:
drivers/ata/libahci.c: In function 'ahci_led_store':
././include/linux/compiler_types.h:315:45: error: call to '__compiletime_assert_340' declared with attribute error: BUILD_BUG_ON failed: sizeof(_s) > sizeof(long)
315 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
| ^
This commit fixes the issue by bumping components which includes the
needed gcc-13 fixes.
The Kernel DTS names are also updated by adding the new "nxp/imx/"
prefix, to follow the upstream reorganization in [1], first included
in v6.5.
Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/7422089449https://gitlab.com/buildroot.org/buildroot/-/jobs/7422089451https://gitlab.com/buildroot.org/buildroot/-/jobs/7422089452https://gitlab.com/buildroot.org/buildroot/-/jobs/7422089455https://gitlab.com/buildroot.org/buildroot/-/jobs/7422089456
[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=724ba6751532055db75992fc6ae21c3e322e94a7
Signed-off-by: Julien Olivain <ju.o@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
NXP moved all its open source code repositories from Code Aurora Forum
to github. See for example:
39bc4d8196
Software packages are now grouped in several NXP github
projects/organizations (nxp-imx, nxp-qoriq, ...). See:
https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB
The NXP code published on Code Aurora is still present (at the time of
this commit) but is no longer receiving updates. It is also expected
to be shut down on 2023-03-31. The Code Aurora website
https://source.codeaurora.org/ currently show the following message:
"""
Note: Qualcomm Innovation Center Inc. maintained repositories have
migrated to git.codelinaro.org. QUIC repositories on this site will
not receive any updates after March 31, 2022, and will be deleted on
March 31, 2023. If your project depends on these repositories, please
adjust your tooling configuration to use the new, up-to-date project
location.
"""
For this reason, the NXP recipes using codeaurora.org urls need to be
updated to the correct github.com replacement.
Note: this commit does not change the component version. Only the
download URL is updated. The archive content is expected to be the
same.
Note 2: this commit updates the Kernel and U-Boot download urls.
The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL.
Signed-off-by: Julien Olivain <ju.o@free.fr>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Bump ATF, U-Boot and Linux kernel to the NXP BSP 5.10.y-1.0.0 versions.
Signed-off-by: Stephane Viau <stephane.viau@oss.nxp.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Stephane Viau <stephane.viau@oss.nxp.com>
[run-tested on i.MX6Q SabreSD, build-tested only for other configs]
Tested-by: Stephane Viau <stephane.viau@oss.nxp.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Stephane Viau <stephane.viau@oss.nxp.com>
[run-tested on i.MX6Q SabreSD, build-tested only for other configs]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
And rebase uboot patch.
Tested-by: Maeva Manuel <maeva.manuel@oss.nxp.com>
[Maeva: Tested on i.MX6Quad SabreAuto CPU1]
Signed-off-by: Julien Olivain <julien.olivain@oss.nxp.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Also switch repository from old freescale site to codeaurora:
https://source.codeaurora.org/external/imx/
Cc: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
MX6 has a Cortex-A9 core, which supports NEON and VFP.
Add support for them.
Suggested-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
In order to have a better hierarchy for the genimage scripts used by
NXP mx25, mx51, mx53, mx6, mx7 SoCs, let's place them inside the
board/freescale/common/imx/ directory.
This helps in creating a more natural separation between the mxs scripts
that are placed inside the board/freescale/common/mxs/ directory.
Suggested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
The boards imx6dlsabreauto, imx6dlsabresd, imx6qsabreauto, imx6qsabresd,
imx6sxsabresd were referring to board/freescale/create-boot-sd.sh for
the sdcard image generation.
This commit:
* Removes board/freescale/create-boot-sd.sh
* Uses the common Freescale genimage template instead.
The offset of the first partition was 1MB in the script and is
modified to 8MB in the template.
* Fixes the readme.txt file accordingly
Signed-off-by: Georges Savoundararadj <savoundg@gmail.com>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Peter Korsgaard <peter@korsgaard.com>
Cc: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
There is a 1.1.0_ga release, and a 1.1.1_patch release. The
patch release appears to be only for i.MX6UL, so it is bumped
to 1.1.1_patch, while the other are 1.1.0_ga.
Signed-off-by: Andrew Webster <awebster@arcx.com>
Reviewed-by: Gary Bisson <gary.bisson@boundarydevices.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Andrew Webster <awebster@arcx.com>
Reviewed-by: Gary Bisson <gary.bisson@boundarydevices.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Since quite some time, the kernel and bootloader communities consider
zImage as the default format for kernel images on ARM, replacing
uImage. The load address information in uImage is no longer needed,
since the kernel is position-independent in terms of physical address,
except on a few old platforms. For most people, using zImage is simply
better/simpler, so let's switch to zImage as the default image format
on ARM.
All defconfigs are updated: 46 defconfigs no longer need to select
explicitly zImage because it's the default, and 16 defconfigs now need
to explicitly select uImage because that's no longer the default.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Matt Weber <matt@thewebers.ws>
Acked-by: Julien Boibessot <julien.boibessot@armadeus.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
For most defconfigs, it was trivial to deduce the kernel version, by
just reading the version string, which could be:
- a standard upstream version string vX.Y.Z
- a non-standard version string, but still containg the standard X.Y.Z
Those for which it was not so trivial were those hosted on git tree.
Since most were already using a custom linux-headers version, it could
be easily deduced from that. It was confirmed by browsing said git trees
and check the version there.
There are a few cases were there was a mismatch:
- microzed: uses a 3.18 kernel, but 3.8 headers; fixed.
- xilinx_zc706: uses a 3.14 kernel, but 3.8 headers; fixed.
- zedboard: uses a 3.18 kernel, but 3.8 headers; fixed.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Peter Korsgaard <peter@korsgaard.com>
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
The i.MX6 SoloX SABRE board for smart devices is Freescale's reference design
board based on the heterogeneous ARM Cortex-A9 + Cortex-M4 i.MX6 SoloX
applications processor.
This defconfig is inspired from previous freescale_imx6*sabresd_defconfig, and
is based on Freescale "official" git repo on git.freescale.com and SW release
3.10.53_1.1.0_ga.
Signed-off-by: Vincent Stehlé <vincent.stehle@laposte.net>
Cc: Gary Bisson <bisson.gary@gmail.com>
Cc: Jérôme Pouiller <jezz@sysmic.org>
Cc: Gilles Talis <gilles.talis@gmail.com>
Cc: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
