From e3f16a1c7f789885bee8edccc4714b3da2a14a87 Mon Sep 17 00:00:00 2001 From: Sipke Vriend Date: Thu, 18 Jul 2013 11:56:25 +1000 Subject: linux-yocto-*: change linux-yocto recipe to target boards rather than architecture, to allow for zedboard and zc702 builds. Signed-off-by: Sipke Vriend --- recipes-kernel/linux/linux-yocto/zc702-standard.scc | 7 +++++++ recipes-kernel/linux/linux-yocto/zc702-tiny.scc | 7 +++++++ recipes-kernel/linux/linux-yocto/zedboard-standard.scc | 11 +++++++++++ recipes-kernel/linux/linux-yocto/zedboard-tiny.scc | 7 +++++++ recipes-kernel/linux/linux-yocto/zynq-standard.scc | 12 +++--------- recipes-kernel/linux/linux-yocto/zynq-tiny.scc | 7 ------- recipes-kernel/linux/linux-yocto_3.8.bbappend | 2 +- 7 files changed, 36 insertions(+), 17 deletions(-) create mode 100644 recipes-kernel/linux/linux-yocto/zc702-standard.scc create mode 100644 recipes-kernel/linux/linux-yocto/zc702-tiny.scc create mode 100644 recipes-kernel/linux/linux-yocto/zedboard-standard.scc create mode 100644 recipes-kernel/linux/linux-yocto/zedboard-tiny.scc diff --git a/recipes-kernel/linux/linux-yocto/zc702-standard.scc b/recipes-kernel/linux/linux-yocto/zc702-standard.scc new file mode 100644 index 00000000..7701de26 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto/zc702-standard.scc @@ -0,0 +1,7 @@ +define KMACHINE zc702 +define KTYPE standard +define KARCH arm + +include ktypes/standard +branch meta +include zynq-standard.scc diff --git a/recipes-kernel/linux/linux-yocto/zc702-tiny.scc b/recipes-kernel/linux/linux-yocto/zc702-tiny.scc new file mode 100644 index 00000000..c5ab596a --- /dev/null +++ b/recipes-kernel/linux/linux-yocto/zc702-tiny.scc @@ -0,0 +1,7 @@ +define KMACHINE zc702 +define KTYPE tiny +define KARCH arm + +include ktypes/tiny +branch meta +include zynq-tiny.scc diff --git a/recipes-kernel/linux/linux-yocto/zedboard-standard.scc b/recipes-kernel/linux/linux-yocto/zedboard-standard.scc new file mode 100644 index 00000000..f1c8fd98 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto/zedboard-standard.scc @@ -0,0 +1,11 @@ +define KMACHINE zedboard +define KTYPE standard +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/zedboard-tiny.scc b/recipes-kernel/linux/linux-yocto/zedboard-tiny.scc new file mode 100644 index 00000000..ff86fd42 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto/zedboard-tiny.scc @@ -0,0 +1,7 @@ +define KMACHINE zedboard +define KTYPE tiny +define KARCH arm + +include ktypes/tiny +branch meta +include zynq-tiny.scc diff --git a/recipes-kernel/linux/linux-yocto/zynq-standard.scc b/recipes-kernel/linux/linux-yocto/zynq-standard.scc index 9f105bc9..50cab2d9 100644 --- a/recipes-kernel/linux/linux-yocto/zynq-standard.scc +++ b/recipes-kernel/linux/linux-yocto/zynq-standard.scc @@ -1,14 +1,7 @@ -define KMACHINE zedboard -define KTYPE standard -define KARCH arm -include ktypes/standard -branch meta kconf hardware cfg/zynq/zynq-arch.cfg kconf hardware cfg/zynq/zynq-boot.cfg - - # non hardware kconfig configs include cfg/commonclk.scc @@ -42,6 +35,7 @@ include cfg/windowsfs.scc include cfg/procevents.scc include cfg/eeprom.scc include cfg/zynq/clk.scc +include cfg/zynq/cma.scc include cfg/arm/amba.scc # Scrutinize all below and see if these are tiny or standard or both... @@ -50,6 +44,7 @@ include cfg/arm/amba.scc include cfg/smp.scc include features/mac80211/mac80211.cfg include arch/arm/arm.cfg +include cfg/uio-irq.scc # Non-hardware kconf configs # IPsec: Configuration for IPv4 and IPv6 @@ -58,10 +53,9 @@ include cfg/net/ipv6.scc include cfg/dmaengine.scc include cfg/usb-mass-storage.scc include cfg/fs/ext2.scc +include cfg/fs/flash_fs.scc include features/power/zynq.scc # Optional kconfig configs include cfg/tracing.scc - -###### \ No newline at end of file diff --git a/recipes-kernel/linux/linux-yocto/zynq-tiny.scc b/recipes-kernel/linux/linux-yocto/zynq-tiny.scc index 7871591a..41490797 100644 --- a/recipes-kernel/linux/linux-yocto/zynq-tiny.scc +++ b/recipes-kernel/linux/linux-yocto/zynq-tiny.scc @@ -1,9 +1,3 @@ -define KMACHINE zedboard -define KTYPE tiny -define KARCH arm - -include ktypes/tiny -branch meta include arch/arm/arm.cfg @@ -44,7 +38,6 @@ include cfg/windowsfs.scc include cfg/procevents.scc include cfg/eeprom.scc -#####include cfg/zynq/clk.scc include cfg/arm/amba.scc # Scrutinize all below and see if these are tiny or standard or both... diff --git a/recipes-kernel/linux/linux-yocto_3.8.bbappend b/recipes-kernel/linux/linux-yocto_3.8.bbappend index e3a5e615..9d509438 100644 --- a/recipes-kernel/linux/linux-yocto_3.8.bbappend +++ b/recipes-kernel/linux/linux-yocto_3.8.bbappend @@ -5,7 +5,7 @@ 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}-standard.scc \ + file://${KMACHINE}-standard.scc \ " SRC_URI_append += "git://github.com/Xilinx/xilinx-kernel-cache;protocol=git;branch=master;type=kmeta;name=externalcache;destsuffix=external-cache/" -- cgit v1.2.3-54-g00ecf