aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@gmail.com>2019-01-05 22:21:40 +0100
committerChristian Lamparter <chunkeey@gmail.com>2019-01-13 11:31:43 +0100
commit85be0f4c2165051a16c1d1980335d4273473933c (patch)
tree3d404b2653cf5b38330622b180b692393d9786cc
parent46d4c09bb64c94724731347f671c01882c23a83a (diff)
downloadupstream-85be0f4c2165051a16c1d1980335d4273473933c.tar.gz
upstream-85be0f4c2165051a16c1d1980335d4273473933c.tar.bz2
upstream-85be0f4c2165051a16c1d1980335d4273473933c.zip
apm821xx: 4.14: sync config
This patch syncs the 4.14 kernel config to the current generic configuration. Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
-rw-r--r--target/linux/apm821xx/config-4.143
1 files changed, 1 insertions, 2 deletions
diff --git a/target/linux/apm821xx/config-4.14 b/target/linux/apm821xx/config-4.14
index c756c8a4f9..a70c95753d 100644
--- a/target/linux/apm821xx/config-4.14
+++ b/target/linux/apm821xx/config-4.14
@@ -54,7 +54,6 @@ CONFIG_CLONE_BACKWARDS=y
CONFIG_CMDLINE="rootfstype=squashfs noinitrd"
CONFIG_CMDLINE_BOOL=y
CONFIG_CONSISTENT_SIZE=0x00200000
-CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
CONFIG_CPU_BIG_ENDIAN=y
CONFIG_CRC16=y
CONFIG_CRYPTO_ACOMP2=y
@@ -212,6 +211,7 @@ CONFIG_LZO_DECOMPRESS=y
# CONFIG_MATH_EMULATION is not set
CONFIG_MDIO_BUS=y
CONFIG_MDIO_DEVICE=y
+CONFIG_MIGRATION=y
# CONFIG_MMIO_NVRAM is not set
CONFIG_MODULES_USE_ELF_RELA=y
# CONFIG_MPIC is not set
@@ -321,7 +321,6 @@ CONFIG_PPC_WERROR=y
# CONFIG_PPC_XIVE is not set
# CONFIG_PPC_XIVE_SPAPR is not set
# CONFIG_PQ2ADS is not set
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
CONFIG_PTE_64BIT=y
# CONFIG_RAINIER is not set
CONFIG_RAS=y