March 2023 - U-Boot

[PATCH] board_r: Relocate OF_EMBED if NEEDS_MANUAL_RELOC only
by Pierre-Clément Tosi 16 Mar '23

16 Mar '23

When the embedded device tree is pointed to by the __dtb_dt_*begin symbols, it seems to be covered by the early relocation code and doesn't need to be manually patched. Cc: Simon Glass <sjg(a)chromium.org> Signed-off-by: Pierre-Clément Tosi <ptosi(a)google.com> --- common/board_r.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index 56eb60fa27..00926dcb1e 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -150,13 +150,13 @@ static int initr_reloc_global_data(void) */ gd->env_addr += gd->reloc_off; #endif -#ifdef CONFIG_OF_EMBED /* * The fdt_blob needs to be moved to new relocation address * incase of FDT blob is embedded with in image */ - gd->fdt_blob += gd->reloc_off; -#endif + if (CONFIG_IS_ENABLED(OF_EMBED) && CONFIG_IS_ENABLED(NEEDS_MANUAL_RELOC)) + gd->fdt_blob += gd->reloc_off; + #ifdef CONFIG_EFI_LOADER /* * On the ARM architecture gd is mapped to a fixed register (r9 or x18). -- 2.37.2.789.g6183377224-goog

4 5

[PATCH] arm: kirkwood: pogo v4: Use a more common format for stdout-path
by Tony Dinh 16 Mar '23

16 Mar '23

The mainline Pogo V4 DTS uses a stdout-path format that is not recognizable by u-boot. Change it to a commonly used format. Note that this patch removes the previous workaround for this board as discussed here: https://lists.denx.de/pipermail/u-boot/2023-February/508936.html Signed-off-by: Tony Dinh <mibodhi(a)gmail.com> --- arch/arm/dts/kirkwood-pogoplug-series-4-u-boot.dtsi | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm/dts/kirkwood-pogoplug-series-4-u-boot.dtsi b/arch/arm/dts/kirkwood-pogoplug-series-4-u-boot.dtsi index f9e127234c..9bb97c6b6b 100644 --- a/arch/arm/dts/kirkwood-pogoplug-series-4-u-boot.dtsi +++ b/arch/arm/dts/kirkwood-pogoplug-series-4-u-boot.dtsi @@ -1,7 +1,10 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2023 Tony Dinh <mibodhi(a)gmail.com> - */ -&uart0 { - u-boot,dm-pre-reloc; +*/ + +/ { + chosen { + stdout-path = &uart0; + }; }; -- 2.30.2

3 4

[PATCH v4 0/4] J721E HS Fixes
by Manorit Chawdhry 16 Mar '23

16 Mar '23

This series fixes the support for J721E board along with some maintainance for it. v4: - Fix docs - applied reviewed-by v3: - drop fixes related to other boards ( make series j721e specific ) - memory map added in docs - applied reviewed-by v2: - Merge two series - Include some more commits that fix the gp builds when merging defconfigs - Update MAINTAINERS to remove hs related defconfigs - applied Acks Andrew Davis (1): arm: k3: config.mk: Add missing dependencies on tispl.bin HS Dave Gerlach (1): arm: mach-k3: Increase SYSFW max image size Manorit Chawdhry (2): configs: j721e: Merge the HS and non-HS defconfigs Kconfig: j721e: Change K3_MCU_SCRATCHPAD_BASE to non firewalled region MAINTAINERS | 2 - arch/arm/mach-k3/Kconfig | 6 +- arch/arm/mach-k3/config.mk | 2 + configs/j721e_evm_a72_defconfig | 3 +- configs/j721e_evm_r5_defconfig | 11 +- configs/j721e_hs_evm_a72_defconfig | 208 ----------------------------- configs/j721e_hs_evm_r5_defconfig | 176 ------------------------ doc/board/ti/j721e_evm.rst | 27 ++++ 8 files changed, 43 insertions(+), 392 deletions(-) delete mode 100644 configs/j721e_hs_evm_a72_defconfig delete mode 100644 configs/j721e_hs_evm_r5_defconfig -- 2.34.1

2 7

[PATCH 0/9] binman: Show missing blob message when building U-Boot
by Jonas Karlman 16 Mar '23

16 Mar '23

binman currently support showing a helpful missing blob message, but only when the --allow-missing flag is used. This changes so that binman is invoked with the --allow-missing flag and the helpful message can be shown by default when building U-Boot. Using the following: make rockpro64-rk3399_defconfig make CROSS_COMPILE="aarch64-linux-gnu-" Before this series a build fails with: binman: Filename 'atf-bl31' not found in input path (...) After this series a build fails with: Image 'simple-bin' is missing external blobs and is non-functional: atf-bl31 /binman/simple-bin/fit/images/@atf-SEQ/atf-bl31 (atf-bl31): See the documentation for your board. You may need to build ARM Trusted Firmware and build with BL31=/path/to/bl31.bin Image 'simple-bin' is missing external blobs but is still functional: tee-os /binman/simple-bin/fit/images/@tee-SEQ/tee-os (tee-os): See the documentation for your board. You may need to build Open Portable Trusted Execution Environment (OP-TEE) with TEE=/path/to/tee.bin Some images are invalid Builds will continue to fail when there is missing blobs, and the use of BINMAN_ALLOW_MISSING=1 now only enables the --ignore-missing flag. This series also fixes a few minor issues that prevented some missing and optional blobs to be detected for fit and mkimage entries. Patch 1-3 contains spelling fixes and code cleanup for related parts. Patch 4-6 improve missing/optional detection for fit and mkimage entries. Patch 7-8 improve the missing blob warning message output. Patch 9 finally update Makefile to always pass the --allow-missing flag. The series is based on top of [1], and is the follow-up series meant to address the issue with missing blob message for mkimage entries. [1] https://patchwork.ozlabs.org/project/uboot/cover/20230219150629.4012377-1-j… Jonas Karlman (9): binman: Remove redundant SetAllowFakeBlob from blob-ext entry binman: Fix spelling of nodes in code comments binman: Use correct argument name in docstrings binman: Override CheckOptional in fit entry binman: Implement missing check functions in mkimage entry binman: Mark mkimage entry missing when its subnodes is missing binman: Fix blank line usage for invalid images warning text binman: Show filename in missing blob help message Makefile: Show binman missing blob message Makefile | 2 +- tools/binman/control.py | 24 ++++++--- tools/binman/entry.py | 2 +- tools/binman/etype/blob.py | 2 +- tools/binman/etype/blob_ext.py | 8 --- tools/binman/etype/fit.py | 9 +++- tools/binman/etype/mkimage.py | 54 ++++++++++++++++++- tools/binman/etype/section.py | 6 +-- tools/binman/ftest.py | 9 ++++ tools/binman/state.py | 2 +- .../test/278_mkimage_missing_multiple.dts | 19 +++++++ 11 files changed, 111 insertions(+), 26 deletions(-) create mode 100644 tools/binman/test/278_mkimage_missing_multiple.dts -- 2.39.2

3 28

[PATCH v3 1/5] x86: minnowmax: Fix up adjustment of CONFIG_TEXT_BASE
by Simon Glass 16 Mar '23

16 Mar '23

With recent CONFIG_TEXT_BASE changes, there are inconsistencies between several settings. Adjust CONFIG_SYS_MONITOR_LEN to allow more code space. Move the MRC cache out of the way too. Add documentation on how to make this change safely. Signed-off-by: Simon Glass <sjg(a)chromium.org> Fixes: 66e2c665f ("x86: minnowmax: Adjust CONFIG_TEXT_BASE") --- Changes in v3: - Squash commits - Fix ordering of Environment in docs - Fix value of CONFIG_TEXT_BASE in docs - Change the commit message and subject Changes in v2: - Add new patch which boots while still enabling EFI_LOADER arch/x86/dts/minnowmax.dts | 2 +- configs/minnowmax_defconfig | 1 + doc/board/intel/minnowmax.rst | 15 +++++++++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/arch/x86/dts/minnowmax.dts b/arch/x86/dts/minnowmax.dts index 68e0510c68d8..466309f2b8d5 100644 --- a/arch/x86/dts/minnowmax.dts +++ b/arch/x86/dts/minnowmax.dts @@ -206,7 +206,7 @@ memory-map = <0xff800000 0x00800000>; rw-mrc-cache { label = "rw-mrc-cache"; - reg = <0x006f0000 0x00010000>; + reg = <0x005f0000 0x00010000>; }; }; }; diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig index 679b6e3de535..b93c0d729f80 100644 --- a/configs/minnowmax_defconfig +++ b/configs/minnowmax_defconfig @@ -18,6 +18,7 @@ CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_MP_TABLE=y CONFIG_HAVE_ACPI_RESUME=y CONFIG_SEABIOS=y +CONFIG_SYS_MONITOR_LEN=2097152 CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_BOOTSTAGE=y diff --git a/doc/board/intel/minnowmax.rst b/doc/board/intel/minnowmax.rst index 1ba25b50d21b..d0286bd99374 100644 --- a/doc/board/intel/minnowmax.rst +++ b/doc/board/intel/minnowmax.rst @@ -54,9 +54,9 @@ Offset Description Controlling config 000000 descriptor.bin Hard-coded to 0 in ifdtool 001000 me.bin Set by the descriptor 500000 <spare> +5f0000 MRC cache CONFIG_ENABLE_MRC_CACHE +600000 u-boot-dtb.bin CONFIG_TEXT_BASE 6ef000 Environment CONFIG_ENV_OFFSET -6f0000 MRC cache CONFIG_ENABLE_MRC_CACHE -700000 u-boot-dtb.bin CONFIG_TEXT_BASE 7b0000 vga.bin CONFIG_VGA_BIOS_ADDR 7c0000 fsp.bin CONFIG_FSP_ADDR 7f8000 <spare> (depends on size of fsp.bin) @@ -68,3 +68,14 @@ Overall ROM image size is controlled by CONFIG_ROM_SIZE. Note that the debug version of the FSP is bigger in size. If this version is used, CONFIG_FSP_ADDR needs to be configured to 0xfffb0000 instead of the default value 0xfffc0000. + +If you want to change CONFIG_TEXT_BASE from the current value of ffe00000 +you need to check a few other things. CONFIG_SYS_MONITOR_BASE should +automatically update to be the same as CONFIG_TEXT_BASE but +CONFIG_SYS_MONITOR_LEN may need to be adjusted too. It must cover the space +from the start of U-Boot to the end of the RAM, since the 16-bit boot needs to +be able to jump to U-Boot. See the end of arch/x86/lib/fsp1/fsp_car.S which +has these values. + +Also check the MRC cache address in the devicetree ("rw-mrc-cache"). It must +not overlap with U-Boot. -- 2.40.0.rc1.284.g88254d51c5-goog

3 12

[PULL] Please pull u-boot-coldfire/master
by Angelo Dureghello 16 Mar '23

16 Mar '23

The following changes since commit 88e08fc5f6e508eac46cd1dfb0379b11ae032c0a: Prepare v2023.04-rc4 (2023-03-13 20:52:48 -0400) are available in the Git repository at: git://git.denx.de/u-boot-coldfire.git master for you to fetch changes up to 791840fdc41d7e937158a6ac56e9316391fde7ab: board: m5253demo: remove floating point flash size calculation (2023-03-15 01:52:15 +0100) ---------------------------------------------------------------- Angelo Dureghello (10): board: amcore: fix u-boot mtd partition m68k: use longword-based jumps m68k: add global variable sdhc_per_clk for m68k board: stmark2: fix clock value arch: enable private libgcc for m68k m68k: dts: stmark2: set correct compatible field for spi nor m68k: rename CONFIG_MCFTMR to CFG_MCFTMR board: amcore: fix config options namespace m68k: add private libgcc ashrdi3 board: m5253demo: remove floating point flash size calculation arch/Kconfig | 1 + arch/m68k/cpu/mcf523x/interrupts.c | 2 +- arch/m68k/cpu/mcf52x2/interrupts.c | 12 ++++++------ arch/m68k/cpu/mcf530x/start.S | 18 ++++++++++++------ arch/m68k/cpu/mcf532x/interrupts.c | 2 +- arch/m68k/cpu/mcf5445x/interrupts.c | 2 +- arch/m68k/dts/stmark2.dts | 2 +- arch/m68k/include/asm/global_data.h | 3 +++ arch/m68k/include/asm/immap.h | 24 ++++++++++++------------ arch/m68k/lib/Makefile | 2 +- arch/m68k/lib/ashrdi3.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ arch/m68k/lib/time.c | 4 ++-- board/freescale/m5253demo/flash.c | 20 ++------------------ board/freescale/m53017evb/README | 2 +- board/freescale/m5373evb/README | 2 +- board/sysam/stmark2/Kconfig | 2 +- configs/M5208EVBE_defconfig | 1 - configs/M5235EVB_Flash32_defconfig | 1 - configs/M5235EVB_defconfig | 1 - configs/M5249EVB_defconfig | 1 - configs/M5253DEMO_defconfig | 1 - configs/M5272C3_defconfig | 1 - configs/M5275EVB_defconfig | 1 - configs/M5282EVB_defconfig | 1 - configs/M53017EVB_defconfig | 1 - configs/M5329AFEE_defconfig | 1 - configs/M5329BFEE_defconfig | 1 - configs/M5373EVB_defconfig | 1 - configs/amcore_defconfig | 4 ++-- configs/astro_mcf5373l_defconfig | 1 - configs/cobra5272_defconfig | 1 - configs/eb_cpu5282_defconfig | 1 - configs/eb_cpu5282_internal_defconfig | 1 - configs/stmark2_defconfig | 1 - include/configs/M5208EVBE.h | 2 ++ include/configs/M5235EVB.h | 2 ++ include/configs/M5249EVB.h | 2 ++ include/configs/M5253DEMO.h | 2 ++ include/configs/M5272C3.h | 3 +++ include/configs/M5275EVB.h | 2 ++ include/configs/M5282EVB.h | 2 ++ include/configs/M53017EVB.h | 2 ++ include/configs/M5329EVB.h | 2 ++ include/configs/M5373EVB.h | 2 ++ include/configs/amcore.h | 15 +++++++++------ include/configs/astro_mcf5373l.h | 2 ++ include/configs/cobra5272.h | 2 ++ include/configs/eb_cpu5282.h | 2 ++ include/configs/stmark2.h | 2 ++ 49 files changed, 134 insertions(+), 77 deletions(-) create mode 100644 arch/m68k/lib/ashrdi3.c

2 1

Pull request: u-boot-sunxi/master DT update for v2023.04
by Andre Przywara 16 Mar '23

16 Mar '23

Hi Tom, please pull these two patches containing just devicetree updates for Allwinner boards. I was still hoping for a review, since we cannot import the files from the Linux tree verbatim, but managed to write some filter script that convinced me that the changes are fine. The files are from Linux v6.2-rc2, but are identical to the v6.2 release. Thanks, Andre ======================== The following changes since commit 33fb2d130e28982b488c2a54978031835ed2aa71: Merge tag 'dm-pull-29feb23' of https://source.denx.de/u-boot/custodians/u-boot-dm (2023-03-01 16:07:24 -0500) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-sunxi.git master for you to fetch changes up to 8e2c0ee3bafbc283b58b66d9007847a5a3ed07be: sunxi: dts: arm64: update devicetree files from Linux v6.2-rc2 (2023-03-05 23:33:14 +0000) ---------------------------------------------------------------- Andre Przywara (2): sunxi: dts: arm: update devicetree files from Linux v6.2-rc2 sunxi: dts: arm64: update devicetree files from Linux v6.2-rc2 arch/arm/dts/axp803.dtsi | 10 -- arch/arm/dts/sun50i-a64-pinebook.dts | 14 +++ arch/arm/dts/sun50i-h6-beelink-gs1.dts | 1 + arch/arm/dts/sun50i-h6-gpu-opp.dtsi | 87 ++++++++++++++ arch/arm/dts/sun50i-h6.dtsi | 52 ++++++++- arch/arm/dts/sun50i-h616-orangepi-zero2.dts | 41 +++++++ arch/arm/dts/sun50i-h616-x96-mate.dts | 25 ++++ arch/arm/dts/sun50i-h616.dtsi | 160 ++++++++++++++++++++++++++ arch/arm/dts/suniv-f1c100s.dtsi | 70 +++++++++++ arch/arm/dts/sunxi-bananapi-m2-plus.dtsi | 14 +-- arch/arm/dts/sunxi-h3-h5.dtsi | 4 + include/dt-bindings/clock/suniv-ccu-f1c100s.h | 2 + 12 files changed, 461 insertions(+), 19 deletions(-) create mode 100644 arch/arm/dts/sun50i-h6-gpu-opp.dtsi

2 1

[PATCH v3] binman: bintool: Add support for tool directories
by Neha Malcom Francis 15 Mar '23

15 Mar '23

Currently, bintool supports external compilable tools as single executable files. Adding support for git repos that can be used to run non-compilable scripting tools that cannot otherwise be present in binman. Signed-off-by: Neha Malcom Francis <n-francis(a)ti.com> --- Changes in v3: - moved back to using DOWNLOAD_DIR as community is making relevant changes - extended coverage for bintool_test.py - added function comment for new parameter Changes in v2: - added parameter to obtain path to download the directory optionally, enables flexibility to avoid using DOWNLOAD_DESTDIR - added test to bintool_test.py - s/FETCH_NO_BUILD/FETCH_SOURCE - code reformatting tools/binman/bintool.py | 47 +++++++++++++++++++++++++++++----- tools/binman/bintool_test.py | 43 +++++++++++++++++++++++++++++++ tools/binman/btool/_testing.py | 4 +++ tools/patman/tools.py | 2 +- 4 files changed, 88 insertions(+), 8 deletions(-) diff --git a/tools/binman/bintool.py b/tools/binman/bintool.py index 8fda13ff01..33f563c46f 100644 --- a/tools/binman/bintool.py +++ b/tools/binman/bintool.py @@ -32,12 +32,13 @@ FORMAT = '%-16.16s %-12.12s %-26.26s %s' modules = {} # Possible ways of fetching a tool (FETCH_COUNT is number of ways) -FETCH_ANY, FETCH_BIN, FETCH_BUILD, FETCH_COUNT = range(4) +FETCH_ANY, FETCH_BIN, FETCH_BUILD, FETCH_SOURCE, FETCH_COUNT = range(5) FETCH_NAMES = { FETCH_ANY: 'any method', FETCH_BIN: 'binary download', - FETCH_BUILD: 'build from source' + FETCH_BUILD: 'build from source', + FETCH_SOURCE: 'download source without building' } # Status of tool fetching @@ -201,12 +202,13 @@ class Bintool: print(f'- trying method: {FETCH_NAMES[try_method]}') result = try_fetch(try_method) if result: + method = try_method break else: result = try_fetch(method) if not result: return FAIL - if result is not True: + if result is not True and method != FETCH_SOURCE: fname, tmpdir = result dest = os.path.join(DOWNLOAD_DESTDIR, self.name) print(f"- writing to '{dest}'") @@ -261,7 +263,7 @@ class Bintool: show_status(col.RED, 'Failures', status[FAIL]) return not status[FAIL] - def run_cmd_result(self, *args, binary=False, raise_on_error=True): + def run_cmd_result(self, *args, binary=False, raise_on_error=True, add_name=True): """Run the bintool using command-line arguments Args: @@ -270,6 +272,7 @@ class Bintool: binary (bool): True to return output as bytes instead of str raise_on_error (bool): True to raise a ValueError exception if the tool returns a non-zero return code + add_name (bool): True to add bintool name to the beginning of command Returns: CommandResult: Resulting output from the bintool, or None if the @@ -278,7 +281,10 @@ class Bintool: if self.name in self.missing_list: return None name = os.path.expanduser(self.name) # Expand paths containing ~ - all_args = (name,) + args + if add_name: + all_args = (name,) + args + else: + all_args = args env = tools.get_env_with_path() tout.detail(f"bintool: {' '.join(all_args)}") result = command.run_pipe( @@ -304,18 +310,19 @@ class Bintool: tout.debug(result.stderr) return result - def run_cmd(self, *args, binary=False): + def run_cmd(self, *args, binary=False, add_name=True): """Run the bintool using command-line arguments Args: args (list of str): Arguments to provide, in addition to the bintool name binary (bool): True to return output as bytes instead of str + add_name (bool): True to add bintool name to the beginning of command Returns: str or bytes: Resulting stdout from the bintool """ - result = self.run_cmd_result(*args, binary=binary) + result = self.run_cmd_result(*args, binary=binary, add_name=add_name) if result: return result.stdout @@ -354,6 +361,32 @@ class Bintool: return None return fname, tmpdir + @classmethod + def fetch_from_git(cls, git_repo, name): + """Fetch a bintool git repo + + This clones the repo and returns + + Args: + git_repo (str): URL of git repo + name (str): Bintool name assigned as tool directory name + + Returns: + str: Directory of fetched repo + or None on error + """ + dir = os.path.join(DOWNLOAD_DESTDIR, name) + if os.path.exists(dir): + print(f"- {dir} repo already exists") + return None + os.mkdir(dir) + print(f"- clone git repo '{git_repo}' to '{dir}'") + tools.run('git', 'clone', '--depth', '1', git_repo, dir) + if len(os.listdir(dir)) == 0: + print(f"- '{dir}' repo is empty") + return None + return dir + @classmethod def fetch_from_url(cls, url): """Fetch a bintool from a URL diff --git a/tools/binman/bintool_test.py b/tools/binman/bintool_test.py index 7efb8391db..e391744289 100644 --- a/tools/binman/bintool_test.py +++ b/tools/binman/bintool_test.py @@ -258,6 +258,36 @@ class TestBintool(unittest.TestCase): fname = os.path.join(self._indir, '_testing') return fname if write_file else self.fname, stdout.getvalue() + def check_fetch_source_method(self, write_file): + """Check output from fetching using SOURCE method + + Args: + write_file (bool): True to write to output directory + + Returns: + tuple: + str: Filename of directory created + str: Contents of stdout + """ + def fake_run(*cmd): + if cmd[0] == 'git': + # See Bintool.fetch_from_git() + tmpdir = cmd[5] + self.fname = os.path.join(tmpdir, 'gitfile') + if write_file: + tools.write_file(self.fname, b'hello') + + btest = Bintool.create('_testing') + col = terminal.Color() + self.dirname = None + with unittest.mock.patch.object(bintool, 'DOWNLOAD_DESTDIR', + self._indir): + with unittest.mock.patch.object(tools, 'run', side_effect=fake_run): + with test_util.capture_sys_output() as (stdout, _): + btest.fetch_tool(bintool.FETCH_SOURCE, col, False) + dirname = os.path.join(self._indir, 'mygit') + return self.fname if write_file else dirname, stdout.getvalue() + def test_build_method(self): """Test fetching using the build method""" fname, stdout = self.check_build_method(write_file=True) @@ -270,6 +300,17 @@ class TestBintool(unittest.TestCase): self.assertFalse(os.path.exists(fname)) self.assertIn(f"File '{fname}' was not produced", stdout) + def test_fetch_source_method(self): + """Test fetching using the source method""" + dirname, stdout = self.check_fetch_source_method(write_file=True) + self.assertTrue(os.path.exists(dirname)) + + def test_fetch_source_method_fail(self): + """Test fetching using the source method when directory is empty""" + dirname, stdout = self.check_fetch_source_method(write_file=False) + self.assertEqual(len(os.listdir(dirname)), 0) + self.assertIn(f"'{dirname}' repo is empty", stdout) + def test_install(self): """Test fetching using the install method""" btest = Bintool.create('_testing') @@ -347,6 +388,8 @@ class TestBintool(unittest.TestCase): btool = Bintool.create('_testing') result = btool.run_cmd_result('fred') self.assertIsNone(result) + result = btool.run_cmd_result('daphne', add_name=False) + self.assertIsNone(result) if __name__ == "__main__": diff --git a/tools/binman/btool/_testing.py b/tools/binman/btool/_testing.py index 4005e8a8a5..b291d35c58 100644 --- a/tools/binman/btool/_testing.py +++ b/tools/binman/btool/_testing.py @@ -5,6 +5,8 @@ This is not a real bintool, just one used for testing""" +import tempfile + from binman import bintool # pylint: disable=C0103 @@ -33,4 +35,6 @@ class Bintool_testing(bintool.Bintool): return self.fetch_from_drive('junk') if method == bintool.FETCH_BUILD: return self.build_from_git('url', 'target', 'pathname') + if method == bintool.FETCH_SOURCE: + return self.fetch_from_git('giturl', 'mygit') return None diff --git a/tools/patman/tools.py b/tools/patman/tools.py index 2ac814d476..b69a651eab 100644 --- a/tools/patman/tools.py +++ b/tools/patman/tools.py @@ -397,7 +397,7 @@ def tool_find(name): paths += tool_search_paths for path in paths: fname = os.path.join(path, name) - if os.path.isfile(fname) and os.access(fname, os.X_OK): + if (os.path.isfile(fname) or os.path.isdir(fname)) and os.access(fname, os.X_OK): return fname def run(name, *args, **kwargs): -- 2.34.1

2 3

[PATCH v1 1/7] arm: dts: rockchip: rk3288: move io-domains nodes
by Johan Jonker 15 Mar '23

15 Mar '23

In order to better compare the Linux rk3288.dtsi version with the u-boot version move the io-domains nodes. Signed-off-by: Johan Jonker <jbx6244(a)gmail.com> --- arch/arm/dts/rk3288-miqi.dtsi | 27 +++++++++++-------------- arch/arm/dts/rk3288-phycore-som.dtsi | 30 +++++++++++++--------------- arch/arm/dts/rk3288-popmetal.dtsi | 30 +++++++++++++--------------- arch/arm/dts/rk3288-veyron.dtsi | 28 ++++++++++++-------------- arch/arm/dts/rk3288.dtsi | 5 +++++ 5 files changed, 58 insertions(+), 62 deletions(-) diff --git a/arch/arm/dts/rk3288-miqi.dtsi b/arch/arm/dts/rk3288-miqi.dtsi index cb80cbf2..00c8613d 100644 --- a/arch/arm/dts/rk3288-miqi.dtsi +++ b/arch/arm/dts/rk3288-miqi.dtsi @@ -18,21 +18,6 @@ clock-output-names = "ext_gmac"; }; - io_domains: io-domains { - compatible = "rockchip,rk3288-io-voltage-domain"; - rockchip,grf = <&grf>; - - audio-supply = <&vcca_33>; - flash0-supply = <&vcc_flash>; - flash1-supply = <&vcc_lan>; - gpio30-supply = <&vcc_io>; - gpio1830-supply = <&vcc_io>; - lcdc-supply = <&vcc_io>; - sdcard-supply = <&vccio_sd>; - wifi-supply = <&vcc_18>; - }; - - leds { compatible = "gpio-leds"; @@ -277,6 +262,18 @@ status = "okay"; }; +&io_domains { + audio-supply = <&vcca_33>; + flash0-supply = <&vcc_flash>; + flash1-supply = <&vcc_lan>; + gpio30-supply = <&vcc_io>; + gpio1830-supply = <&vcc_io>; + lcdc-supply = <&vcc_io>; + sdcard-supply = <&vccio_sd>; + wifi-supply = <&vcc_18>; + status = "okay"; +}; + &pinctrl { pcfg_output_high: pcfg-output-high { output-high; diff --git a/arch/arm/dts/rk3288-phycore-som.dtsi b/arch/arm/dts/rk3288-phycore-som.dtsi index 821525f7..70c00308 100644 --- a/arch/arm/dts/rk3288-phycore-som.dtsi +++ b/arch/arm/dts/rk3288-phycore-som.dtsi @@ -71,22 +71,6 @@ clock-output-names = "ext_gmac"; }; - io_domains: io_domains { - compatible = "rockchip,rk3288-io-voltage-domain"; - - status = "okay"; - sdcard-supply = <&vdd_io_sd>; - flash0-supply = <&vdd_emmc_io>; - flash1-supply = <&vdd_misc_1v8>; - gpio1830-supply = <&vdd_3v3_io>; - gpio30-supply = <&vdd_3v3_io>; - bb-supply = <&vdd_3v3_io>; - dvp-supply = <&vdd_3v3_io>; - lcdc-supply = <&vdd_3v3_io>; - wifi-supply = <&vdd_3v3_io>; - audio-supply = <&vdd_3v3_io>; - }; - leds: user-leds { compatible = "gpio-leds"; pinctrl-names = "default"; @@ -197,6 +181,20 @@ ddc-i2c-bus = <&i2c5>; }; +&io_domains { + audio-supply = <&vdd_3v3_io>; + bb-supply = <&vdd_3v3_io>; + dvp-supply = <&vdd_3v3_io>; + flash0-supply = <&vdd_emmc_io>; + flash1-supply = <&vdd_misc_1v8>; + gpio1830-supply = <&vdd_3v3_io>; + gpio30-supply = <&vdd_3v3_io>; + lcdc-supply = <&vdd_3v3_io>; + sdcard-supply = <&vdd_io_sd>; + wifi-supply = <&vdd_3v3_io>; + status = "okay"; +}; + &i2c0 { status = "okay"; clock-frequency = <400000>; diff --git a/arch/arm/dts/rk3288-popmetal.dtsi b/arch/arm/dts/rk3288-popmetal.dtsi index 0253933a..d732a706 100644 --- a/arch/arm/dts/rk3288-popmetal.dtsi +++ b/arch/arm/dts/rk3288-popmetal.dtsi @@ -71,22 +71,6 @@ }; }; - io_domains: io-domains { - compatible = "rockchip,rk3288-io-voltage-domain"; - rockchip,grf = <&grf>; - - audio-supply = <&vcca_33>; - bb-supply = <&vcc_io>; - dvp-supply = <&vcc18_dvp>; - flash0-supply = <&vcc_flash>; - flash1-supply = <&vcc_lan>; - gpio30-supply = <&vcc_io>; - gpio1830-supply = <&vcc_io>; - lcdc-supply = <&vcc_io>; - sdcard-supply = <&vccio_sd>; - wifi-supply = <&vccio_wl>; - }; - ir: ir-receiver { compatible = "gpio-ir-receiver"; gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; @@ -443,6 +427,20 @@ status = "okay"; }; +&io_domains { + audio-supply = <&vcca_33>; + bb-supply = <&vcc_io>; + dvp-supply = <&vcc18_dvp>; + flash0-supply = <&vcc_flash>; + flash1-supply = <&vcc_lan>; + gpio30-supply = <&vcc_io>; + gpio1830-supply = <&vcc_io>; + lcdc-supply = <&vcc_io>; + sdcard-supply = <&vccio_sd>; + wifi-supply = <&vccio_wl>; + status = "okay"; +}; + &pinctrl { ak8963 { comp_int: comp-int { diff --git a/arch/arm/dts/rk3288-veyron.dtsi b/arch/arm/dts/rk3288-veyron.dtsi index 35db8827..434b0d49 100644 --- a/arch/arm/dts/rk3288-veyron.dtsi +++ b/arch/arm/dts/rk3288-veyron.dtsi @@ -198,21 +198,6 @@ /* Faux input supply. See bt_regulator description. */ vin-supply = <&bt_regulator>; }; - - io-domains { - compatible = "rockchip,rk3288-io-voltage-domain"; - rockchip,grf = <&grf>; - - audio-supply = <&vcc18_codec>; - bb-supply = <&vcc33_io>; - dvp-supply = <&vcc_18>; - flash0-supply = <&vcc18_flashio>; - gpio1830-supply = <&vcc33_io>; - gpio30-supply = <&vcc33_io>; - lcdc-supply = <&vcc33_lcd>; - sdcard-supply = <&vccio_sd>; - wifi-supply = <&vcc18_wl>; - }; }; &cpu0 { @@ -503,6 +488,19 @@ clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>, <&cru SCLK_I2S0_OUT>; }; +&io_domains { + audio-supply = <&vcc18_codec>; + bb-supply = <&vcc33_io>; + dvp-supply = <&vcc_18>; + flash0-supply = <&vcc18_flashio>; + gpio1830-supply = <&vcc33_io>; + gpio30-supply = <&vcc33_io>; + lcdc-supply = <&vcc33_lcd>; + sdcard-supply = <&vccio_sd>; + wifi-supply = <&vcc18_wl>; + status = "okay"; +}; + &wdt { status = "okay"; }; diff --git a/arch/arm/dts/rk3288.dtsi b/arch/arm/dts/rk3288.dtsi index 8c394c1e..9cfb86f9 100644 --- a/arch/arm/dts/rk3288.dtsi +++ b/arch/arm/dts/rk3288.dtsi @@ -762,6 +762,11 @@ grf: syscon@ff770000 { compatible = "rockchip,rk3288-grf", "syscon"; reg = <0xff770000 0x1000>; + + io_domains: io-domains { + compatible = "rockchip,rk3288-io-voltage-domain"; + status = "disabled"; + }; }; wdt: watchdog@ff800000 { -- 2.20.1

3 15

[PATCH v5 00/44] More tidy-ups of Kconfig options
by Simon Glass 15 Mar '23

15 Mar '23

This series was split out of the old 'split config' splc series. It contains clean-up patches which do not depend on split config. This is available at u-boot-dm/spld-working The size changes look pretty good: https://paste.debian.net/1271742/ The remaining patches will move into a new 'splg' series (G for Good). [1] https://patchwork.ozlabs.org/project/uboot/list/?series=341504&state=* Changes in v5: - Fix reply typo - Change approach and expand notes after more investigation - Drop FSL_ISBC_KEY_EXT patch as it changes the size - Drop PHY_CADENCE_SIERRA patch as it changes the size Changes in v4: - Avoid use of def_bool - Modify to get rid of def_bool - Adjust Kconfig ordering - Just fix the typo - Reduce and rename commit - Reduce and rename commit - Fix 'wanderboard' typo - Reduce and rename commit Changes in v3: - Add new patch to disable QFW bootmeth in SPL - Move the option down to the non-SPL part of drivers/Makefile - Correct 'VPL' typo - Use a consistent format for the comment - Fix a transitory build error with sandbox_spl - Add a new patch to disallow commands in SPL Changes in v2: - Rebase to previous series Simon Glass (44): mtd: Drop unused kb9202_nand driver mtd: Drop unused CONFIG_ONENAND_U_BOOT sh4: Drop unused twl6030 driver moveconfig: Update to detect / correct missing SPL Kconfigs bootstd: Disable QFW bootmeth in SPL Correct SPL uses of ARCH_MVEBU Correct SPL uses of DISPLAY_AER_FULL Correct SPL uses of MULTIPLEXER Correct SPL use of PG_WCOM_UBOOT_UPDATE_SUPPORTED Correct SPL uses of PHY_FIXED boot: Add Kconfigs for BOOTMETH_VBE_REQUEST Correct SPL use of DM_RNG lib: Add a Kconfig for SPL_BZIP2 moveconfig: Various minor improvements sandbox: Expand size for VPL image event: Add Kconfig options for SPL bootstd: Correct 'VPL' typo env: Avoid checking ENV_IS_IN when env disabled env: Allow VPL environment to be nowhere lib: Add VPL options for SHA1 and SHA256 x86: Use string functions for all 32-bit builds lib: Fix build condition for tiny-printf sandbox: Tidy up RTC options sandbox: Use the generic VPL option to enable VPL sandbox: Tidy up I2C options fixdep: Add support for VPL fixdep: Refactor to make testing easier fixdep: Add some tests for parse_config_line() test: Add SPL versions of the TEST_KCONFIG options lib: Add an SPL config for LIB_UUID test: Tidy up sandbox handling in test-main x86: Fix up use of X86_32BIT_INIT and X86_64 options Add VPL options for BLOBLIST rockchip: Avoid checking environment without ENV_SUPPORT freescale: Drop old pre-DM_ETH code imx: Use SATA instead of CMD_SATA net: Add an SPL config for atheros freescale: Fix odd use of ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE serial: Support ns16550 driver in TPL dm: Add a TPL symbol for simple-bus x86: coral: Add missing TPL options power: wandboard: Add a missing CONFIG venice: Simplify conditions for network init command: Don't allow commands in SPL Makefile | 1 - arch/arm/cpu/armv7/ls102xa/fdt.c | 12 - arch/powerpc/include/asm/config_mpc85xx.h | 6 +- arch/sandbox/dts/sandbox.dts | 4 +- arch/sandbox/dts/sandbox.dtsi | 6 +- arch/sandbox/dts/sandbox_vpl.dtsi | 4 +- arch/sandbox/include/asm/rtc.h | 2 +- arch/x86/cpu/qemu/qemu.c | 2 +- arch/x86/include/asm/msr.h | 2 +- arch/x86/include/asm/string.h | 2 +- arch/x86/lib/Makefile | 2 +- board/gateworks/venice/venice.c | 6 +- board/keymile/common/common.c | 2 +- board/solidrun/mx6cuboxi/mx6cuboxi.c | 2 +- .../puma_rk3399/puma-rk3399.c | 2 +- .../ringneck_px30/ringneck-px30.c | 2 +- boot/Kconfig | 22 +- boot/Makefile | 5 +- boot/vbe_request.c | 2 +- cmd/nvedit.c | 2 + common/Kconfig | 51 +- configs/chromebook_coral_defconfig | 3 + configs/wandboard_defconfig | 1 + disk/Kconfig | 8 + drivers/Makefile | 2 +- drivers/core/Kconfig | 7 + drivers/i2c/Kconfig | 20 + drivers/input/Makefile | 1 - drivers/input/twl6030.c | 47 -- drivers/mmc/fsl_esdhc.c | 6 +- drivers/mmc/fsl_esdhc_imx.c | 4 +- drivers/mmc/mv_sdhci.c | 4 +- drivers/mtd/nand/raw/Makefile | 1 - drivers/mtd/nand/raw/kb9202_nand.c | 134 ---- drivers/mux/Makefile | 2 +- drivers/net/mvneta.c | 4 +- drivers/net/phy/Kconfig | 3 + drivers/rtc/Kconfig | 18 + drivers/rtc/Makefile | 4 +- drivers/serial/Kconfig | 6 + drivers/sysreset/sysreset_mpc83xx.c | 4 +- env/Kconfig | 10 + include/command.h | 2 +- include/mux.h | 2 +- lib/Kconfig | 30 + lib/Makefile | 2 +- net/mdio-uclass.c | 2 +- scripts/basic/fixdep.c | 162 ++++- test/lib/Kconfig | 20 +- test/test-main.c | 10 +- tools/moveconfig.py | 594 +++++++++++++----- 51 files changed, 831 insertions(+), 421 deletions(-) delete mode 100644 drivers/input/twl6030.c delete mode 100644 drivers/mtd/nand/raw/kb9202_nand.c -- 2.39.2.637.g21b0678d19-goog

6 93