Skip to contentSkip to conversation

omap: Correct the fastboot product var

PATCH New Sam Protsenko 3 participants 3 messages Jul 25, 2019 – Aug 1, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 omap: Correct the fastboot product var

"fastboot flashall" expects "fastboot getvar product" value to be one of values provided in android-info.txt file (in AOSP), from "require board=" list. Before this patch, "am57xx" is returned for all AM57xx based boards, as it's set in $board env var from SYS_BOARD in board/ti/am57xx/Kconfig file, which is used for default implementation of "fastboot getvar product".

In order to fix that inconsistency, let's do next:
1. In U-Boot: override fastboot.product, reusing the value from $board_name
2. In AOSP: provide values for all AM57xx boards we can use to device/ti/beagle_x15/board-info.txt file

This way requirements check in "fastboot flashall" will work as expected, verifying that user tries to flash images to the board which those images were built for.

---
Changes in v2:
- reuse the value from $board_name instead of hard-coding it to "beagle_x15board" (corresponding changes will be done in AOSP)

 arch/arm/mach-omap2/utils.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)
arch/arm/mach-omap2/utils.c +13 -0
index edf5edcb68..7d01446940 100644
@@ -129,12 +129,25 @@ static inline void omap_set_fastboot_userdata_size(void)
 {
 }
 #endif /* CONFIG_FASTBOOT_FLASH_MMC */
+
+static void omap_set_fastboot_product(void)
+{
+	const char *board_name;
+
+	board_name = env_get("board_name");
+	if (board_name == NULL)
+		printf("Warning: fastboot.product: unknown board\n");
+
+	env_set("fastboot.product", board_name);
+}
+
 void omap_set_fastboot_vars(void)
 {
 	omap_set_fastboot_cpu();
 	omap_set_fastboot_secure();
 	omap_set_fastboot_board_rev();
 	omap_set_fastboot_userdata_size();
+	omap_set_fastboot_product();
 }
 #endif /* CONFIG_FASTBOOT_FLASH */
 
Signature · 1 line
2.20.1
#1 lore raw

PATCH v2 1/1 omap: Correct the fastboot product var

Quoted 13 lines · Sam Protsenko

"fastboot flashall" expects "fastboot getvar product" value to be one of values provided in android-info.txt file (in AOSP), from "require board=" list. Before this patch, "am57xx" is returned for all AM57xx based boards, as it's set in $board env var from SYS_BOARD in board/ti/am57xx/Kconfig file, which is used for default implementation of "fastboot getvar product".

In order to fix that inconsistency, let's do next:
1. In U-Boot: override fastboot.product, reusing the value from $board_name
2. In AOSP: provide values for all AM57xx boards we can use to device/ti/beagle_x15/board-info.txt file

Quoted 6 lines

This way requirements check in "fastboot flashall" will work as expected, verifying that user tries to flash images to the board which those images were built for.

---

Much cleaner like this, thanks,

Quoted 38 lines

Changes in v2:
- reuse the value from $board_name instead of hard-coding it to "beagle_x15board" (corresponding changes will be done in AOSP)

 arch/arm/mach-omap2/utils.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)
arch/arm/mach-omap2/utils.c +13 -0
index edf5edcb68..7d01446940 100644
@@ -129,12 +129,25 @@ static inline void omap_set_fastboot_userdata_size(void)
 {
 }
 #endif /* CONFIG_FASTBOOT_FLASH_MMC */
+
+static void omap_set_fastboot_product(void)
+{
+	const char *board_name;
+
+	board_name = env_get("board_name");
+	if (board_name == NULL)
+		printf("Warning: fastboot.product: unknown board\n");
+
+	env_set("fastboot.product", board_name);
+}
+
 void omap_set_fastboot_vars(void)
 {
 	omap_set_fastboot_cpu();
 	omap_set_fastboot_secure();
 	omap_set_fastboot_board_rev();
 	omap_set_fastboot_userdata_size();
+	omap_set_fastboot_product();
 }
 #endif /* CONFIG_FASTBOOT_FLASH */
 
#2 lore raw

PATCH v2 1/1 omap: Correct the fastboot product var

In reply to Sam Protsenko
Quoted 13 lines · Sam Protsenko

"fastboot flashall" expects "fastboot getvar product" value to be one of values provided in android-info.txt file (in AOSP), from "require board=" list. Before this patch, "am57xx" is returned for all AM57xx based boards, as it's set in $board env var from SYS_BOARD in board/ti/am57xx/Kconfig file, which is used for default implementation of "fastboot getvar product".

In order to fix that inconsistency, let's do next:
1. In U-Boot: override fastboot.product, reusing the value from $board_name
2. In AOSP: provide values for all AM57xx boards we can use to device/ti/beagle_x15/board-info.txt file

Quoted 6 lines

This way requirements check in "fastboot flashall" will work as expected, verifying that user tries to flash images to the board which those images were built for.

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/20190731/e2579651/attachment.sig>