qemu_arm_versatile: switch to in-kernel defconfig + fragment
Subsystems (3)
PATCH 1/4 qemu_arm_versatile: switch to in-kernel defconfig + fragment
This platform has its own kernel defconfig in Buildroot, but we cannot get quick idea about how much it diverged from the in-kernel defconfig.
Let's use the upstream arch/arm/config/versatile_defconfig as a base, and maintain the diff as a merge-config fragment. The same .config is still generated based on the 5.10.7 kernel.
The diff is quite big, but this is a good start-point for cleanups. Follow-up works can drop diff lines unless we find a good reason for divergence.
---
board/qemu/arm-versatile/linux.config | 97 +++++++++++++++++---------- configs/qemu_arm_versatile_defconfig | 4 +- 2 files changed, 62 insertions(+), 39 deletions(-)
board/qemu/arm-versatile/linux.config +60 -37
@@ -1,43 +1,66 @@ -CONFIG_SYSVIPC=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_ARCH_MULTI_V7 is not set -CONFIG_ARCH_VERSATILE=y +# CONFIG_BLK_DEV_INITRD is not set +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_CMA is not set +# CONFIG_CRAMFS is not set +CONFIG_CMDLINE="" +CONFIG_CRC16=y +CONFIG_CRYPTO=y +# CONFIG_DEBUG_FS is not set +# CONFIG_DEBUG_KERNEL is not set +# CONFIG_DEBUG_USER is not set +CONFIG_DEVTMPFS=y +# CONFIG_DRM is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EXT2_FS is not set +CONFIG_EXT4_FS=y +CONFIG_FB_ARMCLCD=y +# CONFIG_FONTS is not set +CONFIG_FONT_8x16=y +CONFIG_FONT_8x8=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +# CONFIG_FTRACE is not set +# CONFIG_GPIOLIB is not set +# CONFIG_HIGH_RES_TIMERS is not set +CONFIG_HWMON=y +CONFIG_HZ_PERIODIC=y +# CONFIG_I2C_VERSATILE is not set +CONFIG_INET_DIAG=y +CONFIG_INPUT_EVDEV=y +CONFIG_IPV6=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_PNP is not set +CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOGO is not set +CONFIG_LOG_BUF_SHIFT=17 +CONFIG_MDIO_DEVICE=y +# CONFIG_MINIX_FS is not set +# CONFIG_MMC is not set +# CONFIG_MTD is not set +# CONFIG_NEW_LEDS is not set +# CONFIG_NFSD is not set +# CONFIG_NFS_FS is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_ISO8859_1 is not set +# CONFIG_NO_HZ_IDLE is not set +# CONFIG_NVMEM is not set +# CONFIG_OABI_COMPAT is not set +# CONFIG_PARTITION_ADVANCED is not set CONFIG_PCI=y CONFIG_PCI_VERSATILE=y -CONFIG_AEABI=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y +CONFIG_PHYLIB=y +# CONFIG_ROMFS_FS is not set +# CONFIG_RTC_CLASS is not set CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y +CONFIG_SCSI_SPI_ATTRS=y CONFIG_SCSI_SYM53C8XX_2=y -CONFIG_NETDEVICES=y -CONFIG_8139CP=y -CONFIG_PHYLIB=y -CONFIG_INPUT_EVDEV=y -CONFIG_SERIO_AMBAKMI=y -CONFIG_LEGACY_PTY_COUNT=16 -CONFIG_SERIAL_8250=m -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_SHARE_IRQ=y -CONFIG_SERIAL_8250_RSA=y -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=m -CONFIG_FB=y -CONFIG_FB_ARMCLCD=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_SOUND=y -CONFIG_SND=m -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_ARMAACI=m -CONFIG_EXT4_FS=y -CONFIG_VFAT_FS=m +CONFIG_SERIO_SERPORT=y +CONFIG_SLUB=y +# CONFIG_SPI is not set +# CONFIG_SYNC_FILE is not set CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y -CONFIG_MAGIC_SYSRQ=y +CONFIG_TMPFS_XATTR=y +# CONFIG_VFP is not set +# CONFIG_XZ_DEC is not set +CONFIG_8139CP=y +CONFIG_BLK_DEV_SD=y
configs/qemu_arm_versatile_defconfig +2 -2
@@ -21,8 +21,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux.config" +BR2_LINUX_KERNEL_DEFCONFIG="versatile" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="versatile-pb"
Signature · 1 line
2.27.0
PATCH 2/4 qemu_arm_versatile_nommu: switch to in-kernel defconfig + fragment
This platform has its own kernel defconfig in Buildroot, but we cannot get quick idea about how much it diverged from the in-kernel defconfig.
Let's use the upstream arch/arm/config/versatile_defconfig as a base, and maintain the diff as a merge-config fragment. The same .config is still generated based on the 5.10.7 kernel.
The diff is quite big, but this is a good start-point for cleanups. Follow-up works can drop diff lines unless we find a good reason for divergence.
---
board/qemu/arm-versatile/linux-nommu.config | 98 ++++++++++++--------- configs/qemu_arm_versatile_nommu_defconfig | 4 +- 2 files changed, 57 insertions(+), 45 deletions(-)
board/qemu/arm-versatile/linux-nommu.config +55 -43
@@ -1,47 +1,59 @@ -# CONFIG_MMU is not set -CONFIG_ARCH_VERSATILE=y +# CONFIG_ARM_SINGLE_ARMV7M is not set CONFIG_ARM_SINGLE_ARCH_VERSATILE=y -CONFIG_SET_MEM_PARAM=y +CONFIG_BINFMT_ELF_FDPIC=y +CONFIG_BINFMT_FLAT=y +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_CRAMFS is not set +CONFIG_CMDLINE="" +# CONFIG_DEBUG_FS is not set +# CONFIG_DEBUG_KERNEL is not set +# CONFIG_DEBUG_USER is not set +# CONFIG_DRM is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EXT2_FS is not set +CONFIG_EXT4_FS=y +CONFIG_FB_ARMCLCD=y +# CONFIG_FONTS is not set +CONFIG_FONT_8x16=y +CONFIG_FONT_8x8=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +# CONFIG_FTRACE is not set +# CONFIG_GPIO_PL061 is not set +# CONFIG_HIGH_RES_TIMERS is not set +CONFIG_HWMON=y +# CONFIG_I2C_VERSATILE is not set +CONFIG_INET_DIAG=y +CONFIG_INPUT_EVDEV=y +CONFIG_IPV6=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_PNP is not set +# CONFIG_MMU is not set +CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOGO is not set +CONFIG_LOG_BUF_SHIFT=17 +CONFIG_MDIO_DEVICE=y +# CONFIG_MINIX_FS is not set +# CONFIG_MMC is not set +# CONFIG_MTD is not set +# CONFIG_NEW_LEDS is not set +# CONFIG_NFSD is not set +# CONFIG_NFS_FS is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_ISO8859_1 is not set +# CONFIG_NO_HZ_IDLE is not set +# CONFIG_NVMEM is not set CONFIG_DRAM_BASE=0x00000000 CONFIG_DRAM_SIZE=0x08000000 -CONFIG_ARCH_VERSATILE_PB=y -CONFIG_MACH_VERSATILE_AB=y -CONFIG_MACH_VERSATILE_DT=y -CONFIG_BINFMT_FLAT=y -CONFIG_SYSVIPC=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_ARCH_MULTI_V7 is not set -CONFIG_AEABI=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_NETDEVICES=y -CONFIG_SMC91X=y +CONFIG_INITRAMFS_SOURCE="${BR_BINARIES_DIR}/rootfs.cpio" +# CONFIG_PARTITION_ADVANCED is not set +# CONFIG_OABI_COMPAT is not set CONFIG_PHYLIB=y -CONFIG_INPUT_EVDEV=y -CONFIG_SERIO_AMBAKMI=y -CONFIG_LEGACY_PTY_COUNT=16 -CONFIG_SERIAL_8250=m -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_SHARE_IRQ=y -CONFIG_SERIAL_8250_RSA=y -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=m -CONFIG_FB=y -CONFIG_FB_ARMCLCD=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_SOUND=y -CONFIG_SND=m -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_ARMAACI=m -CONFIG_EXT4_FS=y -CONFIG_VFAT_FS=m -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_MAGIC_SYSRQ=y +# CONFIG_ROMFS_FS is not set +# CONFIG_RTC_CLASS is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIO_SERPORT=y +CONFIG_SET_MEM_PARAM=y +CONFIG_SLUB=y +# CONFIG_SPI is not set +# CONFIG_SYNC_FILE is not set +# CONFIG_VFP is not set
configs/qemu_arm_versatile_nommu_defconfig +2 -2
@@ -32,8 +32,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-nommu.config" +BR2_LINUX_KERNEL_DEFCONFIG="versatile" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux-nommu.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="versatile-pb"
Signature · 1 line
2.27.0
PATCH 3/4 Rename custom kernel defconfig files to *_defconfig
In reply to Masahiro YamadaThere is no consistency in file names for BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE. Some are suffiex with "defconfig", and some with ".config".
Rename *.config to *_defconfig because this is the convention in the upstream Linux kernel.
I used the following shell script for the conversion:
for f in $(find configs -name '*_defconfig')
do
old_name=$(sed -n 's/BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="\(.*\.config\)"/\1/p' $f)
if [ -n "$old_name" ]; then
new_name=${old_name%.config}_defconfig
if [ -e "$old_name" ]; then
git mv $old_name $new_name
fi
sed -i 's:="'$old_name'":="'$new_name'":' $f
fidone
---
.../armadeus/apf27/{linux-4.12.config => linux-4.12_defconfig} | 0
board/armadeus/apf51/{linux-4.4.config => linux-4.4_defconfig} | 0
board/chromebook/elm/{linux.config => linux_defconfig} | 0
board/intel/galileo/{linux-3.14.config => linux-3.14_defconfig} | 0
board/minnowboard/{linux.config => linux_defconfig} | 0
board/olpc/xo-1.75/{linux.config => linux_defconfig} | 0
board/olpc/xo-1/{linux.config => linux_defconfig} | 0
board/pc/{linux.config => linux_defconfig} | 0
board/pcengines/apu2/{linux.config => linux_defconfig} | 0
board/qemu/aarch64-virt/{linux.config => linux_defconfig} | 0
board/qemu/m68k-mcf5208/{linux.config => linux_defconfig} | 0
board/qemu/m68k-q800/{linux.config => linux_defconfig} | 0
board/qemu/microblazebe-mmu/{linux.config => linux_defconfig} | 0
board/qemu/microblazeel-mmu/{linux.config => linux_defconfig} | 0
board/qemu/mips32r2-malta/{linux.config => linux_defconfig} | 0
board/qemu/mips32r2el-malta/{linux.config => linux_defconfig} | 0
board/qemu/mips32r6-malta/{linux.config => linux_defconfig} | 0
board/qemu/mips32r6el-malta/{linux.config => linux_defconfig} | 0
board/qemu/mips64-malta/{linux.config => linux_defconfig} | 0
board/qemu/mips64el-malta/{linux.config => linux_defconfig} | 0
board/qemu/mips64r6-malta/{linux.config => linux_defconfig} | 0
board/qemu/mips64r6el-malta/{linux.config => linux_defconfig} | 0
board/qemu/or1k/{linux.config => linux_defconfig} | 0
board/qemu/ppc-g3beige/{linux.config => linux_defconfig} | 0
board/qemu/ppc-mpc8544ds/{linux.config => linux_defconfig} | 0
board/qemu/sh4-r2d/{linux.config => linux_defconfig} | 0
board/qemu/sh4eb-r2d/{linux.config => linux_defconfig} | 0
board/qemu/sparc-ss10/{linux.config => linux_defconfig} | 0
board/qemu/sparc64-sun4u/{linux.config => linux_defconfig} | 0
board/qemu/x86/{linux.config => linux_defconfig} | 0
board/qemu/x86_64/{linux.config => linux_defconfig} | 0
.../xtensa-lx60/{linux-nommu.config => linux-nommu_defconfig} | 0
board/qemu/xtensa-lx60/{linux.config => linux_defconfig} | 0
board/roseapplepi/{linux.config => linux_defconfig} | 0
.../stm32mp157a-dk1/{linux.config => linux_defconfig} | 0
.../stm32mp157c-dk2/{linux.config => linux_defconfig} | 0
.../ts5500/{linux-4.14.config => linux-4.14_defconfig} | 0
configs/armadeus_apf27_defconfig | 2 +-
configs/armadeus_apf51_defconfig | 2 +-
configs/chromebook_elm_defconfig | 2 +-
configs/galileo_defconfig | 2 +-
configs/minnowboard_max-graphical_defconfig | 2 +-
configs/minnowboard_max_defconfig | 2 +-
configs/olpc_xo175_defconfig | 2 +-
configs/olpc_xo1_defconfig | 2 +-
configs/pc_x86_64_bios_defconfig | 2 +-
configs/pc_x86_64_efi_defconfig | 2 +-
configs/pcengines_apu2_defconfig | 2 +-
configs/qemu_aarch64_virt_defconfig | 2 +-
configs/qemu_m68k_mcf5208_defconfig | 2 +-
configs/qemu_m68k_q800_defconfig | 2 +-
configs/qemu_microblazebe_mmu_defconfig | 2 +-
configs/qemu_microblazeel_mmu_defconfig | 2 +-
configs/qemu_mips32r2_malta_defconfig | 2 +-
configs/qemu_mips32r2el_malta_defconfig | 2 +-
configs/qemu_mips32r6_malta_defconfig | 2 +-
configs/qemu_mips32r6el_malta_defconfig | 2 +-
configs/qemu_mips64_malta_defconfig | 2 +-
configs/qemu_mips64el_malta_defconfig | 2 +-
configs/qemu_mips64r6_malta_defconfig | 2 +-
configs/qemu_mips64r6el_malta_defconfig | 2 +-
configs/qemu_or1k_defconfig | 2 +-
configs/qemu_ppc_g3beige_defconfig | 2 +-
configs/qemu_ppc_mpc8544ds_defconfig | 2 +-
configs/qemu_sh4_r2d_defconfig | 2 +-
configs/qemu_sh4eb_r2d_defconfig | 2 +-
configs/qemu_sparc64_sun4u_defconfig | 2 +-
configs/qemu_sparc_ss10_defconfig | 2 +-
configs/qemu_x86_64_defconfig | 2 +-
configs/qemu_x86_defconfig | 2 +-
configs/qemu_xtensa_lx60_defconfig | 2 +-
configs/qemu_xtensa_lx60_nommu_defconfig | 2 +-
configs/roseapplepi_defconfig | 2 +-
configs/stm32mp157a_dk1_defconfig | 2 +-
configs/stm32mp157c_dk2_defconfig | 2 +-
configs/ts5500_defconfig | 2 +-
76 files changed, 39 insertions(+), 39 deletions(-)
rename board/armadeus/apf27/{linux-4.12.config => linux-4.12_defconfig} (100%)
rename board/armadeus/apf51/{linux-4.4.config => linux-4.4_defconfig} (100%)
rename board/chromebook/elm/{linux.config => linux_defconfig} (100%)
rename board/intel/galileo/{linux-3.14.config => linux-3.14_defconfig} (100%)
rename board/minnowboard/{linux.config => linux_defconfig} (100%)
rename board/olpc/xo-1.75/{linux.config => linux_defconfig} (100%)
rename board/olpc/xo-1/{linux.config => linux_defconfig} (100%)
rename board/pc/{linux.config => linux_defconfig} (100%)
rename board/pcengines/apu2/{linux.config => linux_defconfig} (100%)
rename board/qemu/aarch64-virt/{linux.config => linux_defconfig} (100%)
rename board/qemu/m68k-mcf5208/{linux.config => linux_defconfig} (100%)
rename board/qemu/m68k-q800/{linux.config => linux_defconfig} (100%)
rename board/qemu/microblazebe-mmu/{linux.config => linux_defconfig} (100%)
rename board/qemu/microblazeel-mmu/{linux.config => linux_defconfig} (100%)
rename board/qemu/mips32r2-malta/{linux.config => linux_defconfig} (100%)
rename board/qemu/mips32r2el-malta/{linux.config => linux_defconfig} (100%)
rename board/qemu/mips32r6-malta/{linux.config => linux_defconfig} (100%)
rename board/qemu/mips32r6el-malta/{linux.config => linux_defconfig} (100%)
rename board/qemu/mips64-malta/{linux.config => linux_defconfig} (100%)
rename board/qemu/mips64el-malta/{linux.config => linux_defconfig} (100%)
rename board/qemu/mips64r6-malta/{linux.config => linux_defconfig} (100%)
rename board/qemu/mips64r6el-malta/{linux.config => linux_defconfig} (100%)
rename board/qemu/or1k/{linux.config => linux_defconfig} (100%)
rename board/qemu/ppc-g3beige/{linux.config => linux_defconfig} (100%)
rename board/qemu/ppc-mpc8544ds/{linux.config => linux_defconfig} (100%)
rename board/qemu/sh4-r2d/{linux.config => linux_defconfig} (100%)
rename board/qemu/sh4eb-r2d/{linux.config => linux_defconfig} (100%)
rename board/qemu/sparc-ss10/{linux.config => linux_defconfig} (100%)
rename board/qemu/sparc64-sun4u/{linux.config => linux_defconfig} (100%)
rename board/qemu/x86/{linux.config => linux_defconfig} (100%)
rename board/qemu/x86_64/{linux.config => linux_defconfig} (100%)
rename board/qemu/xtensa-lx60/{linux-nommu.config => linux-nommu_defconfig} (100%)
rename board/qemu/xtensa-lx60/{linux.config => linux_defconfig} (100%)
rename board/roseapplepi/{linux.config => linux_defconfig} (100%)
rename board/stmicroelectronics/stm32mp157a-dk1/{linux.config => linux_defconfig} (100%)
rename board/stmicroelectronics/stm32mp157c-dk2/{linux.config => linux_defconfig} (100%)
rename board/technologic/ts5500/{linux-4.14.config => linux-4.14_defconfig} (100%)board/armadeus/apf27/linux-4.12_defconfig renamed from board/armadeus/apf27/linux-4.12.config +0 -0
board/armadeus/apf51/linux-4.4_defconfig renamed from board/armadeus/apf51/linux-4.4.config +0 -0
board/chromebook/elm/linux_defconfig renamed from board/chromebook/elm/linux.config +0 -0
board/intel/galileo/linux-3.14_defconfig renamed from board/intel/galileo/linux-3.14.config +0 -0
board/minnowboard/linux_defconfig renamed from board/minnowboard/linux.config +0 -0
board/olpc/xo-1.75/linux_defconfig renamed from board/olpc/xo-1.75/linux.config +0 -0
board/olpc/xo-1/linux_defconfig renamed from board/olpc/xo-1/linux.config +0 -0
board/pc/linux_defconfig renamed from board/pc/linux.config +0 -0
board/pcengines/apu2/linux_defconfig renamed from board/pcengines/apu2/linux.config +0 -0
board/qemu/aarch64-virt/linux_defconfig renamed from board/qemu/aarch64-virt/linux.config +0 -0
board/qemu/m68k-mcf5208/linux_defconfig renamed from board/qemu/m68k-mcf5208/linux.config +0 -0
board/qemu/m68k-q800/linux_defconfig renamed from board/qemu/m68k-q800/linux.config +0 -0
board/qemu/microblazebe-mmu/linux_defconfig renamed from board/qemu/microblazebe-mmu/linux.config +0 -0
board/qemu/microblazeel-mmu/linux_defconfig renamed from board/qemu/microblazeel-mmu/linux.config +0 -0
board/qemu/mips32r2-malta/linux_defconfig renamed from board/qemu/mips32r2-malta/linux.config +0 -0
board/qemu/mips32r2el-malta/linux_defconfig renamed from board/qemu/mips32r2el-malta/linux.config +0 -0
board/qemu/mips32r6-malta/linux_defconfig renamed from board/qemu/mips32r6-malta/linux.config +0 -0
board/qemu/mips32r6el-malta/linux_defconfig renamed from board/qemu/mips32r6el-malta/linux.config +0 -0
board/qemu/mips64-malta/linux_defconfig renamed from board/qemu/mips64-malta/linux.config +0 -0
board/qemu/mips64el-malta/linux_defconfig renamed from board/qemu/mips64el-malta/linux.config +0 -0
board/qemu/mips64r6-malta/linux_defconfig renamed from board/qemu/mips64r6-malta/linux.config +0 -0
board/qemu/mips64r6el-malta/linux_defconfig renamed from board/qemu/mips64r6el-malta/linux.config +0 -0
board/qemu/or1k/linux_defconfig renamed from board/qemu/or1k/linux.config +0 -0
board/qemu/ppc-g3beige/linux_defconfig renamed from board/qemu/ppc-g3beige/linux.config +0 -0
board/qemu/ppc-mpc8544ds/linux_defconfig renamed from board/qemu/ppc-mpc8544ds/linux.config +0 -0
board/qemu/sh4-r2d/linux_defconfig renamed from board/qemu/sh4-r2d/linux.config +0 -0
board/qemu/sh4eb-r2d/linux_defconfig renamed from board/qemu/sh4eb-r2d/linux.config +0 -0
board/qemu/sparc-ss10/linux_defconfig renamed from board/qemu/sparc-ss10/linux.config +0 -0
board/qemu/sparc64-sun4u/linux_defconfig renamed from board/qemu/sparc64-sun4u/linux.config +0 -0
board/qemu/x86/linux_defconfig renamed from board/qemu/x86/linux.config +0 -0
board/qemu/x86_64/linux_defconfig renamed from board/qemu/x86_64/linux.config +0 -0
board/qemu/xtensa-lx60/linux-nommu_defconfig renamed from board/qemu/xtensa-lx60/linux-nommu.config +0 -0
board/qemu/xtensa-lx60/linux_defconfig renamed from board/qemu/xtensa-lx60/linux.config +0 -0
board/roseapplepi/linux_defconfig renamed from board/roseapplepi/linux.config +0 -0
board/stmicroelectronics/stm32mp157a-dk1/linux_defconfig renamed from board/stmicroelectronics/stm32mp157a-dk1/linux.config +0 -0
board/stmicroelectronics/stm32mp157c-dk2/linux_defconfig renamed from board/stmicroelectronics/stm32mp157c-dk2/linux.config +0 -0
board/technologic/ts5500/linux-4.14_defconfig renamed from board/technologic/ts5500/linux-4.14.config +0 -0
configs/armadeus_apf27_defconfig +1 -1
@@ -20,7 +20,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.4" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf27/linux-4.12.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf27/linux-4.12_defconfig" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0xA0008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y
configs/armadeus_apf51_defconfig +1 -1
@@ -15,7 +15,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.186" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf51/linux-4.4.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf51/linux-4.4_defconfig" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x90008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y
configs/chromebook_elm_defconfig +1 -1
@@ -19,7 +19,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9" # Build Kernel with a Custom config. BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/chromebook/elm/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/chromebook/elm/linux_defconfig" # DTS support BR2_LINUX_KERNEL_DTS_SUPPORT=y
configs/galileo_defconfig +1 -1
@@ -13,7 +13,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,mdr78,Linux-x1000,8b3c9d8ce1656a26b1097d9091d53bfb39fef640)/linux-8b3c9d8ce1656a26b1097d9091d53bfb39fef640.tar.gz" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/intel/galileo/linux-3.14.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/intel/galileo/linux-3.14_defconfig" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y
configs/minnowboard_max-graphical_defconfig +1 -1
@@ -26,7 +26,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/minnowboard/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/minnowboard/linux_defconfig" # Bootloader BR2_TARGET_GRUB2=y
configs/minnowboard_max_defconfig +1 -1
@@ -26,7 +26,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/minnowboard/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/minnowboard/linux_defconfig" # Bootloader BR2_TARGET_GRUB2=y
configs/olpc_xo175_defconfig +1 -1
@@ -8,7 +8,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.2" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/olpc/xo-1.75/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/olpc/xo-1.75/linux_defconfig" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olpc/linux.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
configs/olpc_xo1_defconfig +1 -1
@@ -7,7 +7,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/olpc/xo-1/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/olpc/xo-1/linux_defconfig" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olpc/linux.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
configs/pc_x86_64_bios_defconfig +1 -1
@@ -31,7 +31,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.10" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux_defconfig" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
configs/pc_x86_64_efi_defconfig +1 -1
@@ -33,7 +33,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.10" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux_defconfig" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
configs/pcengines_apu2_defconfig +1 -1
@@ -7,7 +7,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pcengines/apu2/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pcengines/apu2/linux_defconfig" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_ISO9660=y BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="board/pcengines/apu2/isolinux.cfg"
configs/qemu_aarch64_virt_defconfig +1 -1
@@ -23,7 +23,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux_defconfig" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # host-qemu for gitlab testing
configs/qemu_m68k_mcf5208_defconfig +1 -1
@@ -21,7 +21,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux_defconfig" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config
configs/qemu_m68k_q800_defconfig +1 -1
@@ -21,7 +21,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux_defconfig" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config
configs/qemu_microblazebe_mmu_defconfig +1 -1
@@ -22,7 +22,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux_defconfig" BR2_LINUX_KERNEL_LINUX_BIN=y BR2_LINUX_KERNEL_PATCH="board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch"
configs/qemu_microblazeel_mmu_defconfig +1 -1
@@ -22,7 +22,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux_defconfig" BR2_LINUX_KERNEL_LINUX_BIN=y BR2_LINUX_KERNEL_PATCH="board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch"
configs/qemu_mips32r2_malta_defconfig +1 -1
@@ -21,7 +21,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux_defconfig" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config
configs/qemu_mips32r2el_malta_defconfig +1 -1
@@ -21,7 +21,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux_defconfig" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config
configs/qemu_mips32r6_malta_defconfig +1 -1
@@ -21,7 +21,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux_defconfig" BR2_LINUX_KERNEL_VMLINUX=y BR2_GLOBAL_PATCH_DIR="board/qemu/mips32r6-malta/patches"
configs/qemu_mips32r6el_malta_defconfig +1 -1
@@ -21,7 +21,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux_defconfig" BR2_LINUX_KERNEL_VMLINUX=y BR2_GLOBAL_PATCH_DIR="board/qemu/mips32r6el-malta/patches"
configs/qemu_mips64_malta_defconfig +1 -1
@@ -21,7 +21,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux_defconfig" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config
configs/qemu_mips64el_malta_defconfig +1 -1
@@ -21,7 +21,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux_defconfig" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config
configs/qemu_mips64r6_malta_defconfig +1 -1
@@ -22,7 +22,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux_defconfig" BR2_LINUX_KERNEL_VMLINUX=y BR2_GLOBAL_PATCH_DIR="board/qemu/mips64r6-malta/patches"
configs/qemu_mips64r6el_malta_defconfig +1 -1
@@ -22,7 +22,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux_defconfig" BR2_LINUX_KERNEL_VMLINUX=y BR2_GLOBAL_PATCH_DIR="board/qemu/mips64r6el-malta/patches"
configs/qemu_or1k_defconfig +1 -1
@@ -17,7 +17,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux_defconfig" # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y
configs/qemu_ppc_g3beige_defconfig +1 -1
@@ -21,7 +21,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux_defconfig" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config
configs/qemu_ppc_mpc8544ds_defconfig +1 -1
@@ -22,7 +22,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux_defconfig" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config
configs/qemu_sh4_r2d_defconfig +1 -1
@@ -22,7 +22,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux_defconfig" BR2_LINUX_KERNEL_ZIMAGE=y # host-qemu for gitlab testing
configs/qemu_sh4eb_r2d_defconfig +1 -1
@@ -21,7 +21,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux_defconfig" BR2_LINUX_KERNEL_ZIMAGE=y # host-qemu for gitlab testing
configs/qemu_sparc64_sun4u_defconfig +1 -1
@@ -21,7 +21,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux_defconfig" # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y
configs/qemu_sparc_ss10_defconfig +1 -1
@@ -21,7 +21,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux_defconfig" # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y
configs/qemu_x86_64_defconfig +1 -1
@@ -23,7 +23,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux_defconfig" # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y
configs/qemu_x86_defconfig +1 -1
@@ -24,7 +24,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux_defconfig" # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y
configs/qemu_xtensa_lx60_defconfig +1 -1
@@ -23,7 +23,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux_defconfig" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_NAME="Image.elf" BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="Image"
configs/qemu_xtensa_lx60_nommu_defconfig +1 -1
@@ -27,7 +27,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-nommu.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-nommu_defconfig" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_NAME="Image.elf" BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="Image"
configs/roseapplepi_defconfig +1 -1
@@ -13,7 +13,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/roseapplepi/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/roseapplepi/linux_defconfig" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" BR2_LINUX_KERNEL_DTS_SUPPORT=y
configs/stm32mp157a_dk1_defconfig +1 -1
@@ -7,7 +7,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.13" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32mp157a-dk1/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32mp157a-dk1/linux_defconfig" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32mp157a-dk1" BR2_LINUX_KERNEL_INSTALL_TARGET=y
configs/stm32mp157c_dk2_defconfig +1 -1
@@ -7,7 +7,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.13" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32mp157c-dk2/linux.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32mp157c-dk2/linux_defconfig" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32mp157c-dk2" BR2_LINUX_KERNEL_INSTALL_TARGET=y
configs/ts5500_defconfig +1 -1
@@ -14,7 +14,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/technologic/ts5500/linux-4.14.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/technologic/ts5500/linux-4.14_defconfig" BR2_LINUX_KERNEL_INSTALL_TARGET=y # rootfs
Signature · 1 line
2.27.0
PATCH 3/4 Rename custom kernel defconfig files to *_defconfig
Quoted 3 lines · On Thu, 18 Mar 2021 07:28:48 +0900 Masahiro Yamada <[email protected]> wrote:
There is no consistency in file names for
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE. Some are suffiex with "defconfig", and some with ".config".
The *vast* majority of them are named .config. Only three use -defconfig or _defconfig. Please normalize on .config, not the opposite.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Re: [Buildroot] [PATCH 3/4] Rename custom kernel defconfig files to *_defconfig
Hi everyone,
Quoted 7 lines · Thomas Petazzoni
Quoted 3 lines · On Thu, 18 Mar 2021 07:28:48 +0900 Masahiro Yamada <[email protected]> wrote:
There is no consistency in file names for
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE. Some are suffiex with "defconfig", and some with ".config".The *vast* majority of them are named .config. Only three use -defconfig or
_defconfig. Please normalize on .config, not the opposite.
just to tie up some loose ends. In CAK7LNARM_nzn39T0v46XWmLYE1u-DHi65Odm_w9+vxhc6c0x6Q@mail.gmail.com, (Re:
[Buildroot] [PATCH 1/2] qemu_arm_versatile: switch to in-kernel defconfig + fragment) ...
Quoted 5 lines · Masahiro Yamada
Maybe we can give
_defconfigsuffix toBR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE,
and .config toBR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES.This goes along with the naming rule in the upstream kernel.
If I understand correctly, in Buildroot we have sort of standardized on .fragment for .config fragments, both for Linux and BusyBox. But it may be a bit confusing, since this nomenclature is not used consistently.
From a single linux.config file in board/ it's currently not possible to know if it's a full kernel .config or a .fragment without looking in the corresponding Buildroot _defonfig for that target.
So we should try to clean this up a bit, but what should it be?
1. Enforce current best practices, or
2. Radically rethink our current nomenclature?
Personally I rather like Masahiro's suggestion to follow Linux kernel naming rules. A linux.defconfig (or linux_defconfig) might be better than linux.config, which in turn would allow us to use linux.config for fragments. The same could apply to BusyBox configs as well. In either case we should probably update examples and/or add a section on naming things (policy) to the manual.
I can help out here with both tasks, take over Masahiro's patch series if necessary, and suggest additions to the manual.
What do you think list?
Best regards
/Joachim
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH 4/4 Rename custom kernel config fragment files to *.config
In reply to Masahiro YamadaThere is no consistency in file names for BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES. Some are suffiex with ".config", and some with ".config.fragment".
Rename *.config.fragment to *.config because this is the convention in the upstream Linux kernel.
I used the following shell script for the conversion:
for f in $(find configs -name '*_defconfig')
do
old_name=$(sed -n 's/BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="\(.*\.config.fragment\)"/\1/p' $f)
if [ -n "$old_name" ]; then
new_name=${old_name%.fragment}
if [ -e "$old_name" ]; then
git mv $old_name $new_name
fi
sed -i 's:="'$old_name'":="'$new_name'":' $f
fidone
---
.../csky/{linux-ck610.config.fragment => linux-ck610.config} | 0
.../csky/{linux-ck807.config.fragment => linux-ck807.config} | 0
.../csky/{linux-ck810.config.fragment => linux-ck810.config} | 0
.../csky/{linux-ck860.config.fragment => linux-ck860.config} | 0
.../hifive-unleashed/{linux.config.fragment => linux.config} | 0
configs/csky_gx6605s_defconfig | 2 +-
configs/hifive_unleashed_defconfig | 2 +-
configs/qemu_csky610_virt_defconfig | 2 +-
configs/qemu_csky807_virt_defconfig | 2 +-
configs/qemu_csky810_virt_defconfig | 2 +-
configs/qemu_csky860_virt_defconfig | 2 +-
11 files changed, 6 insertions(+), 6 deletions(-)
rename board/qemu/csky/{linux-ck610.config.fragment => linux-ck610.config} (100%)
rename board/qemu/csky/{linux-ck807.config.fragment => linux-ck807.config} (100%)
rename board/qemu/csky/{linux-ck810.config.fragment => linux-ck810.config} (100%)
rename board/qemu/csky/{linux-ck860.config.fragment => linux-ck860.config} (100%)
rename board/sifive/hifive-unleashed/{linux.config.fragment => linux.config} (100%)board/qemu/csky/linux-ck610.config renamed from board/qemu/csky/linux-ck610.config.fragment +0 -0
board/qemu/csky/linux-ck807.config renamed from board/qemu/csky/linux-ck807.config.fragment +0 -0
board/qemu/csky/linux-ck810.config renamed from board/qemu/csky/linux-ck810.config.fragment +0 -0
board/qemu/csky/linux-ck860.config renamed from board/qemu/csky/linux-ck860.config.fragment +0 -0
board/sifive/hifive-unleashed/linux.config renamed from board/sifive/hifive-unleashed/linux.config.fragment +0 -0
configs/csky_gx6605s_defconfig +1 -1
@@ -14,6 +14,6 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck610.config.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck610.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/csky/gx6605s/gx6605s.dts"
configs/hifive_unleashed_defconfig +1 -1
@@ -29,7 +29,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sifive/hifive-unleashed/linux.config.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sifive/hifive-unleashed/linux.config" BR2_LINUX_KERNEL_IMAGE=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sifive/hifive-unleashed-a00"
configs/qemu_csky610_virt_defconfig +1 -1
@@ -17,4 +17,4 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck610.config.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck610.config"
configs/qemu_csky807_virt_defconfig +1 -1
@@ -17,4 +17,4 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck807.config.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck807.config"
configs/qemu_csky810_virt_defconfig +1 -1
@@ -17,4 +17,4 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck810.config.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck810.config"
configs/qemu_csky860_virt_defconfig +1 -1
@@ -17,4 +17,4 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck860.config.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck860.config"
Signature · 1 line
2.27.0