From 58fb81a47c1af743da7ed9c8349142198d137eb6 Mon Sep 17 00:00:00 2001 From: Sipke Vriend Date: Fri, 3 May 2013 12:16:13 +1000 Subject: Consolidate zynq fragments and move inclusion into board layers. Signed-off-by: Sipke Vriend --- meta-zc702/recipes-kernel/linux/linux-xlnx.inc | 8 ++++++++ meta-zedboard/recipes-kernel/linux/linux-xlnx.inc | 5 +++++ recipes-kernel/linux/linux-xlnx.inc | 3 --- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/meta-zc702/recipes-kernel/linux/linux-xlnx.inc b/meta-zc702/recipes-kernel/linux/linux-xlnx.inc index f2675c8d..b90b846c 100644 --- a/meta-zc702/recipes-kernel/linux/linux-xlnx.inc +++ b/meta-zc702/recipes-kernel/linux/linux-xlnx.inc @@ -1,5 +1,13 @@ # linux-xlnx specific modifications for zc702 +FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx:" + +# Config fragments are either under +# meta-xilinx/kernel-recipes for common fragments, or +# meta-xilinx/meta-/kernel-recipes for board specific fragments +SRC_URI += "file://xilinx_zynq_defconfig.cfg" +SRC_URI_append_zedboard += "file://rtc.cfg" + KERNEL_DEVICETREE_zc702 = "${S}/arch/arm/boot/dts/zynq-zc702.dts" COMPATIBLE_MACHINE_zc702 = "zc702" diff --git a/meta-zedboard/recipes-kernel/linux/linux-xlnx.inc b/meta-zedboard/recipes-kernel/linux/linux-xlnx.inc index 1d0dbc76..e5eefbe2 100644 --- a/meta-zedboard/recipes-kernel/linux/linux-xlnx.inc +++ b/meta-zedboard/recipes-kernel/linux/linux-xlnx.inc @@ -1,6 +1,11 @@ # linux-xlnx specific modifications for zedboard FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx:" + +# Config fragments are either under +# meta-xilinx/kernel-recipes for common fragments, or +# meta-xilinx/meta-/kernel-recipes for board specific fragments +SRC_URI += "file://xilinx_zynq_defconfig.cfg" SRC_URI_append_zedboard += "file://nortc.cfg" KERNEL_DEVICETREE_zedboard = "${S}/arch/arm/boot/dts/zynq-zed.dts" diff --git a/recipes-kernel/linux/linux-xlnx.inc b/recipes-kernel/linux/linux-xlnx.inc index 32adcc7f..7b2319be 100644 --- a/recipes-kernel/linux/linux-xlnx.inc +++ b/recipes-kernel/linux/linux-xlnx.inc @@ -39,9 +39,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx:" # tree if you do not want to build from Linus' tree. SRC_URI = "git://github.com/Xilinx/linux-xlnx;protocol=git;nocheckout=1" -# Consolidate defconfig and use fragments? -SRC_URI += "file://xilinx_zynq_defconfig.cfg" - PR = "r1" PV = "${LINUX_VERSION}${LINUX_VERSION_EXTENSION}+git${SRCPV}" -- cgit v1.2.3-54-g00ecf