diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-04-19 22:02:49 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-04-19 22:02:49 +0300 |
| commit | 36caa12533da01d4319c5ffe7613711a0ec7dea7 (patch) | |
| tree | 591c2077bb14cfd9d23893d32cca71fa7a01bc9c /meta-google/recipes-kernel/linux | |
| parent | 12bef3e1bf292dec5ac15af9fb41e86f7bcfb0cb (diff) | |
| parent | 3cec7f5a630c1ddcad058eb76e1f732a5fa20d59 (diff) | |
| download | openbmc-36caa12533da01d4319c5ffe7613711a0ec7dea7.tar.xz | |
Merge tag '0.45' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-google/recipes-kernel/linux')
| -rw-r--r-- | meta-google/recipes-kernel/linux/files/gbmc-dev.cfg | 15 | ||||
| -rw-r--r-- | meta-google/recipes-kernel/linux/files/gbmc-prod.cfg | 2 | ||||
| -rw-r--r-- | meta-google/recipes-kernel/linux/files/gbmc.cfg | 38 |
3 files changed, 55 insertions, 0 deletions
diff --git a/meta-google/recipes-kernel/linux/files/gbmc-dev.cfg b/meta-google/recipes-kernel/linux/files/gbmc-dev.cfg new file mode 100644 index 000000000..d37b1163e --- /dev/null +++ b/meta-google/recipes-kernel/linux/files/gbmc-dev.cfg @@ -0,0 +1,15 @@ +# Enable all kinds of kernel debug features +CONFIG_DEBUG_KERNEL=y +CONFIG_DYNAMIC_DEBUG=y +CONFIG_DEBUG_FS=y +# Turn off DEBUG_INFO to compress image size. +CONFIG_DEBUG_INFO=n +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y +CONFIG_STACK_TRACER=y +CONFIG_DYNAMIC_FTRACE=y + +# We want to allow for sysrqs over the console +CONFIG_MAGIC_SYSRQ=y +CONFIG_MAGIC_SYSRQ_SERIAL=y +CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1 diff --git a/meta-google/recipes-kernel/linux/files/gbmc-prod.cfg b/meta-google/recipes-kernel/linux/files/gbmc-prod.cfg new file mode 100644 index 000000000..e1a4ce8ec --- /dev/null +++ b/meta-google/recipes-kernel/linux/files/gbmc-prod.cfg @@ -0,0 +1,2 @@ +# Prod builds should not have SYSRQ +CONFIG_MAGIC_SYSRQ=n diff --git a/meta-google/recipes-kernel/linux/files/gbmc.cfg b/meta-google/recipes-kernel/linux/files/gbmc.cfg new file mode 100644 index 000000000..4385cc9eb --- /dev/null +++ b/meta-google/recipes-kernel/linux/files/gbmc.cfg @@ -0,0 +1,38 @@ +# Appended gBMC kernel commandline +CONFIG_CMDLINE="dummy.numdummies=0" +CONFIG_CMDLINE_EXTEND=y + +# We still have commandline users of /dev/mem +CONFIG_DEVMEM=y +CONFIG_DEVMEM_BOOTPARAM=n + +# Unused implicitly included functionality +CONFIG_IPV6_SIT=n + +# Used by gbmc nftables configurations +CONFIG_NETFILTER=y +CONFIG_NF_CONNTRACK=y +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_TABLES=y +CONFIG_NFT_CT=y +CONFIG_NF_TABLES_INET=y +CONFIG_NFT_REJECT=y +CONFIG_NFT_LOG=y +CONFIG_IP_NF_IPTABLES=y +CONFIG_NF_LOG_IPV4=y +CONFIG_NFT_FIB_IPV4=y +CONFIG_IP_NF_FILTER=y +CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP6_NF_IPTABLES=y +CONFIG_NF_LOG_IPV6=y +CONFIG_NFT_FIB_IPV6=y +CONFIG_IP6_NF_FILTER=y +CONFIG_IP6_NF_TARGET_REJECT=y + +# MGMT Bridge Required Features +CONFIG_BRIDGE=y +CONFIG_DUMMY=y +# Support for bridge filter +CONFIG_BRIDGE_NETFILTER=y +CONFIG_NF_TABLES_BRIDGE=y +CONFIG_BRIDGE_NF_EBTABLES=y |