Revert "ipq806x: add mangle bootargs options in config-4.4"
authorJosh Bendavid <joshbendavid@gmail.com>
Tue, 14 Jun 2016 13:07:21 +0000 (15:07 +0200)
committerJohn Crispin <john@phrozen.org>
Tue, 14 Jun 2016 11:28:41 +0000 (13:28 +0200)
This reverts commit 53147c2237231842b4d185f69c2bc0d79aff8b85.

These config changes break booting on C2600 and probably other devices.

Signed-off-by: Josh Bendavid <joshbendavid@gmail.com>
target/linux/ipq806x/config-4.4

index 430f1f709f3a5e67de1745ce98a5100f4cefb26d..408fc6d3e9b187b9fcdd11e8d1834a1b60c3ee4e 100644 (file)
@@ -37,13 +37,11 @@ CONFIG_ARM_AMBA=y
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
+# CONFIG_ARM_ATAG_DTB_COMPAT is not set
 CONFIG_ARM_CCI=y
 CONFIG_ARM_CCI400_COMMON=y
 CONFIG_ARM_CCI400_PMU=y
 CONFIG_ARM_CCI_PMU=y
-CONFIG_ARM_ATAG_DTB_COMPAT=y
-CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND=y
-# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER is not set
 CONFIG_ARM_CPU_SUSPEND=y
 CONFIG_ARM_GIC=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -251,7 +249,6 @@ CONFIG_LOCKUP_DETECTOR=y
 CONFIG_LOCK_SPIN_ON_OWNER=y
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
-CONFIG_MANGLE_BOOTARGS=y
 CONFIG_MDIO_BITBANG=y
 CONFIG_MDIO_BOARDINFO=y
 CONFIG_MDIO_GPIO=y