Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-25 14:56:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge patch series "binman: ti: create binman nodes for EFI capsules"

Browse source 
Jonathan Humphreys <j-humphreys@ti.com> says:

Add binman nodes for EFI capsules of firmware components so that capsules
are automatically created during the UBoot builds.

This is enabled for several TI SoC based platforms: AM64, AM62, AM62p,
BeaglePlay, AM69, J7, and BeagleboneAI.
This commit is contained in:
Tom Rini 2024-06-14 08:59:01 -06:00
commit e7404a804f
12 changed files with 327 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi
View file

@ -214,6 +214,33 @@
}; };
}; };
}; };
#include "k3-binman-capsule.dtsi"
// Capsule update GUIDs in string form. See beagleplay.h
#define BEAGLEPLAY_SPL_IMAGE_GUID_STR "b2e7cc49-1a5a-4036-ae01-3387c3bef657"
#define BEAGLEPLAY_UBOOT_IMAGE_GUID_STR "92c92b11-a7ee-486f-aaa2-713d84425b0e"
&capsule_tispl {
efi-capsule {
image-guid = BEAGLEPLAY_SPL_IMAGE_GUID_STR;
blob {
filename = "tispl.bin_unsigned";
};
};
};
&capsule_uboot {
efi-capsule {
image-guid = BEAGLEPLAY_UBOOT_IMAGE_GUID_STR;
blob {
filename = "u-boot.img_unsigned";
};
};
};
#endif #endif
&main_bcdma { &main_bcdma {

15
arch/arm/dts/k3-am625-r5-beagleplay.dts
View file

@ -114,3 +114,18 @@
}; };
}; };
#include "k3-binman-capsule-r5.dtsi"
// Capsule update GUIDs in string form. See beagleplay.h
#define BEAGLEPLAY_TIBOOT3_IMAGE_GUID_STR "0e225a09-f720-4d57-9120-e28f737f5a5e"
&capsule_tiboot3 {
efi-capsule {
image-guid = BEAGLEPLAY_TIBOOT3_IMAGE_GUID_STR;
blob {
filename = "tiboot3-am62x-gp-evm.bin";
};
};
};

30
arch/arm/dts/k3-am625-sk-binman.dtsi
View file

@ -137,6 +137,17 @@
}; };
}; };
#include "k3-binman-capsule-r5.dtsi"
// Capsule update GUIDs in string form. See am62x_evm.h
#define AM62X_SK_TIBOOT3_IMAGE_GUID_STR "abcb83d2-9cb6-4351-b8f1-6494bbe3700a"
&capsule_tiboot3 {
efi-capsule {
image-guid = AM62X_SK_TIBOOT3_IMAGE_GUID_STR;
};
};
#endif #endif
#ifdef CONFIG_TARGET_AM625_A53_EVM #ifdef CONFIG_TARGET_AM625_A53_EVM
@ -453,4 +464,23 @@
}; };
}; };
}; };
#include "k3-binman-capsule.dtsi"
// Capsule update GUIDs in string form. See am62x_evm.h
#define AM62X_SK_SPL_IMAGE_GUID_STR "aee355fc-bf97-4264-8c82-437255efdc1d"
#define AM62X_SK_UBOOT_IMAGE_GUID_STR "28ab8c6c-fca8-41d3-8ea1-5f171b7d2929"
&capsule_tispl {
efi-capsule {
image-guid = AM62X_SK_SPL_IMAGE_GUID_STR;
};
};
&capsule_uboot {
efi-capsule {
image-guid = AM62X_SK_UBOOT_IMAGE_GUID_STR;
};
};
#endif #endif

29
arch/arm/dts/k3-am62p-sk-binman.dtsi
View file

@ -59,6 +59,17 @@
}; };
}; };
#include "k3-binman-capsule-r5.dtsi"
// Capsule update GUIDs in string form. See am62px_evm.h
#define AM62PX_SK_TIBOOT3_IMAGE_GUID_STR "b08471b7-be2d-4489-87a1-cab28a0cf743"
&capsule_tiboot3 {
efi-capsule {
image-guid = AM62PX_SK_TIBOOT3_IMAGE_GUID_STR;
};
};
#endif /* CONFIG_TARGET_AM62P5_R5_EVM */ #endif /* CONFIG_TARGET_AM62P5_R5_EVM */
#if IS_ENABLED(CONFIG_TARGET_AM62P5_A53_EVM) #if IS_ENABLED(CONFIG_TARGET_AM62P5_A53_EVM)
@ -171,4 +182,22 @@
}; };
}; };
#include "k3-binman-capsule.dtsi"
// Capsule update GUIDs in string form. See am62px_evm.h
#define AM62PX_SK_SPL_IMAGE_GUID_STR "d02ed781-6d71-4c1a-a999-3c6a41c36324"
#define AM62PX_SK_UBOOT_IMAGE_GUID_STR "7e6aea51-965c-44ab-b388-daeb03b54f66"
&capsule_tispl {
efi-capsule {
image-guid = AM62PX_SK_SPL_IMAGE_GUID_STR;
};
};
&capsule_uboot {
efi-capsule {
image-guid = AM62PX_SK_UBOOT_IMAGE_GUID_STR;
};
};
#endif /* CONFIG_TARGET_AM62P5_A53_EVM */ #endif /* CONFIG_TARGET_AM62P5_A53_EVM */

30
arch/arm/dts/k3-am64x-binman.dtsi
View file

@ -114,6 +114,17 @@
}; };
}; };
#include "k3-binman-capsule-r5.dtsi"
// Capsule update GUIDs in string form. See am64x_evm.h
#define AM64X_SK_TIBOOT3_IMAGE_GUID_STR "ede0a0d5-9116-4bfb-aa54-09e97b5afe1a"
&capsule_tiboot3 {
efi-capsule {
image-guid = AM64X_SK_TIBOOT3_IMAGE_GUID_STR;
};
};
#endif #endif
#ifdef CONFIG_TARGET_AM642_A53_EVM #ifdef CONFIG_TARGET_AM642_A53_EVM
@ -373,4 +384,23 @@
}; };
}; };
}; };
#include "k3-binman-capsule.dtsi"
// Capsule update GUIDs in string form. See am64x_evm.h
#define AM64X_SK_SPL_IMAGE_GUID_STR "77678f5c-64d4-4910-ad75-52c9d95cdb1d"
#define AM64X_SK_UBOOT_IMAGE_GUID_STR "c6ad43a9-7d31-4f5d-83e9-b8efecae05bf"
&capsule_tispl {
efi-capsule {
image-guid = AM64X_SK_SPL_IMAGE_GUID_STR;
};
};
&capsule_uboot {
efi-capsule {
image-guid = AM64X_SK_UBOOT_IMAGE_GUID_STR;
};
};
#endif #endif

21
arch/arm/dts/k3-binman-capsule-r5.dtsi Normal file
View file

@ -0,0 +1,21 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (C) 2024 Texas Instruments Incorporated - https://www.ti.com/
*/
&binman {
capsule_tiboot3: capsule-tiboot3 {
filename = "tiboot3-capsule.bin";
efi-capsule {
image-index = <0x1>;
image-guid = "00000000-0000-0000-0000-000000000000";
private-key = "arch/arm/mach-k3/keys/custMpk.pem";
public-key-cert = "arch/arm/mach-k3/keys/custMpk.crt";
monotonic-count = <0x1>;
blob {
filename = "tiboot3.bin";
};
};
};
};

38
arch/arm/dts/k3-binman-capsule.dtsi Normal file
View file

@ -0,0 +1,38 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (C) 2024 Texas Instruments Incorporated - https://www.ti.com/
*/
&binman {
capsule_tispl: capsule-tispl {
filename = "tispl-capsule.bin";
efi-capsule {
image-index = <0x2>;
image-guid = "00000000-0000-0000-0000-000000000000";
private-key = "arch/arm/mach-k3/keys/custMpk.pem";
public-key-cert = "arch/arm/mach-k3/keys/custMpk.crt";
monotonic-count = <0x1>;
blob {
filename = "tispl.bin";
};
};
};
};
&binman {
capsule_uboot: capsule-uboot {
filename = "uboot-capsule.bin";
efi-capsule {
image-index = <0x3>;
image-guid = "00000000-0000-0000-0000-000000000000";
private-key = "arch/arm/mach-k3/keys/custMpk.pem";
public-key-cert = "arch/arm/mach-k3/keys/custMpk.crt";
monotonic-count = <0x1>;
blob {
filename = "u-boot.img";
};
};
};
};

23
arch/arm/dts/k3-j721e-beagleboneai64-u-boot.dtsi
View file

@ -351,4 +351,27 @@
}; };
}; };
}; };
#include "k3-binman-capsule.dtsi"
// Capsule update GUIDs in string form. See beagleboneai64.h
#define BEAGLEBONEAI64_SPL_IMAGE_GUID_STR "83447222-1e26-40cd-a395-b7de0957e875"
#define BEAGLEBONEAI64_UBOOT_IMAGE_GUID_STR "4249ff77-c17d-4eb7-a1db-45aa9887d49e"
&capsule_tispl {
efi-capsule {
image-guid = BEAGLEBONEAI64_SPL_IMAGE_GUID_STR;
blob {
filename = "tispl.bin_unsigned";
};
};
};
&capsule_uboot {
efi-capsule {
image-guid = BEAGLEBONEAI64_UBOOT_IMAGE_GUID_STR;
};
};
#endif #endif

49
arch/arm/dts/k3-j721e-binman.dtsi
View file

@ -295,6 +295,36 @@
}; };
}; };
}; };
#include "k3-binman-capsule-r5.dtsi"
// Capsule update GUIDs in string form. See j721e_evm.h
#define J721E_SK_TIBOOT3_IMAGE_GUID_STR "e672b518-7cd7-4014-bd8d-40724d0ad4dc"
#define J721E_SK_SYSFW_IMAGE_GUID_STR "6fd10680-361b-431f-80aa-899455819e11"
&capsule_tiboot3 {
efi-capsule {
image-guid = J721E_SK_TIBOOT3_IMAGE_GUID_STR;
};
};
&binman {
capsule-sysfw {
filename = "sysfw-capsule.bin";
efi-capsule {
image-index = <0x4>;
image-guid = J721E_SK_SYSFW_IMAGE_GUID_STR;
private-key = "arch/arm/mach-k3/keys/custMpk.pem";
public-key-cert = "arch/arm/mach-k3/keys/custMpk.crt";
monotonic-count = <0x1>;
blob {
filename = "sysfw.itb";
};
};
};
};
#endif #endif
#ifdef CONFIG_TARGET_J721E_A72_EVM #ifdef CONFIG_TARGET_J721E_A72_EVM
@ -587,4 +617,23 @@
}; };
}; };
}; };
#include "k3-binman-capsule.dtsi"
// Capsule update GUIDs in string form. See j721e_evm.h
#define J721E_SK_SPL_IMAGE_GUID_STR "86f710ad-10cf-46ea-ac67-856ae06efad2"
#define J721E_SK_UBOOT_IMAGE_GUID_STR "81b58fb0-3b00-4add-a20a-c185bbaca1ed"
&capsule_tispl {
efi-capsule {
image-guid = J721E_SK_SPL_IMAGE_GUID_STR;
};
};
&capsule_uboot {
efi-capsule {
image-guid = J721E_SK_UBOOT_IMAGE_GUID_STR;
};
};
#endif #endif

29
arch/arm/dts/k3-j721e-r5-beagleboneai64.dts
View file

@ -107,3 +107,32 @@
}; };
}; };
}; };
#include "k3-binman-capsule-r5.dtsi"
// Capsue update GUIDs. See beagleboneai64.h.
#define BEAGLEBONEAI64_TIBOOT3_IMAGE_GUID_STR "772a4810-2194-4923-8754-0115870ef367"
#define BEAGLEBONEAI64_SYSFW_IMAGE_GUID_STR "dfc9c683-49b7-46bd-b3c1-3a3b2fdb135b"
&capsule_tiboot3 {
efi-capsule {
image-guid = BEAGLEBONEAI64_TIBOOT3_IMAGE_GUID_STR;
};
};
&binman {
capsule-sysfw {
filename = "sysfw-capsule.bin";
efi-capsule {
image-index = <0x4>;
image-guid = BEAGLEBONEAI64_SYSFW_IMAGE_GUID_STR;
private-key = "arch/arm/mach-k3/keys/custMpk.pem";
public-key-cert = "arch/arm/mach-k3/keys/custMpk.crt";
monotonic-count = <0x1>;
blob {
filename = "sysfw.itb";
};
};
};
};

35
arch/arm/dts/k3-j784s4-binman.dtsi
View file

@ -157,6 +157,22 @@
}; };
}; };
#include "k3-binman-capsule-r5.dtsi"
// Capsule update GUIDs in string form. See j784s4_evm.h
#define AM69_SK_TIBOOT3_IMAGE_GUID_STR "adf49ec5-61bb-4dbe-8b8d-39df4d7ebf46"
&capsule_tiboot3 {
efi-capsule {
image-guid = AM69_SK_TIBOOT3_IMAGE_GUID_STR;
blob {
filename = "tiboot3-j784s4-hs-fs-evm.bin";
};
};
};
#endif #endif
#ifdef CONFIG_TARGET_J784S4_A72_EVM #ifdef CONFIG_TARGET_J784S4_A72_EVM
@ -343,4 +359,23 @@
}; };
}; };
}; };
#include "k3-binman-capsule.dtsi"
// Capsule update GUIDs in string form. See j784s4_evm.h
#define AM69_SK_SPL_IMAGE_GUID_STR "787f0059-63a1-461c-a18e-9d838345fe8e"
#define AM69_SK_UBOOT_IMAGE_GUID_STR "9300505d-6ec5-4ff8-99e4-5459a04be617"
&capsule_tispl {
efi-capsule {
image-guid = AM69_SK_SPL_IMAGE_GUID_STR;
};
};
&capsule_uboot {
efi-capsule {
image-guid = AM69_SK_UBOOT_IMAGE_GUID_STR;
};
};
#endif #endif

2
tools/Kconfig
View file

@ -98,7 +98,7 @@ config TOOLS_SHA512
config TOOLS_MKEFICAPSULE config TOOLS_MKEFICAPSULE
bool "Build efimkcapsule command" bool "Build efimkcapsule command"
default y if EFI_CAPSULE_ON_DISK default y if EFI_LOADER
help help
This command allows users to create a UEFI capsule file and, This command allows users to create a UEFI capsule file and,
optionally sign that file. If you want to enable UEFI capsule optionally sign that file. If you want to enable UEFI capsule