[PATCH 07/10] microblaze: migrate CONFIG_SYS_USR_EXCEP to Kconfig

Michal Simek monstr at monstr.eu
Mon Nov 29 15:04:32 CET 2021


st 17. 11. 2021 v 13:41 odesílatel Ovidiu Panait
<ovidiu.panait at 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 at 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


More information about the U-Boot mailing list