diff options
| author | Felix Fietkau <nbd@nbd.name> | 2017-07-18 15:58:08 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-09-28 22:45:39 +0200 |
| commit | f4a6daa5da61a53a717e1c8043d02dd0cfcdc5e0 (patch) | |
| tree | 8857c77ed24b3843682429aa9cda702492807b22 | |
| parent | a816e1eac761bfdac720d00d15feb18b7b9fd1e3 (diff) | |
| download | upstream-f4a6daa5da61a53a717e1c8043d02dd0cfcdc5e0.tar.gz upstream-f4a6daa5da61a53a717e1c8043d02dd0cfcdc5e0.tar.bz2 upstream-f4a6daa5da61a53a717e1c8043d02dd0cfcdc5e0.zip | |
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@nbd.name>
| -rw-r--r-- | target/linux/ar71xx/config-4.4 | 2 | ||||
| -rw-r--r-- | target/linux/ar71xx/generic/config-default | 1 | ||||
| -rw-r--r-- | target/linux/ar71xx/mikrotik/config-default | 1 | ||||
| -rw-r--r-- | target/linux/ar71xx/nand/config-default | 1 |
4 files changed, 1 insertions, 4 deletions
diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4 index 09097d0b48..0e77560414 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 45169689e0..e69de29bb2 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 d448560eb9..3ff5379cc4 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 2d3b06f69d..ec9d550f22 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 |