Skip to contentSkip to conversation

arm: dra7xx: Update bootloader partition size

PATCH New Sam Protsenko 5 participants 15 messages Feb 21, 2017 – Mar 16, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm: dra7xx: Update bootloader partition size

The current size of U-Boot is already ~840 KiB.

This patch is to increase bootloader partition size up to 1 MiB and thereby fix flashing error.

Also fix U-Boot environment address on eMMC ("reserved" partition), as it's being shifted by above change.

---
 include/configs/dra7xx_evm.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
include/configs/dra7xx_evm.h +4 -3
index 549439e8b4..1e67c386a0 100644
@@ -13,6 +13,7 @@
 #define __CONFIG_DRA7XX_EVM_H
 
 #include <environment/ti/dfu.h>
+#include <linux/sizes.h>
 
 #define CONFIG_DRA7XX
 
@@ -28,8 +29,8 @@
 /* MMC ENV related defines */
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV		1	/* SLOT2: eMMC(1) */
-#define CONFIG_ENV_SIZE			(128 << 10)
-#define CONFIG_ENV_OFFSET		0xE0000
+#define CONFIG_ENV_SIZE			SZ_128K
+#define CONFIG_ENV_OFFSET		0x1A0000	/* "reserved" part. */
 #define CONFIG_ENV_OFFSET_REDUND	(CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 #endif
@@ -56,7 +57,7 @@
 	"partitions_android=" \
 	"uuid_disk=${uuid_gpt_disk};" \
 	"name=xloader,start=128K,size=256K,uuid=${uuid_gpt_xloader};" \
-	"name=bootloader,size=768K,uuid=${uuid_gpt_bootloader};" \
+	"name=bootloader,size=1M,uuid=${uuid_gpt_bootloader};" \
 	"name=environment,size=128K,uuid=${uuid_gpt_environment};" \
 	"name=misc,size=128K,uuid=${uuid_gpt_misc};" \
 	"name=reserved,size=256K,uuid=${uuid_gpt_reserved};" \
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 arm: dra7xx: Update bootloader partition size

Quoted 9 lines · Sam Protsenko

The current size of U-Boot is already ~840 KiB.

This patch is to increase bootloader partition size up to 1 MiB and thereby fix flashing error.

Also fix U-Boot environment address on eMMC ("reserved" partition), as it's being shifted by above change.

Verified

Quoted 36 lines
---
  include/configs/dra7xx_evm.h | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
include/configs/dra7xx_evm.h +4 -3
index 549439e8b4..1e67c386a0 100644
@@ -13,6 +13,7 @@
  #define __CONFIG_DRA7XX_EVM_H
 
  #include <environment/ti/dfu.h>
+#include <linux/sizes.h>
 
  #define CONFIG_DRA7XX
 
@@ -28,8 +29,8 @@
  /* MMC ENV related defines */
  #define CONFIG_ENV_IS_IN_MMC
  #define CONFIG_SYS_MMC_ENV_DEV		1	/* SLOT2: eMMC(1) */
-#define CONFIG_ENV_SIZE			(128 << 10)
-#define CONFIG_ENV_OFFSET		0xE0000
+#define CONFIG_ENV_SIZE			SZ_128K
+#define CONFIG_ENV_OFFSET		0x1A0000	/* "reserved" part. */
  #define CONFIG_ENV_OFFSET_REDUND	(CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
  #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
  #endif
@@ -56,7 +57,7 @@
  	"partitions_android=" \
  	"uuid_disk=${uuid_gpt_disk};" \
  	"name=xloader,start=128K,size=256K,uuid=${uuid_gpt_xloader};" \
-	"name=bootloader,size=768K,uuid=${uuid_gpt_bootloader};" \
+	"name=bootloader,size=1M,uuid=${uuid_gpt_bootloader};" \
  	"name=environment,size=128K,uuid=${uuid_gpt_environment};" \
  	"name=misc,size=128K,uuid=${uuid_gpt_misc};" \
  	"name=reserved,size=256K,uuid=${uuid_gpt_reserved};" \
#2 lore raw

PATCH 1/1 arm: dra7xx: Update bootloader partition size

In reply to Sam Protsenko

+ jj

Quoted 26 lines · Sam Protsenko

The current size of U-Boot is already ~840 KiB.

This patch is to increase bootloader partition size up to 1 MiB and thereby fix flashing error.

Also fix U-Boot environment address on eMMC ("reserved" partition), as it's being shifted by above change.

---
 include/configs/dra7xx_evm.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
include/configs/dra7xx_evm.h +1 -0
index 549439e8b4..1e67c386a0 100644
@@ -13,6 +13,7 @@
 #define __CONFIG_DRA7XX_EVM_H
 
 #include <environment/ti/dfu.h>
+#include <linux/sizes.h>
 
 #define CONFIG_DRA7XX
 

include/configs/dra7xx_evm.h line 33

Quoted 7 lines
include/configs/dra7xx_evm.h +2 -2
@@ -28,8 +29,8 @@
 /* MMC ENV related defines */
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV		1	/* SLOT2: eMMC(1) */
-#define CONFIG_ENV_SIZE			(128 << 10)
-#define CONFIG_ENV_OFFSET		0xE0000
+#define CONFIG_ENV_SIZE			SZ_128K
+#define CONFIG_ENV_OFFSET		0x1A0000	/* "reserved" part. */

There might be lot of side effects with this. Is it verified that this is not overlapping with any other section? Also dfu parameters needs to be updated.

Thanks and regards,
Lokesh

#3 lore raw

PATCH 1/1 arm: dra7xx: Update bootloader partition size

Quoted 28 lines · Lokesh Vutla

+ jj

Quoted 25 lines · Sam Protsenko

The current size of U-Boot is already ~840 KiB.

This patch is to increase bootloader partition size up to 1 MiB and thereby fix flashing error.

Also fix U-Boot environment address on eMMC ("reserved" partition), as it's being shifted by above change.

---
  include/configs/dra7xx_evm.h | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
include/configs/dra7xx_evm.h +1 -0
index 549439e8b4..1e67c386a0 100644
@@ -13,6 +13,7 @@
  #define __CONFIG_DRA7XX_EVM_H
 
  #include <environment/ti/dfu.h>
+#include <linux/sizes.h>
 
  #define CONFIG_DRA7XX
 
Quoted 11 lines

include/configs/dra7xx_evm.h line 33

Quoted 8 lines
include/configs/dra7xx_evm.h +2 -2
@@ -28,8 +29,8 @@
  /* MMC ENV related defines */
  #define CONFIG_ENV_IS_IN_MMC
  #define CONFIG_SYS_MMC_ENV_DEV		1	/* SLOT2: eMMC(1) */
-#define CONFIG_ENV_SIZE			(128 << 10)
-#define CONFIG_ENV_OFFSET		0xE0000
+#define CONFIG_ENV_SIZE			SZ_128K
+#define CONFIG_ENV_OFFSET		0x1A0000	/* "reserved" part. */

There might be lot of side effects with this. Is it verified that this is not overlapping with any other section? Also dfu parameters needs to be updated.

It does overlap with other regions used by DFU. I have patch queued for posting that does change the layout of MMC and eMMC to give more room to u-boot, args (dtb) and fixes the overlaps. I'll post it now.

Quoted 3 lines

Thanks and regards,
Lokesh

#4 lore raw

PATCH 1/1 ARM: ti: Update layout for MMC and eMMC (env and dfu)

The problems with the current DFU layout are:
MMC: The space allocated for u-boot is too small for the latest u-boot
(>750KB). We need to increase it. eMMC uses a much bigger area (2MB).
eMMC: region "u-boot.img.raw" overlaps the environment area and the region

      "spl-os-image.raw".

both: region "spl-os-image.raw" is quite small and can't handle android
kernels

Fixing this requires growing some regions and moving others. Care has been taken to leave some room for further growth of "spl-os-args.raw".
Also the "env" now appears in the dfu so that it's apparent that the region is not free space that can be used to grow "u-boot.img.raw". The total space allocated for those raw binaries is 16MB, of which 13+MB are reserved for the kernel image.

---

Sam,

This patch goes a bit further in changing the layout of the MMC than yours. However it doesn't update the GPT partitioning. This would still be needed.

tested on DRA7. DFU updates ok for MMC and eMMC

Jean-Jacques

 include/configs/dra7xx_evm.h      |  2 +-
 include/configs/omap5_uevm.h      |  2 +-
 include/configs/ti_armv7_common.h |  7 ++++---
 include/environment/ti/dfu.h      | 14 ++++++++------
 4 files changed, 14 insertions(+), 11 deletions(-)
include/configs/dra7xx_evm.h +1 -1
index bce2816..a56c224 100644
@@ -28,7 +28,7 @@
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV		1	/* SLOT2: eMMC(1) */
 #define CONFIG_ENV_SIZE			(128 << 10)
-#define CONFIG_ENV_OFFSET		0xE0000
+#define CONFIG_ENV_OFFSET		0x220000
 #define CONFIG_ENV_OFFSET_REDUND	(CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 #endif
include/configs/omap5_uevm.h +1 -1
index 736d804..127776e 100644
@@ -38,7 +38,7 @@
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV		1	/* SLOT2: eMMC(1) */
 #define CONFIG_ENV_SIZE			(128 << 10)
-#define CONFIG_ENV_OFFSET		0xE0000
+#define CONFIG_ENV_OFFSET		0x220000
 #define CONFIG_ENV_OFFSET_REDUND	(CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 
include/configs/ti_armv7_common.h +4 -3
index 905e1ef..4cfa134 100644
@@ -282,9 +282,10 @@
 #define CONFIG_SPL_FS_LOAD_ARGS_NAME		"args"
 
 /* RAW SD card / eMMC */
-#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR	0x900	/* address 0x120000 */
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR	0x80	/* address 0x10000 */
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS	0x80	/* 64KiB */
+#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR	0x1500  /* address 0x2A0000 */
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR	0x1300  /* address 0x260000 */
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS	0x100   /* 128KiB */
+
 
 /* spl export command */
 #define CONFIG_CMD_SPL
include/environment/ti/dfu.h +8 -6
index caf71a3..63e0ab8 100644
@@ -12,9 +12,10 @@
 	"rootfs part 0 2;" \
 	"MLO fat 0 1;" \
 	"MLO.raw raw 0x100 0x100;" \
-	"u-boot.img.raw raw 0x300 0x400;" \
-	"spl-os-args.raw raw 0x80 0x80;" \
-	"spl-os-image.raw raw 0x900 0x2000;" \
+	"u-boot.img.raw raw 0x300 0xE00;" \
+	"u-env.raw raw 0x1100 0x200;" \
+	"spl-os-args.raw raw 0x1300 0x100;" \
+	"spl-os-image.raw raw 0x1500 0x6B00;" \
 	"spl-os-args fat 0 1;" \
 	"spl-os-image fat 0 1;" \
 	"u-boot.img fat 0 1;" \
@@ -27,9 +28,10 @@
 	"rootfs part 1 2;" \
 	"MLO fat 1 1;" \
 	"MLO.raw raw 0x100 0x100;" \
-	"u-boot.img.raw raw 0x300 0x1000;" \
-	"spl-os-args.raw raw 0x80 0x80;" \
-	"spl-os-image.raw raw 0x900 0x2000;" \
+	"u-boot.img.raw raw 0x300 0xE00;" \
+	"u-env.raw raw 0x1100 0x200;" \
+	"spl-os-args.raw raw 0x1300 0x100;" \
+	"spl-os-image.raw raw 0x1500 0x6B00;" \
 	"spl-os-args fat 1 1;" \
 	"spl-os-image fat 1 1;" \
 	"u-boot.img fat 1 1;" \
Signature · 1 line
1.9.1
#5 lore raw

PATCH 1/1 ARM: ti: Update layout for MMC and eMMC (env and dfu)

Quoted 16 lines · Jean-Jacques Hiblot

The problems with the current DFU layout are:
MMC: The space allocated for u-boot is too small for the latest u-boot
(>750KB). We need to increase it. eMMC uses a much bigger area (2MB).
eMMC: region "u-boot.img.raw" overlaps the environment area and the region

      "spl-os-image.raw".

both: region "spl-os-image.raw" is quite small and can't handle android
kernels

Fixing this requires growing some regions and moving others. Care has been taken to leave some room for further growth of "spl-os-args.raw".
Also the "env" now appears in the dfu so that it's apparent that the region is not free space that can be used to grow "u-boot.img.raw". The total space allocated for those raw binaries is 16MB, of which 13+MB are reserved for the kernel image.

Quoted 8 lines

---

Sam,

This patch goes a bit further in changing the layout of the MMC than yours. However it doesn't update the GPT partitioning. This would still be needed.

Hi Jean-Jacques,

Got a couple of questions about this change and my patch (changing eMMC partitions table), about how to make them play nice together.

1. How DFU table is connected to eMMC partition table? And why my patch was interfering with DFU table?
2. Can I change CONFIG_ENV_OFFSET? Because my changes is going to move "reserved" partition on eMMC, where U-Boot environment is stored. Or it should be in sync with DFU table somehow? If yes -- we should work together to find solution that works best for both cases.
3. What about my similar patch for AM57x EVM (see [1])? Is it fine, or it affects DFU table as well?

Thanks.

[1] https://patchwork.ozlabs.org/patch/730736/

Quoted 89 lines

tested on DRA7. DFU updates ok for MMC and eMMC

Jean-Jacques

 include/configs/dra7xx_evm.h      |  2 +-
 include/configs/omap5_uevm.h      |  2 +-
 include/configs/ti_armv7_common.h |  7 ++++---
 include/environment/ti/dfu.h      | 14 ++++++++------
 4 files changed, 14 insertions(+), 11 deletions(-)
include/configs/dra7xx_evm.h +1 -1
index bce2816..a56c224 100644
@@ -28,7 +28,7 @@
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV         1       /* SLOT2: eMMC(1) */
 #define CONFIG_ENV_SIZE                        (128 << 10)
-#define CONFIG_ENV_OFFSET              0xE0000
+#define CONFIG_ENV_OFFSET              0x220000
 #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 #endif
include/configs/omap5_uevm.h +1 -1
index 736d804..127776e 100644
@@ -38,7 +38,7 @@
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV         1       /* SLOT2: eMMC(1) */
 #define CONFIG_ENV_SIZE                        (128 << 10)
-#define CONFIG_ENV_OFFSET              0xE0000
+#define CONFIG_ENV_OFFSET              0x220000
 #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 
include/configs/ti_armv7_common.h +4 -3
index 905e1ef..4cfa134 100644
@@ -282,9 +282,10 @@
 #define CONFIG_SPL_FS_LOAD_ARGS_NAME           "args"
 
 /* RAW SD card / eMMC */
-#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR        0x900   /* address 0x120000 */
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x80    /* address 0x10000 */
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x80    /* 64KiB */
+#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR        0x1500  /* address 0x2A0000 */
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x1300  /* address 0x260000 */
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x100   /* 128KiB */
+
 
 /* spl export command */
 #define CONFIG_CMD_SPL
include/environment/ti/dfu.h +8 -7
index caf71a3..63e0ab8 100644
@@ -12,9 +12,10 @@
        "rootfs part 0 2;" \
        "MLO fat 0 1;" \
        "MLO.raw raw 0x100 0x100;" \
-       "u-boot.img.raw raw 0x300 0x400;" \
-       "spl-os-args.raw raw 0x80 0x80;" \
-       "spl-os-image.raw raw 0x900 0x2000;" \
+       "u-boot.img.raw raw 0x300 0xE00;" \
+       "u-env.raw raw 0x1100 0x200;" \
+       "spl-os-args.raw raw 0x1300 0x100;" \
+       "spl-os-image.raw raw 0x1500 0x6B00;" \
        "spl-os-args fat 0 1;" \
        "spl-os-image fat 0 1;" \
        "u-boot.img fat 0 1;" \
@@ -27,9 +28,10 @@
        "rootfs part 1 2;" \
        "MLO fat 1 1;" \
        "MLO.raw raw 0x100 0x100;" \
-       "u-boot.img.raw raw 0x300 0x1000;" \
-       "spl-os-args.raw raw 0x80 0x80;" \
-       "spl-os-image.raw raw 0x900 0x2000;" \
+       "u-boot.img.raw raw 0x300 0xE00;" \
+       "u-env.raw raw 0x1100 0x200;" \
+       "spl-os-args.raw raw 0x1300 0x100;" \
+       "spl-os-image.raw raw 0x1500 0x6B00;" \
        "spl-os-args fat 1 1;" \
        "spl-os-image fat 1 1;" \
        "u-boot.img fat 1 1;" \
--

1.9.1

#6 lore raw

PATCH 1/1 ARM: ti: Update layout for MMC and eMMC (env and dfu)

Quoted 25 lines · Sam Protsenko
Quoted 16 lines · Jean-Jacques Hiblot

The problems with the current DFU layout are:
MMC: The space allocated for u-boot is too small for the latest u-boot
(>750KB). We need to increase it. eMMC uses a much bigger area (2MB).
eMMC: region "u-boot.img.raw" overlaps the environment area and the region

       "spl-os-image.raw".

both: region "spl-os-image.raw" is quite small and can't handle android
kernels

Fixing this requires growing some regions and moving others. Care has been taken to leave some room for further growth of "spl-os-args.raw".
Also the "env" now appears in the dfu so that it's apparent that the region is not free space that can be used to grow "u-boot.img.raw". The total space allocated for those raw binaries is 16MB, of which 13+MB are reserved for the kernel image.

Quoted 8 lines

---

Sam,

This patch goes a bit further in changing the layout of the MMC than yours. However it doesn't update the GPT partitioning. This would still be needed.

Quoted 7 lines

Hi Jean-Jacques,

Got a couple of questions about this change and my patch (changing eMMC partitions table), about how to make them play nice together.

1. How DFU table is connected to eMMC partition table? And why my patch was interfering with DFU table?

AFAIK DFU is not related to GPT. I never used the GPT so I can't for sure how it fits together.
My guess is that env_mmc.c has no idea that GPT even exists and uses raw access to the eMMC. In this case CONFIG_ENV_OFFSET must be defined to point at the beginning of your env partition and must be adapted when the GPT is updated. The same goes for the DFU. Ideally GPT and DFU should use the same layout (at least for MLO, u-boot, kernel and args).

Quoted 4 lines

2. Can I change CONFIG_ENV_OFFSET? Because my changes is going to move "reserved" partition on eMMC, where U-Boot environment is stored. Or it should be in sync with DFU table somehow? If yes -- we should work together to find solution that works best for both cases.

CONFIG_ENV_OFFSET is loosely related to DFU: we don't update the environment through DFU. However we must make sure that the area used to store the env doesn't overlap a another region (MLO, u-boot, kernel, args). The dfu doesn't define those regions, it's done with #defines like CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR. But DFU exposes them for "remote" upgrade.

Quoted 2 lines

3. What about my similar patch for AM57x EVM (see [1])? Is it fine, or it affects DFU table as well?

I guess it's OK because the env is stored in a FAT partition:
CONFIG_ENV_OFFSET is not used

Quoted 94 lines

Thanks.

[1] https://patchwork.ozlabs.org/patch/730736/

Quoted 89 lines

tested on DRA7. DFU updates ok for MMC and eMMC

Jean-Jacques

  include/configs/dra7xx_evm.h      |  2 +-
  include/configs/omap5_uevm.h      |  2 +-
  include/configs/ti_armv7_common.h |  7 ++++---
  include/environment/ti/dfu.h      | 14 ++++++++------
  4 files changed, 14 insertions(+), 11 deletions(-)
include/configs/dra7xx_evm.h +1 -1
index bce2816..a56c224 100644
@@ -28,7 +28,7 @@
  #define CONFIG_ENV_IS_IN_MMC
  #define CONFIG_SYS_MMC_ENV_DEV         1       /* SLOT2: eMMC(1) */
  #define CONFIG_ENV_SIZE                        (128 << 10)
-#define CONFIG_ENV_OFFSET              0xE0000
+#define CONFIG_ENV_OFFSET              0x220000
  #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
  #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
  #endif
include/configs/omap5_uevm.h +1 -1
index 736d804..127776e 100644
@@ -38,7 +38,7 @@
  #define CONFIG_ENV_IS_IN_MMC
  #define CONFIG_SYS_MMC_ENV_DEV         1       /* SLOT2: eMMC(1) */
  #define CONFIG_ENV_SIZE                        (128 << 10)
-#define CONFIG_ENV_OFFSET              0xE0000
+#define CONFIG_ENV_OFFSET              0x220000
  #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
  #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 
include/configs/ti_armv7_common.h +4 -3
index 905e1ef..4cfa134 100644
@@ -282,9 +282,10 @@
  #define CONFIG_SPL_FS_LOAD_ARGS_NAME           "args"
 
  /* RAW SD card / eMMC */
-#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR        0x900   /* address 0x120000 */
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x80    /* address 0x10000 */
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x80    /* 64KiB */
+#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR        0x1500  /* address 0x2A0000 */
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x1300  /* address 0x260000 */
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x100   /* 128KiB */
+
 
  /* spl export command */
  #define CONFIG_CMD_SPL
include/environment/ti/dfu.h +8 -7
index caf71a3..63e0ab8 100644
@@ -12,9 +12,10 @@
         "rootfs part 0 2;" \
         "MLO fat 0 1;" \
         "MLO.raw raw 0x100 0x100;" \
-       "u-boot.img.raw raw 0x300 0x400;" \
-       "spl-os-args.raw raw 0x80 0x80;" \
-       "spl-os-image.raw raw 0x900 0x2000;" \
+       "u-boot.img.raw raw 0x300 0xE00;" \
+       "u-env.raw raw 0x1100 0x200;" \
+       "spl-os-args.raw raw 0x1300 0x100;" \
+       "spl-os-image.raw raw 0x1500 0x6B00;" \
         "spl-os-args fat 0 1;" \
         "spl-os-image fat 0 1;" \
         "u-boot.img fat 0 1;" \
@@ -27,9 +28,10 @@
         "rootfs part 1 2;" \
         "MLO fat 1 1;" \
         "MLO.raw raw 0x100 0x100;" \
-       "u-boot.img.raw raw 0x300 0x1000;" \
-       "spl-os-args.raw raw 0x80 0x80;" \
-       "spl-os-image.raw raw 0x900 0x2000;" \
+       "u-boot.img.raw raw 0x300 0xE00;" \
+       "u-env.raw raw 0x1100 0x200;" \
+       "spl-os-args.raw raw 0x1300 0x100;" \
+       "spl-os-image.raw raw 0x1500 0x6B00;" \
         "spl-os-args fat 1 1;" \
         "spl-os-image fat 1 1;" \
         "u-boot.img fat 1 1;" \
--

1.9.1

#7 lore raw

PATCH 1/1 ARM: ti: Update layout for MMC and eMMC (env and dfu)

Quoted 55 lines · Jean-Jacques Hiblot
Quoted 31 lines · Sam Protsenko
Quoted 19 lines · Jean-Jacques Hiblot

The problems with the current DFU layout are:
MMC: The space allocated for u-boot is too small for the latest u-boot
(>750KB). We need to increase it. eMMC uses a much bigger area
(2MB).
eMMC: region "u-boot.img.raw" overlaps the environment area and the region

       "spl-os-image.raw".

both: region "spl-os-image.raw" is quite small and can't handle android
kernels

Fixing this requires growing some regions and moving others. Care has been taken to leave some room for further growth of "spl-os-args.raw".
Also the "env" now appears in the dfu so that it's apparent that the region is not free space that can be used to grow "u-boot.img.raw". The total space allocated for those raw binaries is 16MB, of which 13+MB are reserved for the kernel image.

Quoted 9 lines

---

Sam,

This patch goes a bit further in changing the layout of the MMC than yours. However
it doesn't update the GPT partitioning. This would still be needed.

Quoted 7 lines

Hi Jean-Jacques,

Got a couple of questions about this change and my patch (changing eMMC partitions table), about how to make them play nice together.

1. How DFU table is connected to eMMC partition table? And why my patch was interfering with DFU table?

AFAIK DFU is not related to GPT. I never used the GPT so I can't for sure how it fits together.
My guess is that env_mmc.c has no idea that GPT even exists and uses raw access to the eMMC. In this case CONFIG_ENV_OFFSET must be defined to point at the beginning of your env partition and must be adapted when the GPT is updated. The same goes for the DFU. Ideally GPT and DFU should use the same layout (at least for MLO, u-boot, kernel and args).

Quoted 4 lines

2. Can I change CONFIG_ENV_OFFSET? Because my changes is going to move "reserved" partition on eMMC, where U-Boot environment is stored. Or it should be in sync with DFU table somehow? If yes -- we should work together to find solution that works best for both cases.

Quoted 7 lines

CONFIG_ENV_OFFSET is loosely related to DFU: we don't update the environment through DFU. However we must make sure that the area used to store the env doesn't overlap a another region (MLO, u-boot, kernel, args). The dfu doesn't define those regions, it's done with #defines like CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR. But DFU exposes them for "remote" upgrade.

So if I change eMMC GPT partition table, it's ok for me to update CONFIG_ENV_OFFSET as well, right? Because in my case CONFIG_ENV_OFFSET is going to be different from the value your patch sets. In case of eMMC table, we're using "reserved" partition to store U-Boot environment, and I want it to be at 1664 KiB, which gives us CONFIG_ENV_OFFSET=0x1A0000. Is it ok if I change it to that value? Or something else must be changed along with it? If yes, then what exactly?

Thanks.

Quoted 109 lines
Quoted 2 lines

3. What about my similar patch for AM57x EVM (see [1])? Is it fine, or it affects DFU table as well?

I guess it's OK because the env is stored in a FAT partition:
CONFIG_ENV_OFFSET is not used

Quoted 101 lines

Thanks.

[1] https://patchwork.ozlabs.org/patch/730736/

Quoted 96 lines

tested on DRA7. DFU updates ok for MMC and eMMC

Jean-Jacques

  include/configs/dra7xx_evm.h      |  2 +-
  include/configs/omap5_uevm.h      |  2 +-
  include/configs/ti_armv7_common.h |  7 ++++---
  include/environment/ti/dfu.h      | 14 ++++++++------
  4 files changed, 14 insertions(+), 11 deletions(-)
include/configs/dra7xx_evm.h +1 -1
index bce2816..a56c224 100644
@@ -28,7 +28,7 @@
  #define CONFIG_ENV_IS_IN_MMC
  #define CONFIG_SYS_MMC_ENV_DEV         1       /* SLOT2: eMMC(1) */
  #define CONFIG_ENV_SIZE                        (128 << 10)
-#define CONFIG_ENV_OFFSET              0xE0000
+#define CONFIG_ENV_OFFSET              0x220000
  #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET +
 CONFIG_ENV_SIZE)
  #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
  #endif
include/configs/omap5_uevm.h +1 -1
index 736d804..127776e 100644
@@ -38,7 +38,7 @@
  #define CONFIG_ENV_IS_IN_MMC
  #define CONFIG_SYS_MMC_ENV_DEV         1       /* SLOT2: eMMC(1) */
  #define CONFIG_ENV_SIZE                        (128 << 10)
-#define CONFIG_ENV_OFFSET              0xE0000
+#define CONFIG_ENV_OFFSET              0x220000
  #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET +
 CONFIG_ENV_SIZE)
  #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
include/configs/ti_armv7_common.h +0 -1
index 905e1ef..4cfa134 100644
@@ -282,9 +282,10 @@
  #define CONFIG_SPL_FS_LOAD_ARGS_NAME           "args"
 
  /* RAW SD card / eMMC */
-#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR        0x900   /*

address 0x120000 */
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x80 /* address
0x10000 */

include/configs/ti_armv7_common.h +1 -1
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x80    /* 64KiB */
+#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR        0x1500  /*

address 0x2A0000 */
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x1300 /* address 0x260000 */

include/configs/ti_armv7_common.h +2 -0
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x100   /* 128KiB */
+
 
  /* spl export command */
  #define CONFIG_CMD_SPL
include/environment/ti/dfu.h +8 -7
index caf71a3..63e0ab8 100644
@@ -12,9 +12,10 @@
         "rootfs part 0 2;" \
         "MLO fat 0 1;" \
         "MLO.raw raw 0x100 0x100;" \
-       "u-boot.img.raw raw 0x300 0x400;" \
-       "spl-os-args.raw raw 0x80 0x80;" \
-       "spl-os-image.raw raw 0x900 0x2000;" \
+       "u-boot.img.raw raw 0x300 0xE00;" \
+       "u-env.raw raw 0x1100 0x200;" \
+       "spl-os-args.raw raw 0x1300 0x100;" \
+       "spl-os-image.raw raw 0x1500 0x6B00;" \
         "spl-os-args fat 0 1;" \
         "spl-os-image fat 0 1;" \
         "u-boot.img fat 0 1;" \
@@ -27,9 +28,10 @@
         "rootfs part 1 2;" \
         "MLO fat 1 1;" \
         "MLO.raw raw 0x100 0x100;" \
-       "u-boot.img.raw raw 0x300 0x1000;" \
-       "spl-os-args.raw raw 0x80 0x80;" \
-       "spl-os-image.raw raw 0x900 0x2000;" \
+       "u-boot.img.raw raw 0x300 0xE00;" \
+       "u-env.raw raw 0x1100 0x200;" \
+       "spl-os-args.raw raw 0x1300 0x100;" \
+       "spl-os-image.raw raw 0x1500 0x6B00;" \
         "spl-os-args fat 1 1;" \
         "spl-os-image fat 1 1;" \
         "u-boot.img fat 1 1;" \
--

1.9.1

#8 lore raw

PATCH 1/1 ARM: ti: Update layout for MMC and eMMC (env and dfu)

Quoted 58 lines · Sam Protsenko
Quoted 50 lines · Jean-Jacques Hiblot
Quoted 29 lines · Sam Protsenko
Quoted 18 lines · Jean-Jacques Hiblot

The problems with the current DFU layout are:
MMC: The space allocated for u-boot is too small for the latest u-boot
(>750KB). We need to increase it. eMMC uses a much bigger area
(2MB).
eMMC: region "u-boot.img.raw" overlaps the environment area and the region

        "spl-os-image.raw".

both: region "spl-os-image.raw" is quite small and can't handle android
kernels

Fixing this requires growing some regions and moving others. Care has been taken to leave some room for further growth of "spl-os-args.raw".
Also the "env" now appears in the dfu so that it's apparent that the region is not free space that can be used to grow "u-boot.img.raw". The total space allocated for those raw binaries is 16MB, of which 13+MB are reserved for the kernel image.

Quoted 9 lines

---

Sam,

This patch goes a bit further in changing the layout of the MMC than yours. However
it doesn't update the GPT partitioning. This would still be needed.

Quoted 7 lines

Hi Jean-Jacques,

Got a couple of questions about this change and my patch (changing eMMC partitions table), about how to make them play nice together.

1. How DFU table is connected to eMMC partition table? And why my patch was interfering with DFU table?

AFAIK DFU is not related to GPT. I never used the GPT so I can't for sure how it fits together.
My guess is that env_mmc.c has no idea that GPT even exists and uses raw access to the eMMC. In this case CONFIG_ENV_OFFSET must be defined to point at the beginning of your env partition and must be adapted when the GPT is updated. The same goes for the DFU. Ideally GPT and DFU should use the same layout (at least for MLO, u-boot, kernel and args).

Quoted 4 lines

2. Can I change CONFIG_ENV_OFFSET? Because my changes is going to move "reserved" partition on eMMC, where U-Boot environment is stored. Or it should be in sync with DFU table somehow? If yes -- we should work together to find solution that works best for both cases.

Quoted 7 lines

CONFIG_ENV_OFFSET is loosely related to DFU: we don't update the environment through DFU. However we must make sure that the area used to store the env doesn't overlap a another region (MLO, u-boot, kernel, args). The dfu doesn't define those regions, it's done with #defines like CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR. But DFU exposes them for "remote" upgrade.

Quoted 2 lines

So if I change eMMC GPT partition table, it's ok for me to update CONFIG_ENV_OFFSET as well, right?

Yes you need to change it

Quoted 7 lines

Because in my case CONFIG_ENV_OFFSET
is going to be different from the value your patch sets. In case of eMMC table, we're using "reserved" partition to store U-Boot environment, and I want it to be at 1664 KiB, which gives us CONFIG_ENV_OFFSET=0x1A0000. Is it ok if I change it to that value? Or something else must be changed along with it? If yes, then what exactly?

You need to adapt DFU if you plan to use it. Maybe you can define a new layout for DFU, something like dfu_alt_info_emmc_gpt that will reflect your GPT layout

Anyway IMO it would be good to use the same offset/size for GPT and non-GPT case for the following regions:
- MLO
- u-boot
- env

For MLO we already use the same: offset 128kB / size 256kB For u-boot, you increased the size to 1MB, I suggest that we increase it a bit more (1.5MB or 2MB) just to make sure that we don't have to increase its size again next year.
For the env, I suggest that the size is increased to 256kB to take care of redundant env.

Quoted 109 lines

Thanks.

Quoted 106 lines
Quoted 2 lines

3. What about my similar patch for AM57x EVM (see [1])? Is it fine, or it affects DFU table as well?

I guess it's OK because the env is stored in a FAT partition:
CONFIG_ENV_OFFSET is not used

Quoted 100 lines

Thanks.

[1] https://patchwork.ozlabs.org/patch/730736/

Quoted 96 lines

tested on DRA7. DFU updates ok for MMC and eMMC

Jean-Jacques

   include/configs/dra7xx_evm.h      |  2 +-
   include/configs/omap5_uevm.h      |  2 +-
   include/configs/ti_armv7_common.h |  7 ++++---
   include/environment/ti/dfu.h      | 14 ++++++++------
   4 files changed, 14 insertions(+), 11 deletions(-)
include/configs/dra7xx_evm.h +1 -1
index bce2816..a56c224 100644
@@ -28,7 +28,7 @@
   #define CONFIG_ENV_IS_IN_MMC
   #define CONFIG_SYS_MMC_ENV_DEV         1       /* SLOT2: eMMC(1) */
   #define CONFIG_ENV_SIZE                        (128 << 10)
-#define CONFIG_ENV_OFFSET              0xE0000
+#define CONFIG_ENV_OFFSET              0x220000
   #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET +
 CONFIG_ENV_SIZE)
   #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
   #endif
include/configs/omap5_uevm.h +1 -1
index 736d804..127776e 100644
@@ -38,7 +38,7 @@
   #define CONFIG_ENV_IS_IN_MMC
   #define CONFIG_SYS_MMC_ENV_DEV         1       /* SLOT2: eMMC(1) */
   #define CONFIG_ENV_SIZE                        (128 << 10)
-#define CONFIG_ENV_OFFSET              0xE0000
+#define CONFIG_ENV_OFFSET              0x220000
   #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET +
 CONFIG_ENV_SIZE)
   #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
include/configs/ti_armv7_common.h +0 -1
index 905e1ef..4cfa134 100644
@@ -282,9 +282,10 @@
   #define CONFIG_SPL_FS_LOAD_ARGS_NAME           "args"
 
   /* RAW SD card / eMMC */
-#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR        0x900   /*

address 0x120000 */
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x80 /* address
0x10000 */

include/configs/ti_armv7_common.h +1 -1
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x80    /* 64KiB */
+#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR        0x1500  /*

address 0x2A0000 */
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x1300 /* address 0x260000 */

include/configs/ti_armv7_common.h +2 -0
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x100   /* 128KiB */
+
 
   /* spl export command */
   #define CONFIG_CMD_SPL
include/environment/ti/dfu.h +8 -7
index caf71a3..63e0ab8 100644
@@ -12,9 +12,10 @@
          "rootfs part 0 2;" \
          "MLO fat 0 1;" \
          "MLO.raw raw 0x100 0x100;" \
-       "u-boot.img.raw raw 0x300 0x400;" \
-       "spl-os-args.raw raw 0x80 0x80;" \
-       "spl-os-image.raw raw 0x900 0x2000;" \
+       "u-boot.img.raw raw 0x300 0xE00;" \
+       "u-env.raw raw 0x1100 0x200;" \
+       "spl-os-args.raw raw 0x1300 0x100;" \
+       "spl-os-image.raw raw 0x1500 0x6B00;" \
          "spl-os-args fat 0 1;" \
          "spl-os-image fat 0 1;" \
          "u-boot.img fat 0 1;" \
@@ -27,9 +28,10 @@
          "rootfs part 1 2;" \
          "MLO fat 1 1;" \
          "MLO.raw raw 0x100 0x100;" \
-       "u-boot.img.raw raw 0x300 0x1000;" \
-       "spl-os-args.raw raw 0x80 0x80;" \
-       "spl-os-image.raw raw 0x900 0x2000;" \
+       "u-boot.img.raw raw 0x300 0xE00;" \
+       "u-env.raw raw 0x1100 0x200;" \
+       "spl-os-args.raw raw 0x1300 0x100;" \
+       "spl-os-image.raw raw 0x1500 0x6B00;" \
          "spl-os-args fat 1 1;" \
          "spl-os-image fat 1 1;" \
          "u-boot.img fat 1 1;" \
--

1.9.1

#9 lore raw

PATCH 1/1 ARM: ti: Update layout for MMC and eMMC (env and dfu)

Quoted 98 lines · Jean-Jacques Hiblot
Quoted 72 lines · Sam Protsenko
Quoted 59 lines · Jean-Jacques Hiblot
Quoted 32 lines · Sam Protsenko
Quoted 20 lines · Jean-Jacques Hiblot

The problems with the current DFU layout are:
MMC: The space allocated for u-boot is too small for the latest u-boot
(>750KB). We need to increase it. eMMC uses a much bigger area
(2MB).
eMMC: region "u-boot.img.raw" overlaps the environment area and the region

        "spl-os-image.raw".

both: region "spl-os-image.raw" is quite small and can't handle android
kernels

Fixing this requires growing some regions and moving others. Care has been taken to leave some room for further growth of "spl-os-args.raw".
Also the "env" now appears in the dfu so that it's apparent that the region is not free space that can be used to grow "u-boot.img.raw". The total space allocated for those raw binaries is 16MB, of which 13+MB
are reserved for the kernel image.

Quoted 9 lines

---

Sam,

This patch goes a bit further in changing the layout of the MMC than yours. However
it doesn't update the GPT partitioning. This would still be needed.

Quoted 7 lines

Hi Jean-Jacques,

Got a couple of questions about this change and my patch (changing eMMC partitions table), about how to make them play nice together.

1. How DFU table is connected to eMMC partition table? And why my patch was interfering with DFU table?

AFAIK DFU is not related to GPT. I never used the GPT so I can't for sure how it fits together.
My guess is that env_mmc.c has no idea that GPT even exists and uses raw access to the eMMC. In this case CONFIG_ENV_OFFSET must be defined to point
at the beginning of your env partition and must be adapted when the GPT is
updated. The same goes for the DFU. Ideally GPT and DFU should use the same
layout (at least for MLO, u-boot, kernel and args).

Quoted 4 lines

2. Can I change CONFIG_ENV_OFFSET? Because my changes is going to move "reserved" partition on eMMC, where U-Boot environment is stored. Or it should be in sync with DFU table somehow? If yes -- we should work together to find solution that works best for both cases.

Quoted 10 lines

CONFIG_ENV_OFFSET is loosely related to DFU: we don't update the environment
through DFU. However we must make sure that the area used to store the env
doesn't overlap a another region (MLO, u-boot, kernel, args). The dfu doesn't define those regions, it's done with #defines like CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR. But DFU exposes them for "remote"
upgrade.

Quoted 2 lines

So if I change eMMC GPT partition table, it's ok for me to update CONFIG_ENV_OFFSET as well, right?

Yes you need to change it

Quoted 8 lines

Because in my case CONFIG_ENV_OFFSET
is going to be different from the value your patch sets. In case of eMMC table, we're using "reserved" partition to store U-Boot environment, and I want it to be at 1664 KiB, which gives us CONFIG_ENV_OFFSET=0x1A0000. Is it ok if I change it to that value? Or something else must be changed along with it? If yes, then what exactly?

You need to adapt DFU if you plan to use it. Maybe you can define a new layout for DFU, something like dfu_alt_info_emmc_gpt that will reflect your GPT layout

Anyway IMO it would be good to use the same offset/size for GPT and non-GPT case for the following regions:
- MLO
- u-boot
- env

Quoted 7 lines

For MLO we already use the same: offset 128kB / size 256kB
For u-boot, you increased the size to 1MB, I suggest that we increase it a bit more (1.5MB or 2MB) just to make sure that we don't have to increase its size again next year.
For the env, I suggest that the size is increased to 256kB to take care of redundant env.

Thank you for detailed explanation. I'm gonna get back to that task in a few weeks, don't have enough time right now. Once I come up with some particular patch, I will add you to reviewers, to be sure that DFU part is correct.

Quoted 116 lines
Quoted 115 lines

Thanks.

Quoted 110 lines
Quoted 2 lines

3. What about my similar patch for AM57x EVM (see [1])? Is it fine, or it affects DFU table as well?

I guess it's OK because the env is stored in a FAT partition:
CONFIG_ENV_OFFSET is not used

Quoted 103 lines

Thanks.

[1] https://patchwork.ozlabs.org/patch/730736/

Quoted 99 lines

tested on DRA7. DFU updates ok for MMC and eMMC

Jean-Jacques

   include/configs/dra7xx_evm.h      |  2 +-
   include/configs/omap5_uevm.h      |  2 +-
   include/configs/ti_armv7_common.h |  7 ++++---
   include/environment/ti/dfu.h      | 14 ++++++++------
   4 files changed, 14 insertions(+), 11 deletions(-)
include/configs/dra7xx_evm.h +1 -1
index bce2816..a56c224 100644
@@ -28,7 +28,7 @@
   #define CONFIG_ENV_IS_IN_MMC
   #define CONFIG_SYS_MMC_ENV_DEV         1       /* SLOT2: eMMC(1) */
   #define CONFIG_ENV_SIZE                        (128 << 10)
-#define CONFIG_ENV_OFFSET              0xE0000
+#define CONFIG_ENV_OFFSET              0x220000
   #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET +
 CONFIG_ENV_SIZE)
   #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
   #endif
include/configs/omap5_uevm.h +1 -1
index 736d804..127776e 100644
@@ -38,7 +38,7 @@
   #define CONFIG_ENV_IS_IN_MMC
   #define CONFIG_SYS_MMC_ENV_DEV         1       /* SLOT2: eMMC(1) */
   #define CONFIG_ENV_SIZE                        (128 << 10)
-#define CONFIG_ENV_OFFSET              0xE0000
+#define CONFIG_ENV_OFFSET              0x220000
   #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET +
 CONFIG_ENV_SIZE)
   #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
include/configs/ti_armv7_common.h +0 -1
index 905e1ef..4cfa134 100644
@@ -282,9 +282,10 @@
   #define CONFIG_SPL_FS_LOAD_ARGS_NAME           "args"
 
   /* RAW SD card / eMMC */
-#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR        0x900   /*

address 0x120000 */
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x80 /* address
0x10000 */

include/configs/ti_armv7_common.h +1 -1
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x80    /* 64KiB */
+#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR        0x1500  /*

address 0x2A0000 */
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x1300 /* address 0x260000 */

include/configs/ti_armv7_common.h +2 -0
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x100   /* 128KiB */
+
 
   /* spl export command */
   #define CONFIG_CMD_SPL
include/environment/ti/dfu.h +8 -7
index caf71a3..63e0ab8 100644
@@ -12,9 +12,10 @@
          "rootfs part 0 2;" \
          "MLO fat 0 1;" \
          "MLO.raw raw 0x100 0x100;" \
-       "u-boot.img.raw raw 0x300 0x400;" \
-       "spl-os-args.raw raw 0x80 0x80;" \
-       "spl-os-image.raw raw 0x900 0x2000;" \
+       "u-boot.img.raw raw 0x300 0xE00;" \
+       "u-env.raw raw 0x1100 0x200;" \
+       "spl-os-args.raw raw 0x1300 0x100;" \
+       "spl-os-image.raw raw 0x1500 0x6B00;" \
          "spl-os-args fat 0 1;" \
          "spl-os-image fat 0 1;" \
          "u-boot.img fat 0 1;" \
@@ -27,9 +28,10 @@
          "rootfs part 1 2;" \
          "MLO fat 1 1;" \
          "MLO.raw raw 0x100 0x100;" \
-       "u-boot.img.raw raw 0x300 0x1000;" \
-       "spl-os-args.raw raw 0x80 0x80;" \
-       "spl-os-image.raw raw 0x900 0x2000;" \
+       "u-boot.img.raw raw 0x300 0xE00;" \
+       "u-env.raw raw 0x1100 0x200;" \
+       "spl-os-args.raw raw 0x1300 0x100;" \
+       "spl-os-image.raw raw 0x1500 0x6B00;" \
          "spl-os-args fat 1 1;" \
          "spl-os-image fat 1 1;" \
          "u-boot.img fat 1 1;" \
--

1.9.1

#10 lore raw

PATCH 1/1 ARM: ti: Update layout for MMC and eMMC (env and dfu)

Quoted 96 lines · Sam Protsenko
Quoted 88 lines · Jean-Jacques Hiblot
Quoted 66 lines · Sam Protsenko
Quoted 54 lines · Jean-Jacques Hiblot
Quoted 30 lines · Sam Protsenko
Quoted 19 lines · Jean-Jacques Hiblot

The problems with the current DFU layout are:
MMC: The space allocated for u-boot is too small for the latest u-boot
(>750KB). We need to increase it. eMMC uses a much bigger area
(2MB).
eMMC: region "u-boot.img.raw" overlaps the environment area and the region

         "spl-os-image.raw".

both: region "spl-os-image.raw" is quite small and can't handle android
kernels

Fixing this requires growing some regions and moving others. Care has been taken to leave some room for further growth of "spl-os-args.raw".
Also the "env" now appears in the dfu so that it's apparent that the region is not free space that can be used to grow "u-boot.img.raw". The total space allocated for those raw binaries is 16MB, of which 13+MB
are reserved for the kernel image.

Quoted 9 lines

---

Sam,

This patch goes a bit further in changing the layout of the MMC than yours. However
it doesn't update the GPT partitioning. This would still be needed.

Quoted 7 lines

Hi Jean-Jacques,

Got a couple of questions about this change and my patch (changing eMMC partitions table), about how to make them play nice together.

1. How DFU table is connected to eMMC partition table? And why my patch was interfering with DFU table?

AFAIK DFU is not related to GPT. I never used the GPT so I can't for sure how it fits together.
My guess is that env_mmc.c has no idea that GPT even exists and uses raw access to the eMMC. In this case CONFIG_ENV_OFFSET must be defined to point
at the beginning of your env partition and must be adapted when the GPT is
updated. The same goes for the DFU. Ideally GPT and DFU should use the same
layout (at least for MLO, u-boot, kernel and args).

Quoted 4 lines

2. Can I change CONFIG_ENV_OFFSET? Because my changes is going to move "reserved" partition on eMMC, where U-Boot environment is stored. Or it should be in sync with DFU table somehow? If yes -- we should work together to find solution that works best for both cases.

Quoted 10 lines

CONFIG_ENV_OFFSET is loosely related to DFU: we don't update the environment
through DFU. However we must make sure that the area used to store the env
doesn't overlap a another region (MLO, u-boot, kernel, args). The dfu doesn't define those regions, it's done with #defines like CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR. But DFU exposes them for "remote"
upgrade.

Quoted 2 lines

So if I change eMMC GPT partition table, it's ok for me to update CONFIG_ENV_OFFSET as well, right?

Yes you need to change it

Quoted 7 lines

Because in my case CONFIG_ENV_OFFSET
is going to be different from the value your patch sets. In case of eMMC table, we're using "reserved" partition to store U-Boot environment, and I want it to be at 1664 KiB, which gives us CONFIG_ENV_OFFSET=0x1A0000. Is it ok if I change it to that value? Or something else must be changed along with it? If yes, then what exactly?

You need to adapt DFU if you plan to use it. Maybe you can define a new layout for DFU, something like dfu_alt_info_emmc_gpt that will reflect your GPT layout

Anyway IMO it would be good to use the same offset/size for GPT and non-GPT case for the following regions:
- MLO
- u-boot
- env

Quoted 7 lines

For MLO we already use the same: offset 128kB / size 256kB
For u-boot, you increased the size to 1MB, I suggest that we increase it a bit more (1.5MB or 2MB) just to make sure that we don't have to increase its size again next year.
For the env, I suggest that the size is increased to 256kB to take care of redundant env.

Quoted 4 lines

Thank you for detailed explanation. I'm gonna get back to that task in a few weeks, don't have enough time right now. Once I come up with some particular patch, I will add you to reviewers, to be sure that DFU part is correct.

Before you switch to another task maybe we can agree on the offset and sizes for MLO, u-boot and env so that I can do the necessary changes on my side (dfu, #defines).

Quoted 113 lines
Quoted 113 lines
Quoted 113 lines

Thanks.

Quoted 109 lines
Quoted 2 lines

3. What about my similar patch for AM57x EVM (see [1])? Is it fine, or it affects DFU table as well?

I guess it's OK because the env is stored in a FAT partition:
CONFIG_ENV_OFFSET is not used

Quoted 103 lines

Thanks.

[1] https://patchwork.ozlabs.org/patch/730736/

Quoted 99 lines

tested on DRA7. DFU updates ok for MMC and eMMC

Jean-Jacques

    include/configs/dra7xx_evm.h      |  2 +-
    include/configs/omap5_uevm.h      |  2 +-
    include/configs/ti_armv7_common.h |  7 ++++---
    include/environment/ti/dfu.h      | 14 ++++++++------
    4 files changed, 14 insertions(+), 11 deletions(-)
include/configs/dra7xx_evm.h +1 -1
index bce2816..a56c224 100644
@@ -28,7 +28,7 @@
    #define CONFIG_ENV_IS_IN_MMC
    #define CONFIG_SYS_MMC_ENV_DEV         1       /* SLOT2: eMMC(1) */
    #define CONFIG_ENV_SIZE                        (128 << 10)
-#define CONFIG_ENV_OFFSET              0xE0000
+#define CONFIG_ENV_OFFSET              0x220000
    #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET +
 CONFIG_ENV_SIZE)
    #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
    #endif
include/configs/omap5_uevm.h +1 -1
index 736d804..127776e 100644
@@ -38,7 +38,7 @@
    #define CONFIG_ENV_IS_IN_MMC
    #define CONFIG_SYS_MMC_ENV_DEV         1       /* SLOT2: eMMC(1) */
    #define CONFIG_ENV_SIZE                        (128 << 10)
-#define CONFIG_ENV_OFFSET              0xE0000
+#define CONFIG_ENV_OFFSET              0x220000
    #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET +
 CONFIG_ENV_SIZE)
    #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
include/configs/ti_armv7_common.h +0 -1
index 905e1ef..4cfa134 100644
@@ -282,9 +282,10 @@
    #define CONFIG_SPL_FS_LOAD_ARGS_NAME           "args"
 
    /* RAW SD card / eMMC */
-#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR        0x900   /*

address 0x120000 */
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x80 /* address
0x10000 */

include/configs/ti_armv7_common.h +1 -1
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x80    /* 64KiB */
+#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR        0x1500  /*

address 0x2A0000 */
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x1300 /* address 0x260000 */

include/configs/ti_armv7_common.h +2 -0
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x100   /* 128KiB */
+
 
    /* spl export command */
    #define CONFIG_CMD_SPL
include/environment/ti/dfu.h +8 -7
index caf71a3..63e0ab8 100644
@@ -12,9 +12,10 @@
           "rootfs part 0 2;" \
           "MLO fat 0 1;" \
           "MLO.raw raw 0x100 0x100;" \
-       "u-boot.img.raw raw 0x300 0x400;" \
-       "spl-os-args.raw raw 0x80 0x80;" \
-       "spl-os-image.raw raw 0x900 0x2000;" \
+       "u-boot.img.raw raw 0x300 0xE00;" \
+       "u-env.raw raw 0x1100 0x200;" \
+       "spl-os-args.raw raw 0x1300 0x100;" \
+       "spl-os-image.raw raw 0x1500 0x6B00;" \
           "spl-os-args fat 0 1;" \
           "spl-os-image fat 0 1;" \
           "u-boot.img fat 0 1;" \
@@ -27,9 +28,10 @@
           "rootfs part 1 2;" \
           "MLO fat 1 1;" \
           "MLO.raw raw 0x100 0x100;" \
-       "u-boot.img.raw raw 0x300 0x1000;" \
-       "spl-os-args.raw raw 0x80 0x80;" \
-       "spl-os-image.raw raw 0x900 0x2000;" \
+       "u-boot.img.raw raw 0x300 0xE00;" \
+       "u-env.raw raw 0x1100 0x200;" \
+       "spl-os-args.raw raw 0x1300 0x100;" \
+       "spl-os-image.raw raw 0x1500 0x6B00;" \
           "spl-os-args fat 1 1;" \
           "spl-os-image fat 1 1;" \
           "u-boot.img fat 1 1;" \
--

1.9.1

#11 lore raw

PATCH 1/1 ARM: ti: Update layout for MMC and eMMC (env and dfu)

Quoted 122 lines · Jean-Jacques Hiblot
Quoted 119 lines · Sam Protsenko
Quoted 116 lines · Jean-Jacques Hiblot
Quoted 78 lines · Sam Protsenko
Quoted 65 lines · Jean-Jacques Hiblot
Quoted 36 lines · Sam Protsenko
Quoted 23 lines · Jean-Jacques Hiblot

The problems with the current DFU layout are:
MMC: The space allocated for u-boot is too small for the latest u-boot
(>750KB). We need to increase it. eMMC uses a much bigger
area
(2MB).
eMMC: region "u-boot.img.raw" overlaps the environment area and the region

         "spl-os-image.raw".

both: region "spl-os-image.raw" is quite small and can't handle android
kernels

Fixing this requires growing some regions and moving others. Care has been taken to leave some room for further growth of "spl-os-args.raw".
Also the "env" now appears in the dfu so that it's apparent that the region is not free space that can be used to grow "u-boot.img.raw". The total space allocated for those raw binaries is 16MB, of which 13+MB
are reserved for the kernel image.

Quoted 9 lines

---

Sam,

This patch goes a bit further in changing the layout of the MMC than yours. However
it doesn't update the GPT partitioning. This would still be needed.

Quoted 7 lines

Hi Jean-Jacques,

Got a couple of questions about this change and my patch (changing eMMC partitions table), about how to make them play nice together.

1. How DFU table is connected to eMMC partition table? And why my patch was interfering with DFU table?

AFAIK DFU is not related to GPT. I never used the GPT so I can't for sure
how it fits together.
My guess is that env_mmc.c has no idea that GPT even exists and uses raw
access to the eMMC. In this case CONFIG_ENV_OFFSET must be defined to point
at the beginning of your env partition and must be adapted when the GPT is
updated. The same goes for the DFU. Ideally GPT and DFU should use the same
layout (at least for MLO, u-boot, kernel and args).

Quoted 4 lines

2. Can I change CONFIG_ENV_OFFSET? Because my changes is going to move "reserved" partition on eMMC, where U-Boot environment is stored. Or it should be in sync with DFU table somehow? If yes -- we should work together to find solution that works best for both cases.

Quoted 10 lines

CONFIG_ENV_OFFSET is loosely related to DFU: we don't update the environment
through DFU. However we must make sure that the area used to store the env
doesn't overlap a another region (MLO, u-boot, kernel, args). The dfu doesn't define those regions, it's done with #defines like CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR. But DFU exposes them for "remote"
upgrade.

Quoted 2 lines

So if I change eMMC GPT partition table, it's ok for me to update CONFIG_ENV_OFFSET as well, right?

Yes you need to change it

Quoted 8 lines

Because in my case CONFIG_ENV_OFFSET
is going to be different from the value your patch sets. In case of eMMC table, we're using "reserved" partition to store U-Boot environment, and I want it to be at 1664 KiB, which gives us CONFIG_ENV_OFFSET=0x1A0000. Is it ok if I change it to that value? Or something else must be changed along with it? If yes, then what exactly?

You need to adapt DFU if you plan to use it. Maybe you can define a new layout for DFU, something like dfu_alt_info_emmc_gpt that will reflect your
GPT layout

Anyway IMO it would be good to use the same offset/size for GPT and non-GPT
case for the following regions:
- MLO
- u-boot
- env

For MLO we already use the same: offset 128kB / size 256kB For u-boot, you increased the size to 1MB, I suggest that we increase it a
bit more (1.5MB or 2MB) just to make sure that we don't have to increase its
size again next year.
For the env, I suggest that the size is increased to 256kB to take care of
redundant env.

Quoted 9 lines
Quoted 4 lines

Thank you for detailed explanation. I'm gonna get back to that task in a few weeks, don't have enough time right now. Once I come up with some particular patch, I will add you to reviewers, to be sure that DFU part is correct.

Before you switch to another task maybe we can agree on the offset and sizes for MLO, u-boot and env so that I can do the necessary changes on my side (dfu, #defines).

Sure. I agree with you that we should increase U-Boot partition. I'm gonna do next layout for eMMC table:

    MLO: start=128K, size=256K
    U-Boot: size=2M
    DTB: size=128K
    misc: size=128K
    U-Boot environment: size=256K
    efs: size=16M
    crypto: size=16K
    recovery: size=10M
    boot: size=10M
    system: size=768M
    cache: size=256M
    ipu1: size=1M
    ipu2: size=1M
    userdata: size=the rest of eMMC space

Is it ok with you? Also, we should check if it's ok with Praneeth, as he mentioned that some changes to that table may be necessary in the future (from Android side).

Quoted 118 lines
Quoted 117 lines
Quoted 117 lines
Quoted 117 lines

Thanks.

Quoted 112 lines
Quoted 2 lines

3. What about my similar patch for AM57x EVM (see [1])? Is it fine, or it affects DFU table as well?

I guess it's OK because the env is stored in a FAT partition:
CONFIG_ENV_OFFSET is not used

Quoted 105 lines

Thanks.

[1] https://patchwork.ozlabs.org/patch/730736/

Quoted 101 lines

tested on DRA7. DFU updates ok for MMC and eMMC

Jean-Jacques

    include/configs/dra7xx_evm.h      |  2 +-
    include/configs/omap5_uevm.h      |  2 +-
    include/configs/ti_armv7_common.h |  7 ++++---
    include/environment/ti/dfu.h      | 14 ++++++++------
    4 files changed, 14 insertions(+), 11 deletions(-)
include/configs/dra7xx_evm.h +1 -1
index bce2816..a56c224 100644
@@ -28,7 +28,7 @@
    #define CONFIG_ENV_IS_IN_MMC
    #define CONFIG_SYS_MMC_ENV_DEV         1       /* SLOT2: eMMC(1)
 */
    #define CONFIG_ENV_SIZE                        (128 << 10)
-#define CONFIG_ENV_OFFSET              0xE0000
+#define CONFIG_ENV_OFFSET              0x220000
    #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET +
 CONFIG_ENV_SIZE)
    #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
    #endif
include/configs/omap5_uevm.h +1 -1
index 736d804..127776e 100644
@@ -38,7 +38,7 @@
    #define CONFIG_ENV_IS_IN_MMC
    #define CONFIG_SYS_MMC_ENV_DEV         1       /* SLOT2: eMMC(1)
 */
    #define CONFIG_ENV_SIZE                        (128 << 10)
-#define CONFIG_ENV_OFFSET              0xE0000
+#define CONFIG_ENV_OFFSET              0x220000
    #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET +
 CONFIG_ENV_SIZE)
    #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
include/configs/ti_armv7_common.h +0 -1
index 905e1ef..4cfa134 100644
@@ -282,9 +282,10 @@
    #define CONFIG_SPL_FS_LOAD_ARGS_NAME           "args"
 
    /* RAW SD card / eMMC */
-#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR        0x900   /*

address 0x120000 */
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x80 /* address
0x10000 */

include/configs/ti_armv7_common.h +1 -1
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x80    /* 64KiB */
+#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR        0x1500  /*

address 0x2A0000 */
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x1300 /* address 0x260000 */

include/configs/ti_armv7_common.h +2 -0
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x100   /* 128KiB */
+
 
    /* spl export command */
    #define CONFIG_CMD_SPL
include/environment/ti/dfu.h +8 -7
index caf71a3..63e0ab8 100644
@@ -12,9 +12,10 @@
           "rootfs part 0 2;" \
           "MLO fat 0 1;" \
           "MLO.raw raw 0x100 0x100;" \
-       "u-boot.img.raw raw 0x300 0x400;" \
-       "spl-os-args.raw raw 0x80 0x80;" \
-       "spl-os-image.raw raw 0x900 0x2000;" \
+       "u-boot.img.raw raw 0x300 0xE00;" \
+       "u-env.raw raw 0x1100 0x200;" \
+       "spl-os-args.raw raw 0x1300 0x100;" \
+       "spl-os-image.raw raw 0x1500 0x6B00;" \
           "spl-os-args fat 0 1;" \
           "spl-os-image fat 0 1;" \
           "u-boot.img fat 0 1;" \
@@ -27,9 +28,10 @@
           "rootfs part 1 2;" \
           "MLO fat 1 1;" \
           "MLO.raw raw 0x100 0x100;" \
-       "u-boot.img.raw raw 0x300 0x1000;" \
-       "spl-os-args.raw raw 0x80 0x80;" \
-       "spl-os-image.raw raw 0x900 0x2000;" \
+       "u-boot.img.raw raw 0x300 0xE00;" \
+       "u-env.raw raw 0x1100 0x200;" \
+       "spl-os-args.raw raw 0x1300 0x100;" \
+       "spl-os-image.raw raw 0x1500 0x6B00;" \
           "spl-os-args fat 1 1;" \
           "spl-os-image fat 1 1;" \
           "u-boot.img fat 1 1;" \
--

1.9.1

#12 lore raw

PATCH 1/1 ARM: ti: Update layout for MMC and eMMC (env and dfu)

Quoted 119 lines · Sam Protsenko
Quoted 110 lines · Jean-Jacques Hiblot
Quoted 108 lines · Sam Protsenko
Quoted 106 lines · Jean-Jacques Hiblot
Quoted 72 lines · Sam Protsenko
Quoted 60 lines · Jean-Jacques Hiblot
Quoted 34 lines · Sam Protsenko
Quoted 22 lines · Jean-Jacques Hiblot

The problems with the current DFU layout are:
MMC: The space allocated for u-boot is too small for the latest u-boot
(>750KB). We need to increase it. eMMC uses a much bigger
area
(2MB).
eMMC: region "u-boot.img.raw" overlaps the environment area and the region

          "spl-os-image.raw".

both: region "spl-os-image.raw" is quite small and can't handle android
kernels

Fixing this requires growing some regions and moving others. Care has been taken to leave some room for further growth of "spl-os-args.raw".
Also the "env" now appears in the dfu so that it's apparent that the region is not free space that can be used to grow "u-boot.img.raw". The total space allocated for those raw binaries is 16MB, of which 13+MB
are reserved for the kernel image.

Quoted 9 lines

---

Sam,

This patch goes a bit further in changing the layout of the MMC than yours. However
it doesn't update the GPT partitioning. This would still be needed.

Quoted 7 lines

Hi Jean-Jacques,

Got a couple of questions about this change and my patch (changing eMMC partitions table), about how to make them play nice together.

1. How DFU table is connected to eMMC partition table? And why my patch was interfering with DFU table?

AFAIK DFU is not related to GPT. I never used the GPT so I can't for sure
how it fits together.
My guess is that env_mmc.c has no idea that GPT even exists and uses raw
access to the eMMC. In this case CONFIG_ENV_OFFSET must be defined to point
at the beginning of your env partition and must be adapted when the GPT is
updated. The same goes for the DFU. Ideally GPT and DFU should use the same
layout (at least for MLO, u-boot, kernel and args).

Quoted 4 lines

2. Can I change CONFIG_ENV_OFFSET? Because my changes is going to move "reserved" partition on eMMC, where U-Boot environment is stored. Or it should be in sync with DFU table somehow? If yes -- we should work together to find solution that works best for both cases.

Quoted 10 lines

CONFIG_ENV_OFFSET is loosely related to DFU: we don't update the environment
through DFU. However we must make sure that the area used to store the env
doesn't overlap a another region (MLO, u-boot, kernel, args). The dfu doesn't define those regions, it's done with #defines like CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR. But DFU exposes them for "remote"
upgrade.

Quoted 2 lines

So if I change eMMC GPT partition table, it's ok for me to update CONFIG_ENV_OFFSET as well, right?

Yes you need to change it

Quoted 7 lines

Because in my case CONFIG_ENV_OFFSET
is going to be different from the value your patch sets. In case of eMMC table, we're using "reserved" partition to store U-Boot environment, and I want it to be at 1664 KiB, which gives us CONFIG_ENV_OFFSET=0x1A0000. Is it ok if I change it to that value? Or something else must be changed along with it? If yes, then what exactly?

You need to adapt DFU if you plan to use it. Maybe you can define a new layout for DFU, something like dfu_alt_info_emmc_gpt that will reflect your
GPT layout

Anyway IMO it would be good to use the same offset/size for GPT and non-GPT
case for the following regions:
- MLO
- u-boot
- env

For MLO we already use the same: offset 128kB / size 256kB For u-boot, you increased the size to 1MB, I suggest that we increase it a
bit more (1.5MB or 2MB) just to make sure that we don't have to increase its
size again next year.
For the env, I suggest that the size is increased to 256kB to take care of
redundant env.

Quoted 8 lines
Quoted 4 lines

Thank you for detailed explanation. I'm gonna get back to that task in a few weeks, don't have enough time right now. Once I come up with some particular patch, I will add you to reviewers, to be sure that DFU part is correct.

Before you switch to another task maybe we can agree on the offset and sizes for MLO, u-boot and env so that I can do the necessary changes on my side (dfu, #defines).

Quoted 5 lines

Sure. I agree with you that we should increase U-Boot partition. I'm gonna do next layout for eMMC table:

     MLO: start=128K, size=256K
     U-Boot: size=2M

Sorry I took so long to reply.
I'd re-arrange the following 3 elements and make the dtb area bigger. At the moment DTBs are around 100k but they keep growing.

Quoted 3 lines
     DTB: size=128K
     misc: size=128K
     U-Boot environment: size=256K

U-Boot environment: size=256K
DTB: size=256K
misc: size=128K

JJ

Quoted 129 lines
     efs: size=16M
     crypto: size=16K
     recovery: size=10M
     boot: size=10M
     system: size=768M
     cache: size=256M
     ipu1: size=1M
     ipu2: size=1M
     userdata: size=the rest of eMMC space

Is it ok with you? Also, we should check if it's ok with Praneeth, as he mentioned that some changes to that table may be necessary in the future (from Android side).

Quoted 113 lines
Quoted 113 lines
Quoted 113 lines
Quoted 113 lines

Thanks.

Quoted 111 lines
Quoted 2 lines

3. What about my similar patch for AM57x EVM (see [1])? Is it fine, or it affects DFU table as well?

I guess it's OK because the env is stored in a FAT partition:
CONFIG_ENV_OFFSET is not used

Quoted 105 lines

Thanks.

[1] https://patchwork.ozlabs.org/patch/730736/

Quoted 101 lines

tested on DRA7. DFU updates ok for MMC and eMMC

Jean-Jacques

     include/configs/dra7xx_evm.h      |  2 +-
     include/configs/omap5_uevm.h      |  2 +-
     include/configs/ti_armv7_common.h |  7 ++++---
     include/environment/ti/dfu.h      | 14 ++++++++------
     4 files changed, 14 insertions(+), 11 deletions(-)
include/configs/dra7xx_evm.h +1 -1
index bce2816..a56c224 100644
@@ -28,7 +28,7 @@
     #define CONFIG_ENV_IS_IN_MMC
     #define CONFIG_SYS_MMC_ENV_DEV         1       /* SLOT2: eMMC(1)
 */
     #define CONFIG_ENV_SIZE                        (128 << 10)
-#define CONFIG_ENV_OFFSET              0xE0000
+#define CONFIG_ENV_OFFSET              0x220000
     #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET +
 CONFIG_ENV_SIZE)
     #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
     #endif
include/configs/omap5_uevm.h +1 -1
index 736d804..127776e 100644
@@ -38,7 +38,7 @@
     #define CONFIG_ENV_IS_IN_MMC
     #define CONFIG_SYS_MMC_ENV_DEV         1       /* SLOT2: eMMC(1)
 */
     #define CONFIG_ENV_SIZE                        (128 << 10)
-#define CONFIG_ENV_OFFSET              0xE0000
+#define CONFIG_ENV_OFFSET              0x220000
     #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET +
 CONFIG_ENV_SIZE)
     #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
include/configs/ti_armv7_common.h +0 -1
index 905e1ef..4cfa134 100644
@@ -282,9 +282,10 @@
     #define CONFIG_SPL_FS_LOAD_ARGS_NAME           "args"
 
     /* RAW SD card / eMMC */
-#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR        0x900   /*

address 0x120000 */
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x80 /* address
0x10000 */

include/configs/ti_armv7_common.h +1 -1
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x80    /* 64KiB */
+#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR        0x1500  /*

address 0x2A0000 */
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x1300 /* address 0x260000 */

include/configs/ti_armv7_common.h +2 -0
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x100   /* 128KiB */
+
 
     /* spl export command */
     #define CONFIG_CMD_SPL
include/environment/ti/dfu.h +8 -7
index caf71a3..63e0ab8 100644
@@ -12,9 +12,10 @@
            "rootfs part 0 2;" \
            "MLO fat 0 1;" \
            "MLO.raw raw 0x100 0x100;" \
-       "u-boot.img.raw raw 0x300 0x400;" \
-       "spl-os-args.raw raw 0x80 0x80;" \
-       "spl-os-image.raw raw 0x900 0x2000;" \
+       "u-boot.img.raw raw 0x300 0xE00;" \
+       "u-env.raw raw 0x1100 0x200;" \
+       "spl-os-args.raw raw 0x1300 0x100;" \
+       "spl-os-image.raw raw 0x1500 0x6B00;" \
            "spl-os-args fat 0 1;" \
            "spl-os-image fat 0 1;" \
            "u-boot.img fat 0 1;" \
@@ -27,9 +28,10 @@
            "rootfs part 1 2;" \
            "MLO fat 1 1;" \
            "MLO.raw raw 0x100 0x100;" \
-       "u-boot.img.raw raw 0x300 0x1000;" \
-       "spl-os-args.raw raw 0x80 0x80;" \
-       "spl-os-image.raw raw 0x900 0x2000;" \
+       "u-boot.img.raw raw 0x300 0xE00;" \
+       "u-env.raw raw 0x1100 0x200;" \
+       "spl-os-args.raw raw 0x1300 0x100;" \
+       "spl-os-image.raw raw 0x1500 0x6B00;" \
            "spl-os-args fat 1 1;" \
            "spl-os-image fat 1 1;" \
            "u-boot.img fat 1 1;" \
--

1.9.1

#13 lore raw

PATCH 1/1 arm: dra7xx: Update bootloader partition size

In reply to Sam Protsenko
Quoted 9 lines · Sam Protsenko

The current size of U-Boot is already ~840 KiB.

This patch is to increase bootloader partition size up to 1 MiB and thereby fix flashing error.

Also fix U-Boot environment address on eMMC ("reserved" partition), as it's being shifted by above change.

I know I'm late chiming in here, but I want to now, all the same. First, we need to explain _why_ things are getting so huge. The answer is that we're including so many (complete, from Linux) device trees. So we should probably update the comments around this area to note why the bootloader partition is so large, and then pick a good, large, and aligned with the underlying erase block size partition.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170301/057e52d9/attachment.sig>
#14 lore raw

PATCH 1/1 arm: dra7xx: Update bootloader partition size

Quoted 10 lines · Tom Rini
Quoted 8 lines · Sam Protsenko

The current size of U-Boot is already ~840 KiB.

This patch is to increase bootloader partition size up to 1 MiB and thereby fix flashing error.

Also fix U-Boot environment address on eMMC ("reserved" partition), as it's being shifted by above change.

Quoted 9 lines
Quoted 1 line

I know I'm late chiming in here, but I want to now, all the same. First, we need to explain _why_ things are getting so huge. The answer is that we're including so many (complete, from Linux) device trees. So we should probably update the comments around this area to note why the bootloader partition is so large, and then pick a good, large, and aligned with the underlying erase block size partition.

Tom,

Your comment is absolutely correct, I was just in a little bit hurry when sending this patch. Please don't merge it yet, I'm gonna get back to it after Linaro Connect. Things you mentioned will be added to commit message, and we are probably going to change that partition size one more time. So let's hold on on this change for now.

Thanks.

Quoted 2 lines

--
Tom