microblaze: migrate CONFIG_SYS_USR_EXCEP to Kconfig

Migrate CONFIG_SYS_USR_EXCEP to Kconfig. Also, rename it to
XILINX_MICROBLAZE0_USR_EXCEP in order to match the naming convention of
microblaze-generic Kconfig options.

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

diff --git a/arch/microblaze/cpu/exception.c b/arch/microblaze/cpu/exception.c
index b8dedc4e1958c59969e1ebc51d956eb7065139b9..e9476abedbdf288a393d4d1c3428ee5101cf6c0a 100644 (file)
--- a/arch/microblaze/cpu/exception.c
+++ b/arch/microblaze/cpu/exception.c
@@ -55,7 +55,7 @@ void _hw_exception_handler (void)
        hang();
 }
 
-#ifdef CONFIG_SYS_USR_EXCEP
+#if CONFIG_IS_ENABLED(XILINX_MICROBLAZE0_USR_EXCEP)
 void _exception_handler (void)
 {
        puts("User vector_exception\n");

diff --git a/arch/microblaze/cpu/start.S b/arch/microblaze/cpu/start.S
index 74ed998c553dad968db35e53cf1b625036fe6bf1..68f97f426cbdc97e3a3aed67a9fc5940057cbcb2 100644 (file)
--- a/arch/microblaze/cpu/start.S
+++ b/arch/microblaze/cpu/start.S
@@ -144,7 +144,7 @@ __setup_exceptions:
        rsubi   r8, r10, 0x6
        sh      r6, r0, r8
 
-#ifdef CONFIG_SYS_USR_EXCEP
+#if CONFIG_IS_ENABLED(XILINX_MICROBLAZE0_USR_EXCEP)
        /* user_vector_exception */
        swi     r2, r0, 0x8     /* user vector exception - imm opcode */
        swi     r3, r0, 0xC     /* user vector exception - brai opcode */

diff --git a/board/xilinx/microblaze-generic/Kconfig b/board/xilinx/microblaze-generic/Kconfig
index f2fa0f72b13f46ac7ba24b31fcac752266e7c7e3..3e3eca0e800637eb0a91c2ffbb66c8bc30311746 100644 (file)
--- a/board/xilinx/microblaze-generic/Kconfig
+++ b/board/xilinx/microblaze-generic/Kconfig
@@ -38,4 +38,13 @@ config XILINX_MICROBLAZE0_HW_VER
        string "Core version number"
        default "7.10.d"
 
+config XILINX_MICROBLAZE0_USR_EXCEP
+       bool "MicroBlaze user exception support"
+       default y
+       help
+         Enable this option in order to install the user exception handler
+         (_exception_handler routine from arch/microblaze/cpu/exception.c) in
+         the exception vector table. The user exception vector is located at
+         C_BASE_VECTORS + 0x8 address.
+
 endif

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 975580e4d4ef760aec74d15959683353f49dac90..28f67e30d5d236906131bdf7e225478e6bbc0a7d 100644 (file)
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -54,8 +54,6 @@
 #define        CONFIG_HOSTNAME         "microblaze-generic"
 
 /* architecture dependent code */
-#define        CONFIG_SYS_USR_EXCEP    /* user exception */
-
 #if defined(CONFIG_CMD_PXE) && defined(CONFIG_CMD_DHCP)
 #define BOOT_TARGET_DEVICES_PXE(func)  func(PXE, pxe, na)
 #else

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index b9c1c61e13dc91fb35fc51a17f36d4208dd5c25a..c53c2c380128a55f9a7028f3f7b01831b2f32fa7 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -2870,7 +2870,6 @@ CONFIG_SYS_USE_MMC
 CONFIG_SYS_USE_NAND
 CONFIG_SYS_USE_NANDFLASH
 CONFIG_SYS_USE_NORFLASH
-CONFIG_SYS_USR_EXCEP
 CONFIG_SYS_VCXK_ACKNOWLEDGE_DDR
 CONFIG_SYS_VCXK_ACKNOWLEDGE_PIN
 CONFIG_SYS_VCXK_ACKNOWLEDGE_PORT