diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2023-03-22 11:48:42 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-03-22 11:48:42 +0100 |
| commit | 50af0029486fbc7325f9e51213b780de789e282c (patch) | |
| tree | 48c6f1fee61d941137ae87706d3a0bb10d70e274 /common | |
| parent | aeffc1b967dfabbd5b94fcdda048d10631a51b78 (diff) | |
| download | barebox-50af0029486fbc7325f9e51213b780de789e282c.tar.gz | |
Revert "boards: qemu-virt: support passing in FIT public key"
This reverts commit 9ac80cbb7b526bc6fe5f68b6c906ca086dd8da05.
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, 2 insertions, 14 deletions
diff --git a/common/boards/qemu-virt/Makefile b/common/boards/qemu-virt/Makefile index 00bfdfbda6..88184e9a79 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 fitimage-pubkey.dtb.o +obj-y += overlay-of-flash.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 e1202034f5..d0f4412cde 100644 --- a/common/boards/qemu-virt/board.c +++ b/common/boards/qemu-virt/board.c @@ -35,11 +35,10 @@ 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, *pubkey; + struct device_node *overlay; void (*init)(void); init = device_get_match_data(dev); @@ -48,10 +47,6 @@ 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 deleted file mode 100644 index 497799fa4b..0000000000 --- a/common/boards/qemu-virt/fitimage-pubkey.dts +++ /dev/null @@ -1,7 +0,0 @@ -/dts-v1/; - -#ifdef CONFIG_BOOTM_FITIMAGE_PUBKEY -#include CONFIG_BOOTM_FITIMAGE_PUBKEY -#endif - -/{ }; |