From: Jassi Brar jaswinder.singh@linaro.org
The Synquacer board is migrating to using the FIP as the only updatable image on the platform with the u-boot and op-tee images packaged as part of the FIP image. Make changes to the structures used for capsule updates to reflect this change.
Signed-off-by: Jassi Brar jaswinder.singh@linaro.org Signed-off-by: Sughosh Ganu sughosh.ganu@linaro.org --- board/socionext/developerbox/developerbox.c | 17 +++-------------- include/configs/synquacer.h | 13 ++----------- 2 files changed, 5 insertions(+), 25 deletions(-)
diff --git a/board/socionext/developerbox/developerbox.c b/board/socionext/developerbox/developerbox.c index f5a5fe0121..b946428ddb 100644 --- a/board/socionext/developerbox/developerbox.c +++ b/board/socionext/developerbox/developerbox.c @@ -20,27 +20,16 @@
#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) struct efi_fw_image fw_images[] = { - { - .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, + .image_index = 1, }, };
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=bank0 raw 600000 400000;" + "bank1 raw a00000 400000;", .images = fw_images, };
diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h index 572f0a42ac..eafcc69e12 100644 --- a/include/configs/synquacer.h +++ b/include/configs/synquacer.h @@ -50,18 +50,9 @@ "mtd nor1=fip.bin raw 600000 400000\0"
/* GUIDs for capsule updatable firmware images */ -#define DEVELOPERBOX_UBOOT_IMAGE_GUID \ - EFI_GUID(0x53a92e83, 0x4ef4, 0x473a, 0x8b, 0x0d, \ - 0xb5, 0xd8, 0xc7, 0xb2, 0xd6, 0x00) - #define DEVELOPERBOX_FIP_IMAGE_GUID \ - EFI_GUID(0x880866e9, 0x84ba, 0x4793, 0xa9, 0x08, \ - 0x33, 0xe0, 0xb9, 0x16, 0xf3, 0x98) - -#define DEVELOPERBOX_OPTEE_IMAGE_GUID \ - EFI_GUID(0xc1b629f1, 0xce0e, 0x4894, 0x82, 0xbf, \ - 0xf0, 0xa3, 0x83, 0x87, 0xe6, 0x30) - + EFI_GUID(0x7d6dc310, 0x52ca, 0x43b8, 0xb7, 0xb9, \ + 0xf9, 0xd6, 0xc5, 0x01, 0xd1, 0x08) /* Distro boot settings */ #ifndef CONFIG_SPL_BUILD #ifdef CONFIG_CMD_USB