summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--target/arm/Makefile4
-rw-r--r--target/arm/kernel/qemu-arm-versatilepb2
-rw-r--r--target/config/Config.in.archopts6
-rw-r--r--target/linux/Config.in1
-rw-r--r--target/linux/config/Config.in.arm11
5 files changed, 23 insertions, 1 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile
index 72e60c772..ad6e1d9ae 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -30,7 +30,11 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE),y)
QEMU_ARGS+=-M realview-eb-mpcore -net user -net nic
endif
ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB),y)
+ifeq ($(ADK_TARGET_WITH_DEVICETREE),y)
QEMU_ARGS+=-M versatilepb -net user -net nic,model=smc91c111 -dtb $(FW_DIR)/versatile-pb.dtb
+else
+QEMU_ARGS+=-M versatilepb -net user -net nic,model=smc91c111
+endif
endif
ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9),y)
QEMU_ARGS+=-M vexpress-a9 -cpu cortex-a9 -m 256 -net user -net nic,model=lan9118 -dtb $(FW_DIR)/vexpress-v2p-ca9.dtb
diff --git a/target/arm/kernel/qemu-arm-versatilepb b/target/arm/kernel/qemu-arm-versatilepb
index 185b54b68..43e9620df 100644
--- a/target/arm/kernel/qemu-arm-versatilepb
+++ b/target/arm/kernel/qemu-arm-versatilepb
@@ -1,6 +1,6 @@
CONFIG_ARM=y
-# CONFIG_ARCH_MULTI_V7 is not set
CONFIG_ARCH_VERSATILE=y
CONFIG_PCI_VERSATILE=y
CONFIG_KUSER_HELPERS=y
CONFIG_ATAGS=y
+CONFIG_USE_OF=y
diff --git a/target/config/Config.in.archopts b/target/config/Config.in.archopts
index 0e0efa728..e205a7909 100644
--- a/target/config/Config.in.archopts
+++ b/target/config/Config.in.archopts
@@ -21,3 +21,9 @@ config ADK_TARGET_INSTRUCTION_SET
string
default "arm" if ADK_TARGET_ARCH_ARM_WITH_ARM
default "thumb" if ADK_TARGET_ARCH_ARM_WITH_THUMB
+
+config ADK_TARGET_WITH_DEVICETREE
+ bool
+ depends on ADK_TARGET_ARCH_ARM
+ default y if ADK_TARGET_KERNEL_VERSION_4_6
+ default n
diff --git a/target/linux/Config.in b/target/linux/Config.in
index 85d110fbc..59d24d43f 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -19,6 +19,7 @@ source target/linux/config/Config.in.audio
source target/linux/config/Config.in.multimedia
source target/linux/config/Config.in.crypto
source target/linux/config/Config.in.misc
+source target/linux/config/Config.in.arm
source target/linux/config/Config.in.mips
source target/linux/config/Config.in.xtensa
source target/linux/config/Config.in.pm
diff --git a/target/linux/config/Config.in.arm b/target/linux/config/Config.in.arm
new file mode 100644
index 000000000..bc61987d1
--- /dev/null
+++ b/target/linux/config/Config.in.arm
@@ -0,0 +1,11 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+config ADK_KERNEL_ARM_PATCH_PHYS_VIRT
+ bool
+
+config ADK_KERNEL_ARCH_VERSATILE_PB
+ bool
+ select ADK_KERNEL_ARM_PATCH_PHYS_VIRT
+ default y if !ADK_TARGET_WITH_DEVICETREE
+