[PATCH] board: synquacer: Update the flash image layout

[PATCH] board: synquacer: Update the flash image layout

[Ilias Apalodimas]

The SynQuacer Developerbox, in EFI mode, supports A/B capsule
updates and single image ones. The flash layout in the latter case is
outdated, update it with the new offsets and images

Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
---
 board/socionext/developerbox/developerbox.c | 23 +--------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/board/socionext/developerbox/developerbox.c b/board/socionext/developerbox/developerbox.c
index 9585944d80c1..ac4415ff3bbb 100644
--- a/board/socionext/developerbox/developerbox.c
+++ b/board/socionext/developerbox/developerbox.c
@@ -20,39 +20,18 @@

 #if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)
 struct efi_fw_image fw_images[] = {
-#if CONFIG_IS_ENABLED(FWU_MULTI_BANK_UPDATE)
 	{
 		.image_type_id = DEVELOPERBOX_FIP_IMAGE_GUID,
 		.fw_name = u"DEVELOPERBOX-FIP",
 		.image_index = 1,
 	},
-#else
-	{
-		.image_type_id = DEVELOPERBOX_UBOOT_IMAGE_GUID,
-		.fw_name = u"DEVELOPERBOX-UBOOT",
-		.image_index = 1,
-	},
-	{
-		.image_type_id = DEVELOPERBOX_FIP_IMAGE_GUID,
-		.fw_name = u"DEVELOPERBOX-FIP",
-		.image_index = 2,
-	},
-	{
-		.image_type_id = DEVELOPERBOX_OPTEE_IMAGE_GUID,
-		.fw_name = u"DEVELOPERBOX-OPTEE",
-		.image_index = 3,
-	},
-#endif
 };

 struct efi_capsule_update_info update_info = {
-	.dfu_string = "mtd nor1=u-boot.bin raw 200000 100000;"
-			"fip.bin raw 180000 78000;"
-			"optee.bin raw 500000 100000",
+	.dfu_string = "mtd nor1=fip.bin raw 600000 400000",
 	.num_images = ARRAY_SIZE(fw_images),
 	.images = fw_images,
 };
-
 #endif /* EFI_HAVE_CAPSULE_SUPPORT */

 static struct mm_region sc2a11_mem_map[] = {
--
2.40.1

Re: [PATCH] board: synquacer: Update the flash image layout

[Masahisa Kojima]

On Thu, 19 Oct 2023 at 22:54, Ilias Apalodimas
<ilias.apalodimas@linaro.org> wrote:
>
> The SynQuacer Developerbox, in EFI mode, supports A/B capsule
> updates and single image ones. The flash layout in the latter case is
> outdated, update it with the new offsets and images
>
> Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
> ---
>  board/socionext/developerbox/developerbox.c | 23 +--------------------
>  1 file changed, 1 insertion(+), 22 deletions(-)

Tested-By: Masahisa Kojima <masahisa.kojima@linaro.org>

Thank you for fixing this issue.
I have tested both A/B multi-bank and single image(multi-bank
disabled) capsule updates work fine.

Thanks,
Masahisa Kojima

>
> diff --git a/board/socionext/developerbox/developerbox.c b/board/socionext/developerbox/developerbox.c
> index 9585944d80c1..ac4415ff3bbb 100644
> --- a/board/socionext/developerbox/developerbox.c
> +++ b/board/socionext/developerbox/developerbox.c
> @@ -20,39 +20,18 @@
>
>  #if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)
>  struct efi_fw_image fw_images[] = {
> -#if CONFIG_IS_ENABLED(FWU_MULTI_BANK_UPDATE)
>         {
>                 .image_type_id = DEVELOPERBOX_FIP_IMAGE_GUID,
>                 .fw_name = u"DEVELOPERBOX-FIP",
>                 .image_index = 1,
>         },
> -#else
> -       {
> -               .image_type_id = DEVELOPERBOX_UBOOT_IMAGE_GUID,
> -               .fw_name = u"DEVELOPERBOX-UBOOT",
> -               .image_index = 1,
> -       },
> -       {
> -               .image_type_id = DEVELOPERBOX_FIP_IMAGE_GUID,
> -               .fw_name = u"DEVELOPERBOX-FIP",
> -               .image_index = 2,
> -       },
> -       {
> -               .image_type_id = DEVELOPERBOX_OPTEE_IMAGE_GUID,
> -               .fw_name = u"DEVELOPERBOX-OPTEE",
> -               .image_index = 3,
> -       },
> -#endif
>  };
>
>  struct efi_capsule_update_info update_info = {
> -       .dfu_string = "mtd nor1=u-boot.bin raw 200000 100000;"
> -                       "fip.bin raw 180000 78000;"
> -                       "optee.bin raw 500000 100000",
> +       .dfu_string = "mtd nor1=fip.bin raw 600000 400000",
>         .num_images = ARRAY_SIZE(fw_images),
>         .images = fw_images,
>  };
> -
>  #endif /* EFI_HAVE_CAPSULE_SUPPORT */
>
>  static struct mm_region sc2a11_mem_map[] = {
> --
> 2.40.1
>

Re: [PATCH] board: synquacer: Update the flash image layout

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 439 bytes --]

On Thu, Oct 19, 2023 at 04:54:19PM +0300, Ilias Apalodimas wrote:

> The SynQuacer Developerbox, in EFI mode, supports A/B capsule
> updates and single image ones. The flash layout in the latter case is
> outdated, update it with the new offsets and images
> 
> Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
> Tested-By: Masahisa Kojima <masahisa.kojima@linaro.org>

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]