August 2022 - U-Boot

[PATCH 1/1] Migration: set deadline for move to DM_GPIO
by Heinrich Schuchardt 12 Aug '22

12 Aug '22

Only five boards are left that need to be migrated to DM_GPIO. Set a 2023.04 deadline. * edminiv2_defconfig * mx28evk_auart_console_defconfig * mx28evk_nand_defconfig * mx28evk_spi_defconfig * warp_defconfig Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- Makefile | 1 + doc/develop/driver-model/migration.rst | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/Makefile b/Makefile index d76ec69b52..f17c0c9bd3 100644 --- a/Makefile +++ b/Makefile @@ -1146,6 +1146,7 @@ endif $(call deprecated,CONFIG_WDT,DM watchdog,v2019.10,\ $(CONFIG_WATCHDOG)$(CONFIG_HW_WATCHDOG)) $(call deprecated,CONFIG_DM_ETH,Ethernet drivers,v2020.07,$(CONFIG_NET)) + $(call deprecated,CONFIG_DM_GPIO,GPIO drivers,v2023.04,$(CONFIG_GPIO)) $(call deprecated,CONFIG_DM_I2C,I2C drivers,v2022.04,$(CONFIG_SYS_I2C_LEGACY)) $(call deprecated,CONFIG_DM_KEYBOARD,Keyboard drivers,v2022.10,$(CONFIG_KEYBOARD)) @# CONFIG_SYS_TIMER_RATE has brackets in it for some boards which diff --git a/doc/develop/driver-model/migration.rst b/doc/develop/driver-model/migration.rst index 5a60436925..0c0cb3cec0 100644 --- a/doc/develop/driver-model/migration.rst +++ b/doc/develop/driver-model/migration.rst @@ -126,3 +126,11 @@ Deadline: 2023.04 The serial subsystem has supported the driver model since late 2014. Maintainers should submit patches switching over to using CONFIG_DM_SERIAL and other base driver model options in time for inclusion in the 2022.10 release. + +CONFIG_DM_GPIO +-------------- +* Deadline: 2023.04 + +The subsystem itself has been converted and maintainers should submit patches +switching over to using CONFIG_DM_GPIO and other base driver model options in +time for inclusion in the 2023.04 rerelease. -- 2.36.1

6 9

[PATCH] bootstage: Show func name for bootstage_mark/error
by Michal Simek 12 Aug '22

12 Aug '22

bootstage_mark() and bootstate_error() are not recording any name and in report it is showing as id=<value>. That's not useful and it is better to show function name which calls it. That's why use macros with passing __func__ as recorded name for bootstage. Origin report looks like this: ZynqMP> bootstage report Timer summary in microseconds (10 records): Mark Elapsed Stage 0 0 reset 2,482,383 2,482,383 board_init_f 4,278,821 1,796,438 board_init_r 4,825,331 546,510 id=64 4,858,409 33,078 id=65 4,862,382 3,973 main_loop 4,921,713 59,331 usb_start 9,345,345 4,423,632 id=175 When this patch is applied. ZynqMP> bootstage report Timer summary in microseconds (31 records): Mark Elapsed Stage 0 0 reset 2,465,624 2,465,624 board_init_f 4,278,628 1,813,004 board_init_r 4,825,139 546,511 eth_common_init 4,858,228 33,089 eth_initialize 4,862,201 3,973 main_loop 4,921,530 59,329 usb_start 8,885,334 3,963,804 cli_loop Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- common/bootstage.c | 10 ++-------- include/bootstage.h | 5 +++-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/common/bootstage.c b/common/bootstage.c index 0fd33be97eae..326c40f1561f 100644 --- a/common/bootstage.c +++ b/common/bootstage.c @@ -147,15 +147,9 @@ ulong bootstage_add_record(enum bootstage_id id, const char *name, return mark; } - -ulong bootstage_mark(enum bootstage_id id) -{ - return bootstage_add_record(id, NULL, 0, timer_get_boot_us()); -} - -ulong bootstage_error(enum bootstage_id id) +ulong bootstage_error_name(enum bootstage_id id, const char *name) { - return bootstage_add_record(id, NULL, BOOTSTAGEF_ERROR, + return bootstage_add_record(id, name, BOOTSTAGEF_ERROR, timer_get_boot_us()); } diff --git a/include/bootstage.h b/include/bootstage.h index bca9438418f5..8d9ef7362f8b 100644 --- a/include/bootstage.h +++ b/include/bootstage.h @@ -268,9 +268,10 @@ ulong bootstage_add_record(enum bootstage_id id, const char *name, /** * Mark a time stamp for the current boot stage. */ -ulong bootstage_mark(enum bootstage_id id); +#define bootstage_mark(id) bootstage_mark_name(id, __func__) +#define bootstage_error(id) bootstage_error_name(id, __func__) -ulong bootstage_error(enum bootstage_id id); +ulong bootstage_error_name(enum bootstage_id id, const char *name); ulong bootstage_mark_name(enum bootstage_id id, const char *name); -- 2.36.1

2 2

[PATCH 00/23] blk: Rationalise the block interface
by Simon Glass 12 Aug '22

12 Aug '22

The block interface has two separate implementations, one using driver model and one not. The latter is really only needed for SPL, where size constraints allegedly don't allow use of driver model. Of course we still need space for filesystems and other code, so it isn't clear that driver model is anything more than the straw that breaks the camel's back. The driver model version uses a uclass ID for the interface time, but converts back and forth between that and if_type, which is the legacy type. The HAVE_BLOCK_DEVICE define is mostly a hangover from the old days. At present its main purpose is to enable the legacy block implementation in SPL. Finally the use of 'select' to enable BLK does not work very well. It causes kconfig errors when another option depends on BLK and it is not recommended by the kconfig style guide. This series aims to clean things up: - Enable BLK based on whether different media types are used, but still allow boards to disable it - Rename HAVE_BLOCK_DEVICE to indicates its real purpose - Drop if_type and use the uclass instead - Drop some obsolete if_type values An issue not resolved by this series is that the sandbox host interface does not actually have a device. At present it uses the root device, which was convenience for the driver model conversion but not really correct. It should be possible to clean this up, in a future series. Another minor issue is the use of UCLASS_USB for a mass-storage device. This has been the case for a while and is not addresed by this series, other than to add a comment. Note that this test relies on Tom Rini's series to drop various boards including warp and cm_t335 Finally, a patch is included to make binman put fake files in a subdirectory, since repeated runs of certain boards can cause unrelated failues (e.g. chromebook_coral) when fake files are left around. Simon Glass (23): binman: Put fake files in a subdirectory disk: Correct help for TPL_PARTITIONS blk: Enable CONFIG_BLK for all media ata: Fix an instance of SPL_SATA_SUPPORT sandbox: Avoid defining HAVE_BLOCK_DEVICE in Konfig disk: Use Makefile to omit partition drivers blk: Use a function for whether block devices are available cmd: Drop use of HAVE_BLOCK_DEVICE blk: Drop unnecessary #ifdef in in blk_legacy blk: Rename HAVE_BLOCK_DEVICE blk: Select SPL_LEGACY_BLOCK automatically blk: Drop unnecessary CONFIG_SPL_LEGACY_BLOCK in defconfigs blk: Hide the BLK and SPL_LEGACY_BLOCK options blk: Drop IF_TYPE_DOC ide: Use a flag for an ATAPI device blk: Drop IF_TYPE_ATAPI blk: Drop IF_TYPE_SD blk: Rename var in blk_get_devnum_by_typename() blk: Rewrite if_type to name functions efi: Correct assumption about if_type blk: Switch over to using uclass IDs blk: Drop if_type blk: Rename if_type to uclass_id arch/Kconfig | 1 - arch/arm/Kconfig | 1 - .../mach-stm32mp/cmd_stm32prog/stm32prog.c | 4 +- board/st/common/stm32mp_dfu.c | 2 +- board/toradex/common/tdx-cfg-block.c | 4 +- cmd/Kconfig | 5 - cmd/Makefile | 2 +- cmd/bcb.c | 4 +- cmd/blk_common.c | 18 +- cmd/ide.c | 2 +- cmd/lsblk.c | 2 +- cmd/mmc.c | 10 +- cmd/mvebu/bubt.c | 2 +- cmd/nvme.c | 4 +- cmd/pvblock.c | 2 +- cmd/sata.c | 4 +- cmd/scsi.c | 2 +- cmd/usb.c | 2 +- cmd/virtio.c | 2 +- common/spl/Kconfig | 2 - common/spl/spl_sata.c | 2 +- common/spl/spl_usb.c | 2 +- common/usb_storage.c | 10 +- configs/M5253DEMO_defconfig | 1 + configs/axm_defconfig | 1 - configs/bcm968380gerg_ram_defconfig | 1 - .../gardena-smart-gateway-mt7688_defconfig | 1 - configs/nsim_hs38_defconfig | 1 - configs/qemu-ppce500_defconfig | 1 - disk/Kconfig | 4 +- disk/Makefile | 4 + disk/disk-uclass.c | 11 +- disk/part.c | 156 +++++-------- disk/part_amiga.c | 4 - disk/part_dos.c | 4 - disk/part_efi.c | 3 - disk/part_iso.c | 3 - disk/part_mac.c | 3 - doc/develop/driver-model/migration.rst | 2 +- doc/develop/uefi/uefi.rst | 2 +- doc/usage/partitions.rst | 2 +- drivers/Makefile | 3 +- drivers/ata/Kconfig | 4 +- drivers/ata/dwc_ahsata.c | 2 +- drivers/ata/fsl_sata.c | 2 +- drivers/ata/sata.c | 2 +- drivers/ata/sata_mv.c | 2 +- drivers/ata/sata_sil.c | 2 +- drivers/block/Kconfig | 20 +- drivers/block/Makefile | 2 +- drivers/block/blk-uclass.c | 219 +++++++++--------- drivers/block/blk_legacy.c | 60 +++-- drivers/block/efi_blk.c | 2 +- drivers/block/ide.c | 16 +- drivers/block/sandbox.c | 14 +- drivers/dfu/dfu_mmc.c | 6 +- drivers/mmc/Kconfig | 1 - drivers/mmc/mmc-uclass.c | 12 +- drivers/mmc/mmc_legacy.c | 8 +- drivers/mmc/mmc_write.c | 4 +- drivers/net/fsl_enetc.c | 12 +- drivers/net/fsl_enetc.h | 2 +- drivers/nvme/Kconfig | 2 - drivers/nvme/nvme.c | 2 +- drivers/scsi/Kconfig | 2 - drivers/scsi/scsi.c | 12 +- drivers/tee/optee/rpmb.c | 4 +- drivers/virtio/Kconfig | 1 - drivers/virtio/virtio_blk.c | 4 +- drivers/xen/Kconfig | 1 - drivers/xen/pvblock.c | 6 +- env/mmc.c | 4 +- fs/fat/fat.c | 4 +- include/blk.h | 141 +++++------ include/efi_api.h | 4 +- include/efi_loader.h | 4 +- include/mmc.h | 2 +- lib/efi_driver/efi_block_device.c | 4 +- lib/efi_loader/Kconfig | 1 - lib/efi_loader/efi_device_path.c | 2 +- lib/efi_loader/efi_device_path_to_text.c | 4 +- lib/efi_loader/efi_disk.c | 28 +-- lib/efi_loader/efi_net.c | 2 +- lib/efi_loader/efi_var_file.c | 4 +- test/dm/blk.c | 24 +- tools/binman/control.py | 10 +- tools/binman/entry.py | 25 +- tools/binman/ftest.py | 30 ++- 88 files changed, 492 insertions(+), 523 deletions(-) -- 2.37.1.559.g78731f0fdb-goog

3 36

[PATCH 00/11] binman: Enhancements to binman mkimage
by Simon Glass 12 Aug '22

12 Aug '22

This includes enhancements to binman's 'mkimage' support so that it can provide control over what is passed using the -n (imagename) argument. It also includes various minor fixes and tweaks. The entry-docs must be regenerated regularly with binman and this is very slow now. A patch is included to speed up 'make htmldocs'. Simon Glass (11): doc: Build documentation in parallel patman: Put the coverage command-line last patman: Don't buffer test output with a single test binman: Fix up the entry-docs for Entry_pre_load binman: Add a function to check for missing properties binman: Adjust mkimage etype node reading binman: Avoid use of expected failure binman: Improve mkimage documentation binman: Allow the image name to be the data file binman: Allow passing entries using -n binman: Allow collection to use entries from other sections doc/Makefile | 1 + tools/binman/entries.rst | 67 ++++++++-- tools/binman/entry.py | 38 ++++++ tools/binman/etype/collection.py | 3 + tools/binman/etype/fill.py | 3 +- tools/binman/etype/mkimage.py | 115 +++++++++++++++--- tools/binman/etype/pre_load.py | 3 +- tools/binman/etype/section.py | 8 +- tools/binman/ftest.py | 78 +++++++++++- tools/binman/test/235_mkimage_name.dts | 18 +++ tools/binman/test/236_mkimage_image.dts | 21 ++++ .../test/237_mkimage_image_no_content.dts | 22 ++++ tools/binman/test/238_mkimage_image_bad.dts | 22 ++++ tools/binman/test/239_collection_other.dts | 29 +++++ tools/patman/test_util.py | 7 +- 15 files changed, 394 insertions(+), 41 deletions(-) create mode 100644 tools/binman/test/235_mkimage_name.dts create mode 100644 tools/binman/test/236_mkimage_image.dts create mode 100644 tools/binman/test/237_mkimage_image_no_content.dts create mode 100644 tools/binman/test/238_mkimage_image_bad.dts create mode 100644 tools/binman/test/239_collection_other.dts -- 2.37.1.559.g78731f0fdb-goog

2 16

[PATCH 0/5] arm: bcmbca: move bcm63158 support under CONFIG_ARCH_BCMBCA
by William Zhang 12 Aug '22

12 Aug '22

BCM63158 is one of the Broadcom Broadband origin DSL Gateway router SoC. It was originally added by Philippe before Broadcom started to upstream the support for broadband SoCs. The ARM based Broadcom Broadband SoC family is now supported under the same ARCH_BCMBCA config. This patch series migrate the BCM63158 support to ARCH_BCMBCA. William Zhang (5): arm: bcmbca: add bcm63158 SoC support under CONFIG_ARCH_BCMBCA arm: bcmbca: remove bcm63158 support under CONFIG_ARCH_BCM63158 arm: bcmbca: make bcm63158 driver depending on CONFIG_BCM63158 MAINTAINERS: Add BCM63158 maintainer to BCMBCA entry arm: bcmbca: make reset_cpu function weak MAINTAINERS | 2 + arch/arm/Kconfig | 8 +- arch/arm/dts/Makefile | 5 +- arch/arm/dts/bcm63158.dtsi | 207 +++++++++++++--------- arch/arm/dts/bcm963158.dts | 6 +- arch/arm/mach-bcmbca/Kconfig | 8 + arch/arm/mach-bcmbca/Makefile | 1 + arch/arm/mach-bcmbca/bcm63158/Kconfig | 17 ++ arch/arm/mach-bcmbca/bcm63158/Makefile | 5 + arch/arm/mach-bcmbca/bcm63158/mmu_table.c | 32 ++++ board/broadcom/bcm963158/Kconfig | 17 -- board/broadcom/bcm963158/MAINTAINERS | 6 - board/broadcom/bcm963158/Makefile | 3 - board/broadcom/bcm963158/bcm963158.c | 62 ------- board/broadcom/bcmbca/Kconfig | 7 + board/broadcom/bcmbca/board.c | 2 +- configs/bcm963158_defconfig | 23 +++ configs/bcm963158_ram_defconfig | 10 +- drivers/gpio/Kconfig | 2 +- drivers/led/Kconfig | 2 +- drivers/mtd/nand/raw/Kconfig | 2 +- drivers/spi/Kconfig | 2 +- drivers/watchdog/Kconfig | 2 +- include/configs/bcm963158.h | 15 ++ include/configs/broadcom_bcm963158.h | 32 ---- 25 files changed, 254 insertions(+), 224 deletions(-) create mode 100644 arch/arm/mach-bcmbca/bcm63158/Kconfig create mode 100644 arch/arm/mach-bcmbca/bcm63158/Makefile create mode 100644 arch/arm/mach-bcmbca/bcm63158/mmu_table.c delete mode 100644 board/broadcom/bcm963158/Kconfig delete mode 100644 board/broadcom/bcm963158/MAINTAINERS delete mode 100644 board/broadcom/bcm963158/Makefile delete mode 100644 board/broadcom/bcm963158/bcm963158.c create mode 100644 configs/bcm963158_defconfig create mode 100644 include/configs/bcm963158.h delete mode 100644 include/configs/broadcom_bcm963158.h -- 2.37.1

1 6

Submitting patches
by Martin Bonner 11 Aug '22

11 Aug '22

I and my colleagues have a number of patches we would like to contribute back to the community, however for various reasons (principally operating inside corporate firewalls), it isn't possible to use `git send-email`, and I haven't been able to create a plain text email which is acceptable to `git am`. Is it possible to fork u-boot on Git[HL][au]b or similar hosting site, and then send an email to the list pointing at the commit? Martin

5 6

Please pull u-boot-dm
by Simon Glass 11 Aug '22

11 Aug '22

Hi Tom, I've dropped the setuptools patch and will look at it later. https://source.denx.de/u-boot/custodians/u-boot-dm/-/pipelines/13113 The following changes since commit 3dd4e916324efc825a7ee8e412f5cf1ded839021: Merge https://source.denx.de/u-boot/custodians/u-boot-marvell (2022-08-09 08:16:14 -0400) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/dm-pull-9aug22-take2 for you to fetch changes up to be43a35bff17550fa707795a06eaed6114eb1742: boot: allow bootmeth-distro without CONFIG_NET (2022-08-10 13:42:56 -0600) ---------------------------------------------------------------- dtoc fixes with pylint, tests ---------------------------------------------------------------- John Keeping (1): boot: allow bootmeth-distro without CONFIG_NET Simon Glass (6): dtoc: Tidy up fdt_tests RunTestCoverage() args dtoc: Tidy up fdt_tests RunTests() dtoc: Fix fdt test coverage dtoc: Move main program into its own function test_fdt: Convert to use argparse dtoc: Correct remaining pylint problems in test_fdt boot/Kconfig | 8 +- boot/Makefile | 3 +- boot/pxe_utils.c | 3 +- cmd/Kconfig | 4 +- include/command.h | 2 +- scripts/pylint.base | 2 +- tools/dtoc/test_fdt.py | 326 +++++++++++++++++++++++++++++++++++++++++-------------------------------- 7 files changed, 197 insertions(+), 151 deletions(-) Regards, Simon

2 1

[PATCH 11/11] binman: Allow collection to use entries from other sections
by Simon Glass 11 Aug '22

11 Aug '22

At present the collections etype only works with entries in the same section. This can be limiting, since in some cases the data may be inside a subsection, e.g. if there are alignment constraints. Add a function to find the entries in an etype and have it search recursively. Make use of this for mkimage also. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- tools/binman/entries.rst | 3 +++ tools/binman/entry.py | 22 ++++++++++++++++ tools/binman/etype/collection.py | 3 +++ tools/binman/etype/mkimage.py | 7 ++++++ tools/binman/etype/section.py | 8 +++--- tools/binman/ftest.py | 14 +++++++++++ tools/binman/test/239_collection_other.dts | 29 ++++++++++++++++++++++ tools/binman/test/240_mkimage_coll.dts | 27 ++++++++++++++++++++ 8 files changed, 109 insertions(+), 4 deletions(-) create mode 100644 tools/binman/test/239_collection_other.dts create mode 100644 tools/binman/test/240_mkimage_coll.dts diff --git a/tools/binman/entries.rst b/tools/binman/entries.rst index 682159ac6d3..3fa027a241c 100644 --- a/tools/binman/entries.rst +++ b/tools/binman/entries.rst @@ -427,6 +427,9 @@ listed entries are combined to form this entry. This serves as a useful base class for entry types which need to process data from elsewhere in the image, not necessarily child entries. +The entries can generally be anywhere in the same image, even if they are in +a different section from this entry. + Entry: cros-ec-rw: A blob entry which contains a Chromium OS read-write EC image diff --git a/tools/binman/entry.py b/tools/binman/entry.py index 3be074ccd66..b9995254982 100644 --- a/tools/binman/entry.py +++ b/tools/binman/entry.py @@ -684,6 +684,28 @@ class Entry(object): """ return None + def FindEntryByNode(self, find_node): + """Find a node in an entry, searching all subentries + + This does a recursive search. + + Args: + find_node (fdt.Node): Node to find + + Returns: + Entry: entry, if found, else None + """ + entries = self.GetEntries() + if entries: + for entry in entries.values(): + if entry._node == find_node: + return entry + found = entry.FindEntryByNode(find_node) + if found: + return found + + return None + def GetArg(self, name, datatype=str): """Get the value of an entry argument or device-tree-node property diff --git a/tools/binman/etype/collection.py b/tools/binman/etype/collection.py index 442b40b48b3..c532aafe3e7 100644 --- a/tools/binman/etype/collection.py +++ b/tools/binman/etype/collection.py @@ -21,6 +21,9 @@ class Entry_collection(Entry): listed entries are combined to form this entry. This serves as a useful base class for entry types which need to process data from elsewhere in the image, not necessarily child entries. + + The entries can generally be anywhere in the same image, even if they are in + a different section from this entry. """ def __init__(self, section, etype, node): super().__init__(section, etype, node) diff --git a/tools/binman/etype/mkimage.py b/tools/binman/etype/mkimage.py index dd82d51bdb6..36eef973f21 100644 --- a/tools/binman/etype/mkimage.py +++ b/tools/binman/etype/mkimage.py @@ -144,6 +144,13 @@ class Entry_mkimage(Entry): return True + def GetEntries(self): + # Make a copy so we don't change the original + entries = OrderedDict(self._mkimage_entries) + if self._imagename: + entries['imagename'] = self._imagename + return entries + def SetAllowMissing(self, allow_missing): """Set whether a section allows missing external blobs diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py index bd67238b919..5c326a75e8c 100644 --- a/tools/binman/etype/section.py +++ b/tools/binman/etype/section.py @@ -506,10 +506,10 @@ class Entry_section(Entry): node = self._node.GetFdt().LookupPhandle(phandle) if not node: source_entry.Raise("Cannot find node for phandle %d" % phandle) - for entry in self._entries.values(): - if entry._node == node: - return entry.GetData(required) - source_entry.Raise("Cannot find entry for node '%s'" % node.name) + entry = self.FindEntryByNode(node) + if not entry: + source_entry.Raise("Cannot find entry for node '%s'" % node.name) + return entry.GetData(required) def LookupSymbol(self, sym_name, optional, msg, base_addr, entries=None): """Look up a symbol in an ELF file diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 9b10fd8698d..737dbcc2466 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -5773,6 +5773,20 @@ fdt fdtmap Extract the devicetree blob from the fdtmap self.assertIn('Cannot use both imagename node and data-to-imagename', str(exc.exception)) + def testCollectionOther(self): + """Test a collection where the data comes from another section""" + data = self._DoReadFile('239_collection_other.dts') + self.assertEqual(U_BOOT_NODTB_DATA + U_BOOT_DTB_DATA + + tools.get_bytes(0xff, 2) + U_BOOT_NODTB_DATA + + tools.get_bytes(0xfe, 3) + U_BOOT_DTB_DATA, + data) + + def testMkimageCollection(self): + """Test using a collection referring to an entry in a mkimage entry""" + data = self._DoReadFile('240_mkimage_coll.dts') + expect = U_BOOT_SPL_DATA + U_BOOT_DATA + self.assertEqual(expect, data[:len(expect)]) + if __name__ == "__main__": unittest.main() diff --git a/tools/binman/test/239_collection_other.dts b/tools/binman/test/239_collection_other.dts new file mode 100644 index 00000000000..09de20e5bca --- /dev/null +++ b/tools/binman/test/239_collection_other.dts @@ -0,0 +1,29 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + collection { + content = <&u_boot_nodtb &dtb>; + }; + section { + fill { + size = <2>; + fill-byte = [ff]; + }; + u_boot_nodtb: u-boot-nodtb { + }; + fill2 { + type = "fill"; + size = <3>; + fill-byte = [fe]; + }; + }; + dtb: u-boot-dtb { + }; + }; +}; diff --git a/tools/binman/test/240_mkimage_coll.dts b/tools/binman/test/240_mkimage_coll.dts new file mode 100644 index 00000000000..30860118860 --- /dev/null +++ b/tools/binman/test/240_mkimage_coll.dts @@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + collection { + content = <&spl &u_boot>; + }; + mkimage { + args = "-T script"; + + spl: u-boot-spl { + }; + + imagename { + type = "section"; + + u_boot: u-boot { + }; + }; + }; + }; +}; -- 2.37.1.559.g78731f0fdb-goog

1 0

Re: [RESEND 3/3] ram: rk3399: Conduct memory training at 400MHz
by Simon Glass 11 Aug '22

11 Aug '22

On Thu, 11 Aug 2022 at 05:09, Lee Jones <lee(a)kernel.org> wrote: > > Currently the default initialisation frequency is 50MHz. Although > this does appear to be suitable for some LPDDR4 RAM chips, training at > this low frequency has been seen to cause Column errors, leading to > Capacity check errors on others. > > Here we force RAM initialisation to happen at 400MHz before ramping up > to the final value running value of 800MHz after everything has been > successfully configured. > > Link: https://lore.kernel.org/u-boot/Yo4v3jUeHXTovjOH@google.com/ > Suggested-by: YouMin Chen <cym(a)rock-chips.com> > Signed-off-by: Lee Jones <lee(a)kernel.org> > Tested-by: Xavier Drudis Ferran <xdrudis(a)tinet.cat> > Reviewed-by: Kever Yang <kever.yang(a)rock-chips.com> > --- > drivers/ram/rockchip/sdram_rk3399.c | 36 +++++++++++++++++------------ > 1 file changed, 21 insertions(+), 15 deletions(-) > Reviewed-by: Simon Glass <sjg(a)chromium.org>

1 0

Re: [RESEND 2/3] ram: rk3399: Fix faulty frequency change reports
by Simon Glass 11 Aug '22

11 Aug '22

On Thu, 11 Aug 2022 at 05:09, Lee Jones <lee(a)kernel.org> wrote: > > Frequency changes to 400MHz are presently reported as: > > lpddr4_set_rate_0: change freq to 400000000 mhz 0, 1 > > This is obviously wrong by 6 orders of magnitude. > > Ensure frequency changes are reported accurately. > > Signed-off-by: Lee Jones <lee(a)kernel.org> > Tested-by: Xavier Drudis Ferran <xdrudis(a)tinet.cat> > Reviewed-by: Kever Yang <kever.yang(a)rock-chips.com> > --- > drivers/ram/rockchip/sdram_rk3399.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Simon Glass <sjg(a)chromium.org>

1 0