| Message ID | 20211117124026.1410172-7-ovidiu.panait@windriver.com |
|---|---|
| State | Superseded |
| Delegated to: | Michal Simek |
| Headers | show |
| Series | [01/10] xilinx: Kconfig: add XILINX_OF_BOARD_DTB_ADDR default value for microblaze | expand |
st 17. 11. 2021 v 13:41 odesÃlatel Ovidiu Panait <ovidiu.panait@windriver.com> napsal: > > 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> > --- > > arch/microblaze/cpu/exception.c | 2 +- > arch/microblaze/cpu/start.S | 2 +- > board/xilinx/microblaze-generic/Kconfig | 4 ++++ > include/configs/microblaze-generic.h | 2 -- > scripts/config_whitelist.txt | 1 - > 5 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/arch/microblaze/cpu/exception.c b/arch/microblaze/cpu/exception.c > index b8dedc4e19..e9476abedb 100644 > --- 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 74ed998c55..68f97f426c 100644 > --- 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 f2fa0f72b1..e3243297fe 100644 > --- a/board/xilinx/microblaze-generic/Kconfig > +++ b/board/xilinx/microblaze-generic/Kconfig > @@ -38,4 +38,8 @@ 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 Can you please write a small paragraph here? Thanks, Michal
diff --git a/arch/microblaze/cpu/exception.c b/arch/microblaze/cpu/exception.c index b8dedc4e19..e9476abedb 100644 --- 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 74ed998c55..68f97f426c 100644 --- 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 f2fa0f72b1..e3243297fe 100644 --- a/board/xilinx/microblaze-generic/Kconfig +++ b/board/xilinx/microblaze-generic/Kconfig @@ -38,4 +38,8 @@ 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 + endif diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 975580e4d4..28f67e30d5 100644 --- 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 b9c1c61e13..c53c2c3801 100644 --- 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
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> --- arch/microblaze/cpu/exception.c | 2 +- arch/microblaze/cpu/start.S | 2 +- board/xilinx/microblaze-generic/Kconfig | 4 ++++ include/configs/microblaze-generic.h | 2 -- scripts/config_whitelist.txt | 1 - 5 files changed, 6 insertions(+), 5 deletions(-)