diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2023-02-10 17:53:53 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-03-10 11:20:12 +0100 |
| commit | 9ac80cbb7b526bc6fe5f68b6c906ca086dd8da05 (patch) | |
| tree | 5b7e6644bec4e591f72d27e7585cf2ca2c259291 /common | |
| parent | f517a02bf8580446a54e62dea54a7275ad8728cc (diff) | |
| download | barebox-9ac80cbb7b526bc6fe5f68b6c906ca086dd8da05.tar.gz | |
boards: qemu-virt: support passing in FIT public key
FIT public key is usually passed in via board DT. Usual way to use
barebox with QEMU Virt however is to use DT supplied by Qemu and apply
overlay to it. mkimage doesn't generate overlay DTB though. To make
barbebox Qemu Virt behave like other boards, let's define a dummy DT
that includes CONFIG_BOOTM_FITIMAGE_PUBKEY, which is merged with the
barebox live device tree.
Suggested-by: Jan Lübbe <jlu@pengutronix.de>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Tested-by: Jan Lübbe <jlu@pengutronix.de>
Link: https://lore.barebox.org/20230210165353.3601175-4-a.fatoum@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common')
| -rw-r--r-- | common/boards/qemu-virt/Makefile | 2 | ||||
| -rw-r--r-- | common/boards/qemu-virt/board.c | 7 | ||||
| -rw-r--r-- | common/boards/qemu-virt/fitimage-pubkey.dts | 7 |
3 files changed, 14 insertions, 2 deletions
diff --git a/common/boards/qemu-virt/Makefile b/common/boards/qemu-virt/Makefile index 88184e9a79..00bfdfbda6 100644 --- a/common/boards/qemu-virt/Makefile +++ b/common/boards/qemu-virt/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only obj-y += board.o -obj-y += overlay-of-flash.dtb.o +obj-y += overlay-of-flash.dtb.o fitimage-pubkey.dtb.o ifeq ($(CONFIG_RISCV),y) DTC_CPP_FLAGS_overlay-of-flash.dtb := -DRISCV_VIRT=1 endif diff --git a/common/boards/qemu-virt/board.c b/common/boards/qemu-virt/board.c index ec92ae94ae..2669e9de5a 100644 --- a/common/boards/qemu-virt/board.c +++ b/common/boards/qemu-virt/board.c @@ -35,10 +35,11 @@ static inline void arm_virt_init(void) {} #endif extern char __dtb_overlay_of_flash_start[]; +extern char __dtb_fitimage_pubkey_start[]; static int virt_probe(struct device *dev) { - struct device_node *overlay; + struct device_node *overlay, *pubkey; void (*init)(void); init = device_get_match_data(dev); @@ -47,6 +48,10 @@ static int virt_probe(struct device *dev) overlay = of_unflatten_dtb(__dtb_overlay_of_flash_start, INT_MAX); of_overlay_apply_tree(dev->of_node, overlay); + + pubkey = of_unflatten_dtb(__dtb_fitimage_pubkey_start, INT_MAX); + of_merge_nodes(dev->of_node, pubkey); + /* of_probe() will happen later at of_populate_initcall */ return 0; diff --git a/common/boards/qemu-virt/fitimage-pubkey.dts b/common/boards/qemu-virt/fitimage-pubkey.dts new file mode 100644 index 0000000000..497799fa4b --- /dev/null +++ b/common/boards/qemu-virt/fitimage-pubkey.dts @@ -0,0 +1,7 @@ +/dts-v1/; + +#ifdef CONFIG_BOOTM_FITIMAGE_PUBKEY +#include CONFIG_BOOTM_FITIMAGE_PUBKEY +#endif + +/{ }; |