diff options
| author | Mark Hatle <mark.hatle@xilinx.com> | 2022-01-21 13:09:53 -0800 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@xilinx.com> | 2022-01-23 12:17:00 -0800 |
| commit | 1167ecec3dbbda5e1ffffdef723ce26455851072 (patch) | |
| tree | 9feef89a3e32f2ef0907437e262b8af5ad64454f | |
| parent | 82c8812822e27a80b7ac87cb2ff99884be88816b (diff) | |
| download | meta-xilinx-1167ecec3dbbda5e1ffffdef723ce26455851072.tar.gz | |
linux-xlnx: Only include microblaze when enabled
This prevents meta-microblaze from being required, and hash values changing
unless microblaze processor is enabled.
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
| -rw-r--r-- | meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc | 5 | ||||
| -rw-r--r-- | meta-xilinx-core/recipes-kernel/linux/linux-yocto-xilinx.inc | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc index 8e72840d..4652154e 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc | |||
| @@ -17,7 +17,10 @@ SRCREV_meta ?= "20b185f6b5afbad309747a7901786e0231dc8195" | |||
| 17 | SRCREV_FORMAT = "machine" | 17 | SRCREV_FORMAT = "machine" |
| 18 | 18 | ||
| 19 | require recipes-kernel/linux/linux-yocto.inc | 19 | require recipes-kernel/linux/linux-yocto.inc |
| 20 | require linux-microblaze.inc | 20 | |
| 21 | LINUX_MB_INC = "" | ||
| 22 | LINUX_MB_INC:microblaze = "linux-microblaze.inc" | ||
| 23 | require ${LINUX_MB_INC} | ||
| 21 | 24 | ||
| 22 | DESCRIPTION = "Xilinx Kernel" | 25 | DESCRIPTION = "Xilinx Kernel" |
| 23 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 26 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
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 688eec2b..5e33ffe5 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-yocto-xilinx.inc +++ b/meta-xilinx-core/recipes-kernel/linux/linux-yocto-xilinx.inc | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | FILESEXTRAPATHS:prepend := "${THISDIR}/linux-xlnx:" | 1 | FILESEXTRAPATHS:prepend := "${THISDIR}/linux-xlnx:" |
| 2 | 2 | ||
| 3 | require linux-microblaze.inc | 3 | LINUX_MB_INC = "" |
| 4 | LINUX_MB_INC:microblaze = "linux-microblaze.inc" | ||
| 5 | require ${LINUX_MB_INC} | ||
| 4 | 6 | ||
| 5 | # Zynq default generic KMACHINE | 7 | # Zynq default generic KMACHINE |
| 6 | COMPATIBLE_MACHINE:zynq = "zynq" | 8 | COMPATIBLE_MACHINE:zynq = "zynq" |