From 8f44d815c29c4d647120f149302b1970b9674fd9 Mon Sep 17 00:00:00 2001
From: Yoshinori Sato <ysato@users.sourceforge.jp>
Date: Fri, 28 Jan 2022 00:36:47 +0900
Subject: [PATCH] rx: remove ROM kernel config.

Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
---
 arch/rx/Kconfig       | 30 +++++-------------------------
 arch/rx/kernel/head.S | 30 ++++++------------------------
 2 files changed, 11 insertions(+), 49 deletions(-)

diff --git a/arch/rx/Kconfig b/arch/rx/Kconfig
index 058012f66448..c2311656c364 100644
--- a/arch/rx/Kconfig
+++ b/arch/rx/Kconfig
@@ -29,6 +29,8 @@ config RX
 	select TIMER_OF
 	select GENERIC_CPU_DEVICES
 	select GENERIC_IRQ_SHOW
+	select UACCESS_MEMCPY
+	select ARCH_HAS_BINFMT_FLAT
 
 config MMU
 	def_bool n
@@ -109,10 +111,10 @@ menu "Processor type and features"
 
 choice
 	prompt "Platform"
-	default RX_GDB_SIM
+	default RX_QEMU
 
-config RX_GDB_SIM
-	bool "GDB Simulator"
+config RX_QEMU
+	bool "QEMU virtual platform"
 	select CPU_RX62N
 	help
 	  GDB Simulator
@@ -161,29 +163,7 @@ config RX_ICUA
 config CPU_LITTLE_ENDIAN
        def_bool y
 
-choice
-	prompt "Kernel executes from"
-	---help---
-	  Choose the memory type that the kernel will be running in.
-
-config RAMKERNEL
-	bool "RAM"
-	help
-	  The kernel will be resident in RAM when running.
-
-config ROMKERNEL
-	bool "ROM"
-	help
-	  The kernel will be resident in FLASH/ROM when running.
-endchoice
-
 menu "memory map"
-config ROMSTART
-       depends on ROMKERNEL
-       hex "ROM start address"
-config ROMEND
-       depends on ROMKERNEL
-       hex "ROM end address"
 config RAMSTART
        hex "RAM start address"
 config RAMEND
diff --git a/arch/rx/kernel/head.S b/arch/rx/kernel/head.S
index 691148f81f53..545a38817e82 100644
--- a/arch/rx/kernel/head.S
+++ b/arch/rx/kernel/head.S
@@ -15,21 +15,9 @@
 	.global	startup
 	.section	.head.text,"ax"
 startup:
-	mov.l	#CONFIG_INITIAL_STACK,r0
-#if defined(CONFIG_ROMKERNEL)
-	mov.l	#setup_bsc,r1
-	jsr	r1
-
-	/* copy rw data to ram */
-	mov.l	#__data_romtop,r2
-	mov.l	#_sdata,r1
-	mov.l	#_edata,r3
-	sub	r1,r3
-	smovf
-	sub	r4,r4
-#else
-	mov	r1,r4
-#endif
+	mov.l	r1,r0
+	/* r1 is FDT header */
+	mov	r1, r4
 	/* clear BSS */
 	mov	#_sbss,r1
 	mov	#_ebss,r3
@@ -37,22 +25,16 @@ startup:
 	shlr	#2,r3
 	mov	#0,r2
 	sstr.l
-	mov	r4,r1
-	mov	#rx_fdt_init,r2
-	jsr	r2
 	/* exception handler setup */
-#if defined(CONFIG_RAMKERNEL)
 	mov	#install_exception_entry,r1
 	jsr	r1
-#endif
+	mov.l	#rx_fdt_init, r2
+	mov	r4,r1
+	jsr	r2
 	/* start kernel */
 	mov	#init_thread_union, r1
 	add	#PAGE_SIZE, r1, r0
 	mov	#start_kernel, r1
 	jmp	r1
 
-	.weak	setup_bsc
-setup_bsc:	
-	rts
-
 	.end
-- 
2.11.0