diff options
12 files changed, 17 insertions, 17 deletions
@@ -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/qemumicroblaze.conf b/conf/machine/ml605-qemu-microblazeel.conf index 6fca065e..38364a83 100644 --- a/conf/machine/qemumicroblaze.conf +++ b/conf/machine/ml605-qemu-microblazeel.conf @@ -1,5 +1,5 @@ #@TYPE: Machine -#@NAME: qemumicroblaze +#@NAME: ml605-qemu-microblazeel #@DESCRIPTION: MicroBlaze QEMU machine support ('petalogix-ml605' model) require conf/machine/include/tune-microblaze.inc diff --git a/conf/machine/qemuzynq.conf b/conf/machine/qemu-zynq7.conf index 70ea9e0e..02b9e621 100644 --- a/conf/machine/qemuzynq.conf +++ b/conf/machine/qemu-zynq7.conf @@ -1,5 +1,5 @@ #@TYPE: Machine -#@NAME: qemuzynq +#@NAME: qemu-zynq7 #@DESCRIPTION: Zynq QEMU machine support ('xilinx-zynq-a9' model) require conf/machine/include/tune-zynq.inc @@ -11,7 +11,7 @@ MACHINE_FEATURES = "ext2 vfat" SERIAL_CONSOLE = "115200 ttyPS0" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" -MACHINE_DEVICETREE = "qemu/qemuzynq.dts" +MACHINE_DEVICETREE = "qemu/qemu-zynq7.dts" # Use the networking setup from qemuarm FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm" diff --git a/conf/machine/qemumicroblaze-s3adsp1800.conf b/conf/machine/s3adsp1800-qemu-microblazeeb.conf index 4eb5061f..d76ed17f 100644 --- a/conf/machine/qemumicroblaze-s3adsp1800.conf +++ b/conf/machine/s3adsp1800-qemu-microblazeeb.conf @@ -1,5 +1,5 @@ #@TYPE: Machine -#@NAME: qemumicroblaze-s3adsp1800 +#@NAME: s3adsp1800-qemu-microblazeeb #@DESCRIPTION: MicroBlaze QEMU machine support ('petalogix-s3adsp1800' model) require conf/machine/include/tune-microblaze.inc diff --git a/recipes-bsp/device-tree/files/qemu/qemuzynq.dts b/recipes-bsp/device-tree/files/qemu/qemu-zynq7.dts index cd0694d6..cd0694d6 100644 --- a/recipes-bsp/device-tree/files/qemu/qemuzynq.dts +++ b/recipes-bsp/device-tree/files/qemu/qemu-zynq7.dts diff --git a/recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze/qemumicroblaze.cfg b/recipes-kernel/linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.cfg index 771aec06..771aec06 100644 --- a/recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze/qemumicroblaze.cfg +++ b/recipes-kernel/linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.cfg 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.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.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/qemumicroblaze-s3adsp1800/qemumicroblaze-s3adsp1800.cfg b/recipes-kernel/linux/config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.cfg index 0f635c16..0f635c16 100644 --- a/recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze-s3adsp1800/qemumicroblaze-s3adsp1800.cfg +++ b/recipes-kernel/linux/config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.cfg 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' |