configs/qemu_xtensa_lx60_defconfig: switch to dc233c

dc232b is MMUv2 core, dc233c is very similar MMUv3 core. MMUv3 is the
latest full MMU for xtensa, which allows running both MMU and noMMU
linux variants.
Update configuration overlay and linux config file.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Tested-by: Waldemar Brodkorb <wbx@openadk.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/board/qemu/xtensa-lx60/linux-4.4.config b/board/qemu/xtensa-lx60/linux-4.4.config
index 51701b20a10ad4cabdbfcfe7d4908154f286ccda..2d8e58d782b378ca340c701c87491cc563d13a9d 100644 (file)
--- a/board/qemu/xtensa-lx60/linux-4.4.config
+++ b/board/qemu/xtensa-lx60/linux-4.4.config
@@ -1,8 +1,8 @@
 # CONFIG_SWAP is not set
 # CONFIG_CROSS_MEMORY_ATTACH is not set
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_XTENSA_VARIANT_DC232B=y
-# CONFIG_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX is not set
+CONFIG_XTENSA_VARIANT_DC233C=y
+CONFIG_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX=y
 CONFIG_XTENSA_PLATFORM_XTFPGA=y
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CMDLINE="console=ttyS0,38400"

diff --git a/board/qemu/xtensa-lx60/readme.txt b/board/qemu/xtensa-lx60/readme.txt
index 04393ea2b09edfed01ff1f657e1e0151bc11b3d6..22f5e5a4caf0c2e7d8929003e210dbfe47d70516 100644 (file)
--- a/board/qemu/xtensa-lx60/readme.txt
+++ b/board/qemu/xtensa-lx60/readme.txt
@@ -1,7 +1,7 @@
 Run the emulation with:
 
- qemu-system-xtensa -M lx60 -cpu dc232b -monitor null -nographic -kernel output/images/Image.elf
+ qemu-system-xtensa -M lx60 -cpu dc233c -monitor null -nographic -kernel output/images/Image.elf
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 2.3.0
+Tested with QEMU 2.5.0

diff --git a/board/qemu/xtensa-lx60/xtensa_dc232b.tar b/board/qemu/xtensa-lx60/xtensa_dc232b.tar
deleted file mode 100644 (file)
index 77080e0..0000000
Binary files a/board/qemu/xtensa-lx60/xtensa_dc232b.tar and /dev/null differ

diff --git a/board/qemu/xtensa-lx60/xtensa_dc233c.tar b/board/qemu/xtensa-lx60/xtensa_dc233c.tar
new file mode 100644 (file)
index 0000000..1a97d7a
Binary files /dev/null and b/board/qemu/xtensa-lx60/xtensa_dc233c.tar differ

diff --git a/configs/qemu_xtensa_lx60_defconfig b/configs/qemu_xtensa_lx60_defconfig
index 4170bba3a4c92f5534bc536c6c2b4e03855161c0..e464c72e1442ad2b080c9d7f63e27d115deab8e7 100644 (file)
--- a/configs/qemu_xtensa_lx60_defconfig
+++ b/configs/qemu_xtensa_lx60_defconfig
@@ -1,7 +1,7 @@
 # Architecture
 BR2_xtensa=y
 BR2_XTENSA_CUSTOM=y
-BR2_XTENSA_CUSTOM_NAME="dc232b"
+BR2_XTENSA_CUSTOM_NAME="dc233c"
 BR2_XTENSA_CORE_NAME="lx60"
 BR2_XTENSA_OVERLAY_DIR="board/qemu/xtensa-lx60"