summaryrefslogtreecommitdiff
path: root/target/linux
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2016-08-27 13:11:40 +0200
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2016-08-27 13:13:56 +0200
commitdb6e6a11e601ed79a78110bf0fb9a3ac7b58e4e5 (patch)
tree505ea732fba35759f04cf0ba1bbf67b45c42888e /target/linux
parent472574b9fcfb3cb64828ae1e430b1f2e0c22b201 (diff)
add support for Qemu ARM noMMU
Greg Ungerer made me aware of this possibility. Rather hackish implementation, we need to deduplicate later. Update Linux Kernel to 4.4.19 while there. Only non-Devicetree system supported right now.
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/config/Config.in.bus1
-rw-r--r--target/linux/config/Config.in.ethernet2
-rw-r--r--target/linux/config/Config.in.kernel3
-rw-r--r--target/linux/config/Config.in.serial2
-rw-r--r--target/linux/patches/4.4.19/coldfire-sighandler.patch (renamed from target/linux/patches/4.4.17/coldfire-sighandler.patch)0
-rw-r--r--target/linux/patches/4.4.19/crisv32.patch (renamed from target/linux/patches/4.4.17/crisv32.patch)0
-rw-r--r--target/linux/patches/4.4.19/initramfs-nosizelimit.patch (renamed from target/linux/patches/4.4.17/initramfs-nosizelimit.patch)0
-rw-r--r--target/linux/patches/4.4.19/ld-or1k.patch (renamed from target/linux/patches/4.4.17/ld-or1k.patch)0
-rw-r--r--target/linux/patches/4.4.19/macsonic.patch (renamed from target/linux/patches/4.4.17/macsonic.patch)0
-rw-r--r--target/linux/patches/4.4.19/mips-xz.patch (renamed from target/linux/patches/4.4.17/mips-xz.patch)0
-rw-r--r--target/linux/patches/4.4.19/patch-realtime (renamed from target/linux/patches/4.4.17/patch-realtime)0
-rw-r--r--target/linux/patches/4.4.19/revert-sparc.patch (renamed from target/linux/patches/4.4.17/revert-sparc.patch)0
-rw-r--r--target/linux/patches/4.4.19/startup.patch (renamed from target/linux/patches/4.4.17/startup.patch)0
-rw-r--r--target/linux/patches/4.4.19/use-libgcc-for-sh.patch (renamed from target/linux/patches/4.4.17/use-libgcc-for-sh.patch)0
-rw-r--r--target/linux/patches/4.4.19/versatile-nommu.patch16
15 files changed, 22 insertions, 2 deletions
diff --git a/target/linux/config/Config.in.bus b/target/linux/config/Config.in.bus
index 9921f5795..351b09f41 100644
--- a/target/linux/config/Config.in.bus
+++ b/target/linux/config/Config.in.bus
@@ -7,6 +7,7 @@ config ADK_KERNEL_PCI
depends on ADK_TARGET_WITH_PCI \
|| ADK_TARGET_QEMU \
|| ADK_TARGET_VBOX
+ default n if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU
default y
config ADK_KERNEL_PCI_QUIRKS
diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet
index 8742b40c6..8f7bbc4b2 100644
--- a/target/linux/config/Config.in.ethernet
+++ b/target/linux/config/Config.in.ethernet
@@ -192,8 +192,10 @@ config ADK_KERNEL_SMC91X
select ADK_KERNEL_GPIOLIB
depends on ADK_TARGET_SYSTEM_ARM_FM || \
ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB || \
+ ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU || \
ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE
default y if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB
+ default y if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU
default y if ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE
default y if ADK_TARGET_SYSTEM_ARM_FM
default n
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index 7761ced3c..843929376 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -88,8 +88,7 @@ config ADK_KERNEL_BINFMT_ELF_FDPIC
config ADK_KERNEL_BINFMT_FLAT
bool
- default y if ADK_TARGET_BINFMT_FLAT_ONE
- default y if ADK_TARGET_BINFMT_FLAT_SEP_DATA
+ default y if ADK_TARGET_BINFMT_FLAT
config ADK_KERNEL_BINFMT_SHARED_FLAT
bool
diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial
index 82d745271..af8fed395 100644
--- a/target/linux/config/Config.in.serial
+++ b/target/linux/config/Config.in.serial
@@ -199,10 +199,12 @@ config ADK_KERNEL_SERIAL_AMBA_PL011
depends on ADK_TARGET_BOARD_BCM28XX \
|| ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE \
|| ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB \
+ || ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU \
|| ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9
default y if ADK_TARGET_BOARD_BCM28XX
default y if ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE
default y if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB
+ default y if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU
default y if ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9
default n
help
diff --git a/target/linux/patches/4.4.17/coldfire-sighandler.patch b/target/linux/patches/4.4.19/coldfire-sighandler.patch
index c52a4e228..c52a4e228 100644
--- a/target/linux/patches/4.4.17/coldfire-sighandler.patch
+++ b/target/linux/patches/4.4.19/coldfire-sighandler.patch
diff --git a/target/linux/patches/4.4.17/crisv32.patch b/target/linux/patches/4.4.19/crisv32.patch
index cb9b0d028..cb9b0d028 100644
--- a/target/linux/patches/4.4.17/crisv32.patch
+++ b/target/linux/patches/4.4.19/crisv32.patch
diff --git a/target/linux/patches/4.4.17/initramfs-nosizelimit.patch b/target/linux/patches/4.4.19/initramfs-nosizelimit.patch
index 40d2f6bd8..40d2f6bd8 100644
--- a/target/linux/patches/4.4.17/initramfs-nosizelimit.patch
+++ b/target/linux/patches/4.4.19/initramfs-nosizelimit.patch
diff --git a/target/linux/patches/4.4.17/ld-or1k.patch b/target/linux/patches/4.4.19/ld-or1k.patch
index 264f9166f..264f9166f 100644
--- a/target/linux/patches/4.4.17/ld-or1k.patch
+++ b/target/linux/patches/4.4.19/ld-or1k.patch
diff --git a/target/linux/patches/4.4.17/macsonic.patch b/target/linux/patches/4.4.19/macsonic.patch
index 75a6fcad2..75a6fcad2 100644
--- a/target/linux/patches/4.4.17/macsonic.patch
+++ b/target/linux/patches/4.4.19/macsonic.patch
diff --git a/target/linux/patches/4.4.17/mips-xz.patch b/target/linux/patches/4.4.19/mips-xz.patch
index 5cfac6254..5cfac6254 100644
--- a/target/linux/patches/4.4.17/mips-xz.patch
+++ b/target/linux/patches/4.4.19/mips-xz.patch
diff --git a/target/linux/patches/4.4.17/patch-realtime b/target/linux/patches/4.4.19/patch-realtime
index c677e4098..c677e4098 100644
--- a/target/linux/patches/4.4.17/patch-realtime
+++ b/target/linux/patches/4.4.19/patch-realtime
diff --git a/target/linux/patches/4.4.17/revert-sparc.patch b/target/linux/patches/4.4.19/revert-sparc.patch
index 296be0e4a..296be0e4a 100644
--- a/target/linux/patches/4.4.17/revert-sparc.patch
+++ b/target/linux/patches/4.4.19/revert-sparc.patch
diff --git a/target/linux/patches/4.4.17/startup.patch b/target/linux/patches/4.4.19/startup.patch
index e54ac19a6..e54ac19a6 100644
--- a/target/linux/patches/4.4.17/startup.patch
+++ b/target/linux/patches/4.4.19/startup.patch
diff --git a/target/linux/patches/4.4.17/use-libgcc-for-sh.patch b/target/linux/patches/4.4.19/use-libgcc-for-sh.patch
index 6420219b0..6420219b0 100644
--- a/target/linux/patches/4.4.17/use-libgcc-for-sh.patch
+++ b/target/linux/patches/4.4.19/use-libgcc-for-sh.patch
diff --git a/target/linux/patches/4.4.19/versatile-nommu.patch b/target/linux/patches/4.4.19/versatile-nommu.patch
new file mode 100644
index 000000000..96140b30c
--- /dev/null
+++ b/target/linux/patches/4.4.19/versatile-nommu.patch
@@ -0,0 +1,16 @@
+diff -Nur linux-4.4.17.orig/arch/arm/mach-versatile/include/mach/hardware.h linux-4.4.17/arch/arm/mach-versatile/include/mach/hardware.h
+--- linux-4.4.17.orig/arch/arm/mach-versatile/include/mach/hardware.h 2016-08-10 11:49:43.000000000 +0200
++++ linux-4.4.17/arch/arm/mach-versatile/include/mach/hardware.h 2016-08-25 23:19:03.691716292 +0200
+@@ -30,8 +30,12 @@
+ #define VERSATILE_PCI_VIRT_BASE (void __iomem *)0xe8000000ul
+ #define VERSATILE_PCI_CFG_VIRT_BASE (void __iomem *)0xe9000000ul
+
++#ifdef CONFIG_MMU
+ /* macro to get at MMIO space when running virtually */
+ #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))
+