Unnecesary options have either been completely removed from the bsp/axxiapowerpc 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/axxiapowerpc/axxiapowerpc-standard.scc | 1 - .../kernel-cache/bsp/axxiapowerpc/axxiapowerpc.cfg | 4 ++-- .../kernel-cache/bsp/axxiapowerpc/axxiapowerpc.scc | 9 ++------- .../kernel-cache/bsp/axxiapowerpc/no-preempt.cfg | 1 - .../kernel-cache/bsp/axxiapowerpc/no-preempt.scc | 1 - meta/cfg/kernel-cache/bsp/axxiapowerpc/rapidio.cfg | 13 +++++++++++++ 6 files changed, 17 insertions(+), 12 deletions(-) delete mode 100644 meta/cfg/kernel-cache/bsp/axxiapowerpc/no-preempt.cfg delete mode 100644 meta/cfg/kernel-cache/bsp/axxiapowerpc/no-preempt.scc diff --git a/meta/cfg/kernel-cache/bsp/axxiapowerpc/axxiapowerpc-standard.scc b/meta/cfg/kernel-cache/bsp/axxiapowerpc/axxiapowerpc-standard.scc index 2af8ed7..1caa2dd 100644 --- a/meta/cfg/kernel-cache/bsp/axxiapowerpc/axxiapowerpc-standard.scc +++ b/meta/cfg/kernel-cache/bsp/axxiapowerpc/axxiapowerpc-standard.scc @@ -6,4 +6,3 @@ include ktypes/standard branch axxia include axxiapowerpc.scc -include no-preempt.scc diff --git a/meta/cfg/kernel-cache/bsp/axxiapowerpc/axxiapowerpc.cfg b/meta/cfg/kernel-cache/bsp/axxiapowerpc/axxiapowerpc.cfg index 689f887..33b1e92 100644 --- a/meta/cfg/kernel-cache/bsp/axxiapowerpc/axxiapowerpc.cfg +++ b/meta/cfg/kernel-cache/bsp/axxiapowerpc/axxiapowerpc.cfg @@ -15,7 +15,7 @@ # CONFIG_44x=y CONFIG_PPC_47x=y -CONFIG_SMP=y +# CONFIG_EBONY is not set CONFIG_NR_CPUS=6 # @@ -69,7 +69,7 @@ CONFIG_SCSI_CONSTANTS=y CONFIG_USB_ZD1201=y -CONFIG_INPUT_EVDEV is not set +# CONFIG_INPUT_EVDEV is not set CONFIG_SERIAL_ACP=y CONFIG_SERIAL_ACP_CONSOLE=y diff --git a/meta/cfg/kernel-cache/bsp/axxiapowerpc/axxiapowerpc.scc b/meta/cfg/kernel-cache/bsp/axxiapowerpc/axxiapowerpc.scc index 938be1f..4393391 100644 --- a/meta/cfg/kernel-cache/bsp/axxiapowerpc/axxiapowerpc.scc +++ b/meta/cfg/kernel-cache/bsp/axxiapowerpc/axxiapowerpc.scc @@ -1,8 +1,3 @@ -kconf hardware axxiapowerpc.cfg - -include features/profiling/profiling.scc -include features/latencytop/latencytop.scc -include features/usb/ehci-hcd.scc -include cfg/usb-mass-storage.scc - include rapidio.scc + +kconf hardware axxiapowerpc.cfg diff --git a/meta/cfg/kernel-cache/bsp/axxiapowerpc/no-preempt.cfg b/meta/cfg/kernel-cache/bsp/axxiapowerpc/no-preempt.cfg deleted file mode 100644 index 0cbeb5a..0000000 --- a/meta/cfg/kernel-cache/bsp/axxiapowerpc/no-preempt.cfg +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PREEMPT_NONE=y diff --git a/meta/cfg/kernel-cache/bsp/axxiapowerpc/no-preempt.scc b/meta/cfg/kernel-cache/bsp/axxiapowerpc/no-preempt.scc deleted file mode 100644 index 1e75e15..0000000 --- a/meta/cfg/kernel-cache/bsp/axxiapowerpc/no-preempt.scc +++ /dev/null @@ -1 +0,0 @@ -kconf non-hardware no-preempt.cfg diff --git a/meta/cfg/kernel-cache/bsp/axxiapowerpc/rapidio.cfg b/meta/cfg/kernel-cache/bsp/axxiapowerpc/rapidio.cfg index 6327327..bbbd785 100644 --- a/meta/cfg/kernel-cache/bsp/axxiapowerpc/rapidio.cfg +++ b/meta/cfg/kernel-cache/bsp/axxiapowerpc/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 is not set CONFIG_RIO_MAINT_WIN_SIZE=0x400000 -- 1.7.9.5 -- _______________________________________________ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto