From 2add7980d34bf9f558c7ea87b79d07479d50c600 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Tue, 8 Jul 2014 16:43:12 +1000 Subject: linux: Add support for linux-yocto config fragments * Added kernel config fragments for Zynq and MicroBlaze * Includes config fragments specifically for the architecture/SoC and drivers * Feature fragments for features commonly used with Zynq and MicroBlaze platforms that are not yet part of the default yocto kernel configs * Setup the linux-yocto append recipes to add the in layers config/* kernel cache * Remove the use of MACHINE_KCONFIG and MACHINE_DEVICETREE from the linux-yocto recipes Signed-off-by: Nathan Rossi --- .../xilinx-common/arch/microblaze/microblaze.cfg | 8 +++ .../xilinx-common/arch/microblaze/microblaze.scc | 6 ++ .../bsp/microblaze/microblaze-standard.scc | 14 +++++ .../xilinx-common/bsp/microblaze/microblaze.cfg | 32 +++++++++++ .../xilinx-common/bsp/microblaze/microblaze.scc | 14 +++++ .../xilinx-common/bsp/zynq/zynq-standard.scc | 14 +++++ .../linux/config/xilinx-common/bsp/zynq/zynq.cfg | 53 ++++++++++++++++++ .../linux/config/xilinx-common/bsp/zynq/zynq.scc | 17 ++++++ .../config/xilinx-common/features/mtd/mtd.cfg | 14 +++++ .../config/xilinx-common/features/mtd/mtd.scc | 5 ++ .../config/xilinx-common/features/rtc/rtc.cfg | 1 + .../config/xilinx-common/features/rtc/rtc.scc | 4 ++ .../xilinx-common/features/scsi/scsi-generic.cfg | 4 ++ .../xilinx-common/features/scsi/scsi-generic.scc | 5 ++ .../config/xilinx-common/features/uio/uio.cfg | 2 + .../config/xilinx-common/features/uio/uio.scc | 5 ++ .../xilinx-common/features/xilinx/board-common.cfg | 30 ++++++++++ .../xilinx-common/features/xilinx/board-common.scc | 5 ++ .../xilinx-common/features/xilinx/xilinx-ip.cfg | 52 ++++++++++++++++++ .../xilinx-common/features/xilinx/xilinx-ip.scc | 5 ++ .../xilinx-common/features/xilinx/zynq7-ip.cfg | 64 ++++++++++++++++++++++ .../xilinx-common/features/xilinx/zynq7-ip.scc | 5 ++ recipes-kernel/linux/linux-xilinx-configs.inc | 11 ++++ recipes-kernel/linux/linux-xilinx-machines.inc | 16 ++++++ recipes-kernel/linux/linux-yocto-dev.bbappend | 5 +- recipes-kernel/linux/linux-yocto_3.10.bbappend | 6 +- recipes-kernel/linux/linux-yocto_3.14.bbappend | 5 +- 27 files changed, 392 insertions(+), 10 deletions(-) create mode 100644 recipes-kernel/linux/config/xilinx-common/arch/microblaze/microblaze.cfg create mode 100644 recipes-kernel/linux/config/xilinx-common/arch/microblaze/microblaze.scc create mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze-standard.scc create mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze.cfg create mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze.scc create mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq-standard.scc create mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq.cfg create mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq.scc create mode 100644 recipes-kernel/linux/config/xilinx-common/features/mtd/mtd.cfg create mode 100644 recipes-kernel/linux/config/xilinx-common/features/mtd/mtd.scc create mode 100644 recipes-kernel/linux/config/xilinx-common/features/rtc/rtc.cfg create mode 100644 recipes-kernel/linux/config/xilinx-common/features/rtc/rtc.scc create mode 100644 recipes-kernel/linux/config/xilinx-common/features/scsi/scsi-generic.cfg create mode 100644 recipes-kernel/linux/config/xilinx-common/features/scsi/scsi-generic.scc create mode 100644 recipes-kernel/linux/config/xilinx-common/features/uio/uio.cfg create mode 100644 recipes-kernel/linux/config/xilinx-common/features/uio/uio.scc create mode 100644 recipes-kernel/linux/config/xilinx-common/features/xilinx/board-common.cfg create mode 100644 recipes-kernel/linux/config/xilinx-common/features/xilinx/board-common.scc create mode 100644 recipes-kernel/linux/config/xilinx-common/features/xilinx/xilinx-ip.cfg create mode 100644 recipes-kernel/linux/config/xilinx-common/features/xilinx/xilinx-ip.scc create mode 100644 recipes-kernel/linux/config/xilinx-common/features/xilinx/zynq7-ip.cfg create mode 100644 recipes-kernel/linux/config/xilinx-common/features/xilinx/zynq7-ip.scc create mode 100644 recipes-kernel/linux/linux-xilinx-configs.inc create mode 100644 recipes-kernel/linux/linux-xilinx-machines.inc diff --git a/recipes-kernel/linux/config/xilinx-common/arch/microblaze/microblaze.cfg b/recipes-kernel/linux/config/xilinx-common/arch/microblaze/microblaze.cfg new file mode 100644 index 00000000..06e03a3f --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/arch/microblaze/microblaze.cfg @@ -0,0 +1,8 @@ + +CONFIG_MICROBLAZE=y + +# Important for performance and code size optimization +CONFIG_CC_OPTIMIZE_FOR_SIZE=y + +CONFIG_ARCH_REQUIRE_GPIOLIB=y + diff --git a/recipes-kernel/linux/config/xilinx-common/arch/microblaze/microblaze.scc b/recipes-kernel/linux/config/xilinx-common/arch/microblaze/microblaze.scc new file mode 100644 index 00000000..2b3aba2c --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/arch/microblaze/microblaze.scc @@ -0,0 +1,6 @@ + +if [ "$KARCH" = "microblaze" ]; then + kconf hardware microblaze.cfg + include cfg/timer/hz_100.scc +fi + diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze-standard.scc b/recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze-standard.scc new file mode 100644 index 00000000..66eaccca --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze-standard.scc @@ -0,0 +1,14 @@ +define KMACHINE microblaze +define KTYPE standard +define KARCH microblaze + +include ktypes/standard/standard.scc + +include bsp/microblaze/microblaze.scc + +# Common board drivers +include features/xilinx/board-common.scc + +# default policy for standard kernels +include features/latencytop/latencytop.scc +include features/profiling/profiling.scc diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze.cfg new file mode 100644 index 00000000..e9dcfb7a --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze.cfg @@ -0,0 +1,32 @@ + +# Arch Feature Selections +CONFIG_MMU=y + +# Default Arch Configuration +CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1 +CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1 +CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1 +CONFIG_XILINX_MICROBLAZE0_USE_DIV=0 +CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=0 +CONFIG_XILINX_MICROBLAZE0_USE_FPU=0 + +# Memory +CONFIG_HIGHMEM=y + +# Device tree +CONFIG_PROC_DEVICETREE=y + +# Debug +CONFIG_PRINTK_TIME=y +CONFIG_EARLY_PRINTK=y + +# OF Scan serial devices +CONFIG_SERIAL_OF_PLATFORM=y + +# Disable VT (Non-Functional with MicroBlaze) +CONFIG_VT=n +# Disable FTRACE, does not work with MicroBlaze +CONFIG_FTRACE=n +# Not supported on MicroBlaze +CONFIG_SERIO_I8042=n + diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze.scc b/recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze.scc new file mode 100644 index 00000000..955e0275 --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze.scc @@ -0,0 +1,14 @@ +include arch/microblaze/microblaze.scc + +kconf hardware microblaze.cfg + +include features/xilinx/xilinx-ip.scc + +include features/scsi/scsi.scc +include features/scsi/scsi-generic.scc +include features/scsi/disk.scc + +include features/mtd/mtd.scc +include features/uio/uio.scc + +include cfg/fs/debugfs.scc diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq-standard.scc b/recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq-standard.scc new file mode 100644 index 00000000..05ab5ec1 --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq-standard.scc @@ -0,0 +1,14 @@ +define KMACHINE zynq +define KTYPE standard +define KARCH arm + +include ktypes/standard/standard.scc + +include bsp/zynq/zynq.scc + +# Common board drivers +include features/xilinx/board-common.scc + +# default policy for standard kernels +include features/latencytop/latencytop.scc +include features/profiling/profiling.scc diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq.cfg new file mode 100644 index 00000000..3b5e2eb5 --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq.cfg @@ -0,0 +1,53 @@ + +# Arch Feature Selections +CONFIG_ARCH_VEXPRESS=y +CONFIG_ARCH_ZYNQ=y +CONFIG_VFP=y +CONFIG_NEON=y +CONFIG_AEABI=y + +# CPU Erratas +CONFIG_ARM_ERRATA_754322=y +CONFIG_ARM_ERRATA_754327=y +CONFIG_ARM_ERRATA_764369=y +CONFIG_ARM_ERRATA_775420=y + +# SMP +CONFIG_SMP=y +CONFIG_SCHED_MC=y +CONFIG_SCHED_SMT=y + +# Memory +CONFIG_HIGHMEM=y + +# Power management +CONFIG_PM_RUNTIME=y + +# Thermal +CONFIG_THERMAL=y +CONFIG_CPU_THERMAL=y + +# CPU Frequency +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_STAT_DETAILS=y +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_GENERIC_CPUFREQ_CPU0=y +CONFIG_CPU_IDLE=y +CONFIG_ARM_ZYNQ_CPUIDLE=y + +# EDAC +CONFIG_EDAC=y +CONFIG_EDAC_MM_EDAC=y +CONFIG_EDAC_ZYNQ=y + +# Device tree +CONFIG_PROC_DEVICETREE=y + +# Debug +CONFIG_PRINTK_TIME=y +CONFIG_EARLY_PRINTK=y + diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq.scc b/recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq.scc new file mode 100644 index 00000000..358f6596 --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq.scc @@ -0,0 +1,17 @@ +kconf hardware zynq.cfg + +include cfg/timer/no_hz.scc + +include features/xilinx/zynq7-ip.scc +include features/xilinx/xilinx-ip.scc + +include cfg/usb-mass-storage.scc + +include features/scsi/scsi.scc +include features/scsi/scsi-generic.scc +include features/scsi/disk.scc + +include features/mtd/mtd.scc +include features/uio/uio.scc + +include cfg/fs/debugfs.scc diff --git a/recipes-kernel/linux/config/xilinx-common/features/mtd/mtd.cfg b/recipes-kernel/linux/config/xilinx-common/features/mtd/mtd.cfg new file mode 100644 index 00000000..17b4ece4 --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/features/mtd/mtd.cfg @@ -0,0 +1,14 @@ + +# MTD +CONFIG_MTD=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_CFI=y +CONFIG_MTD_CFI_AMDSTD=y +CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_CFI_STAA=y +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_PHYSMAP_OF=y +CONFIG_MTD_M25P80=y +CONFIG_MTD_NAND=y + diff --git a/recipes-kernel/linux/config/xilinx-common/features/mtd/mtd.scc b/recipes-kernel/linux/config/xilinx-common/features/mtd/mtd.scc new file mode 100644 index 00000000..48925c6b --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/features/mtd/mtd.scc @@ -0,0 +1,5 @@ +define KFEATURE_DESCRIPTION "Enable MTD Support" +define KFEATURE_COMPATIBILITY board + +kconfig hardware mtd.cfg + diff --git a/recipes-kernel/linux/config/xilinx-common/features/rtc/rtc.cfg b/recipes-kernel/linux/config/xilinx-common/features/rtc/rtc.cfg new file mode 100644 index 00000000..70c9c29c --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/features/rtc/rtc.cfg @@ -0,0 +1 @@ +CONFIG_RTC_CLASS=y diff --git a/recipes-kernel/linux/config/xilinx-common/features/rtc/rtc.scc b/recipes-kernel/linux/config/xilinx-common/features/rtc/rtc.scc new file mode 100644 index 00000000..cb1a0a3d --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/features/rtc/rtc.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Enable RTC Class Support" +define KFEATURE_COMPATIBILITY board + +kconfig hardware rtc.cfg diff --git a/recipes-kernel/linux/config/xilinx-common/features/scsi/scsi-generic.cfg b/recipes-kernel/linux/config/xilinx-common/features/scsi/scsi-generic.cfg new file mode 100644 index 00000000..70210a01 --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/features/scsi/scsi-generic.cfg @@ -0,0 +1,4 @@ + +# Generic SCSI +CONFIG_CHR_DEV_SG=y +CONFIG_SCSI_MULTI_LUN=y diff --git a/recipes-kernel/linux/config/xilinx-common/features/scsi/scsi-generic.scc b/recipes-kernel/linux/config/xilinx-common/features/scsi/scsi-generic.scc new file mode 100644 index 00000000..ad4a5681 --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/features/scsi/scsi-generic.scc @@ -0,0 +1,5 @@ +define KFEATURE_DESCRIPTION "Enable Options for SCSI Generic Support" +define KFEATURE_COMPATIBILITY board + +kconfig hardware scsi-generic.cfg + diff --git a/recipes-kernel/linux/config/xilinx-common/features/uio/uio.cfg b/recipes-kernel/linux/config/xilinx-common/features/uio/uio.cfg new file mode 100644 index 00000000..6c066070 --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/features/uio/uio.cfg @@ -0,0 +1,2 @@ +CONFIG_UIO=y +CONFIG_UIO_PDRV_GENIRQ=y diff --git a/recipes-kernel/linux/config/xilinx-common/features/uio/uio.scc b/recipes-kernel/linux/config/xilinx-common/features/uio/uio.scc new file mode 100644 index 00000000..9697949a --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/features/uio/uio.scc @@ -0,0 +1,5 @@ +define KFEATURE_DESCRIPTION "Enable UIO Support" +define KFEATURE_COMPATIBILITY board + +kconfig hardware uio.cfg + diff --git a/recipes-kernel/linux/config/xilinx-common/features/xilinx/board-common.cfg b/recipes-kernel/linux/config/xilinx-common/features/xilinx/board-common.cfg new file mode 100644 index 00000000..c2afc9a8 --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/features/xilinx/board-common.cfg @@ -0,0 +1,30 @@ +# Common drivers for Zynq Boards + +# Ethernet PHYs +CONFIG_PHYLIB=y +CONFIG_MARVELL_PHY=y +CONFIG_VITESSE_PHY=y + +# I2C +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_PCA954x=y + +# EEPROM +CONFIG_EEPROM_AT24=y +CONFIG_EEPROM_AT25=y + +# Hardware monitors +CONFIG_PMBUS=y +CONFIG_SENSORS_PMBUS=y +CONFIG_REGULATOR=y +CONFIG_SENSORS_UCD9000=y +CONFIG_SENSORS_UCD9200=y + +# RTC drivers +CONFIG_RTC_DRV_PCF8563=y + +# SI570 I2C Device +CONFIG_COMMON_CLK_SI570=y + diff --git a/recipes-kernel/linux/config/xilinx-common/features/xilinx/board-common.scc b/recipes-kernel/linux/config/xilinx-common/features/xilinx/board-common.scc new file mode 100644 index 00000000..480158ee --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/features/xilinx/board-common.scc @@ -0,0 +1,5 @@ +define KFEATURE_DESCRIPTION "Xilinx Evaluation Board Common Drivers" +define KFEATURE_COMPATIBILITY board + +kconfig hardware board-common.cfg + diff --git a/recipes-kernel/linux/config/xilinx-common/features/xilinx/xilinx-ip.cfg b/recipes-kernel/linux/config/xilinx-common/features/xilinx/xilinx-ip.cfg new file mode 100644 index 00000000..bc1c6ee1 --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/features/xilinx/xilinx-ip.cfg @@ -0,0 +1,52 @@ + +# Serial/UART +CONFIG_SERIAL=y +CONFIG_SERIAL_CONSOLE=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_UARTLITE=y +CONFIG_SERIAL_UARTLITE_CONSOLE=y + +# DMA +CONFIG_DMADEVICES=y +CONFIG_XILINX_DMA_ENGINES=y +CONFIG_XILINX_AXIDMA=y +CONFIG_XILINX_AXIVDMA=y +CONFIG_XILINX_AXICDMA=y + +# Watchdog +CONFIG_WATCHDOG=y +CONFIG_XILINX_WATCHDOG=y + +# Ethernet +CONFIG_XILINX_EMACLITE=y +CONFIG_XILINX_AXI_EMAC=y + +# GPIO +CONFIG_GPIOLIB=y +CONFIG_OF_GPIO=y +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_XILINX=y + +# I2C +CONFIG_I2C=y +CONFIG_I2C_XILINX=y + +# SPI +CONFIG_SPI=y +CONFIG_SPI_XILINX=y + +# PCI(e) +CONFIG_XILINX_AXIPCIE=y +CONFIG_PCI_MSI=y + +# Xilinx Traffic Generator +CONFIG_XILINX_TRAFGEN=y + +# Xilinx XADC +CONFIG_IIO=y +CONFIG_XILINX_XADC=y + +# Xilinx SYSACE +CONFIG_XILINX_SYSACE=y + diff --git a/recipes-kernel/linux/config/xilinx-common/features/xilinx/xilinx-ip.scc b/recipes-kernel/linux/config/xilinx-common/features/xilinx/xilinx-ip.scc new file mode 100644 index 00000000..e4f75d7e --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/features/xilinx/xilinx-ip.scc @@ -0,0 +1,5 @@ +define KFEATURE_DESCRIPTION "Xilinx Soft IP Core Drivers/Support" +define KFEATURE_COMPATIBILITY board + +kconfig hardware xilinx-ip.cfg + diff --git a/recipes-kernel/linux/config/xilinx-common/features/xilinx/zynq7-ip.cfg b/recipes-kernel/linux/config/xilinx-common/features/xilinx/zynq7-ip.cfg new file mode 100644 index 00000000..340d3fb2 --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/features/xilinx/zynq7-ip.cfg @@ -0,0 +1,64 @@ + +# UART +CONFIG_SERIAL_XILINX_PS_UART=y +CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y + +# devcfg +CONFIG_XILINX_DEVCFG=y + +# SRAM +CONFIG_SRAM=y + +# DMA +CONFIG_DMADEVICES=y +CONFIG_XILINX_DMA_ENGINES=y +CONFIG_PL330_DMA=y + +# PL310 +CONFIG_PL310_ERRATA_588369=y +CONFIG_PL310_ERRATA_727915=y +CONFIG_PL310_ERRATA_769419=y + +# Watchdog +CONFIG_WATCHDOG=y +CONFIG_CADENCE_WATCHDOG=y + +# Ethernet +CONFIG_MACB=y +CONFIG_XILINX_PS_EMAC=y + +# GPIO +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_ZYNQ=y + +# I2C +CONFIG_I2C=y +CONFIG_I2C_CADENCE=y + +# SPI +CONFIG_SPI=y +CONFIG_SPI_CADENCE=y +CONFIG_SPI_ZYNQ_QSPI=y + +# CAN +CONFIG_CAN=y +CONFIG_CAN_XILINXCAN=y + +# MMC/SD +CONFIG_MMC=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_SDHCI_OF_ARASAN=y + +# NAND +CONFIG_MTD_NAND_PL353=y + +# USB (+otg) +CONFIG_USB=y +CONFIG_USB_OTG=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_ZYNQ=y +CONFIG_USB_ZYNQ_ERRATA_DT654401=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_XILINX=y + diff --git a/recipes-kernel/linux/config/xilinx-common/features/xilinx/zynq7-ip.scc b/recipes-kernel/linux/config/xilinx-common/features/xilinx/zynq7-ip.scc new file mode 100644 index 00000000..3a7f8ce4 --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/features/xilinx/zynq7-ip.scc @@ -0,0 +1,5 @@ +define KFEATURE_DESCRIPTION "Xilinx Zynq 7000 IP Core Drivers/Support" +define KFEATURE_COMPATIBILITY board + +kconfig hardware zynq7-ip.cfg + diff --git a/recipes-kernel/linux/linux-xilinx-configs.inc b/recipes-kernel/linux/linux-xilinx-configs.inc new file mode 100644 index 00000000..4d9efcc3 --- /dev/null +++ b/recipes-kernel/linux/linux-xilinx-configs.inc @@ -0,0 +1,11 @@ +# This include file sets up the xilinx config fragments, these +# fragments build on top of the base config infrastructure provided in +# the linux-yocto/kernel-yocto recipes and classes in core layer of OE. + +FILESEXTRAPATHS_prepend := "${THISDIR}/config:" + +SRC_URI_append += " \ + file://xilinx-common;type=kmeta;destsuffix=xilinx-common \ + file://xilinx-machine;type=kmeta;destsuffix=xilinx-machine \ + " + diff --git a/recipes-kernel/linux/linux-xilinx-machines.inc b/recipes-kernel/linux/linux-xilinx-machines.inc new file mode 100644 index 00000000..d448d71a --- /dev/null +++ b/recipes-kernel/linux/linux-xilinx-machines.inc @@ -0,0 +1,16 @@ +# Setup for MicroBlaze and Zynq architectures + +COMPATIBLE_MACHINE_zynq = "zynq" +KMACHINE_zynq ?= "zynq" + +COMPATIBLE_MACHINE_microblaze = "microblaze" +KMACHINE_microblaze ?= "microblaze" + +# Default kernel config fragements for specific machines + +KERNEL_FEATURES_append_qemumicroblaze += "bsp/qemumicroblaze/qemumicroblaze.scc" +KERNEL_FEATURES_append_kc705-trd-microblazeel += "bsp/kc705-trd-microblazeel/kc705-trd-microblazeel.scc" + +# MicroBlaze is a uImage target, but its not called 'uImage' +DEPENDS_append_microblaze += "u-boot-mkimage-native" + diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend index b9b6b9e3..651e0d72 100644 --- a/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -1,5 +1,4 @@ -require linux-machine-common.inc +require linux-xilinx-configs.inc +require linux-xilinx-machines.inc -COMPATIBLE_MACHINE_zynq = "zynq" -COMPATIBLE_MACHINE_microblaze = "microblaze" diff --git a/recipes-kernel/linux/linux-yocto_3.10.bbappend b/recipes-kernel/linux/linux-yocto_3.10.bbappend index 3601d587..a8b72e04 100644 --- a/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/recipes-kernel/linux/linux-yocto_3.10.bbappend @@ -1,8 +1,6 @@ -require linux-machine-common.inc - -COMPATIBLE_MACHINE_zynq = "zynq" -COMPATIBLE_MACHINE_microblaze = "microblaze" +require linux-xilinx-configs.inc +require linux-xilinx-machines.inc FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:" SRC_URI_append_microblaze += "file://ec2eba55f0c0e74dd39aca14dcc597583cf1eb67.patch" diff --git a/recipes-kernel/linux/linux-yocto_3.14.bbappend b/recipes-kernel/linux/linux-yocto_3.14.bbappend index b9b6b9e3..651e0d72 100644 --- a/recipes-kernel/linux/linux-yocto_3.14.bbappend +++ b/recipes-kernel/linux/linux-yocto_3.14.bbappend @@ -1,5 +1,4 @@ -require linux-machine-common.inc +require linux-xilinx-configs.inc +require linux-xilinx-machines.inc -COMPATIBLE_MACHINE_zynq = "zynq" -COMPATIBLE_MACHINE_microblaze = "microblaze" -- cgit v1.2.3-54-g00ecf