From 9a1dc04091bab915a12798d1b4856a5b60ae7e97 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Mon, 4 Jan 2016 20:59:54 +1000 Subject: 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 --- recipes-kernel/linux/linux-xilinx-machines.inc | 1 + recipes-kernel/linux/linux-xlnx-dev.bb | 2 -- recipes-kernel/linux/linux-xlnx_4.0.bb | 2 -- recipes-kernel/linux/linux-yocto-dev.bbappend | 2 -- recipes-kernel/linux/linux-yocto_4.1.bbappend | 2 -- 5 files changed, 1 insertion(+), 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 @@ # Setup for MicroBlaze and Zynq architectures COMPATIBLE_MACHINE = "^$" COMPATIBLE_MACHINE_zynq = "zynq" +COMPATIBLE_MACHINE_zynqmp = "zynqmp" COMPATIBLE_MACHINE_microblaze = "microblaze" # 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}" include linux-xlnx.inc -COMPATIBLE_MACHINE_zynqmp = "zynqmp" - 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" include linux-xlnx.inc -COMPATIBLE_MACHINE_zynqmp = "zynqmp" - 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 @@ require linux-xilinx-configs.inc require linux-xilinx-machines.inc -COMPATIBLE_MACHINE_zynqmp = "zynqmp" - 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 @@ require linux-xilinx-configs.inc require linux-xilinx-machines.inc -COMPATIBLE_MACHINE_zynqmp = "zynqmp" - -- cgit v1.2.3-54-g00ecf