microblaze: drop CONFIG_SYS_RESET_ADDRESS macro

Microblaze is one the last two users of the CONFIG_SYS_RESET_ADDRESS
macro (the other is arch/powerpc/cpu/mpc8xx/cpu.c, but the macro is not
defined anywhere in powerpc code, so it should be removed there too).

Replace CONFIG_SYS_RESET_ADDRESS usage in start.S with
CONFIG_SYS_TEXT_BASE. If the reset address should really be
user-configurable, a new Kconfig option could be added.

Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Link: https://lore.kernel.org/r/20211130163358.2531677-6-ovidiu.panait@windriver.com
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/microblaze/cpu/start.S b/arch/microblaze/cpu/start.S
index a1c06108d72332ee2e4866ab7603642926fb19e6..74ed998c553dad968db35e53cf1b625036fe6bf1 100644 (file)
--- a/arch/microblaze/cpu/start.S
+++ b/arch/microblaze/cpu/start.S
@@ -132,19 +132,17 @@ __setup_exceptions:
        addi    r2, r0, 0xb0000000      /* hex b000 opcode imm */
        addi    r3, r0, 0xb8080000      /* hew b808 opcode brai */
 
-#ifdef CONFIG_SYS_RESET_ADDRESS
        /* reset address */
        swi     r2, r0, 0x0     /* reset address - imm opcode */
        swi     r3, r0, 0x4     /* reset address - brai opcode */
 
-       addik   r6, r0, CONFIG_SYS_RESET_ADDRESS
+       addik   r6, r0, CONFIG_SYS_TEXT_BASE
        sw      r6, r1, r0
        lhu     r7, r1, r10
        rsubi   r8, r10, 0x2
        sh      r7, r0, r8
        rsubi   r8, r10, 0x6
        sh      r6, r0, r8
-#endif
 
 #ifdef CONFIG_SYS_USR_EXCEP
        /* user_vector_exception */

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index e7882fb60781f51c99c0f0709866b3372c7822d8..975580e4d4ef760aec74d15959683353f49dac90 100644 (file)
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -21,9 +21,6 @@
 # define CONFIG_SYS_BAUDRATE_TABLE \
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
-/* setting reset address */
-/*#define      CONFIG_SYS_RESET_ADDRESS        CONFIG_SYS_TEXT_BASE*/
-
 /* Stack location before relocation */
 #define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_TEXT_BASE - \
                                         CONFIG_SYS_MALLOC_F_LEN)