From eaf81e5bb8ed451613d5c2e11dd062183ef15e4a Mon Sep 17 00:00:00 2001 From: Sipke Vriend Date: Wed, 24 Jul 2013 09:00:59 +1000 Subject: recipes-kernel:linux-yocto Add some kernel configurations to Zynq. linux-yocto-tiny: add mmc.scc and remove all-others.cfg linux-yocto standard: add mmc.scc, mtd.scc, uio.cfg and no_hz.scc Signed-off-by: Sipke Vriend --- recipes-kernel/linux/linux-yocto-tiny_3.8.bbappend | 4 ++-- recipes-kernel/linux/linux-yocto/zedboard-standard.scc | 4 ---- recipes-kernel/linux/linux-yocto/zynq-standard.scc | 6 ++++++ recipes-kernel/linux/linux-yocto/zynq-tiny.scc | 6 ++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/recipes-kernel/linux/linux-yocto-tiny_3.8.bbappend b/recipes-kernel/linux/linux-yocto-tiny_3.8.bbappend index 8b04bba3..636da3bf 100644 --- a/recipes-kernel/linux/linux-yocto-tiny_3.8.bbappend +++ b/recipes-kernel/linux/linux-yocto-tiny_3.8.bbappend @@ -5,10 +5,10 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx:" SRC_URI_append += " \ file://xilinx-v14.5_modifications_to_v3.8.scc \ file://microblaze-patches_v3.8.scc \ - file://${SOC_FAMILY}-tiny.scc \ + file://${KMACHINE}-tiny.scc \ " SRC_URI_append += "git://github.com/Xilinx/xilinx-kernel-cache;protocol=git;branch=master;type=kmeta;name=externalcache;destsuffix=external-cache/" SRCREV_externalcache = "${AUTOREV}" -COMPATIBLE_MACHINE = "zedboard|zc702" \ No newline at end of file +COMPATIBLE_MACHINE = "zedboard|zc702" diff --git a/recipes-kernel/linux/linux-yocto/zedboard-standard.scc b/recipes-kernel/linux/linux-yocto/zedboard-standard.scc index f1c8fd98..d29f8284 100644 --- a/recipes-kernel/linux/linux-yocto/zedboard-standard.scc +++ b/recipes-kernel/linux/linux-yocto/zedboard-standard.scc @@ -5,7 +5,3 @@ define KARCH arm include ktypes/standard branch meta include zynq-standard.scc -###### -##### -#### -############ \ No newline at end of file diff --git a/recipes-kernel/linux/linux-yocto/zynq-standard.scc b/recipes-kernel/linux/linux-yocto/zynq-standard.scc index 50cab2d9..156ed18a 100644 --- a/recipes-kernel/linux/linux-yocto/zynq-standard.scc +++ b/recipes-kernel/linux/linux-yocto/zynq-standard.scc @@ -15,6 +15,7 @@ include cfg/xilinx/userinput.scc include cfg/xilinx/serial.scc include cfg/xilinx/i2c.scc include cfg/xilinx/spi.scc +include cfg/xilinx/mmc.scc include cfg/gps.scc include cfg/ptpclock.scc include cfg/xilinx/gpio.scc @@ -44,6 +45,9 @@ include cfg/arm/amba.scc include cfg/smp.scc include features/mac80211/mac80211.cfg include arch/arm/arm.cfg +include cfg/mtd.scc + +include features/uio/uio.cfg include cfg/uio-irq.scc # Non-hardware kconf configs @@ -59,3 +63,5 @@ include features/power/zynq.scc # Optional kconfig configs include cfg/tracing.scc + +include cfg/timer/no_hz.scc diff --git a/recipes-kernel/linux/linux-yocto/zynq-tiny.scc b/recipes-kernel/linux/linux-yocto/zynq-tiny.scc index 41490797..805decc3 100644 --- a/recipes-kernel/linux/linux-yocto/zynq-tiny.scc +++ b/recipes-kernel/linux/linux-yocto/zynq-tiny.scc @@ -1,10 +1,6 @@ -include arch/arm/arm.cfg - kconf hardware cfg/zynq/zynq-arch.cfg kconf hardware cfg/zynq/zynq-boot.cfg -## remove eventually -kconf hardware cfg/zynq/all-others.cfg # non hardware kconfig configs include cfg/commonclk.scc @@ -19,6 +15,7 @@ include cfg/xilinx/userinput.scc include cfg/xilinx/serial.scc include cfg/xilinx/i2c.scc include cfg/xilinx/spi.scc +include cfg/xilinx/mmc.scc include cfg/gps.scc include cfg/ptpclock.scc include cfg/xilinx/gpio.scc @@ -45,6 +42,7 @@ include cfg/arm/amba.scc # Hardware kconf configs include cfg/smp.scc include features/mac80211/mac80211.cfg +include arch/arm/arm.cfg include cfg/efi-ext.scc # Non-hardware kconf configs -- cgit v1.2.3-54-g00ecf