From cac099d109916246d62fa45a93a1d4ceb9cf58aa Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Sat, 30 Sep 2017 01:13:36 +1000 Subject: linux-yocto: Rework kmeta/config for linux-yocto bbappends Rework meta-xilinx specific appends for linux-yocto to configure specific KMACHINE -> MACHINE pairs as well as setting up the xilinx-kmeta directory for additional fragments. Additionally pull out the MicroBlaze specific DEPENDS modificaation for common use. Signed-off-by: Nathan Rossi --- recipes-kernel/linux/linux-microblaze.inc | 5 +++++ recipes-kernel/linux/linux-yocto-dev.bbappend | 5 +---- recipes-kernel/linux/linux-yocto-tiny_%.bbappend | 5 +---- recipes-kernel/linux/linux-yocto-xilinx.inc | 25 ++++++++++++++++++++++++ recipes-kernel/linux/linux-yocto_%.bbappend | 5 +---- 5 files changed, 33 insertions(+), 12 deletions(-) create mode 100644 recipes-kernel/linux/linux-microblaze.inc create mode 100644 recipes-kernel/linux/linux-yocto-xilinx.inc diff --git a/recipes-kernel/linux/linux-microblaze.inc b/recipes-kernel/linux/linux-microblaze.inc new file mode 100644 index 00000000..e23a50e8 --- /dev/null +++ b/recipes-kernel/linux/linux-microblaze.inc @@ -0,0 +1,5 @@ +# MicroBlaze is a uImage target, but its not called 'uImage' instead it is called 'linux.bin.ub' +python () { + if d.getVar('KERNEL_IMAGETYPE', True).endswith('.ub'): + d.setVar('DEPENDS', "%s u-boot-mkimage-native" % d.getVar('DEPENDS', True)) +} diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend index 651e0d72..05c39951 100644 --- a/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -1,4 +1 @@ - -require linux-xilinx-configs.inc -require linux-xilinx-machines.inc - +require linux-yocto-xilinx.inc diff --git a/recipes-kernel/linux/linux-yocto-tiny_%.bbappend b/recipes-kernel/linux/linux-yocto-tiny_%.bbappend index 651e0d72..05c39951 100644 --- a/recipes-kernel/linux/linux-yocto-tiny_%.bbappend +++ b/recipes-kernel/linux/linux-yocto-tiny_%.bbappend @@ -1,4 +1 @@ - -require linux-xilinx-configs.inc -require linux-xilinx-machines.inc - +require linux-yocto-xilinx.inc diff --git a/recipes-kernel/linux/linux-yocto-xilinx.inc b/recipes-kernel/linux/linux-yocto-xilinx.inc new file mode 100644 index 00000000..92093008 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto-xilinx.inc @@ -0,0 +1,25 @@ +require linux-microblaze.inc + +# Add meta-xilinx kmeta +FILESEXTRAPATHS_prepend := "${THISDIR}:" +SRC_URI_append = " file://xilinx-kmeta;type=kmeta;name=xilinx-kmeta;destsuffix=xilinx-kmeta" + +# Zynq default generic KMACHINE +COMPATIBLE_MACHINE_zynq = "zynq" +KMACHINE_zynq = "zynq" + +# ZynqMP default generic KMACHINE +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/kc705-microblazeel/kc705-microblazeel.scc" + diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-yocto_%.bbappend index 651e0d72..05c39951 100644 --- a/recipes-kernel/linux/linux-yocto_%.bbappend +++ b/recipes-kernel/linux/linux-yocto_%.bbappend @@ -1,4 +1 @@ - -require linux-xilinx-configs.inc -require linux-xilinx-machines.inc - +require linux-yocto-xilinx.inc -- cgit v1.2.3-54-g00ecf