[source] ar71xx: unify CONFIG_CMDLINE

LEDE Commits lede-commits at lists.infradead.org
Thu Sep 28 13:58:06 PDT 2017


nbd pushed a commit to source.git, branch master:
https://git.lede-project.org/f4a6daa5da61a53a717e1c8043d02dd0cfcdc5e0

commit f4a6daa5da61a53a717e1c8043d02dd0cfcdc5e0
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Tue Jul 18 15:58:08 2017 +0200

    ar71xx: unify CONFIG_CMDLINE
    
    Booting from jffs2 directly is no longer supported, use
    rootfstype=squashfs consistently for all subtargets
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 target/linux/ar71xx/config-4.4              | 2 +-
 target/linux/ar71xx/generic/config-default  | 1 -
 target/linux/ar71xx/mikrotik/config-default | 1 -
 target/linux/ar71xx/nand/config-default     | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
index 09097d0..0e77560 100644
--- a/target/linux/ar71xx/config-4.4
+++ b/target/linux/ar71xx/config-4.4
@@ -260,7 +260,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_CEVT_R4K=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLONE_BACKWARDS=y
-CONFIG_CMDLINE="rootfstype=squashfs,jffs2 noinitrd"
+CONFIG_CMDLINE="rootfstype=squashfs noinitrd"
 CONFIG_CMDLINE_BOOL=y
 # CONFIG_CMDLINE_OVERRIDE is not set
 CONFIG_COMMON_CLK=y
diff --git a/target/linux/ar71xx/generic/config-default b/target/linux/ar71xx/generic/config-default
index 4516968..e69de29 100644
--- a/target/linux/ar71xx/generic/config-default
+++ b/target/linux/ar71xx/generic/config-default
@@ -1 +0,0 @@
-CONFIG_CMDLINE="rootfstype=squashfs,jffs2 noinitrd"
diff --git a/target/linux/ar71xx/mikrotik/config-default b/target/linux/ar71xx/mikrotik/config-default
index d448560..3ff5379 100644
--- a/target/linux/ar71xx/mikrotik/config-default
+++ b/target/linux/ar71xx/mikrotik/config-default
@@ -212,7 +212,6 @@ CONFIG_ATH79_MACH_RBSXTLITE=y
 # CONFIG_ATH79_MACH_ZCN_1523H is not set
 # CONFIG_ATH79_NVRAM is not set
 CONFIG_ATH79_ROUTERBOOT=y
-CONFIG_CMDLINE="rootfstype=squashfs noinitrd"
 CONFIG_CRC16=y
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_GPIO_LATCH=y
diff --git a/target/linux/ar71xx/nand/config-default b/target/linux/ar71xx/nand/config-default
index 2d3b06f..ec9d550 100644
--- a/target/linux/ar71xx/nand/config-default
+++ b/target/linux/ar71xx/nand/config-default
@@ -209,7 +209,6 @@ CONFIG_ATH79_MACH_Z1=y
 # CONFIG_ATH79_MACH_ZBT_WE1526 is not set
 # CONFIG_ATH79_MACH_ZCN_1523H is not set
 CONFIG_BCH=y
-CONFIG_CMDLINE="rootfstype=squashfs noinitrd"
 CONFIG_CRC16=y
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_LZO=y



More information about the lede-commits mailing list