[linux-yocto] [PATCH] meta: bsp/axxia: sync with yocto-kernel-cache
Cristian Bercaru
cristian.bercaru at windriver.com
Mon Dec 7 06:56:32 PST 2015
Sync the config fragments of Axxia BSPs with those on the 'yocto-3.14'
branch from git://git.yoctoproject.org/yocto-kernel-cache
Signed-off-by: Cristian Bercaru <cristian.bercaru at windriver.com>
---
.../bsp/axxiaarm/axxiaarm-standard.scc | 1 -
meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm.cfg | 15 ---------------
meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm.scc | 6 ++----
meta/cfg/kernel-cache/bsp/axxiaarm/edac.cfg | 13 +++++++++++++
meta/cfg/kernel-cache/bsp/axxiaarm/kvm.cfg | 15 +++++++++++++--
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 +++++++++++++
.../bsp/axxiapowerpc/axxiapowerpc-standard.scc | 1 -
.../kernel-cache/bsp/axxiapowerpc/axxiapowerpc.cfg | 5 +----
.../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 +++++++++++++
14 files changed, 58 insertions(+), 37 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
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/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 a5610d2..1f30f63 100644
--- a/meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm.cfg
+++ b/meta/cfg/kernel-cache/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,17 +61,14 @@ 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
@@ -137,7 +132,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 +144,8 @@ CONFIG_BLK_DEV_LOOP=y
#
CONFIG_LSI_MTC=y
CONFIG_LSI_NCR=y
-CONFIG_SCSI=y
CONFIG_ATA=y
-
#
# EEPROM support
#
@@ -204,11 +196,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 +211,6 @@ CONFIG_IGB_HWMON=y
CONFIG_IGBVF=y
CONFIG_SMC91X=y
-
#
# USB Network Adapters
#
@@ -285,7 +271,6 @@ CONFIG_FSCACHE_OBJECT_LIST=y
CONFIG_CACHEFILES=y
CONFIG_CACHEFILES_HISTOGRAM=y
-
#
# MMC/SD/SDIO Card Drivers
#
diff --git a/meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm.scc b/meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm.scc
index 6832186..dccecbf 100644
--- a/meta/cfg/kernel-cache/bsp/axxiaarm/axxiaarm.scc
+++ b/meta/cfg/kernel-cache/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/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..146687f 100644
--- a/meta/cfg/kernel-cache/bsp/axxiaarm/kvm.cfg
+++ b/meta/cfg/kernel-cache/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/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
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 ae23320..b93c9d8 100644
--- a/meta/cfg/kernel-cache/bsp/axxiapowerpc/axxiapowerpc.cfg
+++ b/meta/cfg/kernel-cache/bsp/axxiapowerpc/axxiapowerpc.cfg
@@ -15,7 +15,6 @@
#
CONFIG_44x=y
CONFIG_PPC_47x=y
-CONFIG_SMP=y
CONFIG_NR_CPUS=6
#
@@ -80,9 +79,6 @@ CONFIG_MTD_NAND_EP501X=y
CONFIG_LSI_NET=y
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-
CONFIG_USB_CI13612_HCD=y
CONFIG_LSI_USB_SW_WORKAROUND=y
@@ -130,6 +126,7 @@ CONFIG_IGBVF=y
CONFIG_USB_DEBUG=y
CONFIG_USB_DYNAMIC_MINORS=y
CONFIG_USB_MON=y
+CONFIG_USB_STORAGE=y
# CONFIG_USB_EHCI_TT_NEWSCHED is not set
CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
diff --git a/meta/cfg/kernel-cache/bsp/axxiapowerpc/axxiapowerpc.scc b/meta/cfg/kernel-cache/bsp/axxiapowerpc/axxiapowerpc.scc
index 938be1f..37b0c39 100644
--- a/meta/cfg/kernel-cache/bsp/axxiapowerpc/axxiapowerpc.scc
+++ b/meta/cfg/kernel-cache/bsp/axxiapowerpc/axxiapowerpc.scc
@@ -1,8 +1,5 @@
-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 features/scsi/disk.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
More information about the linux-yocto
mailing list