kumquat-buildroot/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch

85 lines
3.4 KiB
Diff
Raw Normal View History

qemu: update defconfigs to Linux 4.16.7 All linux configs are renamed to a version neutral filename to avoid further renaming on kernel bumps. Defconfig Kernel Qemu Network Status -------------------------------------------------------------- aarch64_virt 4.16.7 2.12.0 YES OK arm_versatile 4.16.7 2.12.0 YES OK arm_versatile_nommu 4.16.7 2.12.0 YES OK (3) arm_vexpress 4.16.7 2.12.0 YES OK m68k_mcf5208 4.16.7 2.12.0 YES OK m68k_q800 4.16.7 q800-v2.11.0 NO (2) OK microblazebe 4.16.7 2.12.0 YES OK microblazeel 4.16.7 2.12.0 YES OK mips32r2el_malta 4.16.7 2.12.0 YES OK mips32r2_malta 4.16.7 2.12.0 YES OK mips32r6el_malta 4.16.7 2.12.0 YES OK mips32r6_malta 4.16.7 2.12.0 YES OK mips64el_malta 4.16.7 2.12.0 YES OK mips64_malta 4.16.7 2.12.0 YES OK mips64r6el_malta 4.16.7 2.12.0 YES OK mips64r6_malta 4.16.7 2.12.0 YES OK nios2-10m50 4.16.7 2.12.0 NO OK or1k 4.16.7 2.12.0 NO OK ppc_g3beige 4.16.7 2.12.0 YES OK ppc_mpc8544ds 4.16.7 2.12.0 YES OK ppc_virtex_ml507 4.16.7 2.12.0 NO OK ppc64_pseries 4.16.7 2.12.0 YES OK ppc64le_pseries 4.16.7 2.12.0 YES OK ppc64_e5500 4.16.7 2.12.0 YES OK sh4 4.16.7 2.12.0 YES OK sh4eb 4.16.7 2.12.0 NO (1) OK sparc_ss10 4.16.7 2.12.0 YES OK sparc64_sun4u 4.16.7 2.12.0 YES OK x86 4.16.7 2.12.0 YES OK x86_64 4.16.7 2.12.0 YES OK xtensa_lx60 4.16.7 2.12.0 YES OK xtensa_lx60_nommu 4.16.7 2.12.0 YES OK (1) - Probably an endian issue with 8139 emulation/driver (2) - There's a network interface, but enabling it in qemu fails (3) - Kernel patch required, switched to devicetree usage Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-06-02 22:07:20 +02:00
Signed-Off-by: Waldemar Brodkorb <wbx@openadk.org>
From LKML.
qemu: update defconfigs to Linux 4.16.7 All linux configs are renamed to a version neutral filename to avoid further renaming on kernel bumps. Defconfig Kernel Qemu Network Status -------------------------------------------------------------- aarch64_virt 4.16.7 2.12.0 YES OK arm_versatile 4.16.7 2.12.0 YES OK arm_versatile_nommu 4.16.7 2.12.0 YES OK (3) arm_vexpress 4.16.7 2.12.0 YES OK m68k_mcf5208 4.16.7 2.12.0 YES OK m68k_q800 4.16.7 q800-v2.11.0 NO (2) OK microblazebe 4.16.7 2.12.0 YES OK microblazeel 4.16.7 2.12.0 YES OK mips32r2el_malta 4.16.7 2.12.0 YES OK mips32r2_malta 4.16.7 2.12.0 YES OK mips32r6el_malta 4.16.7 2.12.0 YES OK mips32r6_malta 4.16.7 2.12.0 YES OK mips64el_malta 4.16.7 2.12.0 YES OK mips64_malta 4.16.7 2.12.0 YES OK mips64r6el_malta 4.16.7 2.12.0 YES OK mips64r6_malta 4.16.7 2.12.0 YES OK nios2-10m50 4.16.7 2.12.0 NO OK or1k 4.16.7 2.12.0 NO OK ppc_g3beige 4.16.7 2.12.0 YES OK ppc_mpc8544ds 4.16.7 2.12.0 YES OK ppc_virtex_ml507 4.16.7 2.12.0 NO OK ppc64_pseries 4.16.7 2.12.0 YES OK ppc64le_pseries 4.16.7 2.12.0 YES OK ppc64_e5500 4.16.7 2.12.0 YES OK sh4 4.16.7 2.12.0 YES OK sh4eb 4.16.7 2.12.0 NO (1) OK sparc_ss10 4.16.7 2.12.0 YES OK sparc64_sun4u 4.16.7 2.12.0 YES OK x86 4.16.7 2.12.0 YES OK x86_64 4.16.7 2.12.0 YES OK xtensa_lx60 4.16.7 2.12.0 YES OK xtensa_lx60_nommu 4.16.7 2.12.0 YES OK (1) - Probably an endian issue with 8139 emulation/driver (2) - There's a network interface, but enabling it in qemu fails (3) - Kernel patch required, switched to devicetree usage Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-06-02 22:07:20 +02:00
diff -Nur linux-4.15.13.orig/arch/arm/Kconfig linux-4.15.13/arch/arm/Kconfig
--- linux-4.15.13.orig/arch/arm/Kconfig 2018-03-24 11:02:53.000000000 +0100
+++ linux-4.15.13/arch/arm/Kconfig 2018-04-01 03:47:33.415078244 +0100
@@ -355,6 +355,17 @@
select SPARSE_IRQ
select USE_OF
+config ARM_SINGLE_ARCH_VERSATILE
+ bool "ARM Ltd. Versatile family"
+ depends on !MMU
+ select AUTO_ZRELADDR
+ select CLKSRC_OF
+ select COMMON_CLK
+ select GENERIC_CLOCKEVENTS
+ select GPIOLIB
+ select SPARSE_IRQ
+ select USE_OF
+
config ARCH_EBSA110
bool "EBSA-110"
select ARCH_USES_GETTIMEOFFSET
diff -Nur linux-4.15.13.orig/arch/arm/Kconfig.debug linux-4.15.13/arch/arm/Kconfig.debug
--- linux-4.15.13.orig/arch/arm/Kconfig.debug 2018-03-24 11:02:53.000000000 +0100
+++ linux-4.15.13/arch/arm/Kconfig.debug 2018-04-01 03:47:33.416078232 +0100
@@ -1795,7 +1795,8 @@
config UNCOMPRESS_INCLUDE
string
default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \
- PLAT_SAMSUNG || ARM_SINGLE_ARMV7M
+ PLAT_SAMSUNG || ARM_SINGLE_ARMV7M || \
+ ARM_SINGLE_ARCH_VERSATILE
default "mach/uncompress.h"
config EARLY_PRINTK
diff -Nur linux-4.15.13.orig/arch/arm/include/asm/mach/map.h linux-4.15.13/arch/arm/include/asm/mach/map.h
--- linux-4.15.13.orig/arch/arm/include/asm/mach/map.h 2018-03-24 11:02:53.000000000 +0100
+++ linux-4.15.13/arch/arm/include/asm/mach/map.h 2018-04-01 03:47:17.587276119 +0100
@@ -62,6 +62,7 @@
#else
#define iotable_init(map,num) do { } while (0)
#define vm_reserve_area_early(a,s,c) do { } while (0)
+#define debug_ll_io_init() do { } while (0)
#endif
#endif
diff -Nur linux-4.15.13.orig/arch/arm/mach-versatile/Kconfig linux-4.15.13/arch/arm/mach-versatile/Kconfig
--- linux-4.15.13.orig/arch/arm/mach-versatile/Kconfig 2018-03-24 11:02:53.000000000 +0100
+++ linux-4.15.13/arch/arm/mach-versatile/Kconfig 2018-04-01 03:47:33.417078219 +0100
@@ -1,7 +1,8 @@
# SPDX-License-Identifier: GPL-2.0
config ARCH_VERSATILE
- bool "ARM Ltd. Versatile family"
- depends on ARCH_MULTI_V5
+ bool "ARM Ltd. Versatile family" if ARCH_MULTI_V5
+ depends on ARCH_MULTI_V5 || ARM_SINGLE_ARCH_VERSATILE
+ default y if ARM_SINGLE_ARCH_VERSATILE
select ARM_AMBA
select ARM_TIMER_SP804
select ARM_VIC
diff -Nur linux-4.15.13.orig/arch/arm/mach-versatile/Makefile.boot linux-4.15.13/arch/arm/mach-versatile/Makefile.boot
--- linux-4.15.13.orig/arch/arm/mach-versatile/Makefile.boot 1970-01-01 01:00:00.000000000 +0100
+++ linux-4.15.13/arch/arm/mach-versatile/Makefile.boot 2018-04-01 03:47:25.644175394 +0100
@@ -0,0 +1,3 @@
+# Empty file waiting for deletion once Makefile.boot isn't needed any more.
+# Patch waits for application at
+# http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 .
diff -Nur linux-4.15.13.orig/arch/arm/mach-versatile/versatile_dt.c linux-4.15.13/arch/arm/mach-versatile/versatile_dt.c
--- linux-4.15.13.orig/arch/arm/mach-versatile/versatile_dt.c 2018-03-24 11:02:53.000000000 +0100
+++ linux-4.15.13/arch/arm/mach-versatile/versatile_dt.c 2018-04-01 03:47:10.913359555 +0100
@@ -37,7 +37,11 @@
#include <asm/mach/map.h>
/* macro to get at MMIO space when running virtually */
qemu: update defconfigs to Linux 4.16.7 All linux configs are renamed to a version neutral filename to avoid further renaming on kernel bumps. Defconfig Kernel Qemu Network Status -------------------------------------------------------------- aarch64_virt 4.16.7 2.12.0 YES OK arm_versatile 4.16.7 2.12.0 YES OK arm_versatile_nommu 4.16.7 2.12.0 YES OK (3) arm_vexpress 4.16.7 2.12.0 YES OK m68k_mcf5208 4.16.7 2.12.0 YES OK m68k_q800 4.16.7 q800-v2.11.0 NO (2) OK microblazebe 4.16.7 2.12.0 YES OK microblazeel 4.16.7 2.12.0 YES OK mips32r2el_malta 4.16.7 2.12.0 YES OK mips32r2_malta 4.16.7 2.12.0 YES OK mips32r6el_malta 4.16.7 2.12.0 YES OK mips32r6_malta 4.16.7 2.12.0 YES OK mips64el_malta 4.16.7 2.12.0 YES OK mips64_malta 4.16.7 2.12.0 YES OK mips64r6el_malta 4.16.7 2.12.0 YES OK mips64r6_malta 4.16.7 2.12.0 YES OK nios2-10m50 4.16.7 2.12.0 NO OK or1k 4.16.7 2.12.0 NO OK ppc_g3beige 4.16.7 2.12.0 YES OK ppc_mpc8544ds 4.16.7 2.12.0 YES OK ppc_virtex_ml507 4.16.7 2.12.0 NO OK ppc64_pseries 4.16.7 2.12.0 YES OK ppc64le_pseries 4.16.7 2.12.0 YES OK ppc64_e5500 4.16.7 2.12.0 YES OK sh4 4.16.7 2.12.0 YES OK sh4eb 4.16.7 2.12.0 NO (1) OK sparc_ss10 4.16.7 2.12.0 YES OK sparc64_sun4u 4.16.7 2.12.0 YES OK x86 4.16.7 2.12.0 YES OK x86_64 4.16.7 2.12.0 YES OK xtensa_lx60 4.16.7 2.12.0 YES OK xtensa_lx60_nommu 4.16.7 2.12.0 YES OK (1) - Probably an endian issue with 8139 emulation/driver (2) - There's a network interface, but enabling it in qemu fails (3) - Kernel patch required, switched to devicetree usage Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-06-02 22:07:20 +02:00
+#ifdef CONFIG_MMU
#define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000)
+#else
+#define IO_ADDRESS(x) (x)
+#endif
#define __io_address(n) ((void __iomem __force *)IO_ADDRESS(n))
qemu: update defconfigs to Linux 4.16.7 All linux configs are renamed to a version neutral filename to avoid further renaming on kernel bumps. Defconfig Kernel Qemu Network Status -------------------------------------------------------------- aarch64_virt 4.16.7 2.12.0 YES OK arm_versatile 4.16.7 2.12.0 YES OK arm_versatile_nommu 4.16.7 2.12.0 YES OK (3) arm_vexpress 4.16.7 2.12.0 YES OK m68k_mcf5208 4.16.7 2.12.0 YES OK m68k_q800 4.16.7 q800-v2.11.0 NO (2) OK microblazebe 4.16.7 2.12.0 YES OK microblazeel 4.16.7 2.12.0 YES OK mips32r2el_malta 4.16.7 2.12.0 YES OK mips32r2_malta 4.16.7 2.12.0 YES OK mips32r6el_malta 4.16.7 2.12.0 YES OK mips32r6_malta 4.16.7 2.12.0 YES OK mips64el_malta 4.16.7 2.12.0 YES OK mips64_malta 4.16.7 2.12.0 YES OK mips64r6el_malta 4.16.7 2.12.0 YES OK mips64r6_malta 4.16.7 2.12.0 YES OK nios2-10m50 4.16.7 2.12.0 NO OK or1k 4.16.7 2.12.0 NO OK ppc_g3beige 4.16.7 2.12.0 YES OK ppc_mpc8544ds 4.16.7 2.12.0 YES OK ppc_virtex_ml507 4.16.7 2.12.0 NO OK ppc64_pseries 4.16.7 2.12.0 YES OK ppc64le_pseries 4.16.7 2.12.0 YES OK ppc64_e5500 4.16.7 2.12.0 YES OK sh4 4.16.7 2.12.0 YES OK sh4eb 4.16.7 2.12.0 NO (1) OK sparc_ss10 4.16.7 2.12.0 YES OK sparc64_sun4u 4.16.7 2.12.0 YES OK x86 4.16.7 2.12.0 YES OK x86_64 4.16.7 2.12.0 YES OK xtensa_lx60 4.16.7 2.12.0 YES OK xtensa_lx60_nommu 4.16.7 2.12.0 YES OK (1) - Probably an endian issue with 8139 emulation/driver (2) - There's a network interface, but enabling it in qemu fails (3) - Kernel patch required, switched to devicetree usage Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-06-02 22:07:20 +02:00
/*