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<---
Passing ip=dhcp to the kernel will cause it to try to configure the network
interface using DHCP and wait up to 120s for the interface to detect a link,
slowing down boots without a network cable a lot.
Instead use the "normal" BR2_SYSTEM_DHCP, E.G. trigger ifup to run the DHCP
client in the background.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
The kernel build now requires FIT support in mkimage:
ITB arch/mips/boot/vmlinux.gz.itb
/home/peko/source/buildroot/output-ci20/host/bin/mkimage: unsupported type Flat Device Tree
So enable that.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Bump the kernel to the latest release of 5.4 kernel series
to fix an issue with gcc 12.
arch/mips/jz4740/setup.c: In function 'plat_mem_setup':
arch/mips/jz4740/setup.c:64:25: error: comparison between two arrays [-Werror=array-compare]
64 | if (__dtb_start != __dtb_end)
| ^~
arch/mips/jz4740/setup.c:64:25: note: use '&__dtb_start[0] != &__dtb_end[0]' to compare the addresses
CC fs/debugfs/file.o
cc1: all warnings being treated as errors
Fixed in v5.4.195:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a60def7568216684f62b117c199429c4a9a89570
Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/4889436573
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
For defconfigs that create a boot envimage, add the host package
uboot-tools and update the script variable names.
Add BR2_PACKAGE_HOST_UBOOT_TOOLS=y just before the existing
BR2_TARGET_UBOOT_ENVIMAGE option. Note that for the defconfigs that are
not manually formatted (i.e. just the result of 'make savedefconfig'),
this puts them in the wrong place. However, it's easier this way, and
it's more consistent in general to have the definition of the envimage
close to BR2_TARGET_UBOOT itself.
Related to 78559d699a
Cc: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
The vendor kernel we are currently selecting no longer builds,
and fails with a ton of:
from include/linux/list.h:8,
from include/linux/module.h:9,
from arch/mips/jz4740/prom.c:16:
include/linux/log2.h:22:1: error: ignoring attribute 'noreturn' because it conflicts with attribute 'const' [-Werror=a
ttributes]
22 | int ____ilog2_NaN(void);
| ^~~
We can't afford to fix that, so let's just move to upstream
kernel and bootloader. It doesn't make much sense to keep
using an unsupported kernel and bootloader at this point.
This means we will be missing some of the features supported
by the vendor (such as HDMI support), but it is what it is.
Linux v5.7 and v5.4 have been tested to boot fine, the latter
is picked for the defconfig as it is an LTS version.
Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/674933782
Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Currently, U-Boot is failing to build, due to some issues
with the toolchain and the U-Boot port.
Fix it.
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
The linux git trees on github can be huge, and takes a long time to
download, which is not very nice nor convenient for newcomers.
Switch them to using a wget, with the github macro.
A nice side effect of this conversion, is that we no longer need to wait
for the git clone to finish to notice that the ref is gone; doing a wget
will instantly fail in that case.
Mechanical patch, obtained by running (hang-on tight):
$ sed -r -i -e 's/BR2_LINUX_KERNEL_CUSTOM_GIT/BR2_LINUX_KERNEL_CUSTOM_TARBALL/; /BR2_LINUX_KERNEL_CUSTOM_REPO_URL/N; s:BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https\://github.com/([^/]+)/(.+)"\nBR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="(.+)":BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,\1,\2,\3)/linux-\3.tar.gz":; s/(call github.*)\.git/\1/;' $(grep -l 'BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com' configs/*)
olimex_a20_olinuxino_lime_mali had a comment in between, so it was
manually fixed thereafter; that comment was also moved.
Except for socrates_cyclone5 which did not work previously (missing tag
in git tree?), all the affected defconfigs still download their sources.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Add a genimage.cfg to create a working sdcard.img for the ci20
hardware. We also need a uboot-env.txt to create the partition for
the uboot environment.
Update the board/ci20/readme.txt with the related information. Remove
the tftp netboot description from the readme as it is already to
complicated for a basic bootable example.
Signed-off-by: Johannes Schmitz <johannes.schmitz1@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Unbreak failing defconfig.
Resulting kernel and rootfs booted on ci20 device.
While at it, drop the useless BR2_TARGET_UBOOT_VERSION variable, this
variable is a hidden variable, so it is useless to mention it in a
defconfig.
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
[Thomas: drop BR2_TARGET_UBOOT_VERSION.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.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>
Signed-off-by: David du Colombier <0intro@gmail.com>
Reviewed-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: David du Colombier <0intro@gmail.com>
Reviewed-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
We had this option in the defconfig because the kernel defconfig we
provide doesn't have CONFIG_DEVTMPFS and CONFIG_DEVTMPFS_MOUNT, so a
/dev management which creates the devices dynamically using only
devtmpfs would not work. However, CONFIG_DEVTMPFS and
CONFIG_DEVTMPFS_MOUNT are automatically added to the kernel config when
you build the kernel using Buildroot, except when you choose
BR2_ROOTFS_DEVICE_CREATION_STATIC as a /dev management. This is handled
by linux/linux.mk.
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
MIPS Creator CI20 is a Linux and Android development system from
MIPS/Imagination Technologies. It incorporates an Ingenic JZ4780 SoC
which includes a 1.2GHz dual core MIPS32 processor and Imagination
PowerVR SGX540 GPU.
More information can be found at:
http://elinux.org/MIPS_Creator_CI20
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>