board/qemu/mips*-malta: switch from IDE disk to SCSI disk
Subsystems (2)
PATCH 1/4 board/qemu/mips*-malta: switch from IDE disk to SCSI disk
A following patch will switch to the kernel 5.15 for all qemu defconfigs but the IDE support (used by mips malta) has been removed from the Linux kernel since 5.14 release [1].
Enable the SCSI support and update the kernel command line.
--- board/qemu/mips32r2-malta/linux.config | 8 +++----- board/qemu/mips32r2-malta/readme.txt | 2 +- board/qemu/mips32r2el-malta/linux.config | 8 +++----- board/qemu/mips32r2el-malta/readme.txt | 2 +- board/qemu/mips32r6-malta/linux.config | 8 +++----- board/qemu/mips32r6-malta/readme.txt | 2 +- board/qemu/mips32r6el-malta/linux.config | 8 +++----- board/qemu/mips32r6el-malta/readme.txt | 2 +- board/qemu/mips64-malta/linux.config | 8 +++----- board/qemu/mips64-malta/readme.txt | 2 +- board/qemu/mips64el-malta/linux.config | 8 +++----- board/qemu/mips64el-malta/readme.txt | 2 +- board/qemu/mips64r6-malta/linux.config | 8 +++----- board/qemu/mips64r6-malta/readme.txt | 2 +- board/qemu/mips64r6el-malta/readme.txt | 2 +- 15 files changed, 29 insertions(+), 43 deletions(-)
board/qemu/mips32r2-malta/linux.config +3 -5
@@ -11,11 +11,9 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y -CONFIG_IDE=y -CONFIG_BLK_DEV_IDECD=y -CONFIG_IDE_GENERIC=y -CONFIG_BLK_DEV_GENERIC=y -CONFIG_BLK_DEV_PIIX=y +CONFIG_BLK_DEV_SD=y +CONFIG_ATA=y +CONFIG_ATA_PIIX=y CONFIG_NETDEVICES=y CONFIG_PCNET32=y CONFIG_INPUT_EVDEV=y
board/qemu/mips32r2-malta/readme.txt +1 -1
@@ -1,6 +1,6 @@ Run the emulation with: - qemu-system-mips -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -net nic,model=pcnet -net user # qemu_mips32r2_malta_defconfig + qemu-system-mips -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/sda" -net nic,model=pcnet -net user # qemu_mips32r2_malta_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. No keyboard support has been
board/qemu/mips32r2el-malta/linux.config +3 -5
@@ -12,11 +12,9 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y -CONFIG_IDE=y -CONFIG_BLK_DEV_IDECD=y -CONFIG_IDE_GENERIC=y -CONFIG_BLK_DEV_GENERIC=y -CONFIG_BLK_DEV_PIIX=y +CONFIG_BLK_DEV_SD=y +CONFIG_ATA=y +CONFIG_ATA_PIIX=y CONFIG_NETDEVICES=y CONFIG_PCNET32=y CONFIG_INPUT_EVDEV=y
board/qemu/mips32r2el-malta/readme.txt +1 -1
@@ -1,6 +1,6 @@ Run the emulation with: - qemu-system-mipsel -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -net nic,model=pcnet -net user # qemu_mips32r2el_malta_defconfig + qemu-system-mipsel -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/sda" -net nic,model=pcnet -net user # qemu_mips32r2el_malta_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. No keyboard support has been
board/qemu/mips32r6-malta/linux.config +3 -5
@@ -11,11 +11,9 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y -CONFIG_IDE=y -CONFIG_BLK_DEV_IDECD=y -CONFIG_IDE_GENERIC=y -CONFIG_BLK_DEV_GENERIC=y -CONFIG_BLK_DEV_PIIX=y +CONFIG_BLK_DEV_SD=y +CONFIG_ATA=y +CONFIG_ATA_PIIX=y CONFIG_NETDEVICES=y CONFIG_PCNET32=y CONFIG_INPUT_EVDEV=y
board/qemu/mips32r6-malta/readme.txt +1 -1
@@ -1,5 +1,5 @@ Run the emulation with: - qemu-system-mips -M malta -cpu mips32r6-generic -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -nographic # qemu_mips32r6_malta_defconfig + qemu-system-mips -M malta -cpu mips32r6-generic -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/sda" -nographic # qemu_mips32r6_malta_defconfig The login prompt will appear in the terminal that started Qemu.
board/qemu/mips32r6el-malta/linux.config +3 -5
@@ -11,11 +11,9 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y -CONFIG_IDE=y -CONFIG_BLK_DEV_IDECD=y -CONFIG_IDE_GENERIC=y -CONFIG_BLK_DEV_GENERIC=y -CONFIG_BLK_DEV_PIIX=y +CONFIG_BLK_DEV_SD=y +CONFIG_ATA=y +CONFIG_ATA_PIIX=y CONFIG_NETDEVICES=y CONFIG_PCNET32=y CONFIG_INPUT_EVDEV=y
board/qemu/mips32r6el-malta/readme.txt +1 -1
@@ -1,5 +1,5 @@ Run the emulation with: - qemu-system-mipsel -M malta -cpu mips32r6-generic -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -net nic,model=pcnet -net user -nographic # qemu_mips32r6el_malta_defconfig + qemu-system-mipsel -M malta -cpu mips32r6-generic -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/sda" -net nic,model=pcnet -net user -nographic # qemu_mips32r6el_malta_defconfig The login prompt will appear in the terminal that started Qemu.
board/qemu/mips64-malta/linux.config +3 -5
@@ -15,11 +15,9 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y -CONFIG_IDE=y -CONFIG_BLK_DEV_IDECD=y -CONFIG_IDE_GENERIC=y -CONFIG_BLK_DEV_GENERIC=y -CONFIG_BLK_DEV_PIIX=y +CONFIG_BLK_DEV_SD=y +CONFIG_ATA=y +CONFIG_ATA_PIIX=y CONFIG_NETDEVICES=y CONFIG_PCNET32=y CONFIG_INPUT_EVDEV=y
board/qemu/mips64-malta/readme.txt +1 -1
@@ -1,6 +1,6 @@ Run the emulation with: - qemu-system-mips64 -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" # qemu_mips64_malta_defconfig + qemu-system-mips64 -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/sda" # qemu_mips64_malta_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer.
board/qemu/mips64el-malta/linux.config +3 -5
@@ -16,11 +16,9 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y -CONFIG_IDE=y -CONFIG_BLK_DEV_IDECD=y -CONFIG_IDE_GENERIC=y -CONFIG_BLK_DEV_GENERIC=y -CONFIG_BLK_DEV_PIIX=y +CONFIG_BLK_DEV_SD=y +CONFIG_ATA=y +CONFIG_ATA_PIIX=y CONFIG_NETDEVICES=y CONFIG_PCNET32=y CONFIG_INPUT_EVDEV=y
board/qemu/mips64el-malta/readme.txt +1 -1
@@ -1,6 +1,6 @@ Run the emulation with: - qemu-system-mips64el -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" # qemu_mips64el_malta_defconfig + qemu-system-mips64el -M malta -kernel output/images/vmlinux -serial stdio -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/sda" # qemu_mips64el_malta_defconfig The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer.
board/qemu/mips64r6-malta/linux.config +3 -5
@@ -15,11 +15,9 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y -CONFIG_IDE=y -CONFIG_BLK_DEV_IDECD=y -CONFIG_IDE_GENERIC=y -CONFIG_BLK_DEV_GENERIC=y -CONFIG_BLK_DEV_PIIX=y +CONFIG_BLK_DEV_SD=y +CONFIG_ATA=y +CONFIG_ATA_PIIX=y CONFIG_NETDEVICES=y CONFIG_PCNET32=y CONFIG_INPUT_EVDEV=y
board/qemu/mips64r6-malta/readme.txt +1 -1
@@ -1,5 +1,5 @@ Run the emulation with: - qemu-system-mips64 -M malta -cpu I6400 -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -nographic # qemu_mips64r6_malta_defconfig + qemu-system-mips64 -M malta -cpu I6400 -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/sda" -nographic # qemu_mips64r6_malta_defconfig The login prompt will appear in the terminal that started Qemu.
board/qemu/mips64r6el-malta/readme.txt +1 -1
@@ -1,5 +1,5 @@ Run the emulation with: - qemu-system-mips64el -M malta -cpu I6400 -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/hda" -nographic # qemu_mips64r6el_malta_defconfig + qemu-system-mips64el -M malta -cpu I6400 -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "rootwait root=/dev/sda" -nographic # qemu_mips64r6el_malta_defconfig The login prompt will appear in the terminal that started Qemu.
Signature · 6 lines
2.31.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH 2/4 configs/qemu_aarch64_sbsa_defconfig: update to Linux 5.15
Increase vfat partition size for qemu-aarch64-sbsa since it now requires more than 32M. See "Disk full" [1].
[1] https://gitlab.com/kubu93/buildroot/-/jobs/1745752049
--- board/qemu/aarch64-sbsa/genimage.cfg | 2 +- configs/qemu_aarch64_sbsa_defconfig | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-)
board/qemu/aarch64-sbsa/genimage.cfg +1 -1
@@ -7,7 +7,7 @@ image efi-part.vfat { image = "Image" } } - size = 32M + size = 64M } image disk.img {
configs/qemu_aarch64_sbsa_defconfig +4 -3
@@ -13,18 +13,19 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" # Image BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/aarch64-sbsa/assemble-flash-images support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/qemu/aarch64-sbsa/genimage.cfg" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.34" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
Signature · 6 lines
2.31.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH 3/4 configs/qemu_arm_versatile_nommu_defconfig: update to Linux 5.15
In reply to Romain NaourRebase patch versatile-nommu.patch on top of v5.15.
--- .../patches/linux/versatile-nommu.patch | 31 ++++++++++++------- configs/qemu_arm_versatile_nommu_defconfig | 6 ++-- 2 files changed, 23 insertions(+), 14 deletions(-)
board/qemu/arm-versatile/patches/linux/versatile-nommu.patch +20 -11
@@ -1,10 +1,19 @@ -From 525dd2f3cf4a94837ce6b71d793acb90c25a5654 Mon Sep 17 00:00:00 2001 +From 7c245ffc17a9ab6215830d4ecd8b2f9beddb487c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb <[email protected]> Date: Fri, 1 Feb 2019 11:36:20 +0100 Subject: [PATCH] arm-versatile-nommu: Linux patch Originally made by Waldemar Brodkorb <[email protected]> from LKML. +Rename CLKSRC_OF to TIMER_OF (kernel >= 4.13) +https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=bb0eb050a577a866cb47c2dc37596f1207f4c2d9 + +Remove GENERIC_CLOCKEVENTS since its enabled by default (kernel >= 5.11) +https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=0774a6ed294b963dc76df2d8342ab86d030759ec + +Select CONFIG_GENERIC_IRQ_MULTI_HANDLER since irqchip doesn't select it anymore (kernel >= 5.12) +https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a79f7051cccb6f3bcd3d2a0a058c7d5c79bb0371 + Signed-Off-by: Waldemar Brodkorb <[email protected]> [Gerome: reformated as a Git patch] Signed-off-by: Gerome Burlats <[email protected]>
@@ -21,10 +30,10 @@ Signed-off-by: Romain Naour <[email protected]> create mode 100644 arch/arm/mach-versatile/Makefile.boot diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 002e0cf025f5..c71299b6f91f 100644 +index dcf2df6da98f..c2155c1a2eba 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -343,6 +343,17 @@ config ARM_SINGLE_ARMV7M +@@ -337,6 +337,17 @@ config ARM_SINGLE_ARMV7M select SPARSE_IRQ select USE_OF
@@ -32,21 +41,21 @@ index 002e0cf025f5..c71299b6f91f 100644 + bool "ARM Ltd. Versatile family" + depends on !MMU + select AUTO_ZRELADDR -+ select CLKSRC_OF ++ select TIMER_OF + select COMMON_CLK -+ select GENERIC_CLOCKEVENTS ++ select GENERIC_IRQ_MULTI_HANDLER + select GPIOLIB + select SPARSE_IRQ + select USE_OF + - config ARCH_EBSA110 - bool "EBSA-110" - select ARCH_USES_GETTIMEOFFSET + config ARCH_EP93XX + bool "EP93xx-based" + select ARCH_SPARSEMEM_ENABLE diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug -index 8986a91a6f31..69cb6404e8ce 100644 +index 98436702e0c7..7e63299ceb40 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug -@@ -1943,7 +1943,8 @@ config DEBUG_UNCOMPRESS +@@ -1891,7 +1891,8 @@ config DEBUG_UNCOMPRESS config UNCOMPRESS_INCLUDE string default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \
@@ -109,5 +118,5 @@ index 02ba68abe533..835b51bc597b 100644 /* -- -2.17.1 +2.31.1
configs/qemu_arm_versatile_nommu_defconfig +3 -3
@@ -25,13 +25,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-nommu.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y
Signature · 6 lines
2.31.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH 4/4 configs/qemu: Update defconfigs to Linux 5.15
In reply to Romain NaourRemove upstream patch:
0001-sparc64-avoid-stringop-overread-warning-to-access-Ma.patch
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=fc7c028dcdbfe981bca75d2a7b95f363eb691ef3
0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=1d7ba0165d8206ac073f7ac3b14fc0836b66eae7
0001-arch-s390-disable-SSP-when-needed.patch [3]
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=42e8d652438f5ddf04e5dac299cb5e623d113dc0
Tested on gitlab:
https://gitlab.com/kubu93/buildroot/-/pipelines/402999845
---
The qemu_s390x_defconfig test failed on gitlab but the generated system is working locally using the generated artifacts (bzImage and rootfs.ext2) and by building the configuration locally. It seems an issue with the S20urandom script.
--- ...ude-hi-and-lo-in-clobber-list-for-R6.patch | 149 ----------------- ...ude-hi-and-lo-in-clobber-list-for-R6.patch | 149 ----------------- ...ude-hi-and-lo-in-clobber-list-for-R6.patch | 149 ----------------- board/qemu/mips64r6el-malta/linux.config | 8 +- ...ude-hi-and-lo-in-clobber-list-for-R6.patch | 149 ----------------- ...01-arch-s390-disable-SSP-when-needed.patch | 47 ------ ...ringop-overread-warning-to-access-Ma.patch | 154 ------------------ configs/qemu_aarch64_virt_defconfig | 6 +- configs/qemu_arm_versatile_defconfig | 6 +- configs/qemu_arm_vexpress_defconfig | 6 +- configs/qemu_arm_vexpress_tz_defconfig | 6 +- configs/qemu_m68k_mcf5208_defconfig | 6 +- configs/qemu_m68k_q800_defconfig | 6 +- configs/qemu_microblazebe_mmu_defconfig | 6 +- configs/qemu_microblazeel_mmu_defconfig | 6 +- configs/qemu_mips32r2_malta_defconfig | 6 +- configs/qemu_mips32r2el_malta_defconfig | 6 +- configs/qemu_mips32r6_malta_defconfig | 7 +- configs/qemu_mips32r6el_malta_defconfig | 7 +- configs/qemu_mips64_malta_defconfig | 6 +- configs/qemu_mips64el_malta_defconfig | 6 +- configs/qemu_mips64r6_malta_defconfig | 7 +- configs/qemu_mips64r6el_malta_defconfig | 7 +- configs/qemu_nios2_10m50_defconfig | 6 +- configs/qemu_or1k_defconfig | 6 +- configs/qemu_riscv32_virt_defconfig | 6 +- configs/qemu_riscv64_virt_defconfig | 6 +- configs/qemu_s390x_defconfig | 7 +- configs/qemu_sh4_r2d_defconfig | 6 +- configs/qemu_sh4eb_r2d_defconfig | 6 +- configs/qemu_sparc64_sun4u_defconfig | 9 +- configs/qemu_sparc_ss10_defconfig | 6 +- configs/qemu_x86_64_defconfig | 7 +- configs/qemu_x86_defconfig | 6 +- configs/qemu_xtensa_lx60_defconfig | 6 +- configs/qemu_xtensa_lx60_nommu_defconfig | 6 +- 36 files changed, 91 insertions(+), 897 deletions(-) delete mode 100644 board/qemu/mips32r6-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch delete mode 100644 board/qemu/mips32r6el-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch delete mode 100644 board/qemu/mips64r6-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch delete mode 100644 board/qemu/mips64r6el-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch delete mode 100644 board/qemu/s390x/patches/linux/0001-arch-s390-disable-SSP-when-needed.patch delete mode 100644 board/qemu/sparc64-sun4u/patches/linux/0001-sparc64-avoid-stringop-overread-warning-to-access-Ma.patch
board/qemu/mips32r6-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch deleted +0 -149
@@ -1,149 +0,0 @@ -From b9af6f34e43bf5264d75933f2080f16b8741048d Mon Sep 17 00:00:00 2001 -From: Romain Naour <[email protected]> -Date: Sat, 25 Jul 2020 11:46:01 +0200 -Subject: [PATCH] mips: Do not include hi and lo in clobber list for R6 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From [1] -"GCC 10 (PR 91233) won't silently allow registers that are not architecturally -available to be present in the clobber list anymore, resulting in build failure -for mips*r6 targets in form of: -... -.../sysdep.h:146:2: error: the register ‘lo’ cannot be clobbered in ‘asm’ for the current target - 146 | __asm__ volatile ( \ - | ^~~~~~~ - -This is because base R6 ISA doesn't define hi and lo registers w/o DSP extension. -This patch provides the alternative clobber list for r6 targets that won't include -those registers." - -Since kernel 5.4 and mips support for generic vDSO [2], the kernel fail to build -for mips r6 cpus with gcc 10 for the same reason as glibc. - -[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=020b2a97bb15f807c0482f0faee2184ed05bcad8 -[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=24640f233b466051ad3a5d2786d2951e43026c9d - -Signed-off-by: Romain Naour <[email protected]> ---- - arch/mips/include/asm/vdso/gettimeofday.h | 45 +++++++++++++++++++++++ - 1 file changed, 45 insertions(+) - -diff --git a/arch/mips/include/asm/vdso/gettimeofday.h b/arch/mips/include/asm/vdso/gettimeofday.h -index 2203e2d0ae2a..e28096faecf6 100644 ---- a/arch/mips/include/asm/vdso/gettimeofday.h -+++ b/arch/mips/include/asm/vdso/gettimeofday.h -@@ -30,12 +30,21 @@ static __always_inline long gettimeofday_fallback( - register long nr asm("v0") = __NR_gettimeofday; - register long error asm("a3"); - -+#if MIPS_ISA_REV >= 6 -+ asm volatile( -+ " syscall\n" -+ : "=r" (ret), "=r" (error) -+ : "r" (tv), "r" (tz), "r" (nr) -+ : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", -+ "$14", "$15", "$24", "$25", "memory"); -+#else - asm volatile( - " syscall\n" - : "=r" (ret), "=r" (error) - : "r" (tv), "r" (tz), "r" (nr) - : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", - "$14", "$15", "$24", "$25", "hi", "lo", "memory"); -+#endif - - return error ? -ret : ret; - } -@@ -54,12 +63,21 @@ static __always_inline long clock_gettime_fallback( - #endif - register long error asm("a3"); - -+#if MIPS_ISA_REV >= 6 -+ asm volatile( -+ " syscall\n" -+ : "=r" (ret), "=r" (error) -+ : "r" (clkid), "r" (ts), "r" (nr) -+ : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", -+ "$14", "$15", "$24", "$25", "memory"); -+#else - asm volatile( - " syscall\n" - : "=r" (ret), "=r" (error) - : "r" (clkid), "r" (ts), "r" (nr) - : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", - "$14", "$15", "$24", "$25", "hi", "lo", "memory"); -+#endif - - return error ? -ret : ret; - } -@@ -78,12 +96,21 @@ static __always_inline int clock_getres_fallback( - #endif - register long error asm("a3"); - -+#if MIPS_ISA_REV >= 6 -+ asm volatile( -+ " syscall\n" -+ : "=r" (ret), "=r" (error) -+ : "r" (clkid), "r" (ts), "r" (nr) -+ : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", -+ "$14", "$15", "$24", "$25", "memory"); -+#else - asm volatile( - " syscall\n" - : "=r" (ret), "=r" (error) - : "r" (clkid), "r" (ts), "r" (nr) - : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", - "$14", "$15", "$24", "$25", "hi", "lo", "memory"); -+#endif - - return error ? -ret : ret; - } -@@ -100,12 +127,21 @@ static __always_inline long clock_gettime32_fallback( - register long nr asm("v0") = __NR_clock_gettime; - register long error asm("a3"); - -+#if MIPS_ISA_REV >= 6 -+ asm volatile( -+ " syscall\n" -+ : "=r" (ret), "=r" (error) -+ : "r" (clkid), "r" (ts), "r" (nr) -+ : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", -+ "$14", "$15", "$24", "$25", "memory"); -+#else - asm volatile( - " syscall\n" - : "=r" (ret), "=r" (error) - : "r" (clkid), "r" (ts), "r" (nr) - : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", - "$14", "$15", "$24", "$25", "hi", "lo", "memory"); -+#endif - - return error ? -ret : ret; - } -@@ -120,12 +156,21 @@ static __always_inline int clock_getres32_fallback( - register long nr asm("v0") = __NR_clock_getres; - register long error asm("a3"); - -+#if MIPS_ISA_REV >= 6 -+ asm volatile( -+ " syscall\n" -+ : "=r" (ret), "=r" (error) -+ : "r" (clkid), "r" (ts), "r" (nr) -+ : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", -+ "$14", "$15", "$24", "$25", "memory"); -+#else - asm volatile( - " syscall\n" - : "=r" (ret), "=r" (error) - : "r" (clkid), "r" (ts), "r" (nr) - : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", - "$14", "$15", "$24", "$25", "hi", "lo", "memory"); -+#endif - - return error ? -ret : ret; - } --- -2.17.1 -
board/qemu/mips32r6el-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch deleted +0 -149
149 lines not on this page · raw message
board/qemu/mips64r6-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch deleted +0 -149
149 lines not on this page · raw message
board/qemu/mips64r6el-malta/linux.config +3 -5
@@ -15,11 +15,9 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y -CONFIG_IDE=y -CONFIG_BLK_DEV_IDECD=y -CONFIG_IDE_GENERIC=y -CONFIG_BLK_DEV_GENERIC=y -CONFIG_BLK_DEV_PIIX=y +CONFIG_BLK_DEV_SD=y +CONFIG_ATA=y +CONFIG_ATA_PIIX=y CONFIG_NETDEVICES=y CONFIG_PCNET32=y CONFIG_INPUT_EVDEV=y
board/qemu/mips64r6el-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch deleted +0 -149
149 lines not on this page · raw message
board/qemu/s390x/patches/linux/0001-arch-s390-disable-SSP-when-needed.patch deleted +0 -47
47 lines not on this page · raw message
board/qemu/sparc64-sun4u/patches/linux/0001-sparc64-avoid-stringop-overread-warning-to-access-Ma.patch deleted +0 -154
154 lines not on this page · raw message
configs/qemu_aarch64_virt_defconfig +3 -3
@@ -15,13 +15,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
configs/qemu_arm_versatile_defconfig +3 -3
@@ -14,13 +14,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y
configs/qemu_arm_vexpress_defconfig +3 -3
@@ -19,13 +19,13 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Qemu >= 5.1 requires an SD card size to be a power of 2, e.g. 64 MiB. BR2_TARGET_ROOTFS_EXT2_SIZE="64M" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9"
configs/qemu_arm_vexpress_tz_defconfig +3 -3
@@ -16,13 +16,13 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_TARGET_ROOTFS_CPIO_UIMAGE=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 5.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_11=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.11.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/linux.fragment"
configs/qemu_m68k_mcf5208_defconfig +3 -3
@@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config" BR2_LINUX_KERNEL_VMLINUX=y
configs/qemu_m68k_q800_defconfig +3 -3
@@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config" BR2_LINUX_KERNEL_VMLINUX=y
configs/qemu_microblazebe_mmu_defconfig +3 -3
@@ -14,13 +14,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y
configs/qemu_microblazeel_mmu_defconfig +3 -3
@@ -14,13 +14,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y
configs/qemu_mips32r2_malta_defconfig +3 -3
@@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y
configs/qemu_mips32r2el_malta_defconfig +3 -3
@@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y
configs/qemu_mips32r6_malta_defconfig +3 -4
@@ -13,17 +13,16 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y -BR2_GLOBAL_PATCH_DIR="board/qemu/mips32r6-malta/patches" # Serial port config BR2_TARGET_GENERIC_GETTY=y
configs/qemu_mips32r6el_malta_defconfig +3 -4
@@ -13,17 +13,16 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y -BR2_GLOBAL_PATCH_DIR="board/qemu/mips32r6el-malta/patches" # Serial port config BR2_TARGET_GENERIC_GETTY=y
configs/qemu_mips64_malta_defconfig +3 -3
@@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y
configs/qemu_mips64el_malta_defconfig +3 -3
@@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y
configs/qemu_mips64r6_malta_defconfig +3 -4
@@ -14,17 +14,16 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y -BR2_GLOBAL_PATCH_DIR="board/qemu/mips64r6-malta/patches" # Serial port config BR2_TARGET_GENERIC_GETTY=y
configs/qemu_mips64r6el_malta_defconfig +3 -4
@@ -14,17 +14,16 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y -BR2_GLOBAL_PATCH_DIR="board/qemu/mips64r6el-malta/patches" # Serial port config BR2_TARGET_GENERIC_GETTY=y
configs/qemu_nios2_10m50_defconfig +3 -3
@@ -1,7 +1,7 @@ BR2_nios2=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_DEFCONFIG="10m50" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/nios2-10m50/linux.fragment" BR2_TARGET_ROOTFS_INITRAMFS=y
@@ -10,8 +10,8 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel needs mkimage BR2_PACKAGE_HOST_UBOOT_TOOLS=y
configs/qemu_or1k_defconfig +3 -3
@@ -9,13 +9,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config"
configs/qemu_riscv32_virt_defconfig +3 -3
@@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_DEFCONFIG="rv32" BR2_LINUX_KERNEL_IMAGE=y
configs/qemu_riscv64_virt_defconfig +3 -3
@@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_IMAGE=y
configs/qemu_s390x_defconfig +3 -4
@@ -11,16 +11,15 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.41" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_GLOBAL_PATCH_DIR="board/qemu/s390x/patches" # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y
configs/qemu_sh4_r2d_defconfig +3 -3
@@ -14,13 +14,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y
configs/qemu_sh4eb_r2d_defconfig +3 -3
@@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y
configs/qemu_sparc64_sun4u_defconfig +3 -6
@@ -2,9 +2,6 @@ BR2_sparc64=y BR2_sparc_v9=y -# Patches -BR2_GLOBAL_PATCH_DIR="board/qemu/sparc64-sun4u/patches" - # System BR2_SYSTEM_DHCP="eth0"
@@ -16,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux.config"
configs/qemu_sparc_ss10_defconfig +3 -3
@@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux.config"
configs/qemu_x86_64_defconfig +4 -3
@@ -15,15 +15,16 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" +BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y
configs/qemu_x86_defconfig +3 -3
@@ -16,13 +16,13 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config"
configs/qemu_xtensa_lx60_defconfig +3 -3
@@ -15,13 +15,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
configs/qemu_xtensa_lx60_nommu_defconfig +3 -3
@@ -19,13 +19,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-nommu.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
Signature · 6 lines
2.31.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot