Skip to contentSkip to conversation

poplar: save environment at a different offset

PATCH In review Shawn Guo 4 participants 4 messages Dec 18, 2018 – Jan 14, 2019

lore
Share & tools
lore

Shawn Guo

author
#0 lore raw

PATCH 1/1 poplar: save environment at a different offset

From: Alex Elder <[email protected]>

Change CONFIG_ENV_OFFSET for Poplar to be 1MB further into the eMMC than before. This puts it immediately prior to the space we are reserving offset 0x200000-0x400000 for UEFI to save its persistent data. Define CONFIG_ENV_SIZE as a product of env_mmc_nblks and the sector size, like CONFIG_ENV_OFFSET is.

---
 include/configs/poplar.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
include/configs/poplar.h +3 -3
index 0a126002d7f9..6b93b76ab9ba 100644
@@ -44,7 +44,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS					\
 			"loader_mmc_blknum=0x0\0"			\
 			"loader_mmc_nblks=0x780\0"			\
-			"env_mmc_blknum=0x780\0"			\
+			"env_mmc_blknum=0xf80\0"			\
 			"env_mmc_nblks=0x80\0"				\
 			"kernel_addr_r=0x30000000\0"			\
 			"pxefile_addr_r=0x32000000\0"			\
@@ -57,8 +57,8 @@
 
 /* Command line configuration */
 #define CONFIG_SYS_MMC_ENV_DEV		0
-#define CONFIG_ENV_OFFSET		(0x780 * 512)	/* env_mmc_blknum */
-#define CONFIG_ENV_SIZE			0x10000	/* env_mmc_nblks bytes */
+#define CONFIG_ENV_OFFSET		(0xf80 * 512) /* env_mmc_blknum bytes */
+#define CONFIG_ENV_SIZE			(0x80 * 512)  /* env_mmc_nblks bytes */
 
 /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE		512
Signature · 1 line
2.18.0
#1 lore raw

PATCH 1/1 poplar: save environment at a different offset

Quoted 10 lines · Shawn Guo

From: Alex Elder <[email protected]>

Change CONFIG_ENV_OFFSET for Poplar to be 1MB further into the eMMC than before. This puts it immediately prior to the space we are reserving offset 0x200000-0x400000 for UEFI to save its persistent data. Define CONFIG_ENV_SIZE as a product of env_mmc_nblks and the sector size, like CONFIG_ENV_OFFSET is.

And acked now as well... This was done last year some time. Thanks Shawn.

-Alex

Quoted 29 lines
---
 include/configs/poplar.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
include/configs/poplar.h +3 -3
index 0a126002d7f9..6b93b76ab9ba 100644
@@ -44,7 +44,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS					\
 			"loader_mmc_blknum=0x0\0"			\
 			"loader_mmc_nblks=0x780\0"			\
-			"env_mmc_blknum=0x780\0"			\
+			"env_mmc_blknum=0xf80\0"			\
 			"env_mmc_nblks=0x80\0"				\
 			"kernel_addr_r=0x30000000\0"			\
 			"pxefile_addr_r=0x32000000\0"			\
@@ -57,8 +57,8 @@
 
 /* Command line configuration */
 #define CONFIG_SYS_MMC_ENV_DEV		0
-#define CONFIG_ENV_OFFSET		(0x780 * 512)	/* env_mmc_blknum */
-#define CONFIG_ENV_SIZE			0x10000	/* env_mmc_nblks bytes */
+#define CONFIG_ENV_OFFSET		(0xf80 * 512) /* env_mmc_blknum bytes */
+#define CONFIG_ENV_SIZE			(0x80 * 512)  /* env_mmc_nblks bytes */
 
 /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE		512
#2 lore raw

PATCH 1/1 poplar: save environment at a different offset

In reply to Shawn Guo

Hi Tom,

Can you please help apply the patch if it looks fine?

Shawn

Quoted 45 lines · Shawn Guo

From: Alex Elder <[email protected]>

Change CONFIG_ENV_OFFSET for Poplar to be 1MB further into the eMMC than before. This puts it immediately prior to the space we are reserving offset 0x200000-0x400000 for UEFI to save its persistent data. Define CONFIG_ENV_SIZE as a product of env_mmc_nblks and the sector size, like CONFIG_ENV_OFFSET is.

---
 include/configs/poplar.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
include/configs/poplar.h +3 -3
index 0a126002d7f9..6b93b76ab9ba 100644
@@ -44,7 +44,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS					\
 			"loader_mmc_blknum=0x0\0"			\
 			"loader_mmc_nblks=0x780\0"			\
-			"env_mmc_blknum=0x780\0"			\
+			"env_mmc_blknum=0xf80\0"			\
 			"env_mmc_nblks=0x80\0"				\
 			"kernel_addr_r=0x30000000\0"			\
 			"pxefile_addr_r=0x32000000\0"			\
@@ -57,8 +57,8 @@
 
 /* Command line configuration */
 #define CONFIG_SYS_MMC_ENV_DEV		0
-#define CONFIG_ENV_OFFSET		(0x780 * 512)	/* env_mmc_blknum */
-#define CONFIG_ENV_SIZE			0x10000	/* env_mmc_nblks bytes */
+#define CONFIG_ENV_OFFSET		(0xf80 * 512) /* env_mmc_blknum bytes */
+#define CONFIG_ENV_SIZE			(0x80 * 512)  /* env_mmc_nblks bytes */
 
 /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE		512
Signature · 6 lines
2.18.0

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot
#3 lore raw
In reply to Shawn Guo
Quoted 10 lines · Shawn Guo

From: Alex Elder <[email protected]>

Change CONFIG_ENV_OFFSET for Poplar to be 1MB further into the eMMC than before. This puts it immediately prior to the space we are reserving offset 0x200000-0x400000 for UEFI to save its persistent data. Define CONFIG_ENV_SIZE as a product of env_mmc_nblks and the sector size, like CONFIG_ENV_OFFSET is.

Applied to u-boot/master, thanks!

Signature · 8 lines
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/20190114/25f468cb/attachment.sig>