From c570b1226152338cd6b5a1c254df3bcad83d56b8 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Tue, 11 Oct 2016 20:58:09 +1000 Subject: qemu* -> *qemu-*: Rename QEMU machines Rename the QEMU machines to match the -- convention. QEMU only machines no longer need to be named qemu*. Note for qemuzynq it is special in that it does not model a board, as such it has no board in the name being just 'qemu-zynq7'. This updates the README.md to match the new machine names. Additional update all occurrences of the qemu* machines Signed-off-by: Nathan Rossi Reviewed-by: Alistair Francis --- README.md | 6 +- conf/machine/ml605-qemu-microblazeel.conf | 25 +++++++ conf/machine/qemu-zynq7.conf | 25 +++++++ conf/machine/qemumicroblaze-s3adsp1800.conf | 24 ------ conf/machine/qemumicroblaze.conf | 25 ------- conf/machine/qemuzynq.conf | 25 ------- conf/machine/s3adsp1800-qemu-microblazeeb.conf | 24 ++++++ recipes-bsp/device-tree/files/qemu/qemu-zynq7.dts | 85 ++++++++++++++++++++++ recipes-bsp/device-tree/files/qemu/qemuzynq.dts | 85 ---------------------- .../xilinx-machine/bsp/ml605-qemu-microblazeel.cfg | 15 ++++ .../xilinx-machine/bsp/ml605-qemu-microblazeel.scc | 4 + .../qemumicroblaze-s3adsp1800.cfg | 15 ---- .../qemumicroblaze-s3adsp1800.scc | 4 - .../bsp/qemumicroblaze/qemumicroblaze.cfg | 15 ---- .../bsp/qemumicroblaze/qemumicroblaze.scc | 4 - .../bsp/s3adsp1800-qemu-microblazeeb.cfg | 15 ++++ .../bsp/s3adsp1800-qemu-microblazeeb.scc | 4 + recipes-kernel/linux/linux-xilinx-machines.inc | 4 +- 18 files changed, 202 insertions(+), 202 deletions(-) create mode 100644 conf/machine/ml605-qemu-microblazeel.conf create mode 100644 conf/machine/qemu-zynq7.conf delete mode 100644 conf/machine/qemumicroblaze-s3adsp1800.conf delete mode 100644 conf/machine/qemumicroblaze.conf delete mode 100644 conf/machine/qemuzynq.conf create mode 100644 conf/machine/s3adsp1800-qemu-microblazeeb.conf create mode 100644 recipes-bsp/device-tree/files/qemu/qemu-zynq7.dts delete mode 100644 recipes-bsp/device-tree/files/qemu/qemuzynq.dts create mode 100644 recipes-kernel/linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.cfg create mode 100644 recipes-kernel/linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.scc delete mode 100644 recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze-s3adsp1800/qemumicroblaze-s3adsp1800.cfg delete mode 100644 recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze-s3adsp1800/qemumicroblaze-s3adsp1800.scc delete mode 100644 recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze/qemumicroblaze.cfg delete mode 100644 recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze/qemumicroblaze.scc create mode 100644 recipes-kernel/linux/config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.cfg create mode 100644 recipes-kernel/linux/config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.scc diff --git a/README.md b/README.md index 491b19c4..c3fc6068 100644 --- a/README.md +++ b/README.md @@ -12,11 +12,11 @@ Supported Boards/Machines Boards/Machines supported by this layer: * MicroBlaze: - * [qemumicroblaze](conf/machine/qemumicroblaze.conf) - `qemumicroblaze` - * [qemumicroblaze-s3adsp1800](conf/machine/qemumicroblaze-s3adsp1800.conf) - `qemumicroblaze-s3adsp1800` + * [Xilinx ML605 (QEMU)](conf/machine/ml605-qemu-microblazeel.conf) - `ml605-qemu-microblazeel` (QEMU support) + * [Xilinx S3A DSP 1800 (QEMU)](conf/machine/s3adsp1800-qemu-microblazeeb.conf) - `s3adsp1800-qemu-microblazeeb` (QEMU support) * [Xilinx KC705](conf/machine/kc705-microblazeel.conf) - `kc705-microblazeel` * Zynq: - * [qemuzynq](conf/machine/qemuzynq.conf) - `qemuzynq` + * [Zynq (QEMU)](conf/machine/qemu-zynq7.conf) - `qemu-zynq7` (QEMU Support) * [Xilinx ZC702](conf/machine/zc702-zynq7.conf) - `zc702-zynq7` * [Xilinx ZC706](conf/machine/zc706-zynq7.conf) - `zc706-zynq7` * [Avnet MicroZed](conf/machine/microzed-zynq7.conf) - `microzed-zynq7` diff --git a/conf/machine/ml605-qemu-microblazeel.conf b/conf/machine/ml605-qemu-microblazeel.conf new file mode 100644 index 00000000..38364a83 --- /dev/null +++ b/conf/machine/ml605-qemu-microblazeel.conf @@ -0,0 +1,25 @@ +#@TYPE: Machine +#@NAME: ml605-qemu-microblazeel +#@DESCRIPTION: MicroBlaze QEMU machine support ('petalogix-ml605' model) + +require conf/machine/include/tune-microblaze.inc +require conf/machine/include/machine-xilinx-default.inc +require conf/machine/include/machine-xilinx-qemu.inc + +TUNE_FEATURES_tune-microblaze += "v8.50 little-endian barrel-shift reorder pattern-compare divide-hard multiply-high fpu-hard" + +MACHINE_FEATURES = "" + +USE_VT = "" +SERIAL_CONSOLE = "115200 ttyS0" + +# Use the networking setup from qemuarm +FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm" + +# This machine is a targeting a QEMU model, runqemu setup: +QB_MEM = "-m 256" +QB_MACHINE = "-machine petalogix-ml605" +QB_OPT_APPEND = "-nographic -serial mon:stdio" +QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no -net nic,netdev=net0,macaddr=@MAC@" +QB_SLIRP_OPT = "-netdev user,id=net0 -net nic,netdev=net0" + diff --git a/conf/machine/qemu-zynq7.conf b/conf/machine/qemu-zynq7.conf new file mode 100644 index 00000000..02b9e621 --- /dev/null +++ b/conf/machine/qemu-zynq7.conf @@ -0,0 +1,25 @@ +#@TYPE: Machine +#@NAME: qemu-zynq7 +#@DESCRIPTION: Zynq QEMU machine support ('xilinx-zynq-a9' model) + +require conf/machine/include/tune-zynq.inc +require conf/machine/include/machine-xilinx-default.inc +require conf/machine/include/machine-xilinx-qemu.inc + +MACHINE_FEATURES = "ext2 vfat" + +SERIAL_CONSOLE = "115200 ttyPS0" + +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" +MACHINE_DEVICETREE = "qemu/qemu-zynq7.dts" + +# Use the networking setup from qemuarm +FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm" + +# This machine is a targeting a QEMU model, runqemu setup: +QB_MEM = "-m 1024" +QB_MACHINE = "-machine xilinx-zynq-a9" +QB_OPT_APPEND = "-nographic -serial null -serial mon:stdio" +QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no -net nic,netdev=net0,macaddr=@MAC@" +QB_SLIRP_OPT = "-netdev user,id=net0 -net nic,netdev=net0" + diff --git a/conf/machine/qemumicroblaze-s3adsp1800.conf b/conf/machine/qemumicroblaze-s3adsp1800.conf deleted file mode 100644 index 4eb5061f..00000000 --- a/conf/machine/qemumicroblaze-s3adsp1800.conf +++ /dev/null @@ -1,24 +0,0 @@ -#@TYPE: Machine -#@NAME: qemumicroblaze-s3adsp1800 -#@DESCRIPTION: MicroBlaze QEMU machine support ('petalogix-s3adsp1800' model) - -require conf/machine/include/tune-microblaze.inc -require conf/machine/include/machine-xilinx-default.inc -require conf/machine/include/machine-xilinx-qemu.inc - -TUNE_FEATURES_tune-microblaze += "v7.30 big-endian barrel-shift pattern-compare multiply-low" - -MACHINE_FEATURES = "" - -USE_VT = "" -SERIAL_CONSOLE = "115200 ttyUL0" - -MACHINE_ESSENTIAL_EXTRA_RDEPENDS_remove = "device-tree" - -# This machine is a targeting a QEMU model, runqemu setup: -QB_MEM = "-m 256" -QB_MACHINE = "-machine petalogix-s3adsp1800" -QB_OPT_APPEND = "-nographic -serial mon:stdio" -QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no -net nic,netdev=net0,macaddr=@MAC@" -QB_SLIRP_OPT = "-netdev user,id=net0 -net nic,netdev=net0" - diff --git a/conf/machine/qemumicroblaze.conf b/conf/machine/qemumicroblaze.conf deleted file mode 100644 index 6fca065e..00000000 --- a/conf/machine/qemumicroblaze.conf +++ /dev/null @@ -1,25 +0,0 @@ -#@TYPE: Machine -#@NAME: qemumicroblaze -#@DESCRIPTION: MicroBlaze QEMU machine support ('petalogix-ml605' model) - -require conf/machine/include/tune-microblaze.inc -require conf/machine/include/machine-xilinx-default.inc -require conf/machine/include/machine-xilinx-qemu.inc - -TUNE_FEATURES_tune-microblaze += "v8.50 little-endian barrel-shift reorder pattern-compare divide-hard multiply-high fpu-hard" - -MACHINE_FEATURES = "" - -USE_VT = "" -SERIAL_CONSOLE = "115200 ttyS0" - -# Use the networking setup from qemuarm -FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm" - -# This machine is a targeting a QEMU model, runqemu setup: -QB_MEM = "-m 256" -QB_MACHINE = "-machine petalogix-ml605" -QB_OPT_APPEND = "-nographic -serial mon:stdio" -QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no -net nic,netdev=net0,macaddr=@MAC@" -QB_SLIRP_OPT = "-netdev user,id=net0 -net nic,netdev=net0" - diff --git a/conf/machine/qemuzynq.conf b/conf/machine/qemuzynq.conf deleted file mode 100644 index 70ea9e0e..00000000 --- a/conf/machine/qemuzynq.conf +++ /dev/null @@ -1,25 +0,0 @@ -#@TYPE: Machine -#@NAME: qemuzynq -#@DESCRIPTION: Zynq QEMU machine support ('xilinx-zynq-a9' model) - -require conf/machine/include/tune-zynq.inc -require conf/machine/include/machine-xilinx-default.inc -require conf/machine/include/machine-xilinx-qemu.inc - -MACHINE_FEATURES = "ext2 vfat" - -SERIAL_CONSOLE = "115200 ttyPS0" - -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" -MACHINE_DEVICETREE = "qemu/qemuzynq.dts" - -# Use the networking setup from qemuarm -FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm" - -# This machine is a targeting a QEMU model, runqemu setup: -QB_MEM = "-m 1024" -QB_MACHINE = "-machine xilinx-zynq-a9" -QB_OPT_APPEND = "-nographic -serial null -serial mon:stdio" -QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no -net nic,netdev=net0,macaddr=@MAC@" -QB_SLIRP_OPT = "-netdev user,id=net0 -net nic,netdev=net0" - diff --git a/conf/machine/s3adsp1800-qemu-microblazeeb.conf b/conf/machine/s3adsp1800-qemu-microblazeeb.conf new file mode 100644 index 00000000..d76ed17f --- /dev/null +++ b/conf/machine/s3adsp1800-qemu-microblazeeb.conf @@ -0,0 +1,24 @@ +#@TYPE: Machine +#@NAME: s3adsp1800-qemu-microblazeeb +#@DESCRIPTION: MicroBlaze QEMU machine support ('petalogix-s3adsp1800' model) + +require conf/machine/include/tune-microblaze.inc +require conf/machine/include/machine-xilinx-default.inc +require conf/machine/include/machine-xilinx-qemu.inc + +TUNE_FEATURES_tune-microblaze += "v7.30 big-endian barrel-shift pattern-compare multiply-low" + +MACHINE_FEATURES = "" + +USE_VT = "" +SERIAL_CONSOLE = "115200 ttyUL0" + +MACHINE_ESSENTIAL_EXTRA_RDEPENDS_remove = "device-tree" + +# This machine is a targeting a QEMU model, runqemu setup: +QB_MEM = "-m 256" +QB_MACHINE = "-machine petalogix-s3adsp1800" +QB_OPT_APPEND = "-nographic -serial mon:stdio" +QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no -net nic,netdev=net0,macaddr=@MAC@" +QB_SLIRP_OPT = "-netdev user,id=net0 -net nic,netdev=net0" + diff --git a/recipes-bsp/device-tree/files/qemu/qemu-zynq7.dts b/recipes-bsp/device-tree/files/qemu/qemu-zynq7.dts new file mode 100644 index 00000000..cd0694d6 --- /dev/null +++ b/recipes-bsp/device-tree/files/qemu/qemu-zynq7.dts @@ -0,0 +1,85 @@ +/dts-v1/; +/include/ "zynq-7000.dtsi" +/include/ "zynq-7000-qspi-dummy.dtsi" + +/ { + model = "Zynq A9 QEMU"; + compatible = "qemu,xilinx-zynq-a9", "xlnx,zynq-7000"; + + aliases { + ethernet0 = &gem0; + serial0 = &uart1; + }; + + memory { + device_type = "memory"; + reg = <0x0 0x40000000>; + }; + + chosen { + bootargs = "earlyprintk"; + stdout-path = "serial0:115200n8"; + }; +}; + +&amba { + /* Setup a fixed 25 MHz clock (100Mbps) to trick the ethernet driver */ + fixednetclk: clock { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <25000000>; + }; +}; + +&gem0 { + status = "okay"; + clocks = <&clkc 30>, <&clkc 30>, <&fixednetclk>, <&fixednetclk>, <&clkc 30>; + phy-mode = "rgmii-id"; + phy-handle = <ðernet_phy>; + + ethernet_phy: ethernet-phy@23 { + device_type = "ethernet-phy"; + reg = <23>; + }; +}; + +&sdhci0 { + status = "okay"; +}; + +&uart1 { + status = "okay"; +}; + +&qspi { + status = "okay"; + is-dual = <1>; + primary_flash: ps7-qspi@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "st,m25p80"; + reg = <0x0>; + spi-max-frequency = <50000000>; + partition@0x00000000 { + label = "boot"; + reg = <0x00000000 0x00500000>; + }; + partition@0x00500000 { + label = "bootenv"; + reg = <0x00500000 0x00020000>; + }; + partition@0x00520000 { + label = "config"; + reg = <0x00520000 0x00020000>; + }; + partition@0x00540000 { + label = "image"; + reg = <0x00540000 0x00a80000>; + }; + partition@0x00fc0000 { + label = "spare"; + reg = <0x00fc0000 0x00000000>; + }; + }; +}; + diff --git a/recipes-bsp/device-tree/files/qemu/qemuzynq.dts b/recipes-bsp/device-tree/files/qemu/qemuzynq.dts deleted file mode 100644 index cd0694d6..00000000 --- a/recipes-bsp/device-tree/files/qemu/qemuzynq.dts +++ /dev/null @@ -1,85 +0,0 @@ -/dts-v1/; -/include/ "zynq-7000.dtsi" -/include/ "zynq-7000-qspi-dummy.dtsi" - -/ { - model = "Zynq A9 QEMU"; - compatible = "qemu,xilinx-zynq-a9", "xlnx,zynq-7000"; - - aliases { - ethernet0 = &gem0; - serial0 = &uart1; - }; - - memory { - device_type = "memory"; - reg = <0x0 0x40000000>; - }; - - chosen { - bootargs = "earlyprintk"; - stdout-path = "serial0:115200n8"; - }; -}; - -&amba { - /* Setup a fixed 25 MHz clock (100Mbps) to trick the ethernet driver */ - fixednetclk: clock { - #clock-cells = <0>; - compatible = "fixed-clock"; - clock-frequency = <25000000>; - }; -}; - -&gem0 { - status = "okay"; - clocks = <&clkc 30>, <&clkc 30>, <&fixednetclk>, <&fixednetclk>, <&clkc 30>; - phy-mode = "rgmii-id"; - phy-handle = <ðernet_phy>; - - ethernet_phy: ethernet-phy@23 { - device_type = "ethernet-phy"; - reg = <23>; - }; -}; - -&sdhci0 { - status = "okay"; -}; - -&uart1 { - status = "okay"; -}; - -&qspi { - status = "okay"; - is-dual = <1>; - primary_flash: ps7-qspi@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "st,m25p80"; - reg = <0x0>; - spi-max-frequency = <50000000>; - partition@0x00000000 { - label = "boot"; - reg = <0x00000000 0x00500000>; - }; - partition@0x00500000 { - label = "bootenv"; - reg = <0x00500000 0x00020000>; - }; - partition@0x00520000 { - label = "config"; - reg = <0x00520000 0x00020000>; - }; - partition@0x00540000 { - label = "image"; - reg = <0x00540000 0x00a80000>; - }; - partition@0x00fc0000 { - label = "spare"; - reg = <0x00fc0000 0x00000000>; - }; - }; -}; - diff --git a/recipes-kernel/linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.cfg b/recipes-kernel/linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.cfg new file mode 100644 index 00000000..771aec06 --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.cfg @@ -0,0 +1,15 @@ + +CONFIG_XILINX_MICROBLAZE0_FAMILY="virtex6" + +# CPU ISA Config +CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1 +CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1 +CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1 +CONFIG_XILINX_MICROBLAZE0_USE_DIV=1 +CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=2 +CONFIG_XILINX_MICROBLAZE0_USE_FPU=1 +CONFIG_XILINX_MICROBLAZE0_HW_VER="8.50.a" + +# Memory Base Address +CONFIG_KERNEL_BASE_ADDR=0x50000000 + diff --git a/recipes-kernel/linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.scc b/recipes-kernel/linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.scc new file mode 100644 index 00000000..ae3c3104 --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Kernel Config for ml605-qemu-microblazeel specific setup" +define KFEATURE_COMPATIBILITY board + +kconf hardware ml605-qemu-microblazeel.cfg diff --git a/recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze-s3adsp1800/qemumicroblaze-s3adsp1800.cfg b/recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze-s3adsp1800/qemumicroblaze-s3adsp1800.cfg deleted file mode 100644 index 0f635c16..00000000 --- a/recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze-s3adsp1800/qemumicroblaze-s3adsp1800.cfg +++ /dev/null @@ -1,15 +0,0 @@ - -CONFIG_XILINX_MICROBLAZE0_FAMILY="spartan3" - -# CPU ISA Config -CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1 -CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1 -CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1 -CONFIG_XILINX_MICROBLAZE0_USE_DIV=0 -CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=1 -CONFIG_XILINX_MICROBLAZE0_USE_FPU=0 -CONFIG_XILINX_MICROBLAZE0_HW_VER="7.10.d" - -# Memory Base Address -CONFIG_KERNEL_BASE_ADDR=0x90000000 - diff --git a/recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze-s3adsp1800/qemumicroblaze-s3adsp1800.scc b/recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze-s3adsp1800/qemumicroblaze-s3adsp1800.scc deleted file mode 100644 index e109ecb3..00000000 --- a/recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze-s3adsp1800/qemumicroblaze-s3adsp1800.scc +++ /dev/null @@ -1,4 +0,0 @@ -define KFEATURE_DESCRIPTION "Kernel Config for qemumicroblaze-s3adsp1800 specific setup" -define KFEATURE_COMPATIBILITY board - -kconf hardware qemumicroblaze-s3adsp1800.cfg diff --git a/recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze/qemumicroblaze.cfg b/recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze/qemumicroblaze.cfg deleted file mode 100644 index 771aec06..00000000 --- a/recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze/qemumicroblaze.cfg +++ /dev/null @@ -1,15 +0,0 @@ - -CONFIG_XILINX_MICROBLAZE0_FAMILY="virtex6" - -# CPU ISA Config -CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1 -CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1 -CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1 -CONFIG_XILINX_MICROBLAZE0_USE_DIV=1 -CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=2 -CONFIG_XILINX_MICROBLAZE0_USE_FPU=1 -CONFIG_XILINX_MICROBLAZE0_HW_VER="8.50.a" - -# Memory Base Address -CONFIG_KERNEL_BASE_ADDR=0x50000000 - diff --git a/recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze/qemumicroblaze.scc b/recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze/qemumicroblaze.scc deleted file mode 100644 index 8c14d76e..00000000 --- a/recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze/qemumicroblaze.scc +++ /dev/null @@ -1,4 +0,0 @@ -define KFEATURE_DESCRIPTION "Kernel Config for qemumicroblaze specific setup" -define KFEATURE_COMPATIBILITY board - -kconf hardware qemumicroblaze.cfg diff --git a/recipes-kernel/linux/config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.cfg b/recipes-kernel/linux/config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.cfg new file mode 100644 index 00000000..0f635c16 --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.cfg @@ -0,0 +1,15 @@ + +CONFIG_XILINX_MICROBLAZE0_FAMILY="spartan3" + +# CPU ISA Config +CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1 +CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1 +CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1 +CONFIG_XILINX_MICROBLAZE0_USE_DIV=0 +CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=1 +CONFIG_XILINX_MICROBLAZE0_USE_FPU=0 +CONFIG_XILINX_MICROBLAZE0_HW_VER="7.10.d" + +# Memory Base Address +CONFIG_KERNEL_BASE_ADDR=0x90000000 + diff --git a/recipes-kernel/linux/config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.scc b/recipes-kernel/linux/config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.scc new file mode 100644 index 00000000..aef8109f --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Kernel Config for s3adsp1800-qemu-microblazeeb specific setup" +define KFEATURE_COMPATIBILITY board + +kconf hardware s3adsp1800-qemu-microblazeeb.cfg diff --git a/recipes-kernel/linux/linux-xilinx-machines.inc b/recipes-kernel/linux/linux-xilinx-machines.inc index aa3149b1..77cab0af 100644 --- a/recipes-kernel/linux/linux-xilinx-machines.inc +++ b/recipes-kernel/linux/linux-xilinx-machines.inc @@ -5,8 +5,8 @@ COMPATIBLE_MACHINE_zynqmp = "zynqmp" COMPATIBLE_MACHINE_microblaze = "microblaze" # Default kernel config fragements for specific machines -KERNEL_FEATURES_append_qemumicroblaze = " bsp/qemumicroblaze/qemumicroblaze.scc" -KERNEL_FEATURES_append_qemumicroblaze-s3adsp1800 = " bsp/qemumicroblaze-s3adsp1800/qemumicroblaze-s3adsp1800.scc" +KERNEL_FEATURES_append_ml605-qemu-microblazeel = " bsp/ml605-qemu-microblazeel.scc" +KERNEL_FEATURES_append_s3adsp1800-qemu-microblazeeb = " bsp/s3adsp1800-qemu-microblazeeb.scc" KERNEL_FEATURES_append_kc705-microblazeel = " bsp/kc705-microblazeel/kc705-microblazeel.scc" # MicroBlaze is a uImage target, but its not called 'uImage' instead it is called 'linux.bin.ub' -- cgit v1.2.3-54-g00ecf