configs/qemu_*: bump kernel version to 5.10.7
Subsystems (3)
PATCH 1/2 configs/qemu_*: bump kernel version to 5.10.7
Bump most QEMU defconfigs (every one that was previously on 5.4.y) to latest longterm kernel 5.10.7.
Please note the following exceptions/modifications:
- board/qemu/qemu_s390x_defconfig: ignored (already up to date)
- board/qemu/sh4*-r2d:
- Remove the remaining kernel patch [1] provided by Alan Modra fixing rodata alignment, carried here by Romain Naour [2] to fix an issue preventing kernel from booting with binutils 2.23. Patch is present in upstream Linux now.
- Fix compile-time error regarding 64-bit time data structures from kernel headers when building with uclibc. Previous fix [3] existed upstream; but see details below.
- board/qemu/ppc-mpc8544ds: Updated kernel patch
- board/qemu/arm-versatile: Updated kernel patch
- board/qemu/mips*r6*: Updated kernel patch
Tested on all configs/qemu* configurations. [4]
[1] https://www.sourceware.org/ml/binutils/2019-12/msg00112.html
[2] https://git.busybox.net/buildroot/commit/?id=a2331c8a61bdd71c47492efc818fb0458a349219
[3] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fc94cf2092c7c1267fa2deb8388d624f50eba808
[4] https://gitlab.com/clumsyape/buildroot/-/pipelines/244024195
---
Regarding the 64-bit time data structures, an upstream fix [3] had supposedly prepared for this situation where the libc has not moved to 64-bits data structures yet, but unfortunately we seem to slip into a crack here. Some quick header dependency analysis from the offending __kernel_time64_t type managed to "follow up" to linux/time_types.h (which is the one explicitly added in [3]) as expected; so no luck here.
Any help on that matter would be appreciated.
--- .../patches/linux/versatile-nommu.patch | 22 +++--- ...ude-hi-and-lo-in-clobber-list-for-R6.patch | 16 ++-- ...ude-hi-and-lo-in-clobber-list-for-R6.patch | 16 ++-- ...ude-hi-and-lo-in-clobber-list-for-R6.patch | 16 ++-- ...ude-hi-and-lo-in-clobber-list-for-R6.patch | 16 ++-- ...x-mcpu-options-for-SPE-only-compiler.patch | 10 +-- ....h-and-not-time_types.h-in-sockios.h.patch | 76 +++++++++++++++++++ .../linux/0001-arch-sh-vmlinux.scr.patch | 32 -------- ....h-and-not-time_types.h-in-sockios.h.patch | 76 +++++++++++++++++++ .../linux/0001-arch-sh-vmlinux.scr.patch | 32 -------- configs/qemu_aarch64_virt_defconfig | 6 +- configs/qemu_arm_versatile_defconfig | 6 +- configs/qemu_arm_versatile_nommu_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 | 6 +- configs/qemu_mips32r6el_malta_defconfig | 6 +- configs/qemu_mips64_malta_defconfig | 6 +- configs/qemu_mips64el_malta_defconfig | 6 +- configs/qemu_mips64r6_malta_defconfig | 6 +- configs/qemu_mips64r6el_malta_defconfig | 6 +- configs/qemu_nios2_10m50_defconfig | 6 +- configs/qemu_or1k_defconfig | 6 +- configs/qemu_ppc64_e5500_defconfig | 4 +- configs/qemu_ppc64_pseries_defconfig | 6 +- configs/qemu_ppc64le_pseries_defconfig | 6 +- configs/qemu_ppc_g3beige_defconfig | 6 +- configs/qemu_ppc_mac99_defconfig | 6 +- configs/qemu_ppc_mpc8544ds_defconfig | 6 +- configs/qemu_riscv32_virt_defconfig | 6 +- configs/qemu_riscv64_virt_defconfig | 6 +- configs/qemu_sh4_r2d_defconfig | 6 +- configs/qemu_sh4eb_r2d_defconfig | 6 +- configs/qemu_sparc64_sun4u_defconfig | 6 +- configs/qemu_sparc_ss10_defconfig | 6 +- configs/qemu_x86_64_defconfig | 6 +- configs/qemu_x86_defconfig | 6 +- configs/qemu_xtensa_lx60_defconfig | 6 +- configs/qemu_xtensa_lx60_nommu_defconfig | 6 +- 45 files changed, 304 insertions(+), 216 deletions(-) create mode 100644 board/qemu/sh4-r2d/patches/linux-headers/0001-Use-types.h-and-not-time_types.h-in-sockios.h.patch delete mode 100644 board/qemu/sh4-r2d/patches/linux/0001-arch-sh-vmlinux.scr.patch create mode 100644 board/qemu/sh4eb-r2d/patches/linux-headers/0001-Use-types.h-and-not-time_types.h-in-sockios.h.patch delete mode 100644 board/qemu/sh4eb-r2d/patches/linux/0001-arch-sh-vmlinux.scr.patch
board/qemu/arm-versatile/patches/linux/versatile-nommu.patch +11 -11
@@ -1,4 +1,4 @@ -From 4ac4324dcdaf237aa34545b3795acb2e5c42d10e Mon Sep 17 00:00:00 2001 +From 525dd2f3cf4a94837ce6b71d793acb90c25a5654 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
@@ -21,10 +21,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 e8cd55a5b04c..fc2dbff70394 100644 +index 002e0cf025f5..c71299b6f91f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -353,6 +353,17 @@ config ARM_SINGLE_ARMV7M +@@ -343,6 +343,17 @@ config ARM_SINGLE_ARMV7M select SPARSE_IRQ select USE_OF
@@ -43,10 +43,10 @@ index e8cd55a5b04c..fc2dbff70394 100644 bool "EBSA-110" select ARCH_USES_GETTIMEOFFSET diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug -index f6fcb8a79889..92fc637d3db8 100644 +index 8986a91a6f31..69cb6404e8ce 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug -@@ -1843,7 +1843,8 @@ config DEBUG_UNCOMPRESS +@@ -1943,7 +1943,8 @@ config DEBUG_UNCOMPRESS config UNCOMPRESS_INCLUDE string default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \
@@ -57,10 +57,10 @@ index f6fcb8a79889..92fc637d3db8 100644 config EARLY_PRINTK diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h -index 9b7c328fb207..b1fe9c8b5c3e 100644 +index 92282558caf7..90bd9c069ffc 100644 --- a/arch/arm/include/asm/mach/map.h +++ b/arch/arm/include/asm/mach/map.h -@@ -62,6 +62,7 @@ extern int ioremap_page(unsigned long virt, unsigned long phys, +@@ -59,6 +59,7 @@ extern int ioremap_page(unsigned long virt, unsigned long phys, #else #define iotable_init(map,num) do { } while (0) #define vm_reserve_area_early(a,s,c) do { } while (0)
@@ -69,7 +69,7 @@ index 9b7c328fb207..b1fe9c8b5c3e 100644 #endif diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig -index f5c275434d6c..06ad999d5978 100644 +index d88e7725bf99..d38b90157f13 100644 --- a/arch/arm/mach-versatile/Kconfig +++ b/arch/arm/mach-versatile/Kconfig @@ -1,7 +1,8 @@
@@ -93,10 +93,10 @@ index 000000000000..eacfc3f5c33e +# Patch waits for application at +# http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 . diff --git a/arch/arm/mach-versatile/versatile_dt.c b/arch/arm/mach-versatile/versatile_dt.c -index 3c8d39c12909..8cfa05a37295 100644 +index 02ba68abe533..835b51bc597b 100644 --- a/arch/arm/mach-versatile/versatile_dt.c +++ b/arch/arm/mach-versatile/versatile_dt.c -@@ -37,7 +37,11 @@ +@@ -22,7 +22,11 @@ #include <asm/mach/map.h> /* macro to get at MMIO space when running virtually */
@@ -109,5 +109,5 @@ index 3c8d39c12909..8cfa05a37295 100644 /* -- -2.14.5 +2.17.1
board/qemu/mips32r6-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch +8 -8
@@ -1,4 +1,4 @@ -From bb04c220d82598066eeadf49defaec1157d4d206 Mon Sep 17 00:00:00 2001 +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
@@ -31,10 +31,10 @@ Signed-off-by: Romain Naour <[email protected]> 1 file changed, 45 insertions(+) diff --git a/arch/mips/include/asm/vdso/gettimeofday.h b/arch/mips/include/asm/vdso/gettimeofday.h -index 0ae9b4cbc153..ea600e0ebfe7 100644 +index 2203e2d0ae2a..e28096faecf6 100644 --- a/arch/mips/include/asm/vdso/gettimeofday.h +++ b/arch/mips/include/asm/vdso/gettimeofday.h -@@ -36,12 +36,21 @@ static __always_inline long gettimeofday_fallback( +@@ -30,12 +30,21 @@ static __always_inline long gettimeofday_fallback( register long nr asm("v0") = __NR_gettimeofday; register long error asm("a3");
@@ -56,7 +56,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -60,12 +69,21 @@ static __always_inline long clock_gettime_fallback( +@@ -54,12 +63,21 @@ static __always_inline long clock_gettime_fallback( #endif register long error asm("a3");
@@ -78,7 +78,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -84,12 +102,21 @@ static __always_inline int clock_getres_fallback( +@@ -78,12 +96,21 @@ static __always_inline int clock_getres_fallback( #endif register long error asm("a3");
@@ -100,7 +100,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -108,12 +135,21 @@ static __always_inline long clock_gettime32_fallback( +@@ -100,12 +127,21 @@ static __always_inline long clock_gettime32_fallback( register long nr asm("v0") = __NR_clock_gettime; register long error asm("a3");
@@ -122,7 +122,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -128,12 +164,21 @@ static __always_inline int clock_getres32_fallback( +@@ -120,12 +156,21 @@ static __always_inline int clock_getres32_fallback( register long nr asm("v0") = __NR_clock_getres; register long error asm("a3");
@@ -145,5 +145,5 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -- -2.25.4 +2.17.1
board/qemu/mips32r6el-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch +8 -8
@@ -1,4 +1,4 @@ -From bb04c220d82598066eeadf49defaec1157d4d206 Mon Sep 17 00:00:00 2001 +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
@@ -31,10 +31,10 @@ Signed-off-by: Romain Naour <[email protected]> 1 file changed, 45 insertions(+) diff --git a/arch/mips/include/asm/vdso/gettimeofday.h b/arch/mips/include/asm/vdso/gettimeofday.h -index 0ae9b4cbc153..ea600e0ebfe7 100644 +index 2203e2d0ae2a..e28096faecf6 100644 --- a/arch/mips/include/asm/vdso/gettimeofday.h +++ b/arch/mips/include/asm/vdso/gettimeofday.h -@@ -36,12 +36,21 @@ static __always_inline long gettimeofday_fallback( +@@ -30,12 +30,21 @@ static __always_inline long gettimeofday_fallback( register long nr asm("v0") = __NR_gettimeofday; register long error asm("a3");
@@ -56,7 +56,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -60,12 +69,21 @@ static __always_inline long clock_gettime_fallback( +@@ -54,12 +63,21 @@ static __always_inline long clock_gettime_fallback( #endif register long error asm("a3");
@@ -78,7 +78,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -84,12 +102,21 @@ static __always_inline int clock_getres_fallback( +@@ -78,12 +96,21 @@ static __always_inline int clock_getres_fallback( #endif register long error asm("a3");
@@ -100,7 +100,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -108,12 +135,21 @@ static __always_inline long clock_gettime32_fallback( +@@ -100,12 +127,21 @@ static __always_inline long clock_gettime32_fallback( register long nr asm("v0") = __NR_clock_gettime; register long error asm("a3");
@@ -122,7 +122,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -128,12 +164,21 @@ static __always_inline int clock_getres32_fallback( +@@ -120,12 +156,21 @@ static __always_inline int clock_getres32_fallback( register long nr asm("v0") = __NR_clock_getres; register long error asm("a3");
@@ -145,5 +145,5 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -- -2.25.4 +2.17.1
board/qemu/mips64r6-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch +8 -8
@@ -1,4 +1,4 @@ -From cfb381d8f4b64f3752c95b4bdd787be63ef84fb2 Mon Sep 17 00:00:00 2001 +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
@@ -31,10 +31,10 @@ Signed-off-by: Romain Naour <[email protected]> 1 file changed, 45 insertions(+) diff --git a/arch/mips/include/asm/vdso/gettimeofday.h b/arch/mips/include/asm/vdso/gettimeofday.h -index 0ae9b4cbc153..ea600e0ebfe7 100644 +index 2203e2d0ae2a..e28096faecf6 100644 --- a/arch/mips/include/asm/vdso/gettimeofday.h +++ b/arch/mips/include/asm/vdso/gettimeofday.h -@@ -36,12 +36,21 @@ static __always_inline long gettimeofday_fallback( +@@ -30,12 +30,21 @@ static __always_inline long gettimeofday_fallback( register long nr asm("v0") = __NR_gettimeofday; register long error asm("a3");
@@ -56,7 +56,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -60,12 +69,21 @@ static __always_inline long clock_gettime_fallback( +@@ -54,12 +63,21 @@ static __always_inline long clock_gettime_fallback( #endif register long error asm("a3");
@@ -78,7 +78,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -84,12 +102,21 @@ static __always_inline int clock_getres_fallback( +@@ -78,12 +96,21 @@ static __always_inline int clock_getres_fallback( #endif register long error asm("a3");
@@ -100,7 +100,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -108,12 +135,21 @@ static __always_inline long clock_gettime32_fallback( +@@ -100,12 +127,21 @@ static __always_inline long clock_gettime32_fallback( register long nr asm("v0") = __NR_clock_gettime; register long error asm("a3");
@@ -122,7 +122,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -128,12 +164,21 @@ static __always_inline int clock_getres32_fallback( +@@ -120,12 +156,21 @@ static __always_inline int clock_getres32_fallback( register long nr asm("v0") = __NR_clock_getres; register long error asm("a3");
@@ -145,5 +145,5 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -- -2.25.4 +2.17.1
board/qemu/mips64r6el-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch +8 -8
@@ -1,4 +1,4 @@ -From cfb381d8f4b64f3752c95b4bdd787be63ef84fb2 Mon Sep 17 00:00:00 2001 +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
@@ -31,10 +31,10 @@ Signed-off-by: Romain Naour <[email protected]> 1 file changed, 45 insertions(+) diff --git a/arch/mips/include/asm/vdso/gettimeofday.h b/arch/mips/include/asm/vdso/gettimeofday.h -index 0ae9b4cbc153..ea600e0ebfe7 100644 +index 2203e2d0ae2a..e28096faecf6 100644 --- a/arch/mips/include/asm/vdso/gettimeofday.h +++ b/arch/mips/include/asm/vdso/gettimeofday.h -@@ -36,12 +36,21 @@ static __always_inline long gettimeofday_fallback( +@@ -30,12 +30,21 @@ static __always_inline long gettimeofday_fallback( register long nr asm("v0") = __NR_gettimeofday; register long error asm("a3");
@@ -56,7 +56,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -60,12 +69,21 @@ static __always_inline long clock_gettime_fallback( +@@ -54,12 +63,21 @@ static __always_inline long clock_gettime_fallback( #endif register long error asm("a3");
@@ -78,7 +78,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -84,12 +102,21 @@ static __always_inline int clock_getres_fallback( +@@ -78,12 +96,21 @@ static __always_inline int clock_getres_fallback( #endif register long error asm("a3");
@@ -100,7 +100,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -108,12 +135,21 @@ static __always_inline long clock_gettime32_fallback( +@@ -100,12 +127,21 @@ static __always_inline long clock_gettime32_fallback( register long nr asm("v0") = __NR_clock_gettime; register long error asm("a3");
@@ -122,7 +122,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -128,12 +164,21 @@ static __always_inline int clock_getres32_fallback( +@@ -120,12 +156,21 @@ static __always_inline int clock_getres32_fallback( register long nr asm("v0") = __NR_clock_getres; register long error asm("a3");
@@ -145,5 +145,5 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -- -2.25.4 +2.17.1
board/qemu/ppc-mpc8544ds/patches/linux/0001-powerpc-Fix-mcpu-options-for-SPE-only-compiler.patch +5 -5
@@ -1,4 +1,4 @@ -From 44e3424424b447b00fbe1f10ddba81b55817e970 Mon Sep 17 00:00:00 2001 +From a0919e3177295f4aaa9006915adcddc31788d809 Mon Sep 17 00:00:00 2001 From: Ben Hutchings <[email protected]> Date: Wed, 26 Dec 2018 00:00:40 +0000 Subject: [PATCH] powerpc: Fix -mcpu= options for SPE-only compiler
@@ -20,7 +20,7 @@ Signed-off-by: Romain Naour <[email protected]> 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile -index 37ac731a556b..5211ea4f48b1 100644 +index 5c8c06215dd4..e3dbea6d7ae0 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile @@ -12,7 +12,7 @@
@@ -32,7 +32,7 @@ index 37ac731a556b..5211ea4f48b1 100644 # Set default 32 bits cross compilers for vdso and boot wrapper CROSS32_COMPILE ?= -@@ -166,6 +166,7 @@ CFLAGS-$(CONFIG_PPC32) += $(call cc-option, $(MULTIPLEWORD)) +@@ -164,6 +164,7 @@ CFLAGS-$(CONFIG_PPC32) += $(call cc-option, $(MULTIPLEWORD)) CFLAGS-$(CONFIG_PPC32) += $(call cc-option,-mno-readonly-in-sdata)
@@ -40,7 +40,7 @@ index 37ac731a556b..5211ea4f48b1 100644 ifdef CONFIG_PPC_BOOK3S_64 ifdef CONFIG_CPU_LITTLE_ENDIAN CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=power8 -@@ -177,6 +178,7 @@ endif +@@ -175,6 +176,7 @@ endif else CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=powerpc64 endif
@@ -49,5 +49,5 @@ index 37ac731a556b..5211ea4f48b1 100644 ifdef CONFIG_FUNCTION_TRACER CC_FLAGS_FTRACE := -pg -- -2.25.4 +2.17.1
board/qemu/sh4-r2d/patches/linux-headers/0001-Use-types.h-and-not-time_types.h-in-sockios.h.patch new file +76 -0
76 lines not on this page · raw message
board/qemu/sh4-r2d/patches/linux/0001-arch-sh-vmlinux.scr.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From fe657afd48fc67841d32207ef9eeeb5f099764cd Mon Sep 17 00:00:00 2001 -From: Romain Naour <[email protected]> -Date: Sat, 21 Dec 2019 11:52:04 +0100 -Subject: [PATCH] arch/sh: vmlinux.scr - -Building the kernel using a toolchain built with Binutils 2.33.1 prevent -booting a sh4 system under Qemu. -Apply the patch provided by Alan Modra [2] that fix alignment of rodata. - -[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=ebd2263ba9a9124d93bbc0ece63d7e0fae89b40e -[2] https://www.sourceware.org/ml/binutils/2019-12/msg00112.html - -Signed-off-by: Romain Naour <[email protected]> ---- - arch/sh/boot/compressed/vmlinux.scr | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/sh/boot/compressed/vmlinux.scr b/arch/sh/boot/compressed/vmlinux.scr -index 862d74808236..dd292b4b9082 100644 ---- a/arch/sh/boot/compressed/vmlinux.scr -+++ b/arch/sh/boot/compressed/vmlinux.scr -@@ -1,6 +1,6 @@ - SECTIONS - { -- .rodata..compressed : { -+ .rodata..compressed : ALIGN(8) { - input_len = .; - LONG(input_data_end - input_data) input_data = .; - *(.data) --- -2.24.1 -
board/qemu/sh4eb-r2d/patches/linux-headers/0001-Use-types.h-and-not-time_types.h-in-sockios.h.patch new file +76 -0
76 lines not on this page · raw message
board/qemu/sh4eb-r2d/patches/linux/0001-arch-sh-vmlinux.scr.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From fe657afd48fc67841d32207ef9eeeb5f099764cd Mon Sep 17 00:00:00 2001 -From: Romain Naour <[email protected]> -Date: Sat, 21 Dec 2019 11:52:04 +0100 -Subject: [PATCH] arch/sh: vmlinux.scr - -Building the kernel using a toolchain built with Binutils 2.33.1 prevent -booting a sh4 system under Qemu. -Apply the patch provided by Alan Modra [2] that fix alignment of rodata. - -[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=ebd2263ba9a9124d93bbc0ece63d7e0fae89b40e -[2] https://www.sourceware.org/ml/binutils/2019-12/msg00112.html - -Signed-off-by: Romain Naour <[email protected]> ---- - arch/sh/boot/compressed/vmlinux.scr | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/sh/boot/compressed/vmlinux.scr b/arch/sh/boot/compressed/vmlinux.scr -index 862d74808236..dd292b4b9082 100644 ---- a/arch/sh/boot/compressed/vmlinux.scr -+++ b/arch/sh/boot/compressed/vmlinux.scr -@@ -1,6 +1,6 @@ - SECTIONS - { -- .rodata..compressed : { -+ .rodata..compressed : ALIGN(8) { - input_len = .; - LONG(input_data_end - input_data) input_data = .; - *(.data) --- -2.24.1 -
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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +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_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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +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_DTS_SUPPORT=y
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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +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_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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" 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
@@ -15,13 +15,13 @@ BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_GZIP=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y
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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +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_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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +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_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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +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_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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +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_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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +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_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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +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_VMLINUX=y
configs/qemu_mips32r6_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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +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_VMLINUX=y
configs/qemu_mips32r6el_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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +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_VMLINUX=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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +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_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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +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_VMLINUX=y
configs/qemu_mips64r6_malta_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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +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_VMLINUX=y
configs/qemu_mips64r6el_malta_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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +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_VMLINUX=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.4.88" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" 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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +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"
configs/qemu_ppc64_e5500_defconfig +2 -2
@@ -10,12 +10,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as the kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc64-e5500/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
configs/qemu_ppc64_pseries_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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_DEFCONFIG="pseries" BR2_LINUX_KERNEL_VMLINUX=y
configs/qemu_ppc64le_pseries_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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" BR2_LINUX_KERNEL_VMLINUX=y
configs/qemu_ppc_g3beige_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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +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_VMLINUX=y
configs/qemu_ppc_mac99_defconfig +3 -3
@@ -5,13 +5,13 @@ BR2_powerpc_7400=y # System BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_DEFCONFIG="pmac32" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-mac99/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y
configs/qemu_ppc_mpc8544ds_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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +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_VMLINUX=y
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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" 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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_IMAGE=y
configs/qemu_sh4_r2d_defconfig +3 -3
@@ -15,13 +15,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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +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_ZIMAGE=y
configs/qemu_sh4eb_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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +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_ZIMAGE=y
configs/qemu_sparc64_sun4u_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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +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"
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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +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"
configs/qemu_x86_64_defconfig +3 -3
@@ -15,13 +15,13 @@ 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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +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"
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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +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"
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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +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_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.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" +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_IMAGE_TARGET_CUSTOM=y
Signature · 1 line
2.17.1
PATCH 2/2 Remove Virtex ML507 QEMU board
Support for this board was removed upstream [1] since Xilinx new design tools dropped these platforms in 2013, along with all PPC405/PPC440 new designs. They are not maintained nor tested anymore.
--- board/qemu/ppc-virtex-ml507/linux.config | 36 ------------------------ board/qemu/ppc-virtex-ml507/readme.txt | 5 ---- configs/qemu_ppc_virtex_ml507_defconfig | 34 ---------------------- 3 files changed, 75 deletions(-) delete mode 100644 board/qemu/ppc-virtex-ml507/linux.config delete mode 100644 board/qemu/ppc-virtex-ml507/readme.txt delete mode 100644 configs/qemu_ppc_virtex_ml507_defconfig
board/qemu/ppc-virtex-ml507/linux.config deleted +0 -36
@@ -1,36 +0,0 @@ -CONFIG_44x=y -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_EBONY is not set -CONFIG_XILINX_VIRTEX440_GENERIC_BOARD=y -CONFIG_MATH_EMULATION=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_XILINX_SYSACE=y -CONFIG_NETDEVICES=y -CONFIG_SERIO_XILINX_XPS_PS2=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_UARTLITE=y -CONFIG_SERIAL_UARTLITE_CONSOLE=y -CONFIG_SERIAL_OF_PLATFORM=y -CONFIG_XILINX_HWICAP=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_XILINX=y -CONFIG_FB=y -CONFIG_FB_XILINX=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_EXT4_FS=y -CONFIG_AUTOFS4_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y
board/qemu/ppc-virtex-ml507/readme.txt deleted +0 -5
@@ -1,5 +0,0 @@ -Run the emulation with: - - qemu-system-ppc -M virtex-ml507 -kernel output/images/vmlinux -m 256 -nographic -append "console=ttyS0" -dtb output/images/virtex440-ml507.dtb # qemu_ppc_virtex_ml507_defconfig - -The login prompt will appear in the terminal that started Qemu.
configs/qemu_ppc_virtex_ml507_defconfig deleted +0 -34
@@ -1,34 +0,0 @@ -# Architecture -BR2_powerpc=y -BR2_powerpc_440=y - -# Filesystem -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_ROOTFS_INITRAMFS=y - -# Image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y - -# Use soft float -BR2_POWERPC_SOFT_FLOAT=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-virtex-ml507/linux.config" -BR2_LINUX_KERNEL_VMLINUX=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="virtex440-ml507" - -# Kernel needs mkimage -BR2_PACKAGE_HOST_UBOOT_TOOLS=y - -# host-qemu for gitlab testing -BR2_PACKAGE_HOST_QEMU=y -BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y
Signature · 1 line
2.17.1
PATCH 2/2 Remove Virtex ML507 QEMU board
Quoted 9 lines · Geoffrey Le Gourri?rec
Support for this board was removed upstream [1] since Xilinx new design tools dropped these platforms in 2013, along with all PPC405/PPC440 new designs. They are not maintained nor tested anymore.
Signed-off-by Geoffrey Le Gourri?rec <[email protected]>
Quoted 105 lines
--- board/qemu/ppc-virtex-ml507/linux.config | 36 ------------------------ board/qemu/ppc-virtex-ml507/readme.txt | 5 ---- configs/qemu_ppc_virtex_ml507_defconfig | 34 ---------------------- 3 files changed, 75 deletions(-) delete mode 100644 board/qemu/ppc-virtex-ml507/linux.config delete mode 100644 board/qemu/ppc-virtex-ml507/readme.txt delete mode 100644 configs/qemu_ppc_virtex_ml507_defconfigboard/qemu/ppc-virtex-ml507/linux.config deleted +0
-36@@ -1,36 +0,0 @@ -CONFIG_44x=y -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_EBONY is not set -CONFIG_XILINX_VIRTEX440_GENERIC_BOARD=y -CONFIG_MATH_EMULATION=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_XILINX_SYSACE=y -CONFIG_NETDEVICES=y -CONFIG_SERIO_XILINX_XPS_PS2=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_UARTLITE=y -CONFIG_SERIAL_UARTLITE_CONSOLE=y -CONFIG_SERIAL_OF_PLATFORM=y -CONFIG_XILINX_HWICAP=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_XILINX=y -CONFIG_FB=y -CONFIG_FB_XILINX=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_EXT4_FS=y -CONFIG_AUTOFS4_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=yboard/qemu/ppc-virtex-ml507/readme.txt deleted +0
-5@@ -1,5 +0,0 @@ -Run the emulation with: - - qemu-system-ppc -M virtex-ml507 -kernel output/images/vmlinux -m 256 -nographic -append "console=ttyS0" -dtb output/images/virtex440-ml507.dtb # qemu_ppc_virtex_ml507_defconfig - -The login prompt will appear in the terminal that started Qemu.configs/qemu_ppc_virtex_ml507_defconfig deleted +0
-35@@ -1,34 +0,0 @@ -# Architecture -BR2_powerpc=y -BR2_powerpc_440=y - -# Filesystem -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_ROOTFS_INITRAMFS=y - -# Image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y - -# Use soft float -BR2_POWERPC_SOFT_FLOAT=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.88" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-virtex-ml507/linux.config" -BR2_LINUX_KERNEL_VMLINUX=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="virtex440-ml507" - -# Kernel needs mkimage -BR2_PACKAGE_HOST_UBOOT_TOOLS=y - -# host-qemu for gitlab testing -BR2_PACKAGE_HOST_QEMU=y -BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y --2.17.1
PATCH 1/2 configs/qemu_*: bump kernel version to 5.10.7
In reply to Geoffrey Le GourriérecQuoted 18 lines · Geoffrey Le Gourri?rec
Bump most QEMU defconfigs (every one that was previously on 5.4.y) to latest longterm kernel 5.10.7.
Please note the following exceptions/modifications:
- board/qemu/qemu_s390x_defconfig: ignored (already up to date)
- board/qemu/sh4*-r2d:
- Remove the remaining kernel patch [1] provided by Alan Modra fixing rodata alignment, carried here by Romain Naour [2] to fix an issue preventing kernel from booting with binutils 2.23. Patch is present in upstream Linux now.
- Fix compile-time error regarding 64-bit time data structures from kernel headers when building with uclibc. Previous fix [3] existed upstream; but see details below.
- board/qemu/ppc-mpc8544ds: Updated kernel patch
- board/qemu/arm-versatile: Updated kernel patch
- board/qemu/mips*r6*: Updated kernel patch
Quoted 8 lines
Tested on all configs/qemu* configurations. [4]
[1] https://www.sourceware.org/ml/binutils/2019-12/msg00112.html
[2] https://git.busybox.net/buildroot/commit/?id=a2331c8a61bdd71c47492efc818fb0458a349219
[3] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fc94cf2092c7c1267fa2deb8388d624f50eba808
[4] https://gitlab.com/clumsyape/buildroot/-/pipelines/244024195Signed-off-by Geoffrey Le Gourri?rec <[email protected]>
Nice work.
Quoted 9 lines
---
Regarding the 64-bit time data structures, an upstream fix [3] had supposedly prepared for this situation where the libc has not moved to 64-bits data structures yet, but unfortunately we seem to slip into a crack here. Some quick header dependency analysis from the offending__kernel_time64_ttype managed to "follow up" tolinux/time_types.h(which is the one explicitly added in [3]) as expected; so no luck here.
Any help on that matter would be appreciated.
I saw your commit message for the sockios.h patch has cc Arnd. Did you get a response from him on this issue?
It looks like time_types.h needs a definition of __kernel_time64_t. This appears to live in posix_types.h for uapi headers. Would this patch to the kernel fix the problem?
include/uapi/linux/time_types.h +1 -0
@@ -3,6 +3,7 @@#define _UAPI_LINUX_TIME_TYPES_H#include <linux/types.h> +#include <linux/posix_types.h> struct __kernel_timespec {__kernel_time64_t tv_sec;/* seconds */
Cheers,
Joel
Quoted 82 lines
board/qemu/sh4eb-r2d/patches/linux-headers/0001-Use-types.h-and-not-time_types.h-in-sockios.h.patch new file +76
-0@@ -0,0 +1,76 @@ +From 34c78b21878ae7b0471299d11a7e861125e31b2c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Geoffrey=20Le=20Gourri=C3=A9rec?= + <[email protected]> +Date: Mon, 18 Jan 2021 23:40:28 +0100 +Subject: [PATCH] Use types.h and not time_types.h in sockios.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This fixes builds for sh arch when libc is not using relevant +time data structures definitions for 32-bit machines. A previous +commit [1] provided a fix, that we seemed to slip through here. + +As of the time of this writing, the bug was found with non- +up to date uclibc 1.0.37 only (currently the only libc supporting +sh architecture). + +[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fc94cf2092c7c1267fa2deb8388d624f50eba808 + +Signed-off-by: Geoffrey Le Gourri?rec <[email protected]> +Cc: Arnd Bergmann <[email protected]> + +--- + +For the record, here's the build-time error: + +/usr/bin/make -j2 -C /builds/clumsyape/buildroot/output/build/uclibc-1.0.37 ARCH="sh" CROSS_COMPILE="/builds/clumsyape/buildroot/output/host/bin/sh4-buildroot-linux-uclibc-" UCLIBC_EXTRA_CFLAGS="" HOSTCC="/usr/bin/gcc" +make[1]: Entering directory '/builds/clumsyape/buildroot/output/build/uclibc-1.0.37' + GEN libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelcond.h + GEN libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelcond.h + GEN libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.h + GEN libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.h +In file included from /builds/clumsyape/buildroot/output/build/linux-headers-5.10.7/usr/include/asm/sockios.h:5, + from /builds/clumsyape/buildroot/output/build/linux-headers-5.10.7/usr/include/asm-generic/socket.h:6, + from /builds/clumsyape/buildroot/output/build/linux-headers-5.10.7/usr/include/asm/socket.h:1, + from ./include/bits/socket.h:360, + from ./include/sys/socket.h:39, + from ./include/netinet/in.h:24, + from ./include/resolv.h:57, + from ./libpthread/nptl/descr.h:36, + from ./libpthread/nptl/pthreadP.h:25, + from <stdin>:2: +/builds/clumsyape/buildroot/output/build/linux-headers-5.10.7/usr/include/linux/time_types.h:8:2: error: unknown type name '__kernel_time64_t' + 8 | __kernel_time64_t tv_sec; /* seconds */ + | ^~~~~~~~~~~~~~~~~ +/builds/clumsyape/buildroot/output/build/linux-headers-5.10.7/usr/include/linux/time_types.h:32:2: error: unknown type name '__kernel_old_time_t' + 32 | __kernel_old_time_t tv_sec; /* seconds */ + | ^~~~~~~~~~~~~~~~~~~ +libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch:135: recipe for target 'libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.h' failed +make[1]: *** [libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.h] Error 1 +make[1]: Leaving directory '/builds/clumsyape/buildroot/output/build/uclibc-1.0.37' + +I did a quick header dependency analysis starting from __kernel_time64_t +(one of the offending types), but could "follow up" to linux/time_types.h +as expected; so I fail to understand how this could break. What's even +more confusing is linux/time_types.h includes linux/types.h itself. +--- + arch/sh/include/uapi/asm/sockios.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/sh/include/uapi/asm/sockios.h b/arch/sh/include/uapi/asm/sockios.h +index ef01ced9e169..d97d14685305 100644 +--- a/arch/sh/include/uapi/asm/sockios.h ++++ b/arch/sh/include/uapi/asm/sockios.h +@@ -2,7 +2,7 @@ + #ifndef __ASM_SH_SOCKIOS_H + #define __ASM_SH_SOCKIOS_H + +-#include <linux/time_types.h> ++#include <linux/types.h> + + /* Socket-level I/O control calls. */ + #define FIOGETOWN _IOR('f', 123, int) +-- +2.17.1 +
PATCH 1/2 configs/qemu_*: bump kernel version to 5.10.7
Quoted 15 lines
Nice work.
Reviewed-by Joel Stanley <[email protected]>Quoted 9 lines
---
Regarding the 64-bit time data structures, an upstream fix [3] had supposedly prepared for this situation where the libc has not moved to 64-bits data structures yet, but unfortunately we seem to slip into a crack here. Some quick header dependency analysis from the offending__kernel_time64_ttype managed to "follow up" tolinux/time_types.h(which is the one explicitly added in [3]) as expected; so no luck here.
Any help on that matter would be appreciated.
Quoted 3 lines
I saw your commit message for the
sockios.hpatch has cc Arnd. Did you get a response from him on this issue?
Not yet, I've sent the patch to the SH maintainers CC Arnd Bergman, and am waiting for a reply. I'll keep you up to date when I get one.
It looks like time_types.h needs a definition of __kernel_time64_t.
Quoted 7 lines
This appears to live in
posix_types.hfor uapi headers. Would this patch to the kernel fix the problem?
include/uapi/linux/time_types.h line 9
Quoted 7 lines
include/uapi/linux/time_types.h +1
-0@@ -3,6 +3,7 @@#define _UAPI_LINUX_TIME_TYPES_H#include <linux/types.h> +#include <linux/posix_types.h> struct __kernel_timespec {__kernel_time64_t tv_sec;/* seconds */
I just tried your suggestion with qemu_sh4eb_r2d_defconfig (after removing my
own patch, of course), but looks like compilation still breaks :( Did you have the
time to try it ?
/usr/bin/make -j5 -C/home/clumsyape/PROJETS/buildroot/buildroot_git/output/build/uclibc-1.0.37
ARCH="sh" CROSS_COMPILE="/home/clumsyape/PROJETS/buildroot/buildroot_git/output/host/bin/sh4eb-buildroot-linux-uclibc-" UCLIBC_EXTRA_CFLAGS="" HOSTCC="/usr/bin/gcc"
GEN libpthread/nptl/sysdeps/unix/sysv/linux/structsem.h
GEN libpthread/nptl/sysdeps/unix/sysv/linux/structsem.h
GEN libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.h
GEN libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.h
In file included from /home/clumsyape/PROJETS/buildroot/buildroot_git/output/build/linux-headers-5.10.7/usr/include/asm/sockios.h:5,
from/home/clumsyape/PROJETS/buildroot/buildroot_git/output/build/linux-headers-5.10.7/usr/include/asm-generic/socket.h:6,
from/home/clumsyape/PROJETS/buildroot/buildroot_git/output/build/linux-headers-5.10.7/usr/include/asm/socket.h:1,
from ./include/bits/socket.h:360,
from ./include/sys/socket.h:39,
from ./include/netinet/in.h:24,
from ./include/resolv.h:57,
from ./libpthread/nptl/descr.h:36,
from ./libpthread/nptl/pthreadP.h:25,
from <stdin>:2:
/home/clumsyape/PROJETS/buildroot/buildroot_git/output/build/linux-headers-5.10.7/usr/include/linux/time_types.h:9:2:
error: unknown type name '__kernel_time64_t'
9 | __kernel_time64_t tv_sec; /* seconds */
| ^~~~~~~~~~~~~~~~~
/home/clumsyape/PROJETS/buildroot/buildroot_git/output/build/linux-headers-5.10.7/usr/include/linux/time_types.h:33:2:
error: unknown type name '__kernel_old_time_t'
33 | __kernel_old_time_t tv_sec; /* seconds */
| ^~~~~~~~~~~~~~~~~~~libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch:135: recipe for target 'libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.h' failed make[2]: *** [libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.h] Error 1package/pkg-generic.mk:247: recipe for target '/home/clumsyape/PROJETS/buildroot/buildroot_git/output/build/uclibc-1.0.37/.stamp_built' failed
make[1]: *** [/home/clumsyape/PROJETS/buildroot/buildroot_git/output/build/uclibc-1.0.37/.stamp_built] Error 2
Makefile:84: recipe for target '_all' failed
make: *** [_all] Error 2
Quoted 3 lines
Cheers,
Joel
Thanks for the review,
Signature · 3 lines
Geoffrey Le mer. 20 janv. 2021 ? 23:29, Joel Stanley <[email protected]> a ?crit :
Quoted 155 lines
Quoted 18 lines · Geoffrey Le Gourri?rec
Bump most QEMU defconfigs (every one that was previously on 5.4.y) to latest longterm kernel 5.10.7.
Please note the following exceptions/modifications:
- board/qemu/qemu_s390x_defconfig: ignored (already up to date)
- board/qemu/sh4*-r2d:
- Remove the remaining kernel patch [1] provided by Alan Modra fixing rodata alignment, carried here by Romain Naour [2] to fix an issue preventing kernel from booting with binutils 2.23. Patch is present in upstream Linux now.
- Fix compile-time error regarding 64-bit time data structures from kernel headers when building with uclibc. Previous fix [3] existed upstream; but see details below.
- board/qemu/ppc-mpc8544ds: Updated kernel patch
- board/qemu/arm-versatile: Updated kernel patch
- board/qemu/mips*r6*: Updated kernel patchQuoted 4 lines
Tested on all configs/qemu* configurations. [4]
[1] https://www.sourceware.org/ml/binutils/2019-12/msg00112.html
[2]https://git.busybox.net/buildroot/commit/?id=a2331c8a61bdd71c47492efc818fb0458a349219
Quoted 1 line
[3]
Quoted 3 lines
[4] https://gitlab.com/clumsyape/buildroot/-/pipelines/244024195
Signed-off-by Geoffrey Le Gourri?rec <[email protected]>Nice work.
Reviewed-by Joel Stanley <[email protected]>Quoted 9 lines
---
Regarding the 64-bit time data structures, an upstream fix [3] had supposedly prepared for this situation where the libc has not moved to 64-bits data structures yet, but unfortunately we seem to slip into a crack here. Some quick header dependency analysis from the offending__kernel_time64_ttype managed to "follow up" tolinux/time_types.h(which is the one explicitly added in [3]) as expected; so no luck here.
Any help on that matter would be appreciated.I saw your commit message for the
sockios.hpatch has cc Arnd. Did you get a response from him on this issue?It looks like
time_types.hneeds a definition of__kernel_time64_t. This appears to live inposix_types.hfor uapi headers. Would this patch to the kernel fix the problem?include/uapi/linux/time_types.h +1
-0@@ -3,6 +3,7 @@#define _UAPI_LINUX_TIME_TYPES_H#include <linux/types.h> +#include <linux/posix_types.h> struct __kernel_timespec {__kernel_time64_t tv_sec;/* seconds */ Cheers,
Joel
Quoted 1 line
diff --git
a/board/qemu/sh4eb-r2d/patches/linux-headers/0001-Use-types.h-and-not-time_types.h-in-sockios.h.patchb/board/qemu/sh4eb-r2d/patches/linux-headers/0001-Use-types.h-and-not-time_types.h-in-sockios.h.patchQuoted 4 lines
new file mode 100644
index 0000000000..90bd4e8c6c
---/dev/null
+++
b/board/qemu/sh4eb-r2d/patches/linux-headers/0001-Use-types.h-and-not-time_types.h-in-sockios.h.patchQuoted 9 lines
(quoted diff) +8
-0@@ -0,0 +1,76 @@ +From 34c78b21878ae7b0471299d11a7e861125e31b2c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Geoffrey=20Le=20Gourri=C3=A9rec?= + <[email protected]> +Date: Mon, 18 Jan 2021 23:40:28 +0100 +Subject: [PATCH] Use types.h and not time_types.h in sockios.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bitReview line 18
Quoted 10 lines
(quoted diff) +10
-0+ +This fixes builds for sh arch when libc is not using relevant +time data structures definitions for 32-bit machines. A previous +commit [1] provided a fix, that we seemed to slip through here. + +As of the time of this writing, the bug was found with non- +up to date uclibc 1.0.37 only (currently the only libc supporting +sh architecture). + +[1]Review line 27
Quoted 9 lines
(quoted diff) +9
-0+ +Signed-off-by: Geoffrey Le Gourri?rec <[email protected]> +Cc: Arnd Bergmann <[email protected]> + +--- + +For the record, here's the build-time error: + +/usr/bin/make -j2 -C/builds/clumsyape/buildroot/output/build/uclibc-1.0.37 ARCH="sh" CROSS_COMPILE="/builds/clumsyape/buildroot/output/host/bin/sh4-buildroot-linux-uclibc-" UCLIBC_EXTRA_CFLAGS="" HOSTCC="/usr/bin/gcc"
Review line 28
Quoted 1 line
(quoted diff) +1
-0+make[1]: Entering directory'/builds/clumsyape/buildroot/output/build/uclibc-1.0.37'
Review line 33
Quoted 5 lines
(quoted diff) +5
-0+ GEN libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelcond.h + GEN libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelcond.h + GEN libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.h + GEN libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.h +In file included from/builds/clumsyape/buildroot/output/build/linux-headers-5.10.7/usr/include/asm/sockios.h:5,
Review line 34
Quoted 1 line
(quoted diff) +1
-0+ from/builds/clumsyape/buildroot/output/build/linux-headers-5.10.7/usr/include/asm-generic/socket.h:6,
Review line 35
Quoted 1 line
(quoted diff) +1
-0+ from/builds/clumsyape/buildroot/output/build/linux-headers-5.10.7/usr/include/asm/socket.h:1,
Review line 42
Quoted 8 lines
(quoted diff) +7
-0+ from ./include/bits/socket.h:360, + from ./include/sys/socket.h:39, + from ./include/netinet/in.h:24, + from ./include/resolv.h:57, + from ./libpthread/nptl/descr.h:36, + from ./libpthread/nptl/pthreadP.h:25, + from <stdin>:2:
+/builds/clumsyape/buildroot/output/build/linux-headers-5.10.7/usr/include/linux/time_types.h:8:2:
error: unknown type name '__kernel_time64_t'Review line 44
Quoted 3 lines
(quoted diff) +2
-0+ 8 | __kernel_time64_t tv_sec; /* seconds */ + | ^~~~~~~~~~~~~~~~~
+/builds/clumsyape/buildroot/output/build/linux-headers-5.10.7/usr/include/linux/time_types.h:32:2:
error: unknown type name '__kernel_old_time_t'Review line 47
Quoted 3 lines
(quoted diff) +3
-0+ 32 | __kernel_old_time_t tv_sec; /* seconds */ + | ^~~~~~~~~~~~~~~~~~~ +libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch:135: recipefor target '
libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.h' failedReview line 48
Quoted 1 line
(quoted diff) +1
-0+make[1]: ***[
libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.h] Error 1Review line 49
Quoted 1 line
(quoted diff) +1
-0+make[1]: Leaving directory'/builds/clumsyape/buildroot/output/build/uclibc-1.0.37'
Review line 52
Quoted 3 lines
(quoted diff) +3
-0+ +I did a quick header dependency analysis starting from __kernel_time64_t +(one of the offending types), but could "follow up" to
linux/time_types.hReview line 59
Quoted 7 lines
(quoted diff) +7
-0+as expected; so I fail to understand how this could break. What's even +more confusing is linux/time_types.h includes linux/types.h itself. +--- + arch/sh/include/uapi/asm/sockios.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/sh/include/uapi/asm/sockios.h
b/arch/sh/include/uapi/asm/sockios.h
Quoted 16 lines
Quoted 5 lines
(quoted diff) +5
-0+index ef01ced9e169..d97d14685305 100644 +--- a/arch/sh/include/uapi/asm/sockios.h ++++ b/arch/sh/include/uapi/asm/sockios.h +@@ -2,7 +2,7 @@ + #ifndef __ASM_SH_SOCKIOS_HReview line 74
Quoted 10 lines
(quoted diff) +10
-0+ #define __ASM_SH_SOCKIOS_H + +-#include <linux/time_types.h> ++#include <linux/types.h> + + /* Socket-level I/O control calls. */ + #define FIOGETOWN _IOR('f', 123, int) +-- +2.17.1 +
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20210123/e5b609f4/attachment.html>
PATCH 1/2 configs/qemu_*: bump kernel version to 5.10.7
Quoted 9 lines
Quoted 9 lines
Quoted 8 lines
Regarding the 64-bit time data structures, an upstream fix [3] had supposedly prepared for this situation where the libc has not moved to 64-bits data structures yet, but unfortunately we seem to slip into a crack here. Some quick header dependency analysis from the offending
__kernel_time64_ttype managed to "follow up" tolinux/time_types.h(which is the one explicitly added in [3]) as expected; so no luck here.
Any help on that matter would be appreciated.
Quoted 6 lines
Quoted 2 lines
I saw your commit message for the
sockios.hpatch has cc Arnd. Did you get a response from him on this issue?Not yet, I've sent the patch to the SH maintainers CC Arnd Bergman, and am waiting for a reply. I'll keep you up to date when I get one.
Hi, here's an update.
I had a short exchange with Arnd Bergmann (see the SuperH subsystem patchwork thread[1]) and looks like the real issue lies in uclibc. I have a patch idea (adding relevant types here [2]), so I'll go test it and bug the uclibc folks with it.
[1] https://patchwork.kernel.org/project/linux-sh/patch/20210123165652.10884-1-geoffrey.legourrierec at gmail.com/
[2] https://repo.or.cz/uclibc-ng.git/blob/ab1dd83bec59c9e65c31efd6e887182948f627be:/libc/sysdeps/linux/sh/bits/kernel_types.h
Regards,
Signature · 5 lines
Geoffrey Le sam. 23 janv. 2021 ? 21:35, Geoffrey Le Gourri?rec <[email protected]> a ?crit :
Quoted 230 lines
Quoted 15 lines
Nice work.
Reviewed-by Joel Stanley <[email protected]>Quoted 9 lines
---
Regarding the 64-bit time data structures, an upstream fix [3] had supposedly prepared for this situation where the libc has not moved to 64-bits data structures yet, but unfortunately we seem to slip into a crack here. Some quick header dependency analysis from the offending__kernel_time64_ttype managed to "follow up" tolinux/time_types.h(which is the one explicitly added in [3]) as expected; so no luck here.
Any help on that matter would be appreciated.Quoted 2 lines
I saw your commit message for the
sockios.hpatch has cc Arnd. Did you get a response from him on this issue?Not yet, I've sent the patch to the SH maintainers CC Arnd Bergman, and am waiting for a reply. I'll keep you up to date when I get one.
Quoted 7 lines
It looks like
time_types.hneeds a definition of__kernel_time64_t. This appears to live inposix_types.hfor uapi headers. Would this patch to the kernel fix the problem?include/uapi/linux/time_types.h line 9
Quoted 7 lines
include/uapi/linux/time_types.h +1
-0@@ -3,6 +3,7 @@#define _UAPI_LINUX_TIME_TYPES_H#include <linux/types.h> +#include <linux/posix_types.h> struct __kernel_timespec {__kernel_time64_t tv_sec;/* seconds */ I just tried your suggestion with
qemu_sh4eb_r2d_defconfig(after removing my own patch, of course), but looks like compilation still breaks :( Did you have the time to try it ?
/usr/bin/make-j5 -C/home/clumsyape/PROJETS/buildroot/buildroot_git/output/build/uclibc-1.0.37ARCH="sh" CROSS_COMPILE="/home/clumsyape/PROJETS/buildroot/buildroot_git/output/host/bin/sh4eb-buildroot-linux-uclibc-" UCLIBC_EXTRA_CFLAGS="" HOSTCC="/usr/bin/gcc"
GENlibpthread/nptl/sysdeps/unix/sysv/linux/structsem.h
GENlibpthread/nptl/sysdeps/unix/sysv/linux/structsem.h
GENlibpthread/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.h
GENlibpthread/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.h
In file included from/home/clumsyape/PROJETS/buildroot/buildroot_git/output/build/linux-headers-5.10.7/usr/include/asm/sockios.h:5,from /home/clumsyape/PROJETS/buildroot/buildroot_git/output/build/linux-headers-5.10.7/usr/include/asm-generic/socket.h:6, from /home/clumsyape/PROJETS/buildroot/buildroot_git/output/build/linux-headers-5.10.7/usr/include/asm/socket.h:1, from ./include/bits/socket.h:360, from ./include/sys/socket.h:39, from ./include/netinet/in.h:24, from ./include/resolv.h:57, from ./libpthread/nptl/descr.h:36, from ./libpthread/nptl/pthreadP.h:25, from <stdin>:2: /home/clumsyape/PROJETS/buildroot/buildroot_git/output/build/linux-headers-5.10.7/usr/include/linux/time_types.h:9:2: error: unknown type name '__kernel_time64_t' 9 | __kernel_time64_t tv_sec; /* seconds */ | ^~~~~~~~~~~~~~~~~ /home/clumsyape/PROJETS/buildroot/buildroot_git/output/build/linux-headers-5.10.7/usr/include/linux/time_types.h:33:2: error: unknown type name '__kernel_old_time_t' 33 | __kernel_old_time_t tv_sec; /* seconds */ | ^~~~~~~~~~~~~~~~~~~libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch:135: recipe for target '
libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.h' failed make[2]: *** [libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.h] Error 1package/pkg-generic.mk:247: recipe for target '/home/clumsyape/PROJETS/buildroot/buildroot_git/output/build/uclibc-1.0.37/.stamp_built' failed make[1]: *** [/home/clumsyape/PROJETS/buildroot/buildroot_git/output/build/uclibc-1.0.37/.stamp_built] Error 2
Makefile:84: recipe for target '_all' failed
make: *** [_all] Error 2Quoted 4 lines
Cheers,
Joel
Thanks for the review,
--
GeoffreyLe mer. 20 janv. 2021 ? 23:29, Joel Stanley <[email protected]> a ?crit :
Quoted 148 lines
Quoted 18 lines · Geoffrey Le Gourri?rec
Bump most QEMU defconfigs (every one that was previously on 5.4.y) to latest longterm kernel 5.10.7.
Please note the following exceptions/modifications:
- board/qemu/qemu_s390x_defconfig: ignored (already up to date)
- board/qemu/sh4*-r2d:
- Remove the remaining kernel patch [1] provided by Alan Modra fixing rodata alignment, carried here by Romain Naour [2] to fix an issue preventing kernel from booting with binutils 2.23. Patch is present in upstream Linux now.
- Fix compile-time error regarding 64-bit time data structures from kernel headers when building with uclibc. Previous fix [3] existed upstream; but see details below.
- board/qemu/ppc-mpc8544ds: Updated kernel patch
- board/qemu/arm-versatile: Updated kernel patch
- board/qemu/mips*r6*: Updated kernel patchQuoted 8 lines
Tested on all configs/qemu* configurations. [4]
[1] https://www.sourceware.org/ml/binutils/2019-12/msg00112.html
[2] https://git.busybox.net/buildroot/commit/?id=a2331c8a61bdd71c47492efc818fb0458a349219
[3] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fc94cf2092c7c1267fa2deb8388d624f50eba808
[4] https://gitlab.com/clumsyape/buildroot/-/pipelines/244024195Signed-off-by Geoffrey Le Gourri?rec <[email protected]>Nice work.
Reviewed-by Joel Stanley <[email protected]>Quoted 9 lines
---
Regarding the 64-bit time data structures, an upstream fix [3] had supposedly prepared for this situation where the libc has not moved to 64-bits data structures yet, but unfortunately we seem to slip into a crack here. Some quick header dependency analysis from the offending__kernel_time64_ttype managed to "follow up" tolinux/time_types.h(which is the one explicitly added in [3]) as expected; so no luck here.
Any help on that matter would be appreciated.I saw your commit message for the
sockios.hpatch has cc Arnd. Did you get a response from him on this issue?It looks like
time_types.hneeds a definition of__kernel_time64_t. This appears to live inposix_types.hfor uapi headers. Would this patch to the kernel fix the problem?include/uapi/linux/time_types.h +1
-0@@ -3,6 +3,7 @@#define _UAPI_LINUX_TIME_TYPES_H#include <linux/types.h> +#include <linux/posix_types.h> struct __kernel_timespec {__kernel_time64_t tv_sec;/* seconds */ Cheers,
Joel
Quoted 82 lines
board/qemu/sh4eb-r2d/patches/linux-headers/0001-Use-types.h-and-not-time_types.h-in-sockios.h.patch new file +76
-0@@ -0,0 +1,76 @@ +From 34c78b21878ae7b0471299d11a7e861125e31b2c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Geoffrey=20Le=20Gourri=C3=A9rec?= + <[email protected]> +Date: Mon, 18 Jan 2021 23:40:28 +0100 +Subject: [PATCH] Use types.h and not time_types.h in sockios.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This fixes builds for sh arch when libc is not using relevant +time data structures definitions for 32-bit machines. A previous +commit [1] provided a fix, that we seemed to slip through here. + +As of the time of this writing, the bug was found with non- +up to date uclibc 1.0.37 only (currently the only libc supporting +sh architecture). + +[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fc94cf2092c7c1267fa2deb8388d624f50eba808 + +Signed-off-by: Geoffrey Le Gourri?rec <[email protected]> +Cc: Arnd Bergmann <[email protected]> + +--- + +For the record, here's the build-time error: + +/usr/bin/make -j2 -C /builds/clumsyape/buildroot/output/build/uclibc-1.0.37 ARCH="sh" CROSS_COMPILE="/builds/clumsyape/buildroot/output/host/bin/sh4-buildroot-linux-uclibc-" UCLIBC_EXTRA_CFLAGS="" HOSTCC="/usr/bin/gcc" +make[1]: Entering directory '/builds/clumsyape/buildroot/output/build/uclibc-1.0.37' + GEN libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelcond.h + GEN libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelcond.h + GEN libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.h + GEN libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.h +In file included from /builds/clumsyape/buildroot/output/build/linux-headers-5.10.7/usr/include/asm/sockios.h:5, + from /builds/clumsyape/buildroot/output/build/linux-headers-5.10.7/usr/include/asm-generic/socket.h:6, + from /builds/clumsyape/buildroot/output/build/linux-headers-5.10.7/usr/include/asm/socket.h:1, + from ./include/bits/socket.h:360, + from ./include/sys/socket.h:39, + from ./include/netinet/in.h:24, + from ./include/resolv.h:57, + from ./libpthread/nptl/descr.h:36, + from ./libpthread/nptl/pthreadP.h:25, + from <stdin>:2: +/builds/clumsyape/buildroot/output/build/linux-headers-5.10.7/usr/include/linux/time_types.h:8:2: error: unknown type name '__kernel_time64_t' + 8 | __kernel_time64_t tv_sec; /* seconds */ + | ^~~~~~~~~~~~~~~~~ +/builds/clumsyape/buildroot/output/build/linux-headers-5.10.7/usr/include/linux/time_types.h:32:2: error: unknown type name '__kernel_old_time_t' + 32 | __kernel_old_time_t tv_sec; /* seconds */ + | ^~~~~~~~~~~~~~~~~~~ +libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch:135: recipe for target 'libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.h' failed +make[1]: *** [libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.h] Error 1 +make[1]: Leaving directory '/builds/clumsyape/buildroot/output/build/uclibc-1.0.37' + +I did a quick header dependency analysis starting from __kernel_time64_t +(one of the offending types), but could "follow up" to linux/time_types.h +as expected; so I fail to understand how this could break. What's even +more confusing is linux/time_types.h includes linux/types.h itself. +--- + arch/sh/include/uapi/asm/sockios.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/sh/include/uapi/asm/sockios.h b/arch/sh/include/uapi/asm/sockios.h +index ef01ced9e169..d97d14685305 100644 +--- a/arch/sh/include/uapi/asm/sockios.h ++++ b/arch/sh/include/uapi/asm/sockios.h +@@ -2,7 +2,7 @@ + #ifndef __ASM_SH_SOCKIOS_H + #define __ASM_SH_SOCKIOS_H + +-#include <linux/time_types.h> ++#include <linux/types.h> + + /* Socket-level I/O control calls. */ + #define FIOGETOWN _IOR('f', 123, int) +-- +2.17.1 +
PATCH 1/2 configs/qemu_*: bump kernel version to 5.10.7
Quoted 7 lines · On Sun, 24 Jan 2021 22:06:25 +0100 Geoffrey Le Gourri?rec…
I had a short exchange with Arnd Bergmann (see the SuperH subsystem patchwork thread[1]) and looks like the real issue lies in uclibc. I have a patch idea (adding relevant types here [2]), so I'll go test it and bug the uclibc folks with it.
[1] https://patchwork.kernel.org/project/linux-sh/patch/20210123165652.10884-1-geoffrey.legourrierec at gmail.com/
[2] https://repo.or.cz/uclibc-ng.git/blob/ab1dd83bec59c9e65c31efd6e887182948f627be:/libc/sysdeps/linux/sh/bits/kernel_types.h
Thanks for the follow-up, and the additional work you're doing on fixing this!
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/2 configs/qemu_*: bump kernel version to 5.10.7
In reply to Geoffrey Le GourriérecQuoted 17 lines · On Wed, 20 Jan 2021 20:59:53 +0100 Geoffrey Le Gourri?rec…
Bump most QEMU defconfigs (every one that was previously on 5.4.y) to latest longterm kernel 5.10.7.
Please note the following exceptions/modifications:
- board/qemu/qemu_s390x_defconfig: ignored (already up to date)
- board/qemu/sh4*-r2d:
- Remove the remaining kernel patch [1] provided by Alan Modra fixing rodata alignment, carried here by Romain Naour [2] to fix an issue preventing kernel from booting with binutils 2.23. Patch is present in upstream Linux now.
- Fix compile-time error regarding 64-bit time data structures from kernel headers when building with uclibc. Previous fix [3] existed upstream; but see details below.
- board/qemu/ppc-mpc8544ds: Updated kernel patch
- board/qemu/arm-versatile: Updated kernel patch
- board/qemu/mips*r6*: Updated kernel patch
Quoted 8 lines
Tested on all configs/qemu* configurations. [4]
[1] https://www.sourceware.org/ml/binutils/2019-12/msg00112.html
[2] https://git.busybox.net/buildroot/commit/?id=a2331c8a61bdd71c47492efc818fb0458a349219
[3] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fc94cf2092c7c1267fa2deb8388d624f50eba808
[4] https://gitlab.com/clumsyape/buildroot/-/pipelines/244024195Signed-off-by Geoffrey Le Gourri?rec <[email protected]>
Thanks, series applied!
Quoted 2 lines
....h-and-not-time_types.h-in-sockios.h.patch | 76 +++++++++++++++++++ ....h-and-not-time_types.h-in-sockios.h.patch | 76 +++++++++++++++++++
I am not a huge fan of those linux-headers patches buried deep into defconfig-specific locations. Indeed, I just tried today to build a SH4 toolchain... and fell precisely into those problems, and your patch is not going to fix them.
What about having the patches in package/linux-headers/ for the few linux headers versions that we officially support ?
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com