summaryrefslogtreecommitdiff
path: root/target/linux/config
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/config')
-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
4 files changed, 6 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