ARM: sheevaplug: misc fixes

PATCH New Peter Korsgaard 4 participants 12 messages Jan 17, 2016 – Mar 24, 2016

lore

Share & tools

lore

Peter Korsgaard

author

2016-01-17 17:23 UTC #0 lore raw

cover ARM: sheevaplug: misc fixes

Hi,

The following patch series fixes a number of issues I noticed while updating a sheevaplug from 2013.10 to 2016.01:

Peter Korsgaard (4):
ARM: sheevaplug: unbreak default environment
ARM: sheevaplug: unbreak kernel bootargs / mtdparts command by dropping double mtdparts=
ARM: sheevaplug: drop unneded 'usb start' from boot command
ARM: sheevaplug: correct nand partition layout

--
Bye, Peter Korsgaard

Peter Korsgaard

author

2016-01-17 17:23 UTC #1 lore raw

PATCH 1/4 ARM: sheevaplug: unbreak default environment

Commit 1e3d640316 (ARM: sheevaplug: redefine MTDPARTS) changed the mtdparts part of the default environment, but dropped the trailing zero termination - So the definition of x_bootcmd_kernel becomes part of the x_bootargs variable.

Fix it by reintroducing the zero termination.

Signed-off-by Peter Korsgaard <[email protected]>

---
 include/configs/sheevaplug.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

include/configs/sheevaplug.h +1 -1

index ebc3d64..7d773a8 100644
@@ -65,7 +65,7 @@
 #define CONFIG_MTDPARTS		\
 	"mtdparts=orion_nand:512K(uboot),"				\
 	"512K(env),1M(script),6M(kernel),"				\
-	"12M(ramdisk),4M(spare),-(rootfs)"
+	"12M(ramdisk),4M(spare),-(rootfs)\0"
 
 #define CONFIG_EXTRA_ENV_SETTINGS	"x_bootargs=console"	\
 	"=ttyS0,115200 mtdparts="CONFIG_MTDPARTS	\

Signature · 1 line

2.1.4

Peter Korsgaard

author

2016-01-17 17:23 UTC #2 lore raw

PATCH 2/4 ARM: sheevaplug: unbreak kernel bootargs / mtdparts command by dropping double mtdparts=

In reply to Peter Korsgaard

Commit 1e3d640316 (ARM: sheevaplug: redefine MTDPARTS) prepended mtdparts= to the flash partition information in CONFIG_MTDPARTS, but it is used like "mtdparts=" CONFIG_MTDPARTS - So we end up passing mtdparts=mtdparts=.. to the kernel, confusing the cmdline partition parser.

Fix it by dropping the double 'mtdparts='.

Signed-off-by Peter Korsgaard <[email protected]>

---
 include/configs/sheevaplug.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

include/configs/sheevaplug.h +1 -1

index 7d773a8..8110f83 100644
@@ -63,7 +63,7 @@
 	"${x_bootcmd_usb}; bootm 0x6400000;"
 
 #define CONFIG_MTDPARTS		\
-	"mtdparts=orion_nand:512K(uboot),"				\
+	"orion_nand:512K(uboot),"				\
 	"512K(env),1M(script),6M(kernel),"				\
 	"12M(ramdisk),4M(spare),-(rootfs)\0"

Signature · 1 line

2.1.4

Peter Korsgaard

author

2016-01-17 17:23 UTC #3 lore raw

PATCH 3/4 ARM: sheevaplug: drop unneded 'usb start' from boot command

In reply to Peter Korsgaard

The default bootcommand executes x_bootcmd_usb AFTER loading a kernel from nand and just before executing it, which only slows down boot without adding any functionality - So drop it.

Signed-off-by Peter Korsgaard <[email protected]>

---
 include/configs/sheevaplug.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

include/configs/sheevaplug.h +1 -1

index 8110f83..c529636 100644
@@ -60,7 +60,7 @@
  */
 #define CONFIG_BOOTCOMMAND		"${x_bootcmd_kernel}; "	\
 	"setenv bootargs ${x_bootargs} ${x_bootargs_root}; "	\
-	"${x_bootcmd_usb}; bootm 0x6400000;"
+	"bootm 0x6400000;"
 
 #define CONFIG_MTDPARTS		\
 	"orion_nand:512K(uboot),"				\

Signature · 1 line

2.1.4

Peter Korsgaard

author

2016-01-17 17:23 UTC #4 lore raw

PATCH 4/4 ARM: sheevaplug: correct nand partition layout

In reply to Peter Korsgaard

Commit 1e3d640316 (ARM: sheevaplug: redefine MTDPARTS) changed the partition layout (without any description why), but didn't change the offset/size to load the kernel from or the root=/dev/mtdblockX in the bootargs.

The 3MB forseen for a kernel is furthermore too little. A 4.4 build of mvebu_v5_defconfig is 3.6MB:

-rw-r--r-- 1 peko peko 3.6M Jan 16 20:24 uImage.kirkwood-sheevaplug

When device tree support for sheevaplug was added to the kernel in commit ee514b381e (ARM: Kirkwood: Add dts files for Sheevaplug and eSATA Sheevaplug) a default flash partition layout (used if mtdparts= isn't passed on the command line / CONFIG_MTD_CMDLINE_PARTS isn't enabled) with 1MB for u-boot / environment, 4MB for the kernel and the rest for the rootfs, so use that layout here and adjust the kernel loading to match.

Signed-off-by Peter Korsgaard <[email protected]>

---
 include/configs/sheevaplug.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

include/configs/sheevaplug.h +3 -3

index c529636..f9fb9bc 100644
@@ -64,12 +64,12 @@
 
 #define CONFIG_MTDPARTS		\
 	"orion_nand:512K(uboot),"				\
-	"512K(env),1M(script),6M(kernel),"				\
-	"12M(ramdisk),4M(spare),-(rootfs)\0"
+	"512K(env),4M(kernel),"					\
+	"-(rootfs)\0"
 
 #define CONFIG_EXTRA_ENV_SETTINGS	"x_bootargs=console"	\
 	"=ttyS0,115200 mtdparts="CONFIG_MTDPARTS	\
-	"x_bootcmd_kernel=nand read 0x6400000 0x100000 0x300000\0" \
+	"x_bootcmd_kernel=nand read 0x6400000 0x100000 0x400000\0" \
 	"x_bootcmd_usb=usb start\0" \
 	"x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0"

Signature · 1 line

2.1.4

Tom Rini

2016-01-19 17:14 UTC #5 lore raw

PATCH 4/4 ARM: sheevaplug: correct nand partition layout

Quoted 30 lines · Peter Korsgaard

Commit 1e3d640316 (ARM: sheevaplug: redefine MTDPARTS) changed the partition layout (without any description why), but didn't change the offset/size to load the kernel from or the root=/dev/mtdblockX in the bootargs.
The 3MB forseen for a kernel is furthermore too little. A 4.4 build of mvebu_v5_defconfig is 3.6MB:
-rw-r--r-- 1 peko peko 3.6M Jan 16 20:24 uImage.kirkwood-sheevaplug
When device tree support for sheevaplug was added to the kernel in commit ee514b381e (ARM: Kirkwood: Add dts files for Sheevaplug and eSATA Sheevaplug) a default flash partition layout (used if mtdparts= isn't passed on the command line / CONFIG_MTD_CMDLINE_PARTS isn't enabled) with 1MB for u-boot / environment, 4MB for the kernel and the rest for the rootfs, so use that layout here and adjust the kernel loading to match.
Signed-off-by Peter Korsgaard <[email protected]>
---
 include/configs/sheevaplug.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
include/configs/sheevaplug.h +0 -1
index c529636..f9fb9bc 100644
@@ -64,12 +64,12 @@
 
 #define CONFIG_MTDPARTS		\
 	"orion_nand:512K(uboot),"				\
-	"512K(env),1M(script),6M(kernel),"				\

include/configs/sheevaplug.h line 74

Quoted 10 lines

include/configs/sheevaplug.h +3 -2

-	"12M(ramdisk),4M(spare),-(rootfs)\0"
+	"512K(env),4M(kernel),"					\
+	"-(rootfs)\0"
 
 #define CONFIG_EXTRA_ENV_SETTINGS	"x_bootargs=console"	\
 	"=ttyS0,115200 mtdparts="CONFIG_MTDPARTS	\
-	"x_bootcmd_kernel=nand read 0x6400000 0x100000 0x300000\0" \
+	"x_bootcmd_kernel=nand read 0x6400000 0x100000 0x400000\0" \
 	"x_bootcmd_usb=usb start\0" \
 	"x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0"

Can I suggest future proofing this by using the names set in MTDPARTS instead of direct offsets? Thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160119/bde1ff79/attachment.sig>

Peter Korsgaard

author

2016-01-19 17:48 UTC #6 lore raw

PATCH 4/4 ARM: sheevaplug: correct nand partition layout

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Tom" == Tom Rini <[email protected]> writes:

Hi,

Quoted 9 lines

Quoted 6 lines
#define CONFIG_EXTRA_ENV_SETTINGS "x_bootargs=console" \
"=ttyS0,115200 mtdparts="CONFIG_MTDPARTS \
include/configs/sheevaplug.h +1 -1
-	"x_bootcmd_kernel=nand read 0x6400000 0x100000 0x300000\0" \
+	"x_bootcmd_kernel=nand read 0x6400000 0x100000 0x400000\0" \
"x_bootcmd_usb=usb start\0" \
"x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0"
Can I suggest future proofing this by using the names set in MTDPARTS instead of direct offsets? Thanks!

True. I wanted to do as minimal change as possible, but I'll take a look at using mtdparts and send a patch.

Thanks.

Signature · 2 lines

Venlig hilsen,
Peter Korsgaard

Stefan Roese

2016-03-24 08:26 UTC #7 lore raw

PATCH 4/4 ARM: sheevaplug: correct nand partition layout

In reply to Peter Korsgaard

Quoted 9 lines · Peter Korsgaard

Commit 1e3d640316 (ARM: sheevaplug: redefine MTDPARTS) changed the partition layout (without any description why), but didn't change the offset/size to load the kernel from or the root=/dev/mtdblockX in the bootargs.
The 3MB forseen for a kernel is furthermore too little. A 4.4 build of mvebu_v5_defconfig is 3.6MB:
-rw-r--r-- 1 peko peko 3.6M Jan 16 20:24 uImage.kirkwood-sheevaplug

Quoted 8 lines

When device tree support for sheevaplug was added to the kernel in commit ee514b381e (ARM: Kirkwood: Add dts files for Sheevaplug and eSATA Sheevaplug) a default flash partition layout (used if mtdparts= isn't passed on the command line / CONFIG_MTD_CMDLINE_PARTS isn't enabled) with 1MB for u-boot / environment, 4MB for the kernel and the rest for the rootfs, so use that layout here and adjust the kernel loading to match.
Signed-off-by Peter Korsgaard <[email protected]>

Applied to u-boot-marvell/master.

Thanks,
Stefan

Luka Perkov

Applied

2016-01-17 21:59 UTC #8 lore raw

cover ARM: sheevaplug: misc fixes

In reply to Peter Korsgaard

Quoted 8 lines · Peter Korsgaard

The following patch series fixes a number of issues I noticed while updating a sheevaplug from 2013.10 to 2016.01:
Peter Korsgaard (4):
ARM: sheevaplug: unbreak default environment
ARM: sheevaplug: unbreak kernel bootargs / mtdparts command by dropping double mtdparts=
ARM: sheevaplug: drop unneded 'usb start' from boot command
ARM: sheevaplug: correct nand partition layout

Queued in marvell master. Thanks!

Luka

Peter Korsgaard

author

2016-03-14 22:08 UTC #9 lore raw

cover ARM: sheevaplug: misc fixes

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Luka" == Luka Perkov <[email protected]> writes:

Hi,

Quoted 11 lines · Peter Korsgaard

Quoted 8 lines
The following patch series fixes a number of issues I noticed while updating a sheevaplug from 2013.10 to 2016.01:
Peter Korsgaard (4):
ARM: sheevaplug: unbreak default environment
ARM: sheevaplug: unbreak kernel bootargs / mtdparts command by dropping double mtdparts=
ARM: sheevaplug: drop unneded 'usb start' from boot command
ARM: sheevaplug: correct nand partition layout
Queued in marvell master. Thanks!

What happened to this? I don't see it 2016.03 or in
http://git.denx.de/?p=u-boot/u-boot-marvell.git for that matter.

Signature · 2 lines

Venlig hilsen,
Peter Korsgaard

Luka Perkov

2016-03-14 22:34 UTC #10 lore raw

cover ARM: sheevaplug: misc fixes

Hi Peter,

Quoted 14 lines · Peter Korsgaard

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Luka" == Luka Perkov <[email protected]> writes:
Hi,
Quoted 9 lines · Peter Korsgaard
Quoted 8 lines
The following patch series fixes a number of issues I noticed while updating a sheevaplug from 2013.10 to 2016.01:
Peter Korsgaard (4):
ARM: sheevaplug: unbreak default environment
ARM: sheevaplug: unbreak kernel bootargs / mtdparts command by dropping double mtdparts=
ARM: sheevaplug: drop unneded 'usb start' from boot command
ARM: sheevaplug: correct nand partition layout

Quoted 4 lines

Quoted 1 line
Queued in marvell master. Thanks!
What happened to this? I don't see it 2016.03 or in
http://git.denx.de/?p=u-boot/u-boot-marvell.git for that matter.

I think we lost these by accident when Stefan joined the team as well.

I'll send the pull request shortly.

Luka

Peter Korsgaard

author

2016-03-14 22:37 UTC #11 lore raw

cover ARM: sheevaplug: misc fixes

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Luka" == Luka Perkov <[email protected]> writes:

Hi,

Quoted 6 lines

Quoted 2 lines
What happened to this? I don't see it 2016.03 or in
http://git.denx.de/?p=u-boot/u-boot-marvell.git for that matter.
I think we lost these by accident when Stefan joined the team as well.
I'll send the pull request shortly.

Thanks!

Signature · 2 lines

Venlig hilsen,
Peter Korsgaard