diff mbox series

[1/3] board: developerbox: remove obsolete NOR flash layout definition

Message ID 20231025065103.3101666-2-masahisa.kojima@linaro.org
State Accepted
Commit a248c1a0035ac43dda432a7d482a9ce0dd2f206d
Headers show
Series Developerbox: Cleanup and document update | expand

Commit Message

Masahisa Kojima Oct. 25, 2023, 6:51 a.m. UTC 
There are two kinds of NOR flash layout for the Developerbox.
Capsule update for the old layout is no longer available since
it has small capacity for secure world images and can not
house the TA such as fTPM.
This commit removes the definition related to the obsolete
NOR flash layout for the UEFI capsule update.

Signed-off-by: Masahisa Kojima <masahisa.kojima@linaro.org>
Acked-by: Jassi Brar <jaswinder.singh@linaro.org>
---
 include/configs/synquacer.h | 19 -------------------
 1 file changed, 19 deletions(-)

Comments

Ilias Apalodimas Oct. 26, 2023, 6:58 p.m. UTC | #1 
On Wed, 25 Oct 2023 at 09:52, Masahisa Kojima
<masahisa.kojima@linaro.org> wrote:
>
> There are two kinds of NOR flash layout for the Developerbox.
> Capsule update for the old layout is no longer available since
> it has small capacity for secure world images and can not
> house the TA such as fTPM.
> This commit removes the definition related to the obsolete
> NOR flash layout for the UEFI capsule update.
>
> Signed-off-by: Masahisa Kojima <masahisa.kojima@linaro.org>
> Acked-by: Jassi Brar <jaswinder.singh@linaro.org>
> ---
>  include/configs/synquacer.h | 19 -------------------
>  1 file changed, 19 deletions(-)
>
> diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h
> index cd7359c2f8..e36e63e81e 100644
> --- a/include/configs/synquacer.h
> +++ b/include/configs/synquacer.h
> @@ -40,20 +40,6 @@
>
>  /* Since U-Boot 64bit PCIe support is limited, disable 64bit MMIO support */
>
> -#ifdef CONFIG_FWU_MULTI_BANK_UPDATE
> -#define DEFAULT_DFU_ALT_INFO
> -#else
> -#define DEFAULT_DFU_ALT_INFO "dfu_alt_info="                           \
> -                       "mtd nor1=u-boot.bin raw 200000 100000;"        \
> -                       "fip.bin raw 180000 78000;"                     \
> -                       "optee.bin raw 500000 100000\0"
> -#endif

We don't need any of these because we use the .dfu_alt_string to
generate those right?

> -
> -/* GUIDs for capsule updatable firmware images */
> -#define DEVELOPERBOX_UBOOT_IMAGE_GUID \
> -       EFI_GUID(0x53a92e83, 0x4ef4, 0x473a, 0x8b, 0x0d, \
> -                0xb5, 0xd8, 0xc7, 0xb2, 0xd6, 0x00)
> -
>  #ifdef CONFIG_FWU_MULTI_BANK_UPDATE
>  #define DEVELOPERBOX_FIP_IMAGE_GUID \
>         EFI_GUID(0x7d6dc310, 0x52ca, 0x43b8, 0xb7, 0xb9, \
> @@ -64,10 +50,6 @@
>                  0x33, 0xe0, 0xb9, 0x16, 0xf3, 0x98)
>  #endif
>
> -#define DEVELOPERBOX_OPTEE_IMAGE_GUID \
> -       EFI_GUID(0xc1b629f1, 0xce0e, 0x4894, 0x82, 0xbf, \
> -                0xf0, 0xa3, 0x83, 0x87, 0xe6, 0x30)
> -
>  /* Distro boot settings */
>  #ifdef CONFIG_CMD_USB
>  #define BOOT_TARGET_DEVICE_USB(func)   func(USB, usb, 0)
> @@ -107,7 +89,6 @@
>         "ramdisk_addr_r=0xa0000000\0"           \
>         "scriptaddr=0x88000000\0"               \
>         "pxefile_addr_r=0x88100000\0"           \
> -       DEFAULT_DFU_ALT_INFO                    \
>         BOOTENV
>
>  #endif /* __CONFIG_H */
> --
> 2.34.1
>
Thanks
/Ilias
Masahisa Kojima Oct. 27, 2023, 12:21 a.m. UTC | #2 
Hi Ilias,

On Fri, 27 Oct 2023 at 03:58, Ilias Apalodimas
<ilias.apalodimas@linaro.org> wrote:
>
> On Wed, 25 Oct 2023 at 09:52, Masahisa Kojima
> <masahisa.kojima@linaro.org> wrote:
> >
> > There are two kinds of NOR flash layout for the Developerbox.
> > Capsule update for the old layout is no longer available since
> > it has small capacity for secure world images and can not
> > house the TA such as fTPM.
> > This commit removes the definition related to the obsolete
> > NOR flash layout for the UEFI capsule update.
> >
> > Signed-off-by: Masahisa Kojima <masahisa.kojima@linaro.org>
> > Acked-by: Jassi Brar <jaswinder.singh@linaro.org>
> > ---
> >  include/configs/synquacer.h | 19 -------------------
> >  1 file changed, 19 deletions(-)
> >
> > diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h
> > index cd7359c2f8..e36e63e81e 100644
> > --- a/include/configs/synquacer.h
> > +++ b/include/configs/synquacer.h
> > @@ -40,20 +40,6 @@
> >
> >  /* Since U-Boot 64bit PCIe support is limited, disable 64bit MMIO support */
> >
> > -#ifdef CONFIG_FWU_MULTI_BANK_UPDATE
> > -#define DEFAULT_DFU_ALT_INFO
> > -#else
> > -#define DEFAULT_DFU_ALT_INFO "dfu_alt_info="                           \
> > -                       "mtd nor1=u-boot.bin raw 200000 100000;"        \
> > -                       "fip.bin raw 180000 78000;"                     \
> > -                       "optee.bin raw 500000 100000\0"
> > -#endif
>
> We don't need any of these because we use the .dfu_alt_string to
> generate those right?

You are correct. We can generate dfu_alt_info from .dfu_string.

Thanks,
Masahisa Kojima

>
> > -
> > -/* GUIDs for capsule updatable firmware images */
> > -#define DEVELOPERBOX_UBOOT_IMAGE_GUID \
> > -       EFI_GUID(0x53a92e83, 0x4ef4, 0x473a, 0x8b, 0x0d, \
> > -                0xb5, 0xd8, 0xc7, 0xb2, 0xd6, 0x00)
> > -
> >  #ifdef CONFIG_FWU_MULTI_BANK_UPDATE
> >  #define DEVELOPERBOX_FIP_IMAGE_GUID \
> >         EFI_GUID(0x7d6dc310, 0x52ca, 0x43b8, 0xb7, 0xb9, \
> > @@ -64,10 +50,6 @@
> >                  0x33, 0xe0, 0xb9, 0x16, 0xf3, 0x98)
> >  #endif
> >
> > -#define DEVELOPERBOX_OPTEE_IMAGE_GUID \
> > -       EFI_GUID(0xc1b629f1, 0xce0e, 0x4894, 0x82, 0xbf, \
> > -                0xf0, 0xa3, 0x83, 0x87, 0xe6, 0x30)
> > -
> >  /* Distro boot settings */
> >  #ifdef CONFIG_CMD_USB
> >  #define BOOT_TARGET_DEVICE_USB(func)   func(USB, usb, 0)
> > @@ -107,7 +89,6 @@
> >         "ramdisk_addr_r=0xa0000000\0"           \
> >         "scriptaddr=0x88000000\0"               \
> >         "pxefile_addr_r=0x88100000\0"           \
> > -       DEFAULT_DFU_ALT_INFO                    \
> >         BOOTENV
> >
> >  #endif /* __CONFIG_H */
> > --
> > 2.34.1
> >
> Thanks
> /Ilias
Ilias Apalodimas Oct. 27, 2023, 4:45 a.m. UTC | #3 
On Fri, 27 Oct 2023 at 03:21, Masahisa Kojima
<masahisa.kojima@linaro.org> wrote:
>
> Hi Ilias,
>
> On Fri, 27 Oct 2023 at 03:58, Ilias Apalodimas
> <ilias.apalodimas@linaro.org> wrote:
> >
> > On Wed, 25 Oct 2023 at 09:52, Masahisa Kojima
> > <masahisa.kojima@linaro.org> wrote:
> > >
> > > There are two kinds of NOR flash layout for the Developerbox.
> > > Capsule update for the old layout is no longer available since
> > > it has small capacity for secure world images and can not
> > > house the TA such as fTPM.
> > > This commit removes the definition related to the obsolete
> > > NOR flash layout for the UEFI capsule update.
> > >
> > > Signed-off-by: Masahisa Kojima <masahisa.kojima@linaro.org>
> > > Acked-by: Jassi Brar <jaswinder.singh@linaro.org>
> > > ---
> > >  include/configs/synquacer.h | 19 -------------------
> > >  1 file changed, 19 deletions(-)
> > >
> > > diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h
> > > index cd7359c2f8..e36e63e81e 100644
> > > --- a/include/configs/synquacer.h
> > > +++ b/include/configs/synquacer.h
> > > @@ -40,20 +40,6 @@
> > >
> > >  /* Since U-Boot 64bit PCIe support is limited, disable 64bit MMIO support */
> > >
> > > -#ifdef CONFIG_FWU_MULTI_BANK_UPDATE
> > > -#define DEFAULT_DFU_ALT_INFO
> > > -#else
> > > -#define DEFAULT_DFU_ALT_INFO "dfu_alt_info="                           \
> > > -                       "mtd nor1=u-boot.bin raw 200000 100000;"        \
> > > -                       "fip.bin raw 180000 78000;"                     \
> > > -                       "optee.bin raw 500000 100000\0"
> > > -#endif
> >
> > We don't need any of these because we use the .dfu_alt_string to
> > generate those right?
>
> You are correct. We can generate dfu_alt_info from .dfu_string.
>
> Thanks,
> Masahisa Kojima
>
> >
> > > -
> > > -/* GUIDs for capsule updatable firmware images */
> > > -#define DEVELOPERBOX_UBOOT_IMAGE_GUID \
> > > -       EFI_GUID(0x53a92e83, 0x4ef4, 0x473a, 0x8b, 0x0d, \
> > > -                0xb5, 0xd8, 0xc7, 0xb2, 0xd6, 0x00)
> > > -
> > >  #ifdef CONFIG_FWU_MULTI_BANK_UPDATE
> > >  #define DEVELOPERBOX_FIP_IMAGE_GUID \
> > >         EFI_GUID(0x7d6dc310, 0x52ca, 0x43b8, 0xb7, 0xb9, \
> > > @@ -64,10 +50,6 @@
> > >                  0x33, 0xe0, 0xb9, 0x16, 0xf3, 0x98)
> > >  #endif
> > >
> > > -#define DEVELOPERBOX_OPTEE_IMAGE_GUID \
> > > -       EFI_GUID(0xc1b629f1, 0xce0e, 0x4894, 0x82, 0xbf, \
> > > -                0xf0, 0xa3, 0x83, 0x87, 0xe6, 0x30)
> > > -
> > >  /* Distro boot settings */
> > >  #ifdef CONFIG_CMD_USB
> > >  #define BOOT_TARGET_DEVICE_USB(func)   func(USB, usb, 0)
> > > @@ -107,7 +89,6 @@
> > >         "ramdisk_addr_r=0xa0000000\0"           \
> > >         "scriptaddr=0x88000000\0"               \
> > >         "pxefile_addr_r=0x88100000\0"           \
> > > -       DEFAULT_DFU_ALT_INFO                    \
> > >         BOOTENV
> > >
> > >  #endif /* __CONFIG_H */
> > > --
> > > 2.34.1
> > >
> > Thanks
> > /Ilias

Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Tom Rini Oct. 31, 2023, 5:46 p.m. UTC | #4 
On Wed, Oct 25, 2023 at 03:51:01PM +0900, Masahisa Kojima wrote:

> There are two kinds of NOR flash layout for the Developerbox.
> Capsule update for the old layout is no longer available since
> it has small capacity for secure world images and can not
> house the TA such as fTPM.
> This commit removes the definition related to the obsolete
> NOR flash layout for the UEFI capsule update.
> 
> Signed-off-by: Masahisa Kojima <masahisa.kojima@linaro.org>
> Acked-by: Jassi Brar <jaswinder.singh@linaro.org>
> Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h
index cd7359c2f8..e36e63e81e 100644
--- a/include/configs/synquacer.h
+++ b/include/configs/synquacer.h
@@ -40,20 +40,6 @@ 
 
 /* Since U-Boot 64bit PCIe support is limited, disable 64bit MMIO support */
 
-#ifdef CONFIG_FWU_MULTI_BANK_UPDATE
-#define DEFAULT_DFU_ALT_INFO
-#else
-#define DEFAULT_DFU_ALT_INFO "dfu_alt_info="				\
-			"mtd nor1=u-boot.bin raw 200000 100000;"	\
-			"fip.bin raw 180000 78000;"			\
-			"optee.bin raw 500000 100000\0"
-#endif
-
-/* GUIDs for capsule updatable firmware images */
-#define DEVELOPERBOX_UBOOT_IMAGE_GUID \
-	EFI_GUID(0x53a92e83, 0x4ef4, 0x473a, 0x8b, 0x0d, \
-		 0xb5, 0xd8, 0xc7, 0xb2, 0xd6, 0x00)
-
 #ifdef CONFIG_FWU_MULTI_BANK_UPDATE
 #define DEVELOPERBOX_FIP_IMAGE_GUID \
 	EFI_GUID(0x7d6dc310, 0x52ca, 0x43b8, 0xb7, 0xb9, \
@@ -64,10 +50,6 @@ 
 		 0x33, 0xe0, 0xb9, 0x16, 0xf3, 0x98)
 #endif
 
-#define DEVELOPERBOX_OPTEE_IMAGE_GUID \
-	EFI_GUID(0xc1b629f1, 0xce0e, 0x4894, 0x82, 0xbf, \
-		 0xf0, 0xa3, 0x83, 0x87, 0xe6, 0x30)
-
 /* Distro boot settings */
 #ifdef CONFIG_CMD_USB
 #define BOOT_TARGET_DEVICE_USB(func)	func(USB, usb, 0)
@@ -107,7 +89,6 @@ 
 	"ramdisk_addr_r=0xa0000000\0"		\
 	"scriptaddr=0x88000000\0"		\
 	"pxefile_addr_r=0x88100000\0"		\
-	DEFAULT_DFU_ALT_INFO			\
 	BOOTENV
 
 #endif /* __CONFIG_H */