From b271330b745ead404ddb8a9912db44da6fbbf968 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Thu, 16 Jun 2016 21:39:20 +1000 Subject: linux-xilinx-machines.inc: Do not clobber COMPATIBLE_MACHINE Do not clobber the value of COMPATIBLE_MACHINE, instead set it via ?=. This was clobbering the COMPATIBLE_MACHINE values from linux-yocto causing issues when the meta-xilinx layer was added but not building a meta-xilinx machine. Signed-off-by: Nathan Rossi --- recipes-kernel/linux/linux-xilinx-machines.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-kernel/linux/linux-xilinx-machines.inc b/recipes-kernel/linux/linux-xilinx-machines.inc index 67b07277..136eead4 100644 --- a/recipes-kernel/linux/linux-xilinx-machines.inc +++ b/recipes-kernel/linux/linux-xilinx-machines.inc @@ -1,5 +1,5 @@ # Setup for MicroBlaze and Zynq architectures -COMPATIBLE_MACHINE = "^$" +COMPATIBLE_MACHINE ?= "^$" COMPATIBLE_MACHINE_zynq = "zynq" COMPATIBLE_MACHINE_microblaze = "microblaze" -- cgit v1.2.3-54-g00ecf