Unnecesary options have either been completely removed from the bsp/axxiaarm configuration fragments, or moved to the meta-axxia yocto layer: git://git.yoctoproject.org/meta-axxia
Signed-off-by: Cristian Bercaru <cristian.berc...@windriver.com> --- .../bsp/axxiaarm/axxiaarm-standard.scc | 1 - meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm.cfg | 8 -------- meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm.scc | 10 ++-------- meta/cfg/kernel-cache/bsp/axxiaarm/edac.cfg | 13 +++++++++++++ meta/cfg/kernel-cache/bsp/axxiaarm/kvm.cfg | 13 +++++++++++++ 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 | 13 +++++++++++++ 8 files changed, 41 insertions(+), 19 deletions(-) delete mode 100644 meta/cfg/kernel-cache/bsp/axxiaarm/no-preempt.cfg delete mode 100644 meta/cfg/kernel-cache/bsp/axxiaarm/no-preempt.scc diff --git a/meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm-standard.scc b/meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm-standard.scc index ab6be36..cc57a7e 100644 --- a/meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm-standard.scc +++ b/meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm-standard.scc @@ -6,4 +6,3 @@ 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 index a45781e..99f86f8 100644 --- a/meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm.cfg +++ b/meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm.cfg @@ -73,7 +73,6 @@ CONFIG_PCI_MSI=y # # Kernel Features # -CONFIG_SMP=y CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_HIGHMEM=y CONFIG_NR_CPUS=16 @@ -145,7 +144,6 @@ CONFIG_BLK_DEV_LOOP=y # CONFIG_LSI_MTC=y CONFIG_LSI_NCR=y -CONFIG_SCSI=y CONFIG_ATA=y @@ -199,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 @@ -215,7 +208,6 @@ 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 diff --git a/meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm.scc b/meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm.scc index 6832186..55a516f 100644 --- a/meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm.scc +++ b/meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm.scc @@ -1,14 +1,8 @@ # 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 + +kconf hardware axxiaarm.cfg diff --git a/meta/cfg/kernel-cache/bsp/axxiaarm/edac.cfg b/meta/cfg/kernel-cache/bsp/axxiaarm/edac.cfg index 840af5d..25ad058 100644 --- a/meta/cfg/kernel-cache/bsp/axxiaarm/edac.cfg +++ b/meta/cfg/kernel-cache/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/meta/cfg/kernel-cache/bsp/axxiaarm/kvm.cfg b/meta/cfg/kernel-cache/bsp/axxiaarm/kvm.cfg index a6003e4..82285f9 100644 --- a/meta/cfg/kernel-cache/bsp/axxiaarm/kvm.cfg +++ b/meta/cfg/kernel-cache/bsp/axxiaarm/kvm.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_VIRTUALIZATION=y CONFIG_KVM=y CONFIG_KVM_ARM_HOST=y diff --git a/meta/cfg/kernel-cache/bsp/axxiaarm/no-preempt.cfg b/meta/cfg/kernel-cache/bsp/axxiaarm/no-preempt.cfg deleted file mode 100644 index 0cbeb5a..0000000 --- a/meta/cfg/kernel-cache/bsp/axxiaarm/no-preempt.cfg +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 1e75e15..0000000 --- a/meta/cfg/kernel-cache/bsp/axxiaarm/no-preempt.scc +++ /dev/null @@ -1 +0,0 @@ -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 index 2a5c8ad..77f39e8 100644 --- a/meta/cfg/kernel-cache/bsp/axxiaarm/rapidio.cfg +++ b/meta/cfg/kernel-cache/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