[linux-yocto] [PATCH 2/2] meta: axxiaarm: Adding new fragments
Bruce Ashfield
bruce.ashfield at gmail.com
Thu Mar 19 07:04:55 PDT 2015
On Thu, Mar 19, 2015 at 9:50 AM, Dragomir, Daniel
<Daniel.Dragomir at windriver.com> wrote:
> Bruce,
> I see the patches only in 3.14 Kernel, meta branch.
> In 3.10 those are missing. Can you check again if the merge was successfully?
I merged the changes .. but it was a bit late and apparently I didn't
do the push!
I just pushed them now, so they should be in place.
Bruce
>
> Daniel
> ________________________________________
> From: Bruce Ashfield [bruce.ashfield at windriver.com]
> Sent: Thursday, March 19, 2015 7:32 AM
> To: Dragomir, Daniel; linux-yocto at yoctoproject.org
> Cc: Coker, Bonnie; Bercaru, Cristian
> Subject: Re: [PATCH 2/2] meta: axxiaarm: Adding new fragments
>
> On 03/18/2015 11:50 AM, Dragomir, Daniel wrote:
>> Bruce,
>> If the fragments looks fine, please add (only) this patch also to the 3.14 kernel, meta layer.
>> The first patch is not applicable in 3.14. It just delete some old fragments from 3.10.
>
> I've done the merges. 3.10 and 3.14 have been updated with the relevant
> patches.
>
> Bruce
>
>>
>> Thanks,
>> Daniel
>> ________________________________________
>> From: Daniel Dragomir [daniel.dragomir at windriver.com]
>> Sent: Tuesday, March 17, 2015 7:16 PM
>> To: linux-yocto at yoctoproject.org
>> Cc: Ashfield, Bruce; Dragomir, Daniel; Dragomir, Daniel
>> Subject: [PATCH 2/2] meta: axxiaarm: Adding new fragments
>>
>> For axxiaarm bsp, adding new fragments for standard and preempt-rt
>> kernel types.
>>
>> Signed-off-by: Daniel Dragomir <daniel.dragomir at windriver.com>
>> ---
>> .../bsp/axxiaarm/axxiaarm-preempt-rt.scc | 8 +
>> .../bsp/axxiaarm/axxiaarm-standard.scc | 9 +
>> meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm.cfg | 291 ++++++++++++++++++++
>> meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm.scc | 14 +
>> meta/cfg/kernel-cache/bsp/axxiaarm/edac.cfg | 7 +
>> meta/cfg/kernel-cache/bsp/axxiaarm/edac.scc | 4 +
>> meta/cfg/kernel-cache/bsp/axxiaarm/hardware.kcf | 1 +
>> meta/cfg/kernel-cache/bsp/axxiaarm/kvm.cfg | 7 +
>> meta/cfg/kernel-cache/bsp/axxiaarm/kvm.scc | 4 +
>> meta/cfg/kernel-cache/bsp/axxiaarm/no-preempt.cfg | 1 +
>> meta/cfg/kernel-cache/bsp/axxiaarm/no-preempt.scc | 1 +
>> meta/cfg/kernel-cache/bsp/axxiaarm/rapidio.cfg | 12 +
>> meta/cfg/kernel-cache/bsp/axxiaarm/rapidio.scc | 4 +
>> 13 files changed, 363 insertions(+)
>> create mode 100644 meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm-preempt-rt.scc
>> create mode 100644 meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm-standard.scc
>> create mode 100644 meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm.cfg
>> create mode 100644 meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm.scc
>> create mode 100644 meta/cfg/kernel-cache/bsp/axxiaarm/edac.cfg
>> create mode 100644 meta/cfg/kernel-cache/bsp/axxiaarm/edac.scc
>> create mode 100644 meta/cfg/kernel-cache/bsp/axxiaarm/hardware.kcf
>> create mode 100644 meta/cfg/kernel-cache/bsp/axxiaarm/kvm.cfg
>> create mode 100644 meta/cfg/kernel-cache/bsp/axxiaarm/kvm.scc
>> create mode 100644 meta/cfg/kernel-cache/bsp/axxiaarm/no-preempt.cfg
>> create mode 100644 meta/cfg/kernel-cache/bsp/axxiaarm/no-preempt.scc
>> create mode 100644 meta/cfg/kernel-cache/bsp/axxiaarm/rapidio.cfg
>> create mode 100644 meta/cfg/kernel-cache/bsp/axxiaarm/rapidio.scc
>>
>> diff --git a/meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm-preempt-rt.scc b/meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm-preempt-rt.scc
>> new file mode 100644
>> index 0000000..e1c2aec
>> --- /dev/null
>> +++ b/meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm-preempt-rt.scc
>> @@ -0,0 +1,8 @@
>> +define KMACHINE axxiaarm
>> +define KTYPE preempt-rt
>> +define KARCH arm
>> +
>> +include ktypes/preempt-rt
>> +branch axxia
>> +
>> +include axxiaarm.scc
>> diff --git a/meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm-standard.scc b/meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm-standard.scc
>> new file mode 100644
>> index 0000000..ab6be36
>> --- /dev/null
>> +++ b/meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm-standard.scc
>> @@ -0,0 +1,9 @@
>> +define KMACHINE axxiaarm
>> +define KTYPE standard
>> +define KARCH arm
>> +
>> +include ktypes/standard
>> +branch axxia
>> +
>> +include axxiaarm.scc
>> +include no-preempt.scc
>> diff --git a/meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm.cfg b/meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm.cfg
>> new file mode 100644
>> index 0000000..1e56ed4
>> --- /dev/null
>> +++ b/meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm.cfg
>> @@ -0,0 +1,291 @@
>> +#.........................................................................
>> +# WARNING
>> +#
>> +# This file is a kernel configuration fragment, and not a full kernel
>> +# configuration file. The final kernel configuration is made up of
>> +# an assembly of processed fragments, each of which is designed to
>> +# capture a specific part of the final configuration (e.g. platform
>> +# configuration, feature configuration, and board specific hardware
>> +# configuration). For more information on kernel configuration, please
>> +# consult the product documentation.
>> +#
>> +#.........................................................................
>> +
>> +#
>> +# System Type
>> +#
>> +CONFIG_ARCH_AXXIA=y
>> +
>> +
>> +#
>> +# Axxia platform type
>> +#
>> +CONFIG_ARCH_AXXIA_GIC=y
>> +CONFIG_ARCH_AXXIA_DT=y
>> +CONFIG_ARM_TIMER_SP804=y
>> +
>> +
>> +#
>> +# Processor Features
>> +#
>> +CONFIG_ARM_LPAE=y
>> +CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
>> +CONFIG_ARCH_DMA_ADDR_T_64BIT=y
>> +CONFIG_ARM_ARCH_TIMER=y
>> +CONFIG_ARM_THUMBEE=y
>> +CONFIG_OUTER_CACHE=y
>> +CONFIG_OUTER_CACHE_SYNC=y
>> +CONFIG_MIGHT_HAVE_CACHE_L2X0=y
>> +CONFIG_CACHE_L2X0=y
>> +CONFIG_CACHE_PL310=y
>> +
>> +CONFIG_ARM_ERRATA_430973=y
>> +CONFIG_ARM_ERRATA_458693=y
>> +CONFIG_ARM_ERRATA_460075=y
>> +CONFIG_ARM_ERRATA_643719=y
>> +CONFIG_ARM_ERRATA_742230=y
>> +CONFIG_ARM_ERRATA_742231=y
>> +CONFIG_ARM_ERRATA_720789=y
>> +CONFIG_ARM_ERRATA_743622=y
>> +CONFIG_ARM_ERRATA_751472=y
>> +CONFIG_ARM_ERRATA_754322=y
>> +CONFIG_ARM_ERRATA_754327=y
>> +CONFIG_ARM_ERRATA_764369=y
>> +CONFIG_ARM_ERRATA_775420=y
>> +CONFIG_ARM_ERRATA_798181=y
>> +CONFIG_PL310_ERRATA_588369=y
>> +CONFIG_PL310_ERRATA_727915=y
>> +CONFIG_PL310_ERRATA_753970=y
>> +CONFIG_PL310_ERRATA_769419=y
>> +
>> +
>> +#
>> +# Bus support
>> +#
>> +CONFIG_ARM_AMBA=y
>> +CONFIG_ARM_CCN=y
>> +CONFIG_PCI=y
>> +CONFIG_PCI_DOMAINS=y
>> +CONFIG_PCI_SYSCALL=y
>> +CONFIG_ARCH_SUPPORTS_MSI=y
>> +CONFIG_PCI_MSI=y
>> +
>> +#
>> +# Kernel Features
>> +#
>> +CONFIG_SMP=y
>> +CONFIG_HAVE_ARM_ARCH_TIMER=y
>> +CONFIG_HIGHMEM=y
>> +CONFIG_NR_CPUS=16
>> +
>> +#
>> +# Boot options
>> +#
>> +CONFIG_USE_OF=y
>> +CONFIG_ARM_APPENDED_DTB=y
>> +CONFIG_ZBOOT_ROM_TEXT=0x0
>> +CONFIG_ZBOOT_ROM_BSS=0x0
>> +CONFIG_ARM_ATAG_DTB_COMPAT=y
>> +
>> +#
>> +# At least one emulation must be selected
>> +#
>> +CONFIG_VFP=y
>> +CONFIG_NEON=y
>> +
>> +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
>> +CONFIG_FW_LOADER=y
>> +
>> +CONFIG_MTD=y
>> +CONFIG_MTD_CMDLINE_PARTS=y
>> +CONFIG_MTD_AFS_PARTS=y
>> +CONFIG_MTD_OF_PARTS=y
>> +CONFIG_MTD_PHYSMAP=y
>> +CONFIG_MTD_PHYSMAP_OF=y
>> +
>> +#
>> +# Network testing
>> +#
>> +# CONFIG_WIRELESS is not set
>> +
>> +#
>> +# Generic Driver Options
>> +#
>> +CONFIG_REGMAP=y
>> +CONFIG_REGMAP_MMIO=y
>> +
>> +#
>> +# User Modules And Translation Layers
>> +#
>> +CONFIG_MTD_BLKDEVS=y
>> +CONFIG_MTD_BLOCK=y
>> +
>> +#
>> +# RAM/ROM/Flash chip drivers
>> +#
>> +CONFIG_MTD_CFI=y
>> +CONFIG_MTD_CFI_INTELEXT=y
>> +CONFIG_MTD_CFI_AMDSTD=y
>> +CONFIG_MTD_CFI_STAA=y
>> +
>> +#
>> +# Self-contained MTD device drivers
>> +#
>> +CONFIG_MTD_M25P80=y
>> +CONFIG_M25PXX_USE_FAST_READ=y
>> +
>> +CONFIG_DTC=y
>> +CONFIG_OF=y
>> +
>> +CONFIG_PROC_DEVICETREE=y
>> +CONFIG_BLK_DEV_LOOP=y
>> +
>> +#
>> +# Misc devices
>> +#
>> +CONFIG_LSI_MTC=y
>> +CONFIG_LSI_NCR=y
>> +CONFIG_SCSI=y
>> +CONFIG_ATA=y
>> +
>> +
>> +#
>> +# EEPROM support
>> +#
>> +CONFIG_EEPROM_AT24=y
>> +
>> +#
>> +# SCSI support type (disk, tape, CD-ROM)
>> +#
>> +CONFIG_CHR_DEV_SG=y
>> +
>> +#
>> +# Hardware I/O ports
>> +#
>> +CONFIG_SERIO_AMBAKMI=y
>> +
>> +#
>> +# Character devices
>> +#
>> +CONFIG_LEGACY_PTY_COUNT=16
>> +
>> +#
>> +# Non-8250 serial port support
>> +#
>> +CONFIG_SERIAL_AMBA_PL011=y
>> +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
>> +# CONFIG_HW_RANDOM is not set
>> +CONFIG_I2C=y
>> +CONFIG_I2C_CHARDEV=y
>> +CONFIG_I2C_MUX=y
>> +CONFIG_I2C_AXXIA=y
>> +
>> +CONFIG_SPI=y
>> +CONFIG_SPI_PL022=y
>> +
>> +CONFIG_PPS=y
>> +CONFIG_NETWORK_PHY_TIMESTAMPING=y
>> +
>> +#
>> +# Memory mapped GPIO drivers:
>> +#
>> +CONFIG_GPIOLIB=y
>> +CONFIG_GPIO_SYSFS=y
>> +CONFIG_GPIO_PL061=y
>> +CONFIG_GPIO_GENERIC_PLATFORM=y
>> +
>> +CONFIG_WATCHDOG=y
>> +CONFIG_ARM_SP805_WATCHDOG=y
>> +
>> +#
>> +# SCSI support type (disk, tape, CD-ROM)
>> +#
>> +CONFIG_BLK_DEV_SD=y
>> +
>> +#
>> +# Distributed Switch Architecture drivers
>> +#
>> +CONFIG_ETHERNET=y
>> +CONFIG_LSI_NET=y
>> +CONFIG_LSI_NET_NUM_RX_DESC=32
>> +CONFIG_LSI_NET_RX_BUF_SZ=131072
>> +CONFIG_LSI_NET_NUM_TX_DESC=32
>> +CONFIG_LSI_NET_TX_BUF_SZ=131072
>> +CONFIG_E1000=y
>> +CONFIG_E1000E=y
>> +CONFIG_IGB=y
>> +CONFIG_IGB_HWMON=y
>> +CONFIG_IGBVF=y
>> +CONFIG_SMC91X=y
>> +
>> +
>> +#
>> +# USB Network Adapters
>> +#
>> +# CONFIG_WLAN is not set
>> +
>> +#
>> +# PTP clock support
>> +#
>> +CONFIG_DP83640_PHY=y
>> +
>> +#
>> +# USB GPIO expanders:
>> +#
>> +CONFIG_HWMON_VID=y
>> +
>> +#
>> +# Native drivers
>> +#
>> +CONFIG_SENSORS_ADT7475=y
>> +CONFIG_SENSORS_JC42=y
>> +CONFIG_PMBUS=y
>> +CONFIG_SENSORS_LTC2978=y
>> +
>> +#
>> +# Multifunction device drivers
>> +#
>> +CONFIG_MFD_SYSCON=y
>> +
>> +#
>> +# USB Host Controller Drivers
>> +#
>> +CONFIG_USB_ISP1760_HCD=y
>> +CONFIG_USB_CI13612_HCD=y
>> +# CONFIG_USB_EHCI_TT_NEWSCHED is not set
>> +
>> +#
>> +# DMA Devices
>> +#
>> +CONFIG_DMADEVICES=y
>> +CONFIG_LSI_DMA=y
>> +CONFIG_PL330_DMA=y
>> +
>> +#
>> +# Hardware Spinlock drivers
>> +#
>> +CONFIG_MAILBOX=y
>> +CONFIG_PL320_MBOX=y
>> +# CONFIG_IOMMU_SUPPORT is not set
>> +
>> +#
>> +# Caches
>> +#
>> +CONFIG_FSCACHE=y
>> +CONFIG_FSCACHE_STATS=y
>> +CONFIG_FSCACHE_HISTOGRAM=y
>> +CONFIG_FSCACHE_DEBUG=y
>> +CONFIG_FSCACHE_OBJECT_LIST=y
>> +CONFIG_CACHEFILES=y
>> +CONFIG_CACHEFILES_HISTOGRAM=y
>> +
>> +
>> +#
>> +# MMC/SD/SDIO Card Drivers
>> +#
>> +CONFIG_MMC=y
>> +CONFIG_MMC_ARMMMCI=y
>> +
>> +CONFIG_VMFS_FS=y
>> +CONFIG_VMFS_DEV_BASE=0x20101C0000
>> +CONFIG_VMFS_IRQ=0
>> diff --git a/meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm.scc b/meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm.scc
>> new file mode 100644
>> index 0000000..6832186
>> --- /dev/null
>> +++ b/meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm.scc
>> @@ -0,0 +1,14 @@
>> +# Core arm configuation settings
>> +include arch/arm/arm.scc nopatch
>> +
>> +kconf hardware axxiaarm.cfg
>> +
>> +include features/profiling/profiling.scc
>> +include features/latencytop/latencytop.scc
>> +include features/usb/ehci-hcd.scc
>> +include cfg/usb-mass-storage.scc
>> +include cfg/virtio.scc
>> +
>> +include rapidio.scc
>> +include edac.scc
>> +include kvm.scc
>> diff --git a/meta/cfg/kernel-cache/bsp/axxiaarm/edac.cfg b/meta/cfg/kernel-cache/bsp/axxiaarm/edac.cfg
>> new file mode 100644
>> index 0000000..840af5d
>> --- /dev/null
>> +++ b/meta/cfg/kernel-cache/bsp/axxiaarm/edac.cfg
>> @@ -0,0 +1,7 @@
>> +CONFIG_EDAC=y
>> +CONFIG_EDAC_MM_EDAC=y
>> +CONFIG_EDAC_AXXIA_SYSMEM=y
>> +CONFIG_EDAC_AXXIA_L3=y
>> +CONFIG_EDAC_AXXIA_L2_CPU=y
>> +
>> +# CONFIG_LSI_SMMON is not set
>> diff --git a/meta/cfg/kernel-cache/bsp/axxiaarm/edac.scc b/meta/cfg/kernel-cache/bsp/axxiaarm/edac.scc
>> new file mode 100644
>> index 0000000..d644aa3
>> --- /dev/null
>> +++ b/meta/cfg/kernel-cache/bsp/axxiaarm/edac.scc
>> @@ -0,0 +1,4 @@
>> +define KFEATURE_DESCRIPTION "Enable EDAC driver support for System Memory, L3 cache, L2 cache and CPU"
>> +define KFEATURE_COMPATIBILITY all
>> +
>> +kconf hardware edac.cfg
>> diff --git a/meta/cfg/kernel-cache/bsp/axxiaarm/hardware.kcf b/meta/cfg/kernel-cache/bsp/axxiaarm/hardware.kcf
>> new file mode 100644
>> index 0000000..6aa8119
>> --- /dev/null
>> +++ b/meta/cfg/kernel-cache/bsp/axxiaarm/hardware.kcf
>> @@ -0,0 +1 @@
>> +arch/arm/mach-axxia/Kconfig
>> diff --git a/meta/cfg/kernel-cache/bsp/axxiaarm/kvm.cfg b/meta/cfg/kernel-cache/bsp/axxiaarm/kvm.cfg
>> new file mode 100644
>> index 0000000..a6003e4
>> --- /dev/null
>> +++ b/meta/cfg/kernel-cache/bsp/axxiaarm/kvm.cfg
>> @@ -0,0 +1,7 @@
>> +CONFIG_VIRTUALIZATION=y
>> +CONFIG_KVM=y
>> +CONFIG_KVM_ARM_HOST=y
>> +CONFIG_KVM_ARM_MAX_VCPUS=4
>> +CONFIG_KVM_ARM_VGIC=y
>> +CONFIG_KVM_ARM_TIMER=y
>> +CONFIG_KVM_MMIO=y
>> diff --git a/meta/cfg/kernel-cache/bsp/axxiaarm/kvm.scc b/meta/cfg/kernel-cache/bsp/axxiaarm/kvm.scc
>> new file mode 100644
>> index 0000000..c867555
>> --- /dev/null
>> +++ b/meta/cfg/kernel-cache/bsp/axxiaarm/kvm.scc
>> @@ -0,0 +1,4 @@
>> +define KFEATURE_DESCRIPTION "Enable KVM host support"
>> +define KFEATURE_COMPATIBILITY all
>> +
>> +kconf non-hardware kvm.cfg
>> diff --git a/meta/cfg/kernel-cache/bsp/axxiaarm/no-preempt.cfg b/meta/cfg/kernel-cache/bsp/axxiaarm/no-preempt.cfg
>> new file mode 100644
>> index 0000000..0cbeb5a
>> --- /dev/null
>> +++ b/meta/cfg/kernel-cache/bsp/axxiaarm/no-preempt.cfg
>> @@ -0,0 +1 @@
>> +CONFIG_PREEMPT_NONE=y
>> diff --git a/meta/cfg/kernel-cache/bsp/axxiaarm/no-preempt.scc b/meta/cfg/kernel-cache/bsp/axxiaarm/no-preempt.scc
>> new file mode 100644
>> index 0000000..1e75e15
>> --- /dev/null
>> +++ b/meta/cfg/kernel-cache/bsp/axxiaarm/no-preempt.scc
>> @@ -0,0 +1 @@
>> +kconf non-hardware no-preempt.cfg
>> diff --git a/meta/cfg/kernel-cache/bsp/axxiaarm/rapidio.cfg b/meta/cfg/kernel-cache/bsp/axxiaarm/rapidio.cfg
>> new file mode 100644
>> index 0000000..2a5c8ad
>> --- /dev/null
>> +++ b/meta/cfg/kernel-cache/bsp/axxiaarm/rapidio.cfg
>> @@ -0,0 +1,12 @@
>> +CONFIG_RAPIDIO=y
>> +CONFIG_AXXIA_RIO=y
>> +CONFIG_RIO_MAINT_WIN_SIZE=0x1000000
>> +CONFIG_AXXIA_RIO_STAT=y
>> +CONFIG_OB_DME_ENTRY_SIZE=4096
>> +CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS=y
>> +CONFIG_RAPIDIO_ENUM_BASIC=y
>> +CONFIG_RAPIDIO_CPS_GEN2=y
>> +
>> +CONFIG_RIONET=y
>> +CONFIG_RIONET_TX_SIZE=128
>> +CONFIG_RIONET_RX_SIZE=128
>> diff --git a/meta/cfg/kernel-cache/bsp/axxiaarm/rapidio.scc b/meta/cfg/kernel-cache/bsp/axxiaarm/rapidio.scc
>> new file mode 100644
>> index 0000000..36cb6e6
>> --- /dev/null
>> +++ b/meta/cfg/kernel-cache/bsp/axxiaarm/rapidio.scc
>> @@ -0,0 +1,4 @@
>> +define KFEATURE_DESCRIPTION "Enable support for the sRIO controller"
>> +define KFEATURE_COMPATIBILITY all
>> +
>> +kconf hardware rapidio.cfg
>> --
>> 1.7.9.5
>>
>>
>
> --
> _______________________________________________
> linux-yocto mailing list
> linux-yocto at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/linux-yocto
--
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
More information about the linux-yocto
mailing list