aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSughosh Ganu <sughosh.ganu@linaro.org>2022-11-10 22:34:30 +0530
committerSimon Glass <sjg@chromium.org>2022-11-22 15:13:35 -0700
commit0524bfc2976f3d8f2e3a693eedfcad1299e91a94 (patch)
tree774e76a47880ab31bb1d6c5dd747a440a9490b33
parentb3a680a47abfdd5fa4086bab53891f3a4e798d74 (diff)
downloadu-boot-0524bfc2976f3d8f2e3a693eedfcad1299e91a94.zip
u-boot-0524bfc2976f3d8f2e3a693eedfcad1299e91a94.tar.gz
u-boot-0524bfc2976f3d8f2e3a693eedfcad1299e91a94.tar.bz2
sandbox: Move the capsule GUID declarations to board file
The sandbox config file is to be removed. Move the GUID declarations needed for capsule update functionality to the board file where they are used. Signed-off-by: Sughosh Ganu <sughosh.ganu@linaro.org> Reviewed-by: Simon Glass <sjg@chromium.org>
-rw-r--r--board/sandbox/sandbox.c13
-rw-r--r--include/configs/sandbox.h13
2 files changed, 13 insertions, 13 deletions
diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c
index 4d89f9b..4c655df 100644
--- a/board/sandbox/sandbox.c
+++ b/board/sandbox/sandbox.c
@@ -30,6 +30,19 @@
gd_t *gd;
#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT)
+/* GUIDs for capsule updatable firmware images */
+#define SANDBOX_UBOOT_IMAGE_GUID \
+ EFI_GUID(0x09d7cf52, 0x0720, 0x4710, 0x91, 0xd1, \
+ 0x08, 0x46, 0x9b, 0x7f, 0xe9, 0xc8)
+
+#define SANDBOX_UBOOT_ENV_IMAGE_GUID \
+ EFI_GUID(0x5a7021f5, 0xfef2, 0x48b4, 0xaa, 0xba, \
+ 0x83, 0x2e, 0x77, 0x74, 0x18, 0xc0)
+
+#define SANDBOX_FIT_IMAGE_GUID \
+ EFI_GUID(0x3673b45d, 0x6a7c, 0x46f3, 0x9e, 0x60, \
+ 0xad, 0xab, 0xb0, 0x3f, 0x79, 0x37)
+
struct efi_fw_image fw_images[] = {
#if defined(CONFIG_EFI_CAPSULE_FIRMWARE_RAW)
{
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 5168e2f..0dcb2eb 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -10,19 +10,6 @@
#define CONFIG_MALLOC_F_ADDR 0x0010000
-/* GUIDs for capsule updatable firmware images */
-#define SANDBOX_UBOOT_IMAGE_GUID \
- EFI_GUID(0x09d7cf52, 0x0720, 0x4710, 0x91, 0xd1, \
- 0x08, 0x46, 0x9b, 0x7f, 0xe9, 0xc8)
-
-#define SANDBOX_UBOOT_ENV_IMAGE_GUID \
- EFI_GUID(0x5a7021f5, 0xfef2, 0x48b4, 0xaa, 0xba, \
- 0x83, 0x2e, 0x77, 0x74, 0x18, 0xc0)
-
-#define SANDBOX_FIT_IMAGE_GUID \
- EFI_GUID(0x3673b45d, 0x6a7c, 0x46f3, 0x9e, 0x60, \
- 0xad, 0xab, 0xb0, 0x3f, 0x79, 0x37)
-
/* Size of our emulated memory */
#define SB_CONCAT(x, y) x ## y
#define SB_TO_UL(s) SB_CONCAT(s, UL)