boards: qemu_xtensa: use dc233c core

This changes qemu_xtensa to use dc233c core instead of
sample_controller. The sample_controller uses a very
basic configuration which lacks features usually needed
in real world applications. Instead, use the dc233c core
as the base for qemu_xtensa so we can use QEMU to cover
more of our code path.

Signed-off-by: Daniel Leung <daniel.leung@intel.com>

boards/xtensa/qemu_xtensa/Kconfig.board

@@ -5,7 +5,7 @@
 
 config BOARD_QEMU_XTENSA
 	bool "Xtensa emulation using QEMU"
-	depends on SOC_XTENSA_SAMPLE_CONTROLLER
+	depends on SOC_XTENSA_DC233C
 	select QEMU_TARGET
 
 config BOARD_QEMU_XTENSA_MMU

boards/xtensa/qemu_xtensa/board.cmake

@@ -2,13 +2,7 @@
 
 set(SUPPORTED_EMU_PLATFORMS qemu)
 
-if(CONFIG_BOARD_QEMU_XTENSA)
-  set(QEMU_CPU_TYPE_${ARCH} sample_controller)
-
-  set(QEMU_FLAGS_${ARCH}
-    -machine sim -semihosting -nographic -cpu sample_controller
-  )
-elseif(CONFIG_BOARD_QEMU_XTENSA_MMU)
+if(CONFIG_BOARD_QEMU_XTENSA OR CONFIG_BOARD_QEMU_XTENSA_MMU)
   set(QEMU_CPU_TYPE_${ARCH} dc233c)
 
   set(QEMU_FLAGS_${ARCH}

boards/xtensa/qemu_xtensa/qemu_xtensa.dts

@@ -1,16 +1,16 @@
 /*
- * Copyright (c) 2019 Intel Corporation.
+ * Copyright (c) 2019, 2023 Intel Corporation.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
 /dts-v1/;
 
-#include "sample_controller.dtsi"
+#include "dc233c.dtsi"
 
 / {
 	model = "qemu_xtensa";
-	compatible = "cdns,xtensa-sample-controller";
+	compatible = "cdns,xtensa-dc233c";
 
 	chosen {
 		zephyr,sram = &sram0;

boards/xtensa/qemu_xtensa/qemu_xtensa_defconfig

@@ -3,7 +3,7 @@
 CONFIG_MAIN_STACK_SIZE=2048
 CONFIG_BOARD_QEMU_XTENSA=y
 CONFIG_CONSOLE=y
-CONFIG_SOC_XTENSA_SAMPLE_CONTROLLER=y
+CONFIG_SOC_XTENSA_DC233C=y
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=10000000
 CONFIG_STACK_SENTINEL=y
 CONFIG_GEN_ISR_TABLES=y

soc/xtensa/dc233c/Kconfig.defconfig

@@ -22,7 +22,8 @@ config XTENSA_MMU_NUM_L2_TABLES
 # via TLB way 4 (which covers 1MB).
 config SRAM_OFFSET
 	hex
-	default 0x100000
+	default 0x100000 if XTENSA_MMU
+	default 0x2400
 
 config KERNEL_VM_OFFSET
 	hex

soc/xtensa/dc233c/include/xtensa-dc233c.ld

@@ -346,6 +346,10 @@ SECTIONS
   } >vec_helpers :vec_helpers_phdr
 #endif /* CONFIG_XTENSA_MMU */
 
+#ifdef CONFIG_CODE_DATA_RELOCATION
+#include <linker_relocate.ld>
+#endif
+
   .ResetVector.text : ALIGN(4)
   {
     __rom_region_start = ABSOLUTE(.);
@@ -363,6 +367,7 @@ SECTIONS
     *(.entry.text)
     *(.init.literal)
     *(.iram0.literal .iram.literal .iram.text.literal .iram0.text .iram.text)
+    *(.iram1.literal .iram1)
     KEEP(*(.init))
     *(.literal .text .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
     *(.fini.literal)

tests/application_development/code_relocation/linker_xtensa_qemu_sram2.ld

@@ -26,4 +26,4 @@ PHDRS
 #define MPU_ALIGN(region_size) \
     . = ALIGN(4)
 
-#include <xtensa-sample-controller.ld>
+#include <xtensa-dc233c.ld>