1
0
Преглед на файлове

xtensa: fix noMMU qemu sample, with help from Max

Waldemar Brodkorb преди 7 години
родител
ревизия
f35dbe482c
променени са 5 файла, в които са добавени 7 реда и са изтрити 5 реда
  1. 1 1
      Config.in
  2. 2 2
      target/config/Config.in.kernelcmd
  3. 1 0
      target/linux/config/Config.in.bus
  4. 2 2
      target/xtensa/Makefile
  5. 1 0
      target/xtensa/kernel/qemu-xtensa

+ 1 - 1
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"

+ 2 - 2
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 ""

+ 1 - 0
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

+ 2 - 2
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

+ 1 - 0
target/xtensa/kernel/qemu-xtensa

@@ -1,2 +1,3 @@
 CONFIG_XTENSA=y
 CONFIG_XTENSA_PLATFORM_XTFPGA=y
+CONFIG_CMDLINE_BOOL=y