diff options
author | Mark Hatle <mark.hatle@xilinx.com> | 2021-12-15 15:53:53 -0800 |
---|---|---|
committer | Mark Hatle <mark.hatle@xilinx.com> | 2022-01-14 15:37:05 -0800 |
commit | 7d2009f71d6fca822c49bef1e23775c4faed855b (patch) | |
tree | 42e72819c301b3d76cca9594dfa08f02733392a7 | |
parent | 6634ad159e4d6783428ac83d0adde716b89afa8d (diff) | |
download | meta-xilinx-7d2009f71d6fca822c49bef1e23775c4faed855b.tar.gz |
linux-*: Move BSP settings to meta-xilinx-bsp
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
7 files changed, 31 insertions, 13 deletions
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 @@ | |||
1 | KERNEL_MODULE_AUTOLOAD:k26 += "usb5744" | ||
2 | |||
3 | # MicroBlaze BSP fragments | ||
4 | KERNEL_FEATURES:append:kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc" | ||
5 | |||
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 @@ | |||
1 | KERNEL_MODULE_AUTOLOAD:k26 += "usb5744" | ||
2 | |||
3 | # MicroBlaze BSP fragments | ||
4 | KERNEL_FEATURES:append:kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc" | ||
5 | |||
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 @@ | |||
1 | # MicroBlaze KMACHINEs | ||
2 | KMACHINE:ml605-qemu-microblazeel = "qemumicroblazeel" | ||
3 | KMACHINE:s3adsp1800-qemu-microblazeeb = "qemumicroblazeeb" | ||
4 | |||
5 | # Default kernel config fragements for specific machines | ||
6 | KERNEL_FEATURES:append:kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc" | ||
7 | |||
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 @@ | |||
1 | # MicroBlaze KMACHINEs | ||
2 | KMACHINE:ml605-qemu-microblazeel = "qemumicroblazeel" | ||
3 | KMACHINE:s3adsp1800-qemu-microblazeeb = "qemumicroblazeeb" | ||
4 | |||
5 | # Default kernel config fragements for specific machines | ||
6 | KERNEL_FEATURES:append:kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc" | ||
7 | |||
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 @@ | |||
1 | # MicroBlaze KMACHINEs | ||
2 | KMACHINE:ml605-qemu-microblazeel = "qemumicroblazeel" | ||
3 | KMACHINE:s3adsp1800-qemu-microblazeeb = "qemumicroblazeeb" | ||
4 | |||
5 | # Default kernel config fragements for specific machines | ||
6 | KERNEL_FEATURES:append:kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc" | ||
7 | |||
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc index 31cde189..8e72840d 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" | |||
51 | KBUILD_DEFCONFIG:microblaze ?= "mmu_defconfig" | 51 | KBUILD_DEFCONFIG:microblaze ?= "mmu_defconfig" |
52 | KBUILD_DEFCONFIG:versal ?= "xilinx_defconfig" | 52 | KBUILD_DEFCONFIG:versal ?= "xilinx_defconfig" |
53 | 53 | ||
54 | KERNEL_MODULE_AUTOLOAD:k26 += "usb5744" | ||
55 | |||
56 | # MicroBlaze BSP fragments | ||
57 | KERNEL_FEATURES:append:kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc" | ||
58 | |||
59 | KERNEL_FEATURES:append:zynqmp = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' features/xen/xen.scc', '', d)}" | 54 | KERNEL_FEATURES:append:zynqmp = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' features/xen/xen.scc', '', d)}" |
60 | 55 | ||
61 | KERNEL_FEATURES:append:zynqmp = "${@' features/xilinx/overlay_of/overlay_of.scc' if d.getVar('FPGA_MNGR_RECONFIG_ENABLE') == '1' else ''}" | 56 | 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" | |||
10 | COMPATIBLE_MACHINE:zynqmp = "zynqmp" | 10 | COMPATIBLE_MACHINE:zynqmp = "zynqmp" |
11 | KMACHINE:zynqmp = "zynqmp" | 11 | KMACHINE:zynqmp = "zynqmp" |
12 | 12 | ||
13 | # MicroBlaze KMACHINEs | ||
14 | KMACHINE:ml605-qemu-microblazeel = "qemumicroblazeel" | ||
15 | KMACHINE:s3adsp1800-qemu-microblazeeb = "qemumicroblazeeb" | ||
16 | |||
17 | # MicroBlaze default generic KMACHINE | 13 | # MicroBlaze default generic KMACHINE |
18 | KMACHINE:microblaze = "microblaze" | 14 | KMACHINE:microblaze = "microblaze" |
19 | COMPATIBLE_MACHINE:microblaze = "microblaze" | 15 | COMPATIBLE_MACHINE:microblaze = "microblaze" |
20 | |||
21 | # Default kernel config fragements for specific machines | ||
22 | KERNEL_FEATURES:append:kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc" | ||
23 | |||