random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 04:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

microblaze: migrate CONFIG_SYS_USR_EXCEP to Kconfig

Browse Source 
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>
This commit is contained in:
Ovidiu Panait 2021-11-30 18:33:54 +02:00 committed by Michal Simek
parent 70c68712ef
commit 83b175be16
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/microblaze/cpu/exception.c
View File

@ -55,7 +55,7 @@ void _hw_exception_handler (void)
hang(); hang();
} }
#ifdef CONFIG_SYS_USR_EXCEP #if CONFIG_IS_ENABLED(XILINX_MICROBLAZE0_USR_EXCEP)
void _exception_handler (void) void _exception_handler (void)
{ {
puts("User vector_exception\n"); puts("User vector_exception\n");

2
arch/microblaze/cpu/start.S
View File

@ -144,7 +144,7 @@ __setup_exceptions:
rsubi r8, r10, 0x6 rsubi r8, r10, 0x6
sh r6, r0, r8 sh r6, r0, r8
#ifdef CONFIG_SYS_USR_EXCEP #if CONFIG_IS_ENABLED(XILINX_MICROBLAZE0_USR_EXCEP)
/* user_vector_exception */ /* user_vector_exception */
swi r2, r0, 0x8 /* user vector exception - imm opcode */ swi r2, r0, 0x8 /* user vector exception - imm opcode */
swi r3, r0, 0xC /* user vector exception - brai opcode */ swi r3, r0, 0xC /* user vector exception - brai opcode */

9
board/xilinx/microblaze-generic/Kconfig
View File

@ -38,4 +38,13 @@ config XILINX_MICROBLAZE0_HW_VER
string "Core version number" string "Core version number"
default "7.10.d" 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 endif

2
include/configs/microblaze-generic.h
View File

@ -54,8 +54,6 @@
#define CONFIG_HOSTNAME "microblaze-generic" #define CONFIG_HOSTNAME "microblaze-generic"
/* architecture dependent code */ /* architecture dependent code */
#define CONFIG_SYS_USR_EXCEP /* user exception */
#if defined(CONFIG_CMD_PXE) && defined(CONFIG_CMD_DHCP) #if defined(CONFIG_CMD_PXE) && defined(CONFIG_CMD_DHCP)
#define BOOT_TARGET_DEVICES_PXE(func) func(PXE, pxe, na) #define BOOT_TARGET_DEVICES_PXE(func) func(PXE, pxe, na)
#else #else

1
scripts/config_whitelist.txt
View File

@ -2870,7 +2870,6 @@ CONFIG_SYS_USE_MMC
CONFIG_SYS_USE_NAND CONFIG_SYS_USE_NAND
CONFIG_SYS_USE_NANDFLASH CONFIG_SYS_USE_NANDFLASH
CONFIG_SYS_USE_NORFLASH CONFIG_SYS_USE_NORFLASH
CONFIG_SYS_USR_EXCEP
CONFIG_SYS_VCXK_ACKNOWLEDGE_DDR CONFIG_SYS_VCXK_ACKNOWLEDGE_DDR
CONFIG_SYS_VCXK_ACKNOWLEDGE_PIN CONFIG_SYS_VCXK_ACKNOWLEDGE_PIN
CONFIG_SYS_VCXK_ACKNOWLEDGE_PORT CONFIG_SYS_VCXK_ACKNOWLEDGE_PORT