diff options
author | Josh Bendavid <joshbendavid@gmail.com> | 2016-06-14 15:07:21 +0200 |
---|---|---|
committer | John Crispin <john@phrozen.org> | 2016-06-14 13:28:41 +0200 |
commit | e13b6322cdbea9d7bdeed83fe04a5fd988b2f035 (patch) | |
tree | dcc157b922c6ee662300facce2dde942ff0ef276 /target/linux/ipq806x | |
parent | e030c31e3577f41581d43e3cd959a11643764937 (diff) | |
download | upstream-e13b6322cdbea9d7bdeed83fe04a5fd988b2f035.tar.gz upstream-e13b6322cdbea9d7bdeed83fe04a5fd988b2f035.tar.bz2 upstream-e13b6322cdbea9d7bdeed83fe04a5fd988b2f035.zip |
Revert "ipq806x: add mangle bootargs options in config-4.4"
This reverts commit 53147c2237231842b4d185f69c2bc0d79aff8b85.
These config changes break booting on C2600 and probably other devices.
Signed-off-by: Josh Bendavid <joshbendavid@gmail.com>
Diffstat (limited to 'target/linux/ipq806x')
-rw-r--r-- | target/linux/ipq806x/config-4.4 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/target/linux/ipq806x/config-4.4 b/target/linux/ipq806x/config-4.4 index 430f1f709f..408fc6d3e9 100644 --- a/target/linux/ipq806x/config-4.4 +++ b/target/linux/ipq806x/config-4.4 @@ -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 |