diff options
| author | Nathan Rossi <nathan@nathanrossi.com> | 2016-01-04 20:59:54 +1000 |
|---|---|---|
| committer | Nathan Rossi <nathan@nathanrossi.com> | 2016-01-06 13:10:44 +1000 |
| commit | 9a1dc04091bab915a12798d1b4856a5b60ae7e97 (patch) | |
| tree | 635834f49f8474ffd5f4696e4fe01a9c7da4cc95 | |
| parent | 2c86432d9b11a8d9505bf1232ef6de38bb36802c (diff) | |
| download | meta-xilinx-9a1dc04091bab915a12798d1b4856a5b60ae7e97.tar.gz | |
linux-xilinx-machines.inc: Default COMPATIBLE_MACHINE for ZynqMP
All meta-xilinx kernels now support ZynqMP, set the compatiblity in
common include instead of per kernel.
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
| -rw-r--r-- | recipes-kernel/linux/linux-xilinx-machines.inc | 1 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-xlnx-dev.bb | 2 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-xlnx_4.0.bb | 2 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-yocto-dev.bbappend | 2 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-yocto_4.1.bbappend | 2 |
5 files changed, 1 insertions, 8 deletions
diff --git a/recipes-kernel/linux/linux-xilinx-machines.inc b/recipes-kernel/linux/linux-xilinx-machines.inc index 94753eea..6e70b4be 100644 --- a/recipes-kernel/linux/linux-xilinx-machines.inc +++ b/recipes-kernel/linux/linux-xilinx-machines.inc | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | # Setup for MicroBlaze and Zynq architectures | 1 | # Setup for MicroBlaze and Zynq architectures |
| 2 | COMPATIBLE_MACHINE = "^$" | 2 | COMPATIBLE_MACHINE = "^$" |
| 3 | COMPATIBLE_MACHINE_zynq = "zynq" | 3 | COMPATIBLE_MACHINE_zynq = "zynq" |
| 4 | COMPATIBLE_MACHINE_zynqmp = "zynqmp" | ||
| 4 | COMPATIBLE_MACHINE_microblaze = "microblaze" | 5 | COMPATIBLE_MACHINE_microblaze = "microblaze" |
| 5 | 6 | ||
| 6 | # Default kernel config fragements for specific machines | 7 | # Default kernel config fragements for specific machines |
diff --git a/recipes-kernel/linux/linux-xlnx-dev.bb b/recipes-kernel/linux/linux-xlnx-dev.bb index 9967c165..9f2b8564 100644 --- a/recipes-kernel/linux/linux-xlnx-dev.bb +++ b/recipes-kernel/linux/linux-xlnx-dev.bb | |||
| @@ -20,5 +20,3 @@ PV = "${LINUX_VERSION}${LINUX_VERSION_EXTENSION}+git${SRCPV}" | |||
| 20 | 20 | ||
| 21 | include linux-xlnx.inc | 21 | include linux-xlnx.inc |
| 22 | 22 | ||
| 23 | COMPATIBLE_MACHINE_zynqmp = "zynqmp" | ||
| 24 | |||
diff --git a/recipes-kernel/linux/linux-xlnx_4.0.bb b/recipes-kernel/linux/linux-xlnx_4.0.bb index 57415a74..f06a7e01 100644 --- a/recipes-kernel/linux/linux-xlnx_4.0.bb +++ b/recipes-kernel/linux/linux-xlnx_4.0.bb | |||
| @@ -4,5 +4,3 @@ SRCREV ?= "c8087d7838faed86341e4f749a740f69d95248a8" | |||
| 4 | 4 | ||
| 5 | include linux-xlnx.inc | 5 | include linux-xlnx.inc |
| 6 | 6 | ||
| 7 | COMPATIBLE_MACHINE_zynqmp = "zynqmp" | ||
| 8 | |||
diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend index ae51eb1f..651e0d72 100644 --- a/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/recipes-kernel/linux/linux-yocto-dev.bbappend | |||
| @@ -2,5 +2,3 @@ | |||
| 2 | require linux-xilinx-configs.inc | 2 | require linux-xilinx-configs.inc |
| 3 | require linux-xilinx-machines.inc | 3 | require linux-xilinx-machines.inc |
| 4 | 4 | ||
| 5 | COMPATIBLE_MACHINE_zynqmp = "zynqmp" | ||
| 6 | |||
diff --git a/recipes-kernel/linux/linux-yocto_4.1.bbappend b/recipes-kernel/linux/linux-yocto_4.1.bbappend index ae51eb1f..651e0d72 100644 --- a/recipes-kernel/linux/linux-yocto_4.1.bbappend +++ b/recipes-kernel/linux/linux-yocto_4.1.bbappend | |||
| @@ -2,5 +2,3 @@ | |||
| 2 | require linux-xilinx-configs.inc | 2 | require linux-xilinx-configs.inc |
| 3 | require linux-xilinx-machines.inc | 3 | require linux-xilinx-machines.inc |
| 4 | 4 | ||
| 5 | COMPATIBLE_MACHINE_zynqmp = "zynqmp" | ||
| 6 | |||