From fbbfd180b4a74770dc3ccf770712cccb316cbfef Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Thu, 26 May 2016 16:13:28 -0700 Subject: [PATCH 1/2] sys-kernel/coreos-kernel: enable EXPERT for arm64 --- .../sys-kernel/coreos-kernel/files/arm64_defconfig-4.6 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/arm64_defconfig-4.6 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/arm64_defconfig-4.6 index bfd9b6bd34..9eea656c92 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/arm64_defconfig-4.6 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/arm64_defconfig-4.6 @@ -26,10 +26,12 @@ CONFIG_CPUSETS=y CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_PERF=y +CONFIG_NAMESPACES=y CONFIG_USER_NS=y CONFIG_SCHED_AUTOGROUP=y CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="bootengine.cpio" +CONFIG_EXPERT=y CONFIG_KALLSYMS_ALL=y # CONFIG_COMPAT_BRK is not set CONFIG_PROFILING=y @@ -62,7 +64,6 @@ CONFIG_SECCOMP=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_BINFMT_MISC=m CONFIG_COMPAT=y -CONFIG_CPU_IDLE=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y @@ -303,7 +304,6 @@ CONFIG_VIRTUALIZATION=y CONFIG_DEBUG_INFO=y CONFIG_DEBUG_FS=y CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y CONFIG_LOCKUP_DETECTOR=y CONFIG_SCHEDSTATS=y # CONFIG_DEBUG_PREEMPT is not set From 3ec60a5790488a165529a4a1b80314d6bcc8214e Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Thu, 26 May 2016 16:21:21 -0700 Subject: [PATCH 2/2] sys-kernel/coreos-kernel: merge arm64 changes from cavium for thunderx --- ...0.ebuild => coreos-kernel-4.6.0-r1.ebuild} | 0 .../coreos-kernel/files/arm64_defconfig-4.6 | 20 ++++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-4.6.0.ebuild => coreos-kernel-4.6.0-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.6.0.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.6.0-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.6.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.6.0-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/arm64_defconfig-4.6 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/arm64_defconfig-4.6 index 9eea656c92..a4841cc915 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/arm64_defconfig-4.6 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/arm64_defconfig-4.6 @@ -53,8 +53,22 @@ CONFIG_ARCH_VEXPRESS=y CONFIG_ARCH_XGENE=y CONFIG_ARCH_ZYNQMP=y CONFIG_PCI=y +CONFIG_HOTPLUG_PCI_PCIE=y CONFIG_PCI_MSI=y +CONFIG_PCI_REALLOC_ENABLE_AUTO=y +CONFIG_PCI_STUB=m +CONFIG_PCI_IOV=y +CONFIG_PCI_PRI=y +CONFIG_PCI_PASID=y +CONFIG_HOTPLUG_PCI=y +CONFIG_PCI_HOST_GENERIC=y CONFIG_PCI_XGENE=y +CONFIG_PCI_HISI=y +CONFIG_PCI_HOST_THUNDER_PEM=y +CONFIG_PCI_HOST_THUNDER_ECAM=y +CONFIG_ARM64_64K_PAGES=y +CONFIG_ARM64_VA_BITS_48=y +CONFIG_NR_CPUS=96 CONFIG_PREEMPT=y CONFIG_KSM=y CONFIG_TRANSPARENT_HUGEPAGE=y @@ -183,9 +197,14 @@ CONFIG_TUN=y CONFIG_VETH=y CONFIG_VIRTIO_NET=y CONFIG_NET_XGENE=y +CONFIG_THUNDER_NIC_PF=y +CONFIG_THUNDER_NIC_VF=y CONFIG_SKY2=y CONFIG_SMC91X=y CONFIG_SMSC911X=y +CONFIG_MDIO_BITBANG=m +CONFIG_MDIO_GPIO=m +CONFIG_MDIO_OCTEON=y CONFIG_PPP=m CONFIG_PPP_BSDCOMP=m CONFIG_PPP_DEFLATE=m @@ -310,7 +329,6 @@ CONFIG_SCHEDSTATS=y CONFIG_DEBUG_CREDENTIALS=y # CONFIG_FTRACE is not set CONFIG_DEBUG_SET_MODULE_RONX=y -CONFIG_DEBUG_ALIGN_RODATA=y CONFIG_SECURITY=y CONFIG_CRYPTO_ANSI_CPRNG=y CONFIG_ARM64_CRYPTO=y