add libfdt bootz support and change nand partition table
cover add libfdt bootz support and change nand partition table
This patch series implement following feature:
- Add libfdt support
- Add bootz support
- Change nand partition table
Bo Shen (1):
ARM: at91: change nand flash table
Nicolas Ferre (2):
arm: at91/configs: add libfdt to configuration
arm: at91/configs: add bootz to configuration
include/configs/at91rm9200ek.h | 3 +++ include/configs/at91sam9260ek.h | 21 ++++++++++++--------- include/configs/at91sam9261ek.h | 19 +++++++++---------- include/configs/at91sam9263ek.h | 20 ++++++++++++-------- include/configs/at91sam9m10g45ek.h | 17 +++++++++-------- include/configs/at91sam9rlek.h | 3 +++ include/configs/at91sam9x5ek.h | 12 +++++++----- 7 files changed, 55 insertions(+), 40 deletions(-)
Signature · 1 line
1.7.9.5
PATCH 1/3 arm: at91/configs: add libfdt to configuration
From: Nicolas Ferre <[email protected]>
support to boot device tree Linux kernel
--- include/configs/at91rm9200ek.h | 2 ++ include/configs/at91sam9260ek.h | 2 ++ include/configs/at91sam9263ek.h | 2 ++ include/configs/at91sam9rlek.h | 2 ++ 4 files changed, 8 insertions(+)
include/configs/at91rm9200ek.h +2 -0
@@ -75,6 +75,8 @@#define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_OF_LIBFDT +/* * Memory Configuration */
include/configs/at91sam9260ek.h +2 -0
@@ -62,6 +62,8 @@#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_DISPLAY_CPUINFO +#define CONFIG_OF_LIBFDT +/* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ #define CONFIG_AT91_GPIO
include/configs/at91sam9263ek.h +2 -0
@@ -62,6 +62,8 @@#define CONFIG_DISPLAY_CPUINFO +#define CONFIG_OF_LIBFDT +/* * Hardware drivers */
include/configs/at91sam9rlek.h +2 -0
@@ -48,6 +48,8 @@#define CONFIG_DISPLAY_CPUINFO +#define CONFIG_OF_LIBFDT +#define CONFIG_ATMEL_LEGACY #define CONFIG_AT91_GPIO 1#define CONFIG_AT91_GPIO_PULLUP 1
Signature · 1 line
1.7.9.5
PATCH 1/3 arm: at91/configs: add libfdt to configuration
Dear Bo Shen,
Quoted 8 lines · Bo Shen
From: Nicolas Ferre <[email protected]>
support to boot device tree Linux kernel
Signed-off-by Nicolas Ferre <[email protected]>[Add libftd for at91rm9200, at91sam9263, at91sam9rl]Signed-off-by Bo Shen <[email protected]>
Quoted 6 lines
---
include/configs/at91rm9200ek.h | 2 ++ include/configs/at91sam9260ek.h | 2 ++ include/configs/at91sam9263ek.h | 2 ++ include/configs/at91sam9rlek.h | 2 ++ 4 files changed, 8 insertions(+)
applied to u-boot-atmel/master, thanks!
Best regards,
Andreas Bie?mann
PATCH 2/3 arm: at91/configs: add bootz to configuration
In reply to Bo ShenFrom: Nicolas Ferre <[email protected]>
Support to boot zImage
--- include/configs/at91rm9200ek.h | 1 + include/configs/at91sam9260ek.h | 1 + include/configs/at91sam9263ek.h | 1 + include/configs/at91sam9m10g45ek.h | 1 + include/configs/at91sam9rlek.h | 1 + include/configs/at91sam9x5ek.h | 1 + 6 files changed, 6 insertions(+)
include/configs/at91rm9200ek.h +1 -0
@@ -75,6 +75,7 @@#define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_CMD_BOOTZ #define CONFIG_OF_LIBFDT /*
include/configs/at91sam9260ek.h +1 -0
@@ -62,6 +62,7 @@#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_DISPLAY_CPUINFO +#define CONFIG_CMD_BOOTZ #define CONFIG_OF_LIBFDT /* general purpose I/O */
include/configs/at91sam9263ek.h +1 -0
@@ -62,6 +62,7 @@#define CONFIG_DISPLAY_CPUINFO +#define CONFIG_CMD_BOOTZ #define CONFIG_OF_LIBFDT /*
include/configs/at91sam9m10g45ek.h +1 -0
@@ -47,6 +47,7 @@#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_DISPLAY_CPUINFO +#define CONFIG_CMD_BOOTZ #define CONFIG_OF_LIBFDT /* general purpose I/O */
include/configs/at91sam9rlek.h +1 -0
@@ -48,6 +48,7 @@#define CONFIG_DISPLAY_CPUINFO +#define CONFIG_CMD_BOOTZ #define CONFIG_OF_LIBFDT #define CONFIG_ATMEL_LEGACY
include/configs/at91sam9x5ek.h +1 -0
@@ -42,6 +42,7 @@#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_DISPLAY_CPUINFO +#define CONFIG_CMD_BOOTZ #define CONFIG_OF_LIBFDT /* general purpose I/O */
Signature · 1 line
1.7.9.5
PATCH 2/3 arm: at91/configs: add bootz to configuration
Dear Bo Shen,
Quoted 8 lines · Bo Shen
From: Nicolas Ferre <[email protected]>
Support to boot zImage
Signed-off-by Nicolas Ferre <[email protected]>[Add bootz for at91rm9200, at91sam9263, at91sam9rl]Signed-off-by Bo Shen <[email protected]>
Quoted 8 lines
---
include/configs/at91rm9200ek.h | 1 + include/configs/at91sam9260ek.h | 1 + include/configs/at91sam9263ek.h | 1 + include/configs/at91sam9m10g45ek.h | 1 + include/configs/at91sam9rlek.h | 1 + include/configs/at91sam9x5ek.h | 1 + 6 files changed, 6 insertions(+)
applied to u-boot-atmel/master, thanks!
Best regards,
Andreas Bie?mann
PATCH 3/3 ARM: at91: change nand flash table
In reply to Bo ShenChange nand flash partition tablke according to www.at91.com/linux4sam
more information: http://www.at91.com/linux4sam/bin/view/Linux4SAM/GettingStarted#Linux4SAM_NandFlash_demo_Memory
--- include/configs/at91sam9260ek.h | 18 +++++++++--------- include/configs/at91sam9261ek.h | 19 +++++++++---------- include/configs/at91sam9263ek.h | 17 +++++++++-------- include/configs/at91sam9m10g45ek.h | 16 ++++++++-------- include/configs/at91sam9x5ek.h | 11 ++++++----- 5 files changed, 41 insertions(+), 40 deletions(-)
include/configs/at91sam9260ek.h +9 -9
@@ -215,16 +215,16 @@/* bootstrap + u-boot + env + linux in nandflash */ #define CONFIG_ENV_IS_IN_NAND 1 -#define CONFIG_ENV_OFFSET 0x60000 -#define CONFIG_ENV_OFFSET_REDUND 0x80000 +#define CONFIG_ENV_OFFSET 0xc0000 +#define CONFIG_ENV_OFFSET_REDUND 0x100000#define CONFIG_ENV_SIZE 0x20000/* 1 sector = 128 kB */ -#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" -#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ - "root=/dev/mtdblock5 " \ - "mtdparts=atmel_nand:128k(bootstrap)ro," \ - "256k(uboot)ro,128k(env1)ro," \ - "128k(env2)ro,2M(linux),-(root) " \ - "rw rootfstype=jffs2" +#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x300000; bootm" +#define CONFIG_BOOTARGS \ + "console=ttyS0,115200 earlyprintk " \ + "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \ + "256k(env),256k(env_redundant),256k(spare)," \ + "512k(dtb),6M(kernel)ro,-(rootfs) " \ + "root=/dev/mtdblock7 rw rootfstype=jffs2"#endif
include/configs/at91sam9261ek.h +9 -10
@@ -212,17 +212,16 @@/* bootstrap + u-boot + env + linux in nandflash */ #define CONFIG_ENV_IS_IN_NAND -#define CONFIG_ENV_OFFSET 0x60000 -#define CONFIG_ENV_OFFSET_REDUND 0x80000 +#define CONFIG_ENV_OFFSET 0xc0000 +#define CONFIG_ENV_OFFSET_REDUND 0x100000#define CONFIG_ENV_SIZE 0x20000/* 1 sector = 128 kB */ -#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" -#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ - "root=/dev/mtdblock5 " \ - "mtdparts=atmel_nand:128k(bootstrap)ro," \ - "256k(uboot)ro,128k(env1)ro," \ - "128k(env2)ro,2M(linux),-(root) " \ - "rw rootfstype=jffs2" - +#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x300000; bootm" +#define CONFIG_BOOTARGS \ + "console=ttyS0,115200 earlyprintk " \ + "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \ + "256k(env),256k(env_redundant),256k(spare)," \ + "512k(dtb),6M(kernel)ro,-(rootfs) " \ + "root=/dev/mtdblock7 rw rootfstype=jffs2"#endif #define CONFIG_SYS_PROMPT "U-Boot> "
include/configs/at91sam9263ek.h +9 -8
@@ -327,15 +327,16 @@/* bootstrap + u-boot + env + linux in nandflash */ #define CONFIG_ENV_IS_IN_NAND 1 -#define CONFIG_ENV_OFFSET 0x60000 -#define CONFIG_ENV_OFFSET_REDUND 0x80000 +#define CONFIG_ENV_OFFSET 0xc0000 +#define CONFIG_ENV_OFFSET_REDUND 0x100000#define CONFIG_ENV_SIZE 0x20000/* 1 sector = 128 kB */ -#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" -#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ - "root=/dev/mtdblock5 " \ - "mtdparts=atmel_nand:128k(bootstrap)ro,256k(uboot)ro,128k(env1)ro,128k(env2)ro,2M(linux),-(root) " \ - "rw rootfstype=jffs2" - +#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x300000; bootm" +#define CONFIG_BOOTARGS \ + "console=ttyS0,115200 earlyprintk " \ + "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \ + "256k(env),256k(env_redundant),256k(spare)," \ + "512k(dtb),6M(kernel)ro,-(rootfs) " \ + "root=/dev/mtdblock7 rw rootfstype=jffs2"#endif #define CONFIG_SYS_PROMPT "U-Boot> "
include/configs/at91sam9m10g45ek.h +8 -8
@@ -150,19 +150,19 @@/* bootstrap + u-boot + env in nandflash */ #define CONFIG_ENV_IS_IN_NAND -#define CONFIG_ENV_OFFSET 0x60000 -#define CONFIG_ENV_OFFSET_REDUND 0x80000 +#define CONFIG_ENV_OFFSET 0xc0000 +#define CONFIG_ENV_OFFSET_REDUND 0x100000#define CONFIG_ENV_SIZE 0x20000 -#define CONFIG_BOOTCOMMAND "nand read 0x70000000 0x100000 0x200000;" \ +#define CONFIG_BOOTCOMMAND \ + "nand read 0x70000000 0x200000 0x300000;" \ "bootm 0x70000000"#define CONFIG_BOOTARGS \ "console=ttyS0,115200 earlyprintk " \ - "root=/dev/mtdblock5 " \ - "mtdparts=atmel_nand:128k(bootstrap)ro," \ - "256k(uboot)ro,128k(env1)ro,128k(env2)ro," \ - "2M at 1M(linux),-(root) " \ - "rw rootfstype=jffs2" + "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \ + "256k(env),256k(env_redundant),256k(spare)," \ + "512k(dtb),6M(kernel)ro,-(rootfs) " \ + "root=/dev/mtdblock7 rw rootfstype=jffs2"#define CONFIG_BAUDRATE 115200
include/configs/at91sam9x5ek.h +6 -5
@@ -232,11 +232,12 @@"root=/dev/mmcblk0p2 " \ "rw rootfstype=ext4 rootwait"#else -#define CONFIG_BOOTARGS "mem=128M console=ttyS0,115200 " \ - "mtdparts=atmel_nand:" \ - "8M(bootstrap/uboot/kernel)ro,-(rootfs) " \ - "root=/dev/mtdblock1 rw " \ - "rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs" +#define CONFIG_BOOTARGS \ + "console=ttyS0,115200 earlyprintk " \ + "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \ + "256k(env),256k(env_redundant),256k(spare)," \ + "512k(dtb),6M(kernel)ro,-(rootfs) " \ + "rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs rw"#endif #define CONFIG_BAUDRATE 115200
Signature · 1 line
1.7.9.5
PATCH 3/3 ARM: at91: change nand flash table
Quoted 5 lines · Bo Shen
Change nand flash partition tablke according to www.at91.com/linux4sam
more information: http://www.at91.com/linux4sam/bin/view/Linux4SAM/GettingStarted#Linux4SAM_NandFlash_demo_Memory
Signed-off-by Bo Shen <[email protected]>
Question. Is there a reason to not being doing the MTDIDS / MTDPARTS and adding CONFIG_CMD_MTDPARTS ? Doing that should also "just" enable the nand info to be passed in the device tree.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130220/c2570336/attachment.pgp>
PATCH 3/3 ARM: at91: change nand flash table
Hi Tom,
Quoted 10 lines · Tom Rini
Quoted 5 lines · Bo Shen
Change nand flash partition tablke according to www.at91.com/linux4sam
more information: http://www.at91.com/linux4sam/bin/view/Linux4SAM/GettingStarted#Linux4SAM_NandFlash_demo_Memory
Signed-off-by Bo Shen <[email protected]>Question. Is there a reason to not being doing the MTDIDS / MTDPARTS and adding
CONFIG_CMD_MTDPARTS?
Yes, MTDIDS/MTDPARTS is missing, however, we can set mtdids and mtdpart environment to use mtdparts command. (Maybe this is not a good idea, will consider to add MTDIDS / MTDPARTS later, not in this patch series.)
Quoted 2 lines
Doing that should also "just" enable
the nand info to be passed in the device tree.
I am not fully understand this. You means add MTDIDS / MTDPARTS, it can automatically pass the nand info to device tree, not through the command line, am I right?
Best Regards,
Bo Shen
PATCH 3/3 ARM: at91: change nand flash table
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 14 lines · Bo Shen
Hi Tom,
Quoted 11 lines · Tom Rini
Quoted 9 lines · Bo Shen
Change nand flash partition tablke according to
www.at91.com/linux4sammore information:
http://www.at91.com/linux4sam/bin/view/Linux4SAM/GettingStarted#Linux4SAM_NandFlash_demo_Memory
Quoted 8 lines
Quoted 3 lines
Question. Is there a reason to not being doing the MTDIDS / MTDPARTS and adding
CONFIG_CMD_MTDPARTS?Yes, MTDIDS/MTDPARTS is missing, however, we can set mtdids and mtdpart environment to use mtdparts command. (Maybe this is not a good idea, will consider to add MTDIDS / MTDPARTS later, not in this patch series.)
Right. But without CONFIG_CMD_MTDPARTS you don't have the mtdparts commands / infrastructure in U-Boot :)
Quoted 6 lines
Quoted 2 lines
Doing that should also "just" enable the nand info to be passed in the device tree.
I am not fully understand this. You means add MTDIDS / MTDPARTS, it can automatically pass the nand info to device tree, not through the command line, am I right?
I was mis-remembering the code. If you have CONFIG_FDT_FIXUP_PARTITIONS set and the board support code calls fdt_fixup_mtdparts then yes, the mtdparts info will be put into the device tree and then CONFIG_MTD_OF_PARTS in the kernel should take that and run with it. At least I think that's all there is to it, I've meant to, but not had a chance, to try that all out again. Perhaps soon tho.
- --
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iQIcBAEBAgAGBQJRJi4EAAoJENk4IS6UOR1WDGoP/ineyNosxYT2e1yLIWNKDeI6 S+tTcYU6fLyI/0rB9mSfALXCbWVaVq6NVmkpwwKBYZhOSOAt7QiQTPI4wVRVnK85 801qUEIBral3NKeSULkQJ/Nk22SjwRWu+lURksuHISkPuXNKMve0R66pJeZYR1Eo mLCEW+yI+ugnoNJgUCOZNFBTdsbMQzScSCRzJ5MEorHS2xBuygZxfHpw8CKKjlbs sEENBtc5bXqmZ33n0Yw1Hy08eAsySowSqo3z4OOFNvILq2Jh0RvIrYXQ04W8Uakr GAwXV3kPLbbAaZ4r7nIfWnIdAq0QWB/AK0N5EaXReiW+k3BJbvcS+0Aha+o1RlWs Cxho2n3UGuuPOB792ioobbd74NuoLGZR5arj14nrD5mI2edh7p9jd0yiYAW61Lri +D+iE2JVxsAfj9qWy+1B6Ha8b7VmnR8qnsLgXiAFtoHG546M5aINJlr1wLAKsiDc CGNeFi1Xh4StApcOOzq53NfNxoCAPhr7c/0Zw0wkFbyztUrWPjqmp07HocRBINWl jFqiiSrxIskeQe56qd8nc2u7wFw/Of7kDBbMiVqJ24mQwM8pp0LQLLXdRdi9Xj53 mXvl9GtiFAXPaoOkLA5X5M4cySC3yhftoHAd94/Soj6B1cRajhYXIGEL5+ZX5wRx Jg15Mk+3nt2gFXfbXnPy
=wEzg
-----END PGP SIGNATURE-----
PATCH 3/3 ARM: at91: change nand flash table
In reply to Bo ShenDear Bo Shen,
Quoted 7 lines · Bo Shen
Change nand flash partition tablke according to www.at91.com/linux4sam
more information: http://www.at91.com/linux4sam/bin/view/Linux4SAM/GettingStarted#Linux4SAM_NandFlash_demo_Memory
Signed-off-by Bo Shen <[email protected]>Signed-off-by Bo Shen <[email protected]>
Quoted 7 lines
---
include/configs/at91sam9260ek.h | 18 +++++++++--------- include/configs/at91sam9261ek.h | 19 +++++++++---------- include/configs/at91sam9263ek.h | 17 +++++++++-------- include/configs/at91sam9m10g45ek.h | 16 ++++++++-------- include/configs/at91sam9x5ek.h | 11 ++++++----- 5 files changed, 41 insertions(+), 40 deletions(-)
applied with some minor changes in commit message to u-boot-atmel/master, thanks!
Best regards,
Andreas Bie?mann