This patch removes the unnecesary options from the Axxia 5500 config fragments.
Signed-off-by: Cristian Bercaru <cristian.berc...@windriver.com> --- bsp/axxiaarm/axxiaarm-standard.scc | 1 - bsp/axxiaarm/axxiaarm.cfg | 14 -------------- bsp/axxiaarm/axxiaarm.scc | 6 ++---- bsp/axxiaarm/edac.cfg | 13 +++++++++++++ bsp/axxiaarm/kvm.cfg | 15 +++++++++++++-- bsp/axxiaarm/no-preempt.cfg | 1 - bsp/axxiaarm/no-preempt.scc | 1 - bsp/axxiaarm/rapidio.cfg | 13 +++++++++++++ 8 files changed, 41 insertions(+), 23 deletions(-) delete mode 100644 bsp/axxiaarm/no-preempt.cfg delete mode 100644 bsp/axxiaarm/no-preempt.scc diff --git a/bsp/axxiaarm/axxiaarm-standard.scc b/bsp/axxiaarm/axxiaarm-standard.scc index ab6be36..cc57a7e 100644 --- a/bsp/axxiaarm/axxiaarm-standard.scc +++ b/bsp/axxiaarm/axxiaarm-standard.scc @@ -6,4 +6,3 @@ include ktypes/standard branch axxia include axxiaarm.scc -include no-preempt.scc diff --git a/bsp/axxiaarm/axxiaarm.cfg b/bsp/axxiaarm/axxiaarm.cfg index a5610d2..58b4eb7 100644 --- a/bsp/axxiaarm/axxiaarm.cfg +++ b/bsp/axxiaarm/axxiaarm.cfg @@ -16,7 +16,6 @@ # CONFIG_ARCH_AXXIA=y - # # Axxia platform type # @@ -24,7 +23,6 @@ CONFIG_ARCH_AXXIA_GIC=y CONFIG_ARCH_AXXIA_DT=y CONFIG_ARM_TIMER_SP804=y - # # Processor Features # @@ -63,11 +61,9 @@ 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 # @@ -137,7 +133,6 @@ 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 @@ -150,10 +145,8 @@ CONFIG_BLK_DEV_LOOP=y # CONFIG_LSI_MTC=y CONFIG_LSI_NCR=y -CONFIG_SCSI=y CONFIG_ATA=y - # # EEPROM support # @@ -204,11 +197,6 @@ 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 @@ -224,7 +212,6 @@ CONFIG_IGB_HWMON=y CONFIG_IGBVF=y CONFIG_SMC91X=y - # # USB Network Adapters # @@ -285,7 +272,6 @@ CONFIG_FSCACHE_OBJECT_LIST=y CONFIG_CACHEFILES=y CONFIG_CACHEFILES_HISTOGRAM=y - # # MMC/SD/SDIO Card Drivers # diff --git a/bsp/axxiaarm/axxiaarm.scc b/bsp/axxiaarm/axxiaarm.scc index 6832186..dccecbf 100644 --- a/bsp/axxiaarm/axxiaarm.scc +++ b/bsp/axxiaarm/axxiaarm.scc @@ -1,10 +1,6 @@ # 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 @@ -12,3 +8,5 @@ include cfg/virtio.scc include rapidio.scc include edac.scc include kvm.scc + +kconf hardware axxiaarm.cfg diff --git a/bsp/axxiaarm/edac.cfg b/bsp/axxiaarm/edac.cfg index 840af5d..25ad058 100644 --- a/bsp/axxiaarm/edac.cfg +++ b/bsp/axxiaarm/edac.cfg @@ -1,3 +1,16 @@ +#......................................................................... +# 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. +# +#......................................................................... + CONFIG_EDAC=y CONFIG_EDAC_MM_EDAC=y CONFIG_EDAC_AXXIA_SYSMEM=y diff --git a/bsp/axxiaarm/kvm.cfg b/bsp/axxiaarm/kvm.cfg index a6003e4..146687f 100644 --- a/bsp/axxiaarm/kvm.cfg +++ b/bsp/axxiaarm/kvm.cfg @@ -1,7 +1,18 @@ +#......................................................................... +# 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. +# +#......................................................................... + 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/bsp/axxiaarm/no-preempt.cfg b/bsp/axxiaarm/no-preempt.cfg deleted file mode 100644 index 0cbeb5a..0000000 --- a/bsp/axxiaarm/no-preempt.cfg +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PREEMPT_NONE=y diff --git a/bsp/axxiaarm/no-preempt.scc b/bsp/axxiaarm/no-preempt.scc deleted file mode 100644 index 1e75e15..0000000 --- a/bsp/axxiaarm/no-preempt.scc +++ /dev/null @@ -1 +0,0 @@ -kconf non-hardware no-preempt.cfg diff --git a/bsp/axxiaarm/rapidio.cfg b/bsp/axxiaarm/rapidio.cfg index 2a5c8ad..77f39e8 100644 --- a/bsp/axxiaarm/rapidio.cfg +++ b/bsp/axxiaarm/rapidio.cfg @@ -1,3 +1,16 @@ +#......................................................................... +# 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. +# +#......................................................................... + CONFIG_RAPIDIO=y CONFIG_AXXIA_RIO=y CONFIG_RIO_MAINT_WIN_SIZE=0x1000000 -- 1.7.9.5 -- _______________________________________________ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto
