From 4f40d4ca73a6da3c88804c46f8c7ab0096cdabf1 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 4 Nov 2018 18:22:33 +0100 Subject: oxnas: squash-pick commits from master branch 4f017c871d oxnas: switch to generic board detect ef9b169df0 oxnas: remove stray kernel config symbols cf7896117b oxnas: enable image metadata by setting SUPPORTED_DEVICES 9bcc08958b oxnas: add console=ttyS0,115200 argument to bootargs b831eb5363 oxnas: kd20: correct memory size to 256MB 217fe505b6 oxnas: remove superseded sysupgrade image check Signed-off-by: Daniel Golle --- target/linux/oxnas/files/arch/arm/boot/dts/ox820-akitio-mycloud.dts | 2 +- .../files/arch/arm/boot/dts/ox820-cloudengines-pogoplug-pro.dts | 2 +- .../linux/oxnas/files/arch/arm/boot/dts/ox820-mitrastar-stg212.dts | 2 +- target/linux/oxnas/files/arch/arm/boot/dts/ox820-shuttle-kd20.dts | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'target/linux/oxnas/files') diff --git a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-akitio-mycloud.dts b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-akitio-mycloud.dts index c0bf34c3f4..90ea15d400 100644 --- a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-akitio-mycloud.dts +++ b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-akitio-mycloud.dts @@ -10,7 +10,7 @@ compatible = "akitio,mycloud", "oxsemi,ox820"; chosen { - bootargs = "earlyprintk"; + bootargs = "earlyprintk console=ttyS0,115200"; stdout-path = "serial0:115200n8"; }; diff --git a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-cloudengines-pogoplug-pro.dts b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-cloudengines-pogoplug-pro.dts index 363fd30d20..2872d40e3d 100644 --- a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-cloudengines-pogoplug-pro.dts +++ b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-cloudengines-pogoplug-pro.dts @@ -15,7 +15,7 @@ compatible = "cloudengines,pogoplugpro", "oxsemi,ox820"; chosen { - bootargs = "earlyprintk"; + bootargs = "earlyprintk console=ttyS0,115200"; stdout-path = "serial0:115200n8"; }; diff --git a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-mitrastar-stg212.dts b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-mitrastar-stg212.dts index 834ea77653..cc8d640ee0 100644 --- a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-mitrastar-stg212.dts +++ b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-mitrastar-stg212.dts @@ -10,7 +10,7 @@ compatible = "mitrastar,stg-212", "oxsemi,ox820"; chosen { - bootargs = "earlyprintk"; + bootargs = "earlyprintk console=ttyS0,115200"; stdout-path = "serial0:115200n8"; }; diff --git a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-shuttle-kd20.dts b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-shuttle-kd20.dts index badfa2578e..9186d08585 100644 --- a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-shuttle-kd20.dts +++ b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-shuttle-kd20.dts @@ -10,13 +10,13 @@ compatible = "shuttle,kd20", "oxsemi,ox820"; chosen { - bootargs = "earlyprintk"; + bootargs = "earlyprintk console=ttyS0,115200"; stdout-path = "serial0:115200n8"; }; memory { - /* 128Mbytes DDR */ - reg = <0x60000000 0x8000000>; + /* 256Mbytes DDR */ + reg = <0x60000000 0x10000000>; }; aliases { -- cgit v1.2.3