[U-Boot] [PATCH 0/3] Adjust at91 boards config offset for all boards

All of lore.kernel.org
 help / color / mirror / Atom feed

* [U-Boot] [PATCH 0/3] Adjust at91 boards config offset for all boards
@ 2018-05-09  7:30 Eugen Hristev
  2018-05-09  7:30 ` [U-Boot] [PATCH 1/3] configs: at91: sama5_common: Adjust CONFIG_ENV_OFFSET to match block alignment Eugen Hristev
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Eugen Hristev @ 2018-05-09  7:30 UTC (permalink / raw)
  To: u-boot

We have a new demo layout of our sama5 boards for the NAND Flash
memory.
According to this new layout, adjust the mtdparts variable in bootargs
and config offsets in the board include files.
The map is available at :
http://www.at91.com/linux4sam/bin/view/Linux4SAM/Sama5d3XplainedMainPage#NAND_Flash_demo_Memory_map

We have already aligned the sama5 mtdparts to new map with commit:
"72281cbcf" : configs: at91: sama5: updated mtdparts variable in bootargs

This series will fix the other at91 boards w.r.t. mtdparts and all the at91
boards w.r.t. CONFIG_ENV_OFFSET.

All the boards will be aligned with the same flash memory map linked above.

Thanks!

Eugen Hristev (1):
  configs: at91sam9x5ek: updated mtdparts variable in bootargs

Nicolas Ferre (2):
  configs: at91: sama5_common: Adjust CONFIG_ENV_OFFSET to match block
    alignment
  configs: at91: Adjust CONFIG_ENV_OFFSET to match sama5 address

 configs/at91sam9x5ek_dataflash_defconfig | 2 +-
 configs/at91sam9x5ek_nandflash_defconfig | 2 +-
 configs/at91sam9x5ek_spiflash_defconfig  | 2 +-
 include/configs/at91-sama5_common.h      | 2 +-
 include/configs/at91sam9260ek.h          | 2 +-
 include/configs/at91sam9261ek.h          | 2 +-
 include/configs/at91sam9263ek.h          | 2 +-
 include/configs/at91sam9m10g45ek.h       | 2 +-
 include/configs/at91sam9n12ek.h          | 2 +-
 include/configs/at91sam9rlek.h           | 2 +-
 include/configs/at91sam9x5ek.h           | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

-- 
2.7.4

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [U-Boot] [PATCH 1/3] configs: at91: sama5_common: Adjust CONFIG_ENV_OFFSET to match block alignment
  2018-05-09  7:30 [U-Boot] [PATCH 0/3] Adjust at91 boards config offset for all boards Eugen Hristev
@ 2018-05-09  7:30 ` Eugen Hristev
  2018-05-24 12:40   ` [U-Boot] [U-Boot, " Tom Rini
  2018-05-09  7:30 ` [U-Boot] [PATCH 2/3] configs: at91: Adjust CONFIG_ENV_OFFSET to match sama5 address Eugen Hristev
  2018-05-09  7:30 ` [U-Boot] [PATCH 3/3] configs: at91sam9x5ek: updated mtdparts variable in bootargs Eugen Hristev
  2 siblings, 1 reply; 7+ messages in thread
From: Eugen Hristev @ 2018-05-09  7:30 UTC (permalink / raw)
  To: u-boot

From: Nicolas Ferre <nicolas.ferre@microchip.com>

Fix the unaligned environment address.
This address matches our NAND flash map available at:
http://www.at91.com/linux4sam/bin/view/Linux4SAM/Sama5d3XplainedMainPage#NAND_Flash_demo_Memory_map

Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
[eugen.hristev at microchip.com: rework on latest version of u-boot]
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
 include/configs/at91-sama5_common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
index 5af7d1d..30c6cd4 100644
--- a/include/configs/at91-sama5_common.h
+++ b/include/configs/at91-sama5_common.h
@@ -57,7 +57,7 @@
 
 #ifdef CONFIG_NAND_BOOT
 /* u-boot env in nand flash */
-#define CONFIG_ENV_OFFSET		0xc0000
+#define CONFIG_ENV_OFFSET		0x140000
 #define CONFIG_ENV_OFFSET_REDUND	0x100000
 #define CONFIG_ENV_SIZE			0x20000
 #define CONFIG_BOOTCOMMAND		"nand read 0x21000000 0x180000 0x80000;"	\
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [U-Boot] [U-Boot, 1/3] configs: at91: sama5_common: Adjust CONFIG_ENV_OFFSET to match block alignment
  2018-05-09  7:30 ` [U-Boot] [PATCH 1/3] configs: at91: sama5_common: Adjust CONFIG_ENV_OFFSET to match block alignment Eugen Hristev
@ 2018-05-24 12:40   ` Tom Rini
  0 siblings, 0 replies; 7+ messages in thread
From: Tom Rini @ 2018-05-24 12:40 UTC (permalink / raw)
  To: u-boot

On Wed, May 09, 2018 at 10:30:24AM +0300, Eugen Hristev wrote:

> From: Nicolas Ferre <nicolas.ferre@microchip.com>
> 
> Fix the unaligned environment address.
> This address matches our NAND flash map available at:
> http://www.at91.com/linux4sam/bin/view/Linux4SAM/Sama5d3XplainedMainPage#NAND_Flash_demo_Memory_map
> 
> Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
> [eugen.hristev at microchip.com: rework on latest version of u-boot]
> Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180524/f9b664d3/attachment.sig>

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [U-Boot] [PATCH 2/3] configs: at91: Adjust CONFIG_ENV_OFFSET to match sama5 address
  2018-05-09  7:30 [U-Boot] [PATCH 0/3] Adjust at91 boards config offset for all boards Eugen Hristev
  2018-05-09  7:30 ` [U-Boot] [PATCH 1/3] configs: at91: sama5_common: Adjust CONFIG_ENV_OFFSET to match block alignment Eugen Hristev
@ 2018-05-09  7:30 ` Eugen Hristev
  2018-05-24 12:40   ` [U-Boot] [U-Boot, " Tom Rini
  2018-05-09  7:30 ` [U-Boot] [PATCH 3/3] configs: at91sam9x5ek: updated mtdparts variable in bootargs Eugen Hristev
  2 siblings, 1 reply; 7+ messages in thread
From: Eugen Hristev @ 2018-05-09  7:30 UTC (permalink / raw)
  To: u-boot

From: Nicolas Ferre <nicolas.ferre@microchip.com>

In order to have a single ENV_OFFSET to manage, use the same as the sama5 one.
This address matches our NAND flash map available at:
http://www.at91.com/linux4sam/bin/view/Linux4SAM/Sama5d3XplainedMainPage#NAND_Flash_demo_Memory_map

Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
[eugen.hristev at microchip.com: rework on latest version of u-boot]
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
 include/configs/at91sam9260ek.h    | 2 +-
 include/configs/at91sam9261ek.h    | 2 +-
 include/configs/at91sam9263ek.h    | 2 +-
 include/configs/at91sam9m10g45ek.h | 2 +-
 include/configs/at91sam9n12ek.h    | 2 +-
 include/configs/at91sam9rlek.h     | 2 +-
 include/configs/at91sam9x5ek.h     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index 433e4a8..137d7f0 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -138,7 +138,7 @@
 #elif defined(CONFIG_SYS_USE_NANDFLASH)
 
 /* bootstrap + u-boot + env + linux in nandflash */
-#define CONFIG_ENV_OFFSET		0x120000
+#define CONFIG_ENV_OFFSET		0x140000
 #define CONFIG_ENV_OFFSET_REDUND	0x100000
 #define CONFIG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */
 #define CONFIG_BOOTCOMMAND	"nand read 0x22000000 0x200000 0x300000; bootm"
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 6a085dd..9e85259 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -125,7 +125,7 @@
 #else /* CONFIG_SYS_USE_NANDFLASH */
 
 /* bootstrap + u-boot + env + linux in nandflash */
-#define CONFIG_ENV_OFFSET		0x120000
+#define CONFIG_ENV_OFFSET		0x140000
 #define CONFIG_ENV_OFFSET_REDUND	0x100000
 #define CONFIG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */
 #define CONFIG_BOOTCOMMAND	"nand read 0x22000000 0x200000 0x300000; bootm"
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index f37ef59..4c476fc 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -234,7 +234,7 @@
 #elif CONFIG_SYS_USE_NANDFLASH
 
 /* bootstrap + u-boot + env + linux in nandflash */
-#define CONFIG_ENV_OFFSET		0x120000
+#define CONFIG_ENV_OFFSET		0x140000
 #define CONFIG_ENV_OFFSET_REDUND	0x100000
 #define CONFIG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */
 #define CONFIG_BOOTCOMMAND	"nand read 0x22000000 0x200000 0x300000; bootm"
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index 2597066..bec1558 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -76,7 +76,7 @@
 
 #ifdef CONFIG_NAND_BOOT
 /* bootstrap + u-boot + env in nandflash */
-#define CONFIG_ENV_OFFSET		0x120000
+#define CONFIG_ENV_OFFSET		0x140000
 #define CONFIG_ENV_OFFSET_REDUND	0x100000
 #define CONFIG_ENV_SIZE			0x20000
 
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index b284db3..a6865b2 100644
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -110,7 +110,7 @@
 #elif defined(CONFIG_NAND_BOOT)
 
 /* bootstrap + u-boot + env + linux in nandflash */
-#define CONFIG_ENV_OFFSET		0x120000
+#define CONFIG_ENV_OFFSET		0x140000
 #define CONFIG_ENV_OFFSET_REDUND	0x100000
 #define CONFIG_ENV_SIZE			0x20000		/* 1 sector = 128 kB */
 #define CONFIG_BOOTCOMMAND						\
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index f805c75..5ddb767 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -86,7 +86,7 @@
 #elif CONFIG_SYS_USE_NANDFLASH
 
 /* bootstrap + u-boot + env + linux in nandflash */
-#define CONFIG_ENV_OFFSET		0x120000
+#define CONFIG_ENV_OFFSET		0x140000
 #define CONFIG_ENV_OFFSET_REDUND	0x100000
 #define CONFIG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */
 #define CONFIG_BOOTCOMMAND	"nand read 0x22000000 0x200000 0x600000; "	\
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index de10fad..8fc9750 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -86,7 +86,7 @@
 
 #ifdef CONFIG_NAND_BOOT
 /* bootstrap + u-boot + env + linux in nandflash */
-#define CONFIG_ENV_OFFSET		0x120000
+#define CONFIG_ENV_OFFSET		0x140000
 #define CONFIG_ENV_OFFSET_REDUND	0x100000
 #define CONFIG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */
 #define CONFIG_BOOTCOMMAND	"nand read " \
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [U-Boot] [U-Boot, 2/3] configs: at91: Adjust CONFIG_ENV_OFFSET to match sama5 address
  2018-05-09  7:30 ` [U-Boot] [PATCH 2/3] configs: at91: Adjust CONFIG_ENV_OFFSET to match sama5 address Eugen Hristev
@ 2018-05-24 12:40   ` Tom Rini
  0 siblings, 0 replies; 7+ messages in thread
From: Tom Rini @ 2018-05-24 12:40 UTC (permalink / raw)
  To: u-boot

On Wed, May 09, 2018 at 10:30:25AM +0300, Eugen Hristev wrote:

> From: Nicolas Ferre <nicolas.ferre@microchip.com>
> 
> In order to have a single ENV_OFFSET to manage, use the same as the sama5 one.
> This address matches our NAND flash map available at:
> http://www.at91.com/linux4sam/bin/view/Linux4SAM/Sama5d3XplainedMainPage#NAND_Flash_demo_Memory_map
> 
> Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
> [eugen.hristev at microchip.com: rework on latest version of u-boot]
> Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180524/68b7c4d1/attachment.sig>

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [U-Boot] [PATCH 3/3] configs: at91sam9x5ek: updated mtdparts variable in bootargs
  2018-05-09  7:30 [U-Boot] [PATCH 0/3] Adjust at91 boards config offset for all boards Eugen Hristev
  2018-05-09  7:30 ` [U-Boot] [PATCH 1/3] configs: at91: sama5_common: Adjust CONFIG_ENV_OFFSET to match block alignment Eugen Hristev
  2018-05-09  7:30 ` [U-Boot] [PATCH 2/3] configs: at91: Adjust CONFIG_ENV_OFFSET to match sama5 address Eugen Hristev
@ 2018-05-09  7:30 ` Eugen Hristev
  2018-05-24 12:40   ` [U-Boot] [U-Boot, " Tom Rini
  2 siblings, 1 reply; 7+ messages in thread
From: Eugen Hristev @ 2018-05-09  7:30 UTC (permalink / raw)
  To: u-boot

We have a new demo layout of our sama5 boards for the NAND Flash
memory.
According to this new layout, adjust the mtdparts variable in bootargs
to align with this, which is available at :
http://www.at91.com/linux4sam/bin/view/Linux4SAM/Sama5d3XplainedMainPage#NAND_Flash_demo_Memory_map,

Based on original work by Wenyou Yang

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
 configs/at91sam9x5ek_dataflash_defconfig | 2 +-
 configs/at91sam9x5ek_nandflash_defconfig | 2 +-
 configs/at91sam9x5ek_spiflash_defconfig  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig
index ffed179..a888e9d 100644
--- a/configs/at91sam9x5ek_dataflash_defconfig
+++ b/configs/at91sam9x5ek_dataflash_defconfig
@@ -8,7 +8,7 @@ CONFIG_DEBUG_UART=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
-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"
+CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,768k(uboot)ro,256k(env_redundant),256k(env),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=6 root=ubi0:rootfs rw"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig
index 4d16eb5..e3c863e 100644
--- a/configs/at91sam9x5ek_nandflash_defconfig
+++ b/configs/at91sam9x5ek_nandflash_defconfig
@@ -8,7 +8,7 @@ CONFIG_DEBUG_UART=y
 CONFIG_NAND_BOOT=y
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
-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"
+CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,768k(uboot)ro,256k(env_redundant),256k(env),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=6 root=ubi0:rootfs rw"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig
index 52c419d..16d7de5 100644
--- a/configs/at91sam9x5ek_spiflash_defconfig
+++ b/configs/at91sam9x5ek_spiflash_defconfig
@@ -8,7 +8,7 @@ CONFIG_DEBUG_UART=y
 CONFIG_SPI_BOOT=y
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
-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"
+CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,768k(uboot)ro,256k(env_redundant),256k(env),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=6 root=ubi0:rootfs rw"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_DISPLAY_BOARDINFO is not set
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [U-Boot] [U-Boot, 3/3] configs: at91sam9x5ek: updated mtdparts variable in bootargs
  2018-05-09  7:30 ` [U-Boot] [PATCH 3/3] configs: at91sam9x5ek: updated mtdparts variable in bootargs Eugen Hristev
@ 2018-05-24 12:40   ` Tom Rini
  0 siblings, 0 replies; 7+ messages in thread
From: Tom Rini @ 2018-05-24 12:40 UTC (permalink / raw)
  To: u-boot

On Wed, May 09, 2018 at 10:30:26AM +0300, Eugen Hristev wrote:

> We have a new demo layout of our sama5 boards for the NAND Flash
> memory.
> According to this new layout, adjust the mtdparts variable in bootargs
> to align with this, which is available at :
> http://www.at91.com/linux4sam/bin/view/Linux4SAM/Sama5d3XplainedMainPage#NAND_Flash_demo_Memory_map,
> 
> Based on original work by Wenyou Yang
> 
> Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180524/6acd8b19/attachment.sig>

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2018-05-24 12:40 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-09  7:30 [U-Boot] [PATCH 0/3] Adjust at91 boards config offset for all boards Eugen Hristev
2018-05-09  7:30 ` [U-Boot] [PATCH 1/3] configs: at91: sama5_common: Adjust CONFIG_ENV_OFFSET to match block alignment Eugen Hristev
2018-05-24 12:40   ` [U-Boot] [U-Boot, " Tom Rini
2018-05-09  7:30 ` [U-Boot] [PATCH 2/3] configs: at91: Adjust CONFIG_ENV_OFFSET to match sama5 address Eugen Hristev
2018-05-24 12:40   ` [U-Boot] [U-Boot, " Tom Rini
2018-05-09  7:30 ` [U-Boot] [PATCH 3/3] configs: at91sam9x5ek: updated mtdparts variable in bootargs Eugen Hristev
2018-05-24 12:40   ` [U-Boot] [U-Boot, " Tom Rini

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.