From 18b9efd047faab28d8eeff322320c211effcc07b Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 15 Dec 2021 15:53:53 -0800 Subject: linux-*: Move BSP settings to meta-xilinx-bsp Signed-off-by: Mark Hatle --- meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx-dev.bbappend | 5 +++++ meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_%.bbappend | 5 +++++ meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend | 7 +++++++ meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-tiny_%.bbappend | 7 +++++++ meta-xilinx-bsp/recipes-kernel/linux/linux-yocto_%.bbappend | 7 +++++++ meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc | 5 ----- meta-xilinx-core/recipes-kernel/linux/linux-yocto-xilinx.inc | 8 -------- 7 files changed, 31 insertions(+), 13 deletions(-) create mode 100644 meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx-dev.bbappend create mode 100644 meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_%.bbappend create mode 100644 meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend create mode 100644 meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-tiny_%.bbappend create mode 100644 meta-xilinx-bsp/recipes-kernel/linux/linux-yocto_%.bbappend diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx-dev.bbappend b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx-dev.bbappend new file mode 100644 index 00000000..285621b1 --- /dev/null +++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx-dev.bbappend @@ -0,0 +1,5 @@ +KERNEL_MODULE_AUTOLOAD:k26 += "usb5744" + +# MicroBlaze BSP fragments +KERNEL_FEATURES:append:kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc" + diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_%.bbappend b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_%.bbappend new file mode 100644 index 00000000..285621b1 --- /dev/null +++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_%.bbappend @@ -0,0 +1,5 @@ +KERNEL_MODULE_AUTOLOAD:k26 += "usb5744" + +# MicroBlaze BSP fragments +KERNEL_FEATURES:append:kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc" + diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend new file mode 100644 index 00000000..0233531d --- /dev/null +++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -0,0 +1,7 @@ +# MicroBlaze KMACHINEs +KMACHINE:ml605-qemu-microblazeel = "qemumicroblazeel" +KMACHINE:s3adsp1800-qemu-microblazeeb = "qemumicroblazeeb" + +# Default kernel config fragements for specific machines +KERNEL_FEATURES:append:kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc" + diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-tiny_%.bbappend b/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-tiny_%.bbappend new file mode 100644 index 00000000..0233531d --- /dev/null +++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-tiny_%.bbappend @@ -0,0 +1,7 @@ +# MicroBlaze KMACHINEs +KMACHINE:ml605-qemu-microblazeel = "qemumicroblazeel" +KMACHINE:s3adsp1800-qemu-microblazeeb = "qemumicroblazeeb" + +# Default kernel config fragements for specific machines +KERNEL_FEATURES:append:kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc" + diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto_%.bbappend new file mode 100644 index 00000000..0233531d --- /dev/null +++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto_%.bbappend @@ -0,0 +1,7 @@ +# MicroBlaze KMACHINEs +KMACHINE:ml605-qemu-microblazeel = "qemumicroblazeel" +KMACHINE:s3adsp1800-qemu-microblazeeb = "qemumicroblazeeb" + +# Default kernel config fragements for specific machines +KERNEL_FEATURES:append:kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc" + diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc index 147c53e2..f65fd64f 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc @@ -51,11 +51,6 @@ KBUILD_DEFCONFIG:zynq ?= "xilinx_zynq_defconfig" KBUILD_DEFCONFIG:microblaze ?= "mmu_defconfig" KBUILD_DEFCONFIG:versal ?= "xilinx_defconfig" -KERNEL_MODULE_AUTOLOAD:k26 += "usb5744" - -# MicroBlaze BSP fragments -KERNEL_FEATURES:append:kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc" - KERNEL_FEATURES:append:zynqmp = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' features/xen/xen.scc', '', d)}" KERNEL_FEATURES:append:zynqmp = "${@' features/xilinx/overlay_of/overlay_of.scc' if d.getVar('FPGA_MNGR_RECONFIG_ENABLE') == '1' else ''}" diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-yocto-xilinx.inc b/meta-xilinx-core/recipes-kernel/linux/linux-yocto-xilinx.inc index 708c99f0..688eec2b 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-yocto-xilinx.inc +++ b/meta-xilinx-core/recipes-kernel/linux/linux-yocto-xilinx.inc @@ -10,14 +10,6 @@ KMACHINE:zynq = "zynq" COMPATIBLE_MACHINE:zynqmp = "zynqmp" KMACHINE:zynqmp = "zynqmp" -# MicroBlaze KMACHINEs -KMACHINE:ml605-qemu-microblazeel = "qemumicroblazeel" -KMACHINE:s3adsp1800-qemu-microblazeeb = "qemumicroblazeeb" - # MicroBlaze default generic KMACHINE KMACHINE:microblaze = "microblaze" COMPATIBLE_MACHINE:microblaze = "microblaze" - -# Default kernel config fragements for specific machines -KERNEL_FEATURES:append:kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc" - -- cgit v1.2.3-54-g00ecf