From 9b90c101329049ab9cb5ba4641e091effd7edd07 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Sat, 18 Dec 2021 09:20:42 -0800 Subject: New microblaze-generic based on microblazeel-v11.0-bs-cmp-mh-div-generic The new generic will be the default microblaze configuration, with the other remaining temporarily for compatibility. Signed-off-by: Mark Hatle --- .../conf/machine/microblaze-generic.conf | 21 +++++++++++++++++++++ .../microblazeel-v11.0-bs-cmp-mh-div-generic.conf | 18 ++---------------- .../microblazeel-v11.0-bs-cmp-ml-generic.conf | 17 ++--------------- 3 files changed, 25 insertions(+), 31 deletions(-) create mode 100644 meta-xilinx-bsp/conf/machine/microblaze-generic.conf (limited to 'meta-xilinx-bsp') diff --git a/meta-xilinx-bsp/conf/machine/microblaze-generic.conf b/meta-xilinx-bsp/conf/machine/microblaze-generic.conf new file mode 100644 index 00000000..af119f5f --- /dev/null +++ b/meta-xilinx-bsp/conf/machine/microblaze-generic.conf @@ -0,0 +1,21 @@ +#@TYPE: Machine +#@NAME: microblaze-generic +#@DESCRIPTION: Generic microblaze defaults to little-endian v11.0 barrel-shift pattern-compare reorder divide-hard multiple-high support + +require conf/machine/include/microblaze/tune-microblaze.inc +require conf/machine/include/machine-xilinx-default.inc +require conf/machine/include/xilinx-board.inc + +TUNE_FEATURES:tune-microblaze = "microblaze v11.0 barrel-shift pattern-compare reorder divide-hard multiply-high" + +MACHINE_FEATURES = "" + +KERNEL_IMAGETYPE = "linux.bin.ub" +KERNEL_IMAGETYPES = "" + +SERIAL_CONSOLES ?= "115200;ttyS0" + +EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native" + +UBOOT_MACHINE ?= "microblaze-generic_defconfig" +UBOOT_INITIAL_ENV = "" diff --git a/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf b/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf index f562d58f..415a61c2 100644 --- a/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf +++ b/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf @@ -2,20 +2,6 @@ #@NAME: microblazeel-v11.0-bs-cmp-mh-div-generic #@DESCRIPTION: microblazeel-v11.0-bs-cmp-mh-div -require conf/machine/include/microblaze/tune-microblaze.inc -require conf/machine/include/machine-xilinx-default.inc -require conf/machine/include/xilinx-board.inc +require conf/machine/include/microblaze-generic.conf -TUNE_FEATURES:tune-microblaze += "v11.0 barrel-shift pattern-compare reorder divide-hard multiply-high" - -MACHINE_FEATURES = "" - -KERNEL_IMAGETYPE = "linux.bin.ub" -KERNEL_IMAGETYPES = "" - -SERIAL_CONSOLES ?= "115200;ttyS0" - -EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native" - -UBOOT_MACHINE ?= "microblaze-generic_defconfig" -UBOOT_INITIAL_ENV = "" +TUNE_FEATURES:tune-microblaze = "microblaze v11.0 barrel-shift pattern-compare reorder divide-hard multiply-high" diff --git a/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf b/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf index 2770b5b9..5d6ea8ab 100644 --- a/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf +++ b/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf @@ -2,19 +2,6 @@ #@NAME: microblazeel-v11.0-bs-cmp-ml-generic #@DESCRIPTION: microblazeel-v11.0-bs-cmp-ml -require conf/machine/include/microblaze/tune-microblaze.inc -require conf/machine/include/machine-xilinx-default.inc +require conf/machine/include/microblaze-generic.conf -TUNE_FEATURES:tune-microblaze += "v11.0 barrel-shift reorder pattern-compare multiply-low" - -MACHINE_FEATURES = "" - -KERNEL_IMAGETYPE = "linux.bin.ub" -KERNEL_IMAGETYPES = "" - -SERIAL_CONSOLES ?= "115200;ttyS0" - -EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native" - -UBOOT_MACHINE ?= "microblaze-generic_defconfig" -UBOOT_INITIAL_ENV = "" +TUNE_FEATURES:tune-microblaze = "microblaze v11.0 barrel-shift reorder pattern-compare multiply-low" -- cgit v1.2.3-54-g00ecf