From d167062c48a822ae754f1b1c75e97233184b8a0e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 18 Aug 2023 15:54:10 +0100 Subject: boot: Fix reference to bootmenu doc The Kconfig references a readme file that's moved and converted to rst so update the reference. Signed-off-by: Peter Robinson Reviewed-by: Simon Glass --- boot/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/Kconfig b/boot/Kconfig index e8fb03b8016..86c2787dc53 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -1439,7 +1439,7 @@ config AUTOBOOT_MENU_SHOW This enables the boot menu, controlled by environment variables defined by the board. The menu starts after running the 'preboot' environmnent variable (if enabled) and before handling the boot delay. - See README.bootmenu for more details. + See doc/usage/cmd/bootmenu.rst for more details. config BOOTMENU_DISABLE_UBOOT_CONSOLE bool "Disallow bootmenu to enter the U-Boot console" -- cgit v1.3.1 From d389efc44898f9b5b3d07e810253b6fb73c55e3c Mon Sep 17 00:00:00 2001 From: Frank Wunderlich Date: Thu, 3 Aug 2023 18:52:58 +0200 Subject: arm: dts: mediatek: convert gmac link mode to 2500base-x for r3 Ethernet on Bananapi-r3 is broken after commit bd70f3cea353 ("net: mediatek: add support for SGMII 1Gbps auto-negotiation mode") because changes from this commit were not applied to bpi-r3 devicetree too: commit aef54ea16cac ("arm: dts: medaitek: convert gmac link mode to 2500base-x") Signed-off-by: Frank Wunderlich Reviewed-by: Weijie Gao --- arch/arm/dts/mt7986a-bpi-r3-sd.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/mt7986a-bpi-r3-sd.dts b/arch/arm/dts/mt7986a-bpi-r3-sd.dts index 15256302b86..c156a813634 100644 --- a/arch/arm/dts/mt7986a-bpi-r3-sd.dts +++ b/arch/arm/dts/mt7986a-bpi-r3-sd.dts @@ -76,12 +76,12 @@ ð { status = "okay"; mediatek,gmac-id = <0>; - phy-mode = "sgmii"; + phy-mode = "2500base-x"; mediatek,switch = "mt7531"; reset-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>; fixed-link { - speed = <1000>; + speed = <2500>; full-duplex; }; }; -- cgit v1.3.1 From 5986d46f8efb20532d494242fccb051267f92e1a Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 19 Aug 2023 16:49:35 -0600 Subject: bootstd: Adjust the default bootmeth order The existing distro scripts check extlinux and scripts before EFI. Adjust the default ordering to do the same, to avoid breaking existing flows. Add some documentation, mentioning that this order will likely change in future. Signed-off-by: Simon Glass Reported-by: Da Xue --- boot/bootmeth_extlinux.c | 3 ++- boot/bootmeth_script.c | 3 ++- doc/develop/bootstd.rst | 8 +++++++- test/boot/bootflow.c | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/boot/bootmeth_extlinux.c b/boot/bootmeth_extlinux.c index 6b2b8400383..aa2a4591ebd 100644 --- a/boot/bootmeth_extlinux.c +++ b/boot/bootmeth_extlinux.c @@ -184,7 +184,8 @@ static const struct udevice_id extlinux_bootmeth_ids[] = { { } }; -U_BOOT_DRIVER(bootmeth_extlinux) = { +/* Put an number before 'extlinux' to provide a default ordering */ +U_BOOT_DRIVER(bootmeth_1extlinux) = { .name = "bootmeth_extlinux", .id = UCLASS_BOOTMETH, .of_match = extlinux_bootmeth_ids, diff --git a/boot/bootmeth_script.c b/boot/bootmeth_script.c index a4050c384df..58c57a2d4b5 100644 --- a/boot/bootmeth_script.c +++ b/boot/bootmeth_script.c @@ -243,7 +243,8 @@ static const struct udevice_id script_bootmeth_ids[] = { { } }; -U_BOOT_DRIVER(bootmeth_script) = { +/* Put an number before 'script' to provide a default ordering */ +U_BOOT_DRIVER(bootmeth_2script) = { .name = "bootmeth_script", .id = UCLASS_BOOTMETH, .of_match = script_bootmeth_ids, diff --git a/doc/develop/bootstd.rst b/doc/develop/bootstd.rst index ec313653578..c47de273ab1 100644 --- a/doc/develop/bootstd.rst +++ b/doc/develop/bootstd.rst @@ -132,6 +132,9 @@ above bootdev scanning. Controlling ordering -------------------- +By default, faster bootdevs (or those which are assumed to be faster) are used +first, since they are more likely to be able to boot the device quickly. + Several options are available to control the ordering of boot scanning: @@ -151,6 +154,10 @@ bootdevs and their sequence numbers. bootmeths ~~~~~~~~~ +By default bootmeths are checked in name order. Use `bootmeth list` to see the +ordering. Note that the `extlinux` and `script` bootmeth is first, to preserve the behaviour +used by the old distro scripts. + This environment variable can be used to control the list of bootmeths used and their ordering for example:: @@ -164,7 +171,6 @@ controlled by aliases. The :ref:`usage/cmd/bootmeth:bootmeth command` (`bootmeth order`) operates in the same way as setting this variable. - Bootdev uclass -------------- diff --git a/test/boot/bootflow.c b/test/boot/bootflow.c index 8a4e090e9bc..1c91a942e98 100644 --- a/test/boot/bootflow.c +++ b/test/boot/bootflow.c @@ -27,7 +27,7 @@ DECLARE_GLOBAL_DATA_PTR; -extern U_BOOT_DRIVER(bootmeth_script); +extern U_BOOT_DRIVER(bootmeth_2script); static int inject_response(struct unit_test_state *uts) { @@ -525,7 +525,7 @@ static int prep_mmc4_bootdev(struct unit_test_state *uts) /* Enable the script bootmeth too */ ut_assertok(uclass_first_device_err(UCLASS_BOOTSTD, &bootstd)); - ut_assertok(device_bind(bootstd, DM_DRIVER_REF(bootmeth_script), + ut_assertok(device_bind(bootstd, DM_DRIVER_REF(bootmeth_2script), "bootmeth_script", 0, ofnode_null(), &dev)); /* Change the order to include mmc4 */ -- cgit v1.3.1 From b982a850d04c1fac04df676b28d93ad26f6984d0 Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Mon, 21 Aug 2023 08:59:10 -0500 Subject: configs: Enable CONFIG_DM_SCSI in am57xx_hs_evm_usb This should have already been enabled but was missed when converting the base platform defconfig, fix this here. Fixes: 3c5aa6caccab ("configs: Enable CONFIG_BLK in am57xx_evm and am57xx_hs_evm") Signed-off-by: Andrew Davis Reviewed-by: Tom Rini Reviewed-by: Simon Glass --- configs/am57xx_hs_evm_usb_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/am57xx_hs_evm_usb_defconfig b/configs/am57xx_hs_evm_usb_defconfig index 404e714d4f0..9ed59ac9aec 100644 --- a/configs/am57xx_hs_evm_usb_defconfig +++ b/configs/am57xx_hs_evm_usb_defconfig @@ -70,7 +70,7 @@ CONFIG_NET_RETRY_COUNT=10 CONFIG_BOOTP_SEND_HOSTNAME=y CONFIG_SPL_DM=y CONFIG_SPL_DM_SEQ_ALIAS=y -CONFIG_SCSI_AHCI=y +CONFIG_DWC_AHCI=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_USB_FUNCTION_FASTBOOT=y @@ -102,7 +102,7 @@ CONFIG_PMIC_PALMAS=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_PALMAS=y CONFIG_PALMAS_POWER=y -CONFIG_SCSI_AHCI_PLAT=y +CONFIG_DM_SCSI=y CONFIG_DM_SERIAL=y CONFIG_SPI=y CONFIG_DM_SPI=y -- cgit v1.3.1 From dcde1f95bfa6d634f0cf7b7c0f6f71b3c08c6fa2 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Mon, 21 Aug 2023 20:38:23 +0100 Subject: configs: set CONFIG_LMB_MAX_REGIONS=64 for MT7988 boards Similar to MT7981 and MT7986 also MT7988 can have a high number of reserved-memory regions used by the various hardware offloading subsystems. Raise CONFIG_LMB_MAX_REGIONS to 64 to avoid errors when trying to boot Linux with more then 6 reserved regions: ERROR: reserving fdt memory region failed (addr=4f700000 size=240000 flags=4) ERROR: reserving fdt memory region failed (addr=15194000 size=1000 flags=4) ERROR: reserving fdt memory region failed (addr=15294000 size=1000 flags=4) ERROR: reserving fdt memory region failed (addr=15394000 size=1000 flags=4) ERROR: Failed to allocate 0xb161 bytes below 0x80000000. device tree - allocation error Fixes: bc4adc97cfb ("board: mediatek: add MT7988 reference boards") Reported-by: Lorenzo Bianconi Signed-off-by: Daniel Golle --- configs/mt7988_rfb_defconfig | 1 + configs/mt7988_sd_rfb_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/configs/mt7988_rfb_defconfig b/configs/mt7988_rfb_defconfig index dc97bb36ea7..ced52edecf0 100644 --- a/configs/mt7988_rfb_defconfig +++ b/configs/mt7988_rfb_defconfig @@ -81,3 +81,4 @@ CONFIG_MTK_SPIM=y CONFIG_LZO=y CONFIG_HEXDUMP=y # CONFIG_EFI_LOADER is not set +CONFIG_LMB_MAX_REGIONS=64 diff --git a/configs/mt7988_sd_rfb_defconfig b/configs/mt7988_sd_rfb_defconfig index 421999da869..670f5eae185 100644 --- a/configs/mt7988_sd_rfb_defconfig +++ b/configs/mt7988_sd_rfb_defconfig @@ -69,3 +69,4 @@ CONFIG_MTK_SPIM=y CONFIG_LZO=y CONFIG_HEXDUMP=y # CONFIG_EFI_LOADER is not set +CONFIG_LMB_MAX_REGIONS=64 -- cgit v1.3.1 From 04f7e9538557072500d96447438a4d35f2a64204 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sun, 20 Aug 2023 13:31:26 -0400 Subject: Azure: Set the timeout for jobs to the maximum As per current Azure Pipelines documentation we qualify for 3600 minutes per job, if specified, as the timeout. The default unspecified timeout is 60 minutes. Rework things to specify 0 as the timeout (and so maximum allowed) so that we don't have failures due to running slightly past 60 minutes total. Link: https://learn.microsoft.com/en-us/azure/devops/pipelines/process/phases?view=azure-devops&tabs=yaml#timeouts Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- .azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 53a83eef7db..0304be8a60f 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -468,6 +468,7 @@ stages: - stage: world_build jobs: - job: build_the_world + timeoutInMinutes: 0 # Use the maximum allowed displayName: 'Build the World' pool: vmImage: $(ubuntu_vm) -- cgit v1.3.1 From 70bd47198402f5faea381428639ced55e893f70b Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Wed, 23 Aug 2023 17:56:27 +0300 Subject: spl: crypto: fix including SHA* object files in SPL If one of SHA* algorithms is disabled in u-boot, its code is not included in SPL even if a given SHA* option is enabled in SPL. Fix this. Fixes: 603d15a572d ("spl: cypto: Bring back SPL_ versions of SHA") Signed-off-by: Oleksandr Suvorov Reviewed-by: Tom Rini --- lib/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index 8d8ccc8bbc3..9fa573525b8 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -72,9 +72,9 @@ obj-$(CONFIG_ECDSA) += ecdsa/ obj-$(CONFIG_$(SPL_)RSA) += rsa/ obj-$(CONFIG_HASH) += hash-checksum.o obj-$(CONFIG_BLAKE2) += blake2/blake2b.o -obj-$(CONFIG_SHA1) += sha1.o -obj-$(CONFIG_SHA256) += sha256.o -obj-$(CONFIG_SHA512) += sha512.o +obj-$(CONFIG_$(SPL_)SHA1) += sha1.o +obj-$(CONFIG_$(SPL_)SHA256) += sha256.o +obj-$(CONFIG_$(SPL_)SHA512) += sha512.o obj-$(CONFIG_CRYPT_PW) += crypt/ obj-$(CONFIG_$(SPL_)ASN1_DECODER) += asn1_decoder.o -- cgit v1.3.1 From fa140172cb6e98ee8a820289e5106cbfbdcc79c3 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Thu, 24 Aug 2023 00:12:47 +0200 Subject: MAINTAINERS: remove Wolfgang Denk Signed-off-by: Heinrich Schuchardt --- MAINTAINERS | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 84de9de5319..17309e25f28 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1015,7 +1015,6 @@ F: tools/mkeficapsule.c ENVIRONMENT M: Joe Hershberger -R: Wolfgang Denk S: Maintained F: env/ F: include/env* @@ -1025,7 +1024,6 @@ F: tools/mkenvimage.c ENVIRONMENT AS TEXT M: Simon Glass -R: Wolfgang Denk S: Maintained F: doc/usage/environment.rst F: scripts/env2string.awk @@ -1343,8 +1341,7 @@ F: drivers/power/ F: include/power/ POWERPC -M: Wolfgang Denk -S: Maintained +S: Orphan (Since 2022-10-21) F: arch/powerpc/ POWERPC MPC8XX -- cgit v1.3.1 From 98244a85507d7ba77ffab56d458eef25629271ec Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 23 Aug 2023 19:18:01 -0600 Subject: imx: Drop unneeded phandle in FIT template Adding a phandle to a template node is not allowed, since when the node is instantiated multiple times, we end up with duplicate phandles. Drop this invalid constructs. Signed-off-by: Simon Glass Acked-by: Tim Harvey --- arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi | 2 ++ arch/arm/dts/imx8mm-u-boot.dtsi | 2 +- arch/arm/dts/imx8mn-u-boot.dtsi | 2 +- arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi | 2 ++ arch/arm/dts/imx8mp-u-boot.dtsi | 4 ++-- arch/arm/dts/imx8qm-u-boot.dtsi | 2 +- arch/arm/dts/k3-am65-iot2050-boot-image.dtsi | 8 ++++---- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi b/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi index 484e31824b8..d93e1cbd8a7 100644 --- a/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi @@ -41,9 +41,11 @@ }; }; +/* This cannot work since it refers to a template node &binman_configuration { loadables = "atf", "fip"; }; +*/ &fec1 { phy-reset-gpios = <&gpio4 22 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi index 035282bf0b0..6085128e24e 100644 --- a/arch/arm/dts/imx8mm-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-u-boot.dtsi @@ -140,7 +140,7 @@ configurations { default = "@config-DEFAULT-SEQ"; - binman_configuration: @config-SEQ { + @config-SEQ { description = "NAME"; fdt = "fdt-SEQ"; firmware = "uboot"; diff --git a/arch/arm/dts/imx8mn-u-boot.dtsi b/arch/arm/dts/imx8mn-u-boot.dtsi index 5046b38e4e2..bc57566a108 100644 --- a/arch/arm/dts/imx8mn-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-u-boot.dtsi @@ -204,7 +204,7 @@ configurations { default = "@config-DEFAULT-SEQ"; - binman_configuration: @config-SEQ { + @config-SEQ { description = "NAME"; fdt = "fdt-SEQ"; firmware = "uboot"; diff --git a/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi b/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi index f3fb44046d5..c4ea536b29b 100644 --- a/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi @@ -162,6 +162,8 @@ }; }; +/* This cannot work since it refers to a template node &binman_configuration { loadables = "atf", "fip"; }; +*/ diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi index 36e7444a627..200938a9807 100644 --- a/arch/arm/dts/imx8mp-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-u-boot.dtsi @@ -146,7 +146,7 @@ type = "flat_dt"; compression = "none"; - uboot_fdt_blob: blob-ext { + blob-ext { filename = "u-boot.dtb"; }; }; @@ -155,7 +155,7 @@ configurations { default = "@config-DEFAULT-SEQ"; - binman_configuration: @config-SEQ { + @config-SEQ { description = "NAME"; fdt = "fdt-SEQ"; firmware = "uboot"; diff --git a/arch/arm/dts/imx8qm-u-boot.dtsi b/arch/arm/dts/imx8qm-u-boot.dtsi index a3e0af48109..d316e869516 100644 --- a/arch/arm/dts/imx8qm-u-boot.dtsi +++ b/arch/arm/dts/imx8qm-u-boot.dtsi @@ -112,7 +112,7 @@ configurations { default = "@config-DEFAULT-SEQ"; - binman_configuration: @config-SEQ { + @config-SEQ { description = "NAME"; fdt = "fdt-SEQ"; firmware = "uboot"; diff --git a/arch/arm/dts/k3-am65-iot2050-boot-image.dtsi b/arch/arm/dts/k3-am65-iot2050-boot-image.dtsi index 3ecb461b011..64318d09cf0 100644 --- a/arch/arm/dts/k3-am65-iot2050-boot-image.dtsi +++ b/arch/arm/dts/k3-am65-iot2050-boot-image.dtsi @@ -41,7 +41,7 @@ os = "arm-trusted-firmware"; load = ; entry = ; - atf: atf-bl31 { + atf-bl31 { }; }; @@ -53,7 +53,7 @@ os = "tee"; load = <0x9e800000>; entry = <0x9e800000>; - tee: tee-os { + tee-os { }; }; @@ -78,7 +78,7 @@ compression = "none"; load = ; entry = ; - u_boot_spl_nodtb: blob-ext { + blob-ext { filename = "spl/u-boot-spl-nodtb.bin"; }; }; @@ -88,7 +88,7 @@ type = "flat_dt"; arch = "arm"; compression = "none"; - spl_am65x_evm_dtb: blob-ext { + blob-ext { filename = "spl/dts/k3-am65-iot2050-spl.dtb"; }; }; -- cgit v1.3.1 From bbbf04cc7da1b60ed6b342700ec366f27d49546e Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 23 Aug 2023 19:18:02 -0600 Subject: Revert "binman: Add a temporary hack for duplicate phandles" The affected boards have been fixed, so drop this hack. This reverts commit 288ae53cb73605500b7fc01e5919753c878466be. Signed-off-by: Simon Glass Acked-by: Tim Harvey --- Makefile | 6 ------ tools/binman/cmdline.py | 2 -- tools/binman/control.py | 5 ----- tools/dtoc/fdt.py | 12 ++++-------- 4 files changed, 4 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 9b90204bfe6..033daf1695c 100644 --- a/Makefile +++ b/Makefile @@ -1328,11 +1328,6 @@ u-boot.ldr: u-boot # Use 'make BINMAN_VERBOSE=3' to set vebosity level default_dt := $(if $(DEVICE_TREE),$(DEVICE_TREE),$(CONFIG_DEFAULT_DEVICE_TREE)) -# Temporary workaround for Venice boards -ifneq ($(CONFIG_TARGET_IMX8MM_VENICE),$(CONFIG_TARGET_IMX8MN_VENICE),$(CONFIG_TARGET_IMX8MP_VENICE),) -ignore_dups := --ignore-dup-phandles -endif - quiet_cmd_binman = BINMAN $@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \ $(foreach f,$(BINMAN_TOOLPATHS),--toolpath $(f)) \ @@ -1354,7 +1349,6 @@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \ -a spl-dtb=$(CONFIG_SPL_OF_REAL) \ -a tpl-dtb=$(CONFIG_TPL_OF_REAL) \ -a pre-load-key-path=${PRE_LOAD_KEY_PATH} \ - $(ignore_dups) \ $(BINMAN_$(@F)) OBJCOPYFLAGS_u-boot.ldr.hex := -I binary -O ihex diff --git a/tools/binman/cmdline.py b/tools/binman/cmdline.py index 39c61c2c032..9632ec115e5 100644 --- a/tools/binman/cmdline.py +++ b/tools/binman/cmdline.py @@ -126,8 +126,6 @@ controlled by a description in the board device tree.''' help='Comma-separated list of bintools to consider missing (for testing)') build_parser.add_argument('-i', '--image', type=str, action='append', help='Image filename to build (if not specified, build all)') - build_parser.add_argument('--ignore-dup-phandles', action='store_true', - help='Temporary option to ignore duplicate phandles') build_parser.add_argument('-I', '--indir', action='append', help='Add a path to the list of directories to use for input files') build_parser.add_argument('-m', '--map', action='store_true', diff --git a/tools/binman/control.py b/tools/binman/control.py index 45948955812..c6d3205b8c2 100644 --- a/tools/binman/control.py +++ b/tools/binman/control.py @@ -22,7 +22,6 @@ from binman import bintool from binman import cbfs_util from binman import elf from binman import entry -from dtoc import fdt from dtoc import fdt_util from u_boot_pylib import command from u_boot_pylib import tools @@ -817,10 +816,6 @@ def Binman(args): cbfs_util.VERBOSE = args.verbosity > 2 state.use_fake_dtb = args.fake_dtb - # Temporary hack - if args.ignore_dup_phandles: # pragma: no cover - fdt.IGNORE_DUP_PHANDLES = True - # Normally we replace the 'u-boot' etype with 'u-boot-expanded', etc. # When running tests this can be disabled using this flag. When not # updating the FDT in image, it is not needed by binman, but we use it diff --git a/tools/dtoc/fdt.py b/tools/dtoc/fdt.py index 0b20d52f313..5963925146a 100644 --- a/tools/dtoc/fdt.py +++ b/tools/dtoc/fdt.py @@ -15,9 +15,6 @@ from libfdt import QUIET_NOTFOUND from u_boot_pylib import tools from u_boot_pylib import tout -# Temporary hack -IGNORE_DUP_PHANDLES = False - # This deals with a device tree, presenting it as an assortment of Node and # Prop objects, representing nodes and properties, respectively. This file # contains the base classes and defines the high-level API. You can use @@ -342,11 +339,10 @@ class Node: if phandle: dup = self._fdt.phandle_to_node.get(phandle) if dup: - if not IGNORE_DUP_PHANDLES: - raise ValueError( - f'Duplicate phandle {phandle} in nodes {dup.path} and {self.path}') - else: - self._fdt.phandle_to_node[phandle] = self + raise ValueError( + f'Duplicate phandle {phandle} in nodes {dup.path} and {self.path}') + + self._fdt.phandle_to_node[phandle] = self offset = fdt_obj.first_subnode(self.Offset(), QUIET_NOTFOUND) while offset >= 0: -- cgit v1.3.1 From c91feda87ce33c81acc51cc4bf69d613c4fe89de Mon Sep 17 00:00:00 2001 From: Ricardo Salveti Date: Fri, 25 Aug 2023 16:47:11 +0300 Subject: Revert "arm: imx: mx7: Move CONFIG_OPTEE_TZDRAM_SIZE from lib/optee" This reverts commit c5b68ef8af3c2f515c1f5b8d63a69359a85d753b. CONFIG_OPTEE_TZDRAM_SIZE is used by imx6-based SoCs as well. Move the option back. Signed-off-by: Ricardo Salveti Signed-off-by: Oleksandr Suvorov --- arch/arm/mach-imx/mx7/Kconfig | 8 -------- lib/optee/Kconfig | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig index 0bb18f65200..3c0208e13dd 100644 --- a/arch/arm/mach-imx/mx7/Kconfig +++ b/arch/arm/mach-imx/mx7/Kconfig @@ -24,14 +24,6 @@ config SPL_TEXT_BASE depends on SPL default 0x00912000 -config OPTEE_TZDRAM_SIZE - hex "Amount of Trust-Zone RAM for the OPTEE image" - default 0x0000000 - depends on OPTEE_LIB - help - The size of pre-allocated Trust Zone DRAM to allocate for the OPTEE - runtime. - choice prompt "MX7 board select" optional diff --git a/lib/optee/Kconfig b/lib/optee/Kconfig index 517136a4485..e6834d4d3e1 100644 --- a/lib/optee/Kconfig +++ b/lib/optee/Kconfig @@ -11,6 +11,14 @@ config OPTEE_IMAGE This option enable the OPTEE specific checks done before booting an OPTEE image created with mkimage +config OPTEE_TZDRAM_SIZE + hex "Amount of Trust-Zone RAM for the OPTEE image" + default 0x0000000 + depends on OPTEE_LIB + help + The size of pre-allocated Trust Zone DRAM to allocate for the OPTEE + runtime. + config BOOTM_OPTEE bool "Support OPTEE bootm command" select BOOTM_LINUX -- cgit v1.3.1