Commit ac551e34 authored by Michal Simek's avatar Michal Simek

microblaze: Move MSR instruction selection to Kconfig

Select MSR instructions via Kconfig instead of xparameters.h.
Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
parent 4ad1096e
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
#define NOP __asm__ __volatile__ ("nop"); #define NOP __asm__ __volatile__ ("nop");
/* use machine status registe USE_MSR_REG */ /* use machine status registe USE_MSR_REG */
#if XILINX_USE_MSR_INSTR == 1 #if CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR == 1
#define MSRSET(val) \ #define MSRSET(val) \
__asm__ __volatile__ ("msrset r0," #val ); __asm__ __volatile__ ("msrset r0," #val );
......
...@@ -9,6 +9,10 @@ config SYS_VENDOR ...@@ -9,6 +9,10 @@ config SYS_VENDOR
config SYS_CONFIG_NAME config SYS_CONFIG_NAME
default "microblaze-generic" default "microblaze-generic"
config XILINX_MICROBLAZE0_USE_MSR_INSTR
int "USE_MSR_INSTR range (0:1)"
default 0
config XILINX_MICROBLAZE0_USE_PCMP_INSTR config XILINX_MICROBLAZE0_USE_PCMP_INSTR
int "USE_PCMP_INSTR range (0:1)" int "USE_PCMP_INSTR range (0:1)"
default 0 default 0
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#define XILINX_BOARD_NAME microblaze-generic #define XILINX_BOARD_NAME microblaze-generic
/* Microblaze is microblaze_0 */ /* Microblaze is microblaze_0 */
#define XILINX_USE_MSR_INSTR 1
#define XILINX_FSL_NUMBER 3 #define XILINX_FSL_NUMBER 3
/* GPIO is LEDs_4Bit*/ /* GPIO is LEDs_4Bit*/
......
...@@ -2,6 +2,7 @@ CONFIG_MICROBLAZE=y ...@@ -2,6 +2,7 @@ CONFIG_MICROBLAZE=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_DM=y CONFIG_SPL_DM=y
CONFIG_TARGET_MICROBLAZE_GENERIC=y CONFIG_TARGET_MICROBLAZE_GENERIC=y
CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1
CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1 CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1
CONFIG_XILINX_MICROBLAZE0_USE_DIV=1 CONFIG_XILINX_MICROBLAZE0_USE_DIV=1
CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=1 CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment