summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2017-03-18 07:23:14 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2017-03-18 07:23:21 (GMT)
commitf35dbe482cb0a2b1ed9c9241a10c073238fdb907 (patch)
tree4b9f84c62de1973fb73710366b099e0340d91ce7
parente80e2408d4e54999784338182527ec16949addd8 (diff)
xtensa: fix noMMU qemu sample, with help from Max
-rw-r--r--Config.in2
-rw-r--r--target/config/Config.in.kernelcmd4
-rw-r--r--target/linux/config/Config.in.bus1
-rw-r--r--target/xtensa/Makefile4
-rw-r--r--target/xtensa/kernel/qemu-xtensa1
5 files changed, 7 insertions, 5 deletions
diff --git a/Config.in b/Config.in
index d6a2889..2467ba5 100644
--- a/Config.in
+++ b/Config.in
@@ -53,7 +53,7 @@ source "target/config/Config.in.runtime"
endmenu
menu "Linux Kernel configuration"
- visible if ADK_TARGET_OS_LINUX
+ visible if ADK_TARGET_OS_LINUX && !ADK_TARGET_CHOOSE_ARCH
source "target/config/Config.in.kernelversion"
source "target/config/Config.in.kernelcfg"
source "target/config/Config.in.kernelcmd"
diff --git a/target/config/Config.in.kernelcmd b/target/config/Config.in.kernelcmd
index 5a2b305..e575f52 100644
--- a/target/config/Config.in.kernelcmd
+++ b/target/config/Config.in.kernelcmd
@@ -2,12 +2,12 @@
# material, please see the LICENCE file in the top-level directory.
config ADK_TARGET_CMDLINE
- string "Kernel cmdline"
+ string "Kernel commandline"
default "fbcon=rotate:1" if ADK_TARGET_SYSTEM_SHARP_ZAURUS
default "geodewdt.nowayout=1" if ADK_TARGET_MODEL_PCENGINES_ALIX1C
default "kinetis_platform=k70-som" if ADK_TARGET_SYSTEM_KINETIS_K70
default "metag_da.console_poll=1" if ADK_TARGET_SYSTEM_QEMU_METAG
- default "earlycon=uart8250,mmio32,0x9d050020,115200n8 console=ttyS0,115200n8" if ADK_TARGET_CPU_XTENSA_DE212
+ default "earlycon=uart8250,mmio32,0x9d050020,115200n8 memmap=256M@0x60000000" if ADK_TARGET_CPU_XTENSA_DE212
default "earlyprintk=uart8250-32bit,0x99600000" if ADK_TARGET_SYSTEM_ANDES_AG101P
default "earlycon noiotrap" if ADK_TARGET_SYSTEM_NUMATO_MIMASV2
default ""
diff --git a/target/linux/config/Config.in.bus b/target/linux/config/Config.in.bus
index f7f5e82..4ac0a2b 100644
--- a/target/linux/config/Config.in.bus
+++ b/target/linux/config/Config.in.bus
@@ -8,6 +8,7 @@ config ADK_KERNEL_PCI
|| ADK_TARGET_QEMU \
|| ADK_TARGET_VBOX
default n if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU
+ default n if ADK_TARGET_CPU_XTENSA_DE212
default y
config ADK_KERNEL_PCI_QUIRKS
diff --git a/target/xtensa/Makefile b/target/xtensa/Makefile
index d391ef4..f0d3b95 100644
--- a/target/xtensa/Makefile
+++ b/target/xtensa/Makefile
@@ -11,7 +11,7 @@ else
KERNEL:=$(LINUX_DIR)/arch/xtensa/boot/uImage
endif
-QEMU_ARGS:=-M ml605 -monitor null
+QEMU_ARGS:=-M kc705
QEMU_ARGS+=${ADK_QEMU_ARGS}
ifeq ($(ADK_TARGET_CPU_XTENSA_DC233C),y)
QEMU_ARGS+=-cpu dc233c
@@ -20,7 +20,7 @@ ifeq ($(ADK_TARGET_CPU_XTENSA_DC232B),y)
QEMU_ARGS+=-cpu dc232b
endif
ifeq ($(ADK_TARGET_CPU_XTENSA_DE212),y)
-QEMU_ARGS+=-cpu de212
+QEMU_ARGS+=-cpu de212 -m 256
endif
# target helper text
diff --git a/target/xtensa/kernel/qemu-xtensa b/target/xtensa/kernel/qemu-xtensa
index a6202d5..5db1a10 100644
--- a/target/xtensa/kernel/qemu-xtensa
+++ b/target/xtensa/kernel/qemu-xtensa
@@ -1,2 +1,3 @@
CONFIG_XTENSA=y
CONFIG_XTENSA_PLATFORM_XTFPGA=y
+CONFIG_CMDLINE_BOOL=y