September 2022 - U-Boot

[PATCH v2 0/3] Add riscv semihosting support in u-boot
by Kautuk Consul 16 Sep '22

16 Sep '22

Semihosting is a mechanism that enables code running on a target to communicate and use the Input/Output facilities on a host computer that is running a debugger. This patchset adds support for semihosting in u-boot for RISCV64 targets. CHANGES since v1: - Moved the identical smh_* and semihosting_enabled/disable_semihosting code of ARM and RISC-V to lib/semihosting.c - Extend the handle_trap() functionality to call disable_semihosting() if the cause is a breakpoint (i.e. ebreak instruction) - Change our implementation of semihosting_enabled to be exactly the same as the way ARM implemented it - Additionally enable the CONFIG_SPL_FS_EXT4 and CONFIG_SPL_FS_FAT configs for qemu defconfigs so that CONFIG_SPL_FS_LOAD_PAYLOAD_NAME gets automatically enabled instead of us #defining it in include/configs/qemu-riscv.h Compilation and test commands for SPL and S-mode configurations ================================================================= U-Boot S-mode on QEMU virt ---------------------------- // Compilation of S-mode u-boot ARCH=riscv CROSS_COMPILE=riscv64-unknown-linux-gnu- make qemu-riscv64_smode_defconfig make // Run riscv 64-bit u-boot with opensbi on qemu qemu-system-riscv64 -M virt -m 256M -display none -serial stdio -bios\ opensbi/build/platform/generic/firmware/fw_jump.bin -kernel\ u-boot/u-boot.bin U-Boot SPL on QEMU virt ------------------------ // Compilation of u-boot-spl ARCH=riscv CROSS_COMPILE=riscv64-unknown-linux-gnu- make qemu-riscv64_spl_defconfig make OPENSBI=opensbi/build/platform/generic/firmware/fw_dynamic.bin // Run 64-bit u-boot-spl in qemu qemu-system-riscv64 -M virt -m 256M -display none -serial stdio -bios\ u-boot/spl/u-boot-spl.bin -device\ loader,file=u-boot/u-boot.itb,addr=0x80200000 Kautuk Consul (3): lib: Add common semihosting library arch/riscv: add semihosting support for RISC-V board: qemu-riscv: enable semihosting arch/arm/Kconfig | 2 + arch/arm/lib/semihosting.c | 179 +------------------------- arch/riscv/Kconfig | 47 +++++++ arch/riscv/include/asm/semihosting.h | 11 ++ arch/riscv/include/asm/spl.h | 1 + arch/riscv/lib/Makefile | 2 + arch/riscv/lib/interrupts.c | 11 ++ arch/riscv/lib/semihosting.c | 24 ++++ configs/qemu-riscv32_defconfig | 4 + configs/qemu-riscv32_smode_defconfig | 4 + configs/qemu-riscv32_spl_defconfig | 7 + configs/qemu-riscv64_defconfig | 4 + configs/qemu-riscv64_smode_defconfig | 4 + configs/qemu-riscv64_spl_defconfig | 7 + include/semihosting.h | 11 ++ lib/Kconfig | 3 + lib/Makefile | 2 + lib/semihosting.c | 186 +++++++++++++++++++++++++++ 18 files changed, 331 insertions(+), 178 deletions(-) create mode 100644 arch/riscv/include/asm/semihosting.h create mode 100644 arch/riscv/lib/semihosting.c create mode 100644 lib/semihosting.c -- 2.34.1

1 0

[PATCH v1 0/6] Migrate watchdog reset to cyclic infrastructure
by Stefan Roese 16 Sep '22

16 Sep '22

This patchset migrates the watchdog triggering (WATCHDOG_RESET calls) to the newly introduced cyclic execution framework. For this, the watchdog driver now registers a cyclic execution function for each WDT device that needs to get serviced. Additionally the cyclic IF is a bit extended to also support the CONFIG_HW_WATCHDOG users. It might make sense to deprecate this HW_WATCHDOG usage at some point. Please note that this migration work is based on the cyclic execution infrastructure, which I posted in the last few weeks. So these cyclic patches need to be applied for this migration to work. Some further cleanup and improvements are possible after this patch. E.g. Heinrich mentioned that the WATCHDOG_RESET call locations need to get improved / changed in some places. I've pushed a working branch here for anyone who wants to do some testing with this patchset: https://source.denx.de/u-boot/custodians/u-boot-watchdog/-/commits/cyclic-v… Here the log from octeon_ebb7304 compiled on this branch: U-Boot 2022.10-rc3-00063-g1050cb3e6d8e (Aug 29 2022 - 07:57:07 +0200) SoC: Octeon CN73xx (16 cores) Model: cavium,ebb7304 DRAM: 256 MiB (16 GiB total) Core: 31 devices, 24 uclasses, devicetree: separate WDT: Started interrupt-controller@1010000000000 with servicing all 1000ms (60s timeout) Flash: 8 MiB MMC: octeontx-mmc0: 0, octeontx-mmc1: 1 Loading Environment from Flash... OK QLM 0: PCIe gen3 root complex, x4 lanes QLM 2: SGMII QLM 3: XLAUI QLM 5: SGMII Net: eth0: ethernet-mac-nexus@11800e0000000 => cyclic list function: interrupt-controller@1010000000000, cpu-time: 4 us, frequency: 1.11 times/s => wdt list interrupt-controller@1010000000000 (wdt_octeontx) Any comments and suggestions are welcome. Thanks, Stefan Stefan Roese (6): watchdog: Integrate watchdog triggering into the cyclic framework cyclic: Introduce schedule() function cyclic: Use schedule() instead of WATCHDOG_RESET() watchdog: Get rid of ASSEMBLY hacks watchdog: Remove WATCHDOG_RESET macro watchdog: Further cleanup arch/arm/mach-at91/phy.c | 2 +- arch/arm/mach-imx/i2c-mxv7.c | 2 +- arch/arm/mach-socfpga/spl_a10.c | 8 +- .../cmd_stm32prog/stm32prog_serial.c | 6 +- arch/m68k/lib/time.c | 2 +- arch/powerpc/cpu/mpc8xx/cpu_init.c | 2 +- arch/powerpc/lib/bootm.c | 6 +- arch/powerpc/lib/cache.c | 2 +- arch/powerpc/lib/interrupts.c | 2 +- arch/powerpc/lib/ticks.S | 5 +- board/astro/mcf5373l/fpga.c | 4 +- board/dhelectronics/dh_stm32mp1/board.c | 2 +- board/liebherr/display5/spl.c | 2 +- board/nokia/rx51/rx51.c | 2 +- board/st/stm32mp1/stm32mp1.c | 2 +- boot/bootretry.c | 2 +- boot/image-board.c | 2 +- cmd/fastboot.c | 2 +- cmd/mem.c | 16 ++-- cmd/usb_mass_storage.c | 2 +- cmd/ximg.c | 2 +- common/board_f.c | 4 +- common/board_r.c | 2 +- common/cli_readline.c | 4 +- common/console.c | 2 +- common/cyclic.c | 11 +++ common/dfu.c | 2 +- common/lcd.c | 10 +-- common/menu.c | 6 +- common/usb_kbd.c | 2 +- common/xyzModem.c | 2 +- drivers/block/ide.c | 8 +- drivers/crypto/aspeed/aspeed_hace.c | 2 +- drivers/crypto/hash/hash_sw.c | 2 +- drivers/ddr/altera/sdram_arria10.c | 4 +- drivers/ddr/altera/sdram_n5x.c | 4 +- drivers/ddr/altera/sdram_soc64.c | 2 +- drivers/fpga/intel_sdm_mb.c | 8 +- drivers/fpga/socfpga_arria10.c | 8 +- drivers/i2c/mxc_i2c.c | 4 +- drivers/mmc/octeontx_hsmmc.c | 12 +-- drivers/mmc/sh_mmcif.c | 6 +- drivers/mmc/stm32_sdmmc2.c | 2 +- drivers/mtd/cfi_flash.c | 4 +- drivers/mtd/nand/core.c | 2 +- drivers/mtd/nand/raw/atmel_nand.c | 6 +- drivers/mtd/nand/raw/nand_base.c | 10 +-- drivers/mtd/nand/raw/nand_util.c | 6 +- drivers/mtd/nand/spi/core.c | 4 +- drivers/mtd/onenand/onenand_base.c | 4 +- drivers/mtd/spi/spi-nor-core.c | 4 +- drivers/net/octeontx2/nix.c | 2 +- drivers/net/octeontx2/nix_af.c | 32 ++++---- drivers/ram/stm32mp1/stm32mp1_tests.c | 2 +- drivers/serial/atmel_usart.c | 2 +- drivers/serial/ns16550.c | 6 +- drivers/serial/serial-uclass.c | 2 +- drivers/serial/serial_bcm283x_mu.c | 2 +- drivers/serial/serial_lpuart.c | 8 +- drivers/serial/serial_mpc8xx.c | 4 +- drivers/serial/serial_mt7620.c | 2 +- drivers/serial/serial_mtk.c | 4 +- drivers/serial/serial_mxc.c | 6 +- drivers/serial/serial_octeon_bootcmd.c | 2 +- drivers/serial/serial_octeon_pcie_console.c | 4 +- drivers/serial/serial_pl01x.c | 8 +- drivers/serial/serial_sifive.c | 2 +- drivers/serial/serial_zynq.c | 2 +- drivers/spi/mtk_snfi_spi.c | 2 +- drivers/spi/octeon_spi.c | 2 +- drivers/spi/stm32_qspi.c | 2 +- drivers/timer/mpc83xx_timer.c | 4 +- drivers/usb/eth/lan7x.h | 4 +- drivers/usb/gadget/f_acm.c | 4 +- drivers/usb/gadget/f_sdp.c | 4 +- drivers/usb/host/ehci-hcd.c | 2 +- drivers/usb/musb-new/musb_uboot.c | 2 +- drivers/video/video_bmp.c | 4 +- drivers/watchdog/Kconfig | 2 + drivers/watchdog/wdt-uclass.c | 73 +++++++++++-------- env/common.c | 2 +- fs/cramfs/uncompress.c | 3 +- fs/jffs2/jffs2_1pass.c | 2 +- include/cyclic.h | 12 +++ include/linux/compat.h | 2 +- include/wait_bit.h | 2 +- include/watchdog.h | 68 +---------------- lib/bzip2/bzlib.c | 2 +- lib/bzip2/bzlib_decompress.c | 8 +- lib/crc32.c | 2 +- lib/efi_loader/efi_boottime.c | 4 +- lib/gunzip.c | 2 +- lib/lzma/LzmaDec.c | 16 ++-- lib/lzma/LzmaTools.c | 2 +- lib/md5.c | 2 +- lib/sha1.c | 2 +- lib/sha256.c | 2 +- lib/sha512.c | 4 +- lib/time.c | 2 +- lib/zlib/inflate.c | 8 +- net/net.c | 2 +- post/cpu/mpc83xx/ecc.c | 2 +- post/drivers/memory.c | 36 ++++----- post/lib_powerpc/cpu.c | 16 ++-- post/lib_powerpc/fpu/fpu.c | 4 +- post/post.c | 4 +- test/common/cyclic.c | 2 +- test/dm/wdt.c | 9 ++- 108 files changed, 306 insertions(+), 333 deletions(-) -- 2.37.3

2 8

[PATCH 0/2] Add riscv semihosting support in u-boot
by Kautuk Consul 16 Sep '22

16 Sep '22

Semihosting is a mechanism that enables code running on a target to communicate and use the Input/Output facilities on a host computer that is running a debugger. This patchset adds support for semihosting in u-boot for RISCV64 targets. Compilation and test commands for SPL and S-mode configurations ================================================================= U-Boot S-mode on QEMU virt ---------------------------- // Compilation of S-mode u-boot ARCH=riscv CROSS_COMPILE=riscv64-unknown-linux-gnu- make qemu-riscv64_smode_defconfig make // Run riscv 64-bit u-boot with opensbi on qemu qemu-system-riscv64 -M virt -m 256M -display none -serial stdio -bios\ opensbi/build/platform/generic/firmware/fw_jump.bin -kernel\ u-boot/u-boot.bin U-Boot SPL on QEMU virt ------------------------ // Compilation of u-boot-spl ARCH=riscv CROSS_COMPILE=riscv64-unknown-linux-gnu- make qemu-riscv64_spl_defconfig make OPENSBI=opensbi/build/platform/generic/firmware/fw_dynamic.bin // Run 64-bit u-boot-spl in qemu qemu-system-riscv64 -M virt -m 256M -display none -serial stdio -bios\ u-boot/spl/u-boot-spl.bin -device\ loader,file=u-boot/u-boot.itb,addr=0x80200000 Kautuk Consul (2): arch/riscv: add semihosting support for RISC-V board: qemu-riscv: enable semihosting arch/riscv/Kconfig | 45 ++++++++ arch/riscv/include/asm/semihosting.h | 11 ++ arch/riscv/include/asm/spl.h | 1 + arch/riscv/lib/Makefile | 7 ++ arch/riscv/lib/semihosting.c | 166 +++++++++++++++++++++++++++ arch/riscv/lib/semihosting_mmode.c | 77 +++++++++++++ arch/riscv/lib/semihosting_smode.c | 77 +++++++++++++ configs/qemu-riscv32_defconfig | 4 + configs/qemu-riscv32_smode_defconfig | 4 + configs/qemu-riscv32_spl_defconfig | 5 + configs/qemu-riscv64_defconfig | 4 + configs/qemu-riscv64_smode_defconfig | 4 + configs/qemu-riscv64_spl_defconfig | 5 + include/configs/qemu-riscv.h | 2 + 14 files changed, 412 insertions(+) create mode 100644 arch/riscv/include/asm/semihosting.h create mode 100644 arch/riscv/lib/semihosting.c create mode 100644 arch/riscv/lib/semihosting_mmode.c create mode 100644 arch/riscv/lib/semihosting_smode.c -- 2.34.1

3 9

[PATCH 0/6] Enable CONFIG_TIMER for all Kirwood / MVEBU boards
by Stefan Roese 16 Sep '22

16 Sep '22

This patchset enhaces the recently added Orion Timer driver to support all other Kirkwood & 32bit MVEBU Armada platforms. Additionally, this timer support is then enabled per default for those platforms, so that the board config files don't need to be changed. Also necessary is some dts hacking, so that the timer DT node is available in early U-Boot stages. I've successfully tested this patchset on an Armada XP board. Additional test on other boards and platforms are very welcome and necessary. Thanks, Stefan Stefan Roese (6): timer: orion-timer: Add support for other Armada SoC's timer: orion-timer: Add timer_get_boot_us() for BOOTSTAGE support arm: mvebu: Use CONFIG_TIMER on all MVEBU & KIRKWOOD platforms arm: mvebu: dts: Makefile: Compile Armada 375 dtb in a separate step arm: mvebu: dts: armada-375.dtsi: Add timer0 & timer1 arm: mvebu: dts: mvebu-u-boot.dtsi: Add "u-boot,dm-pre-reloc" to timer DT node arch/arm/Kconfig | 4 ++ arch/arm/dts/Makefile | 6 ++- arch/arm/dts/armada-375.dtsi | 4 +- arch/arm/dts/mvebu-u-boot.dtsi | 11 ++++ arch/arm/mach-mvebu/include/mach/config.h | 5 -- drivers/timer/Kconfig | 5 +- drivers/timer/orion-timer.c | 66 +++++++++++++++++++++-- 7 files changed, 89 insertions(+), 12 deletions(-) -- 2.37.2

1 0

[PATCH 1/4] Makefile: Add a Python-based CONFIG checker
by Simon Glass 16 Sep '22

16 Sep '22

The existing shell script is a bit ugly. It was picked up by Chromium OS and then rewritten in Python, adding unit tests. Bring this new version into U-Boot. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- scripts/kconfig_check.py | 338 ++++++++++++++++++++++++++++++++++ scripts/test_kconfig_check.py | 185 +++++++++++++++++++ 2 files changed, 523 insertions(+) create mode 100755 scripts/kconfig_check.py create mode 100755 scripts/test_kconfig_check.py diff --git a/scripts/kconfig_check.py b/scripts/kconfig_check.py new file mode 100755 index 00000000000..8f0e142bdc6 --- /dev/null +++ b/scripts/kconfig_check.py @@ -0,0 +1,338 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0+ +"""Kconfig checker + +Checks that the .config file provided does not introduce any new ad-hoc CONFIG +options + +This tool is also present in the Chromium OS EC, so we should keep the two in +sync. + +The tool supports two formats for the 'configs' file: + + CONFIG_SOMETHING=xx + +and + + #define CONFIG_SOMETHING xx + +Use the -d flag to select the second format. +""" + +import argparse +import os +import re +import sys + +# Bring in the kconfig library +our_path = os.path.dirname(os.path.realpath(__file__)) +sys.path.insert(1, os.path.join(our_path, '..')) + +# Try to use kconfiglib if available, but fall back to a simple recursive grep +USE_KCONFIGLIB = False +try: + from tools.buildman import kconfiglib + USE_KCONFIGLIB = True +except ImportError: + pass + +# Where we put the new config_allowed file +NEW_ALLOWED_FNAME = '/tmp/new_config_allowed.txt' + + +def parse_args(argv): + """Parse the program arguments + + Args: + argv: List of arguments to parse, excluding the program name + + Returns: + argparse.Namespace object containing the results + """ + epilog = """Checks that new ad-hoc CONFIG options are not introduced without +a corresponding Kconfig option for Zephyr""" + + parser = argparse.ArgumentParser(epilog=epilog) + parser.add_argument('-a', '--allowed', type=str, + default='util/config_allowed.txt', + help='File containing list of allowed ad-hoc CONFIGs') + parser.add_argument('-c', '--configs', type=str, default='.config', + help='File containing CONFIG options to check') + parser.add_argument('-d', '--use-defines', action='store_true', + help='Lines in the configs file use #define') + parser.add_argument( + '-D', '--debug', action='store_true', + help='Enabling debugging (provides a full traceback on error)') + parser.add_argument('-p', '--prefix', type=str, default='', + help='Prefix to string from Kconfig options') + parser.add_argument('-s', '--srctree', type=str, default='zephyr/', + help='Path to source tree to look for Kconfigs') + + # The chroot uses a very old Python + if sys.version_info >= (3, 7): + subparsers = parser.add_subparsers(dest='cmd', required=True) + else: + subparsers = parser.add_subparsers(dest='cmd') + subparsers.required = True + subparsers.add_parser('check', help='Check for new ad-hoc CONFIGs') + + return parser.parse_args(argv) + + +class KconfigCheck: + """Class for handling checking of CONFIG options against Kconfig options + + The goal is to make sure that CONFIG_xxx options used by a build have an + equivalent Kconfig option defined as well. + + For example if a Kconfig file has: + + config PREFIX_MY_CONFIG + ... + + and the CONFIG files has + + CONFIG_MY_CONFIG + + then we consider these equivalent (with the prefix 'PREFIX_') and thus + CONFIG_MY_CONFIG is allowed to be used. + + If any CONFIG option is found that does not have an equivalent in the Kconfig, + the user is exhorted to add a new Kconfig. This helps avoid adding new ad-hoc + CONFIG options, eventually returning the number to zero. + """ + @classmethod + def find_new_adhoc(cls, configs, kconfigs, allowed): + """Get a list of new ad-hoc CONFIG options + + Arguments and return value should omit the 'CONFIG_' prefix, so + CONFIG_LTO should be provided as 'LTO'. + + Args: + configs: List of existing CONFIG options + kconfigs: List of existing Kconfig options + allowed: List of allowed CONFIG options + + Returns: + List of new CONFIG options, with the CONFIG_ prefix removed + """ + return sorted(list(set(configs) - set(kconfigs) - set(allowed))) + + @classmethod + def find_unneeded_adhoc(cls, kconfigs, allowed): + """Get a list of ad-hoc CONFIG options that now have Kconfig options + + Arguments and return value should omit the 'CONFIG_' prefix, so + CONFIG_LTO should be provided as 'LTO'. + + Args: + kconfigs: List of existing Kconfig options + allowed: List of allowed CONFIG options + + Returns: + List of new CONFIG options, with the CONFIG_ prefix removed + """ + return sorted(list(set(allowed) & set(kconfigs))) + + @classmethod + def get_updated_adhoc(cls, unneeded_adhoc, allowed): + """Get a list of ad-hoc CONFIG options that are still needed + + Arguments and return value should omit the 'CONFIG_' prefix, so + CONFIG_LTO should be provided as 'LTO'. + + Args: + unneeded_adhoc: List of ad-hoc CONFIG options to remove + allowed: Current list of allowed CONFIG options + + Returns: + New version of allowed CONFIG options, with the CONFIG_ prefix + removed + """ + return sorted(list(set(allowed) - set(unneeded_adhoc))) + + @classmethod + def read_configs(cls, configs_file, use_defines=False): + """Read CONFIG options from a file + + The file consists of a number of lines, each containing a CONFIG + option + + Args: + configs_file: Filename to read from (e.g. u-boot.cfg) + use_defines: True if each line of the file starts with #define + + Returns: + List of CONFIG_xxx options found in the file, with the 'CONFIG_' + prefix removed + """ + with open(configs_file, encoding='utf-8') as inf: + configs = re.findall('%sCONFIG_([A-Za-z0-9_]*)%s' % + ((use_defines and '#define ' or ''), + (use_defines and ' ' or '')), + inf.read()) + return configs + + @classmethod + def read_allowed(cls, allowed_file): + """Read allowed CONFIG options from a file + + Args: + allowed_file: Filename to read from + + Returns: + List of CONFIG_xxx options found in the file, with the 'CONFIG_' + prefix removed + """ + with open(allowed_file) as inf: + configs = re.findall('CONFIG_([A-Za-z0-9_]*)', inf.read()) + return configs + + @classmethod + def find_kconfigs(cls, srcdir): + """Find all the Kconfig files in a source directory, recursively + + Any subdirectory called 'Kconfig' is ignored, since Zephyr generates + this in its build directory. + + Args: + srcdir: Directory to scan + + Returns: + List of pathnames found + """ + kconfig_files = [] + for root, dirs, files in os.walk(srcdir): + kconfig_files += [os.path.join(root, fname) + for fname in files if fname.startswith('Kconfig')] + if 'Kconfig' in dirs: + dirs.remove('Kconfig') + return kconfig_files + + @classmethod + def scan_kconfigs(cls, srcdir, prefix=''): + """Scan a source tree for Kconfig options + + Args: + srcdir: Directory to scan (containing top-level Kconfig file) + prefix: Prefix to strip from the name (e.g. 'PLATFORM_EC_') + + Returns: + List of config and menuconfig options found + """ + if USE_KCONFIGLIB: + kconf = kconfiglib.Kconfig(os.path.join(srcdir, 'Kconfig'), + warn=False) + + # There is always a MODULES config, since kconfiglib is designed for + # linux, but we don't want it + kconfigs = filter(lambda name: name != 'MODULES', kconf.syms.keys()) + + if prefix: + re_drop_prefix = re.compile(r'^%s' % prefix) + kconfigs = [re_drop_prefix.sub('', name) for name in kconfigs] + else: + kconfigs = [] + # Remove the prefix if present + expr = re.compile(r'(config|menuconfig) (%s)?([A-Za-z0-9_]*)\n' % + prefix) + for fname in cls.find_kconfigs(srcdir): + with open(fname, encoding='utf-8') as inf: + found = re.findall(expr, inf.read()) + kconfigs += [name for kctype, _, name in found] + return kconfigs + + def check_adhoc_configs(self, configs_file, srcdir, allowed_file, + prefix='', use_defines=False): + """Find new and unneeded ad-hoc configs in the configs_file + + Args: + configs_file: Filename containing CONFIG options to check + srcdir: Source directory to scan for Kconfig files + allowed_file: File containing allowed CONFIG options + prefix: Prefix to strip from the start of each Kconfig + (e.g. 'PLATFORM_EC_') + use_defines: True if each line of the file starts with #define + + Returns: + Tuple: + List of new ad-hoc CONFIG options (without 'CONFIG_' prefix) + List of ad-hoc CONFIG options (without 'CONFIG_' prefix) that + are no-longer needed, since they now have an associated + Kconfig + List of ad-hoc CONFIG options that are still needed, given the + current state of the Kconfig options + """ + configs = self.read_configs(configs_file, use_defines) + kconfigs = self.scan_kconfigs(srcdir, prefix) + allowed = self.read_allowed(allowed_file) + new_adhoc = self.find_new_adhoc(configs, kconfigs, allowed) + unneeded_adhoc = self.find_unneeded_adhoc(kconfigs, allowed) + updated_adhoc = self.get_updated_adhoc(unneeded_adhoc, allowed) + return new_adhoc, unneeded_adhoc, updated_adhoc + + def do_check(self, configs_file, srcdir, allowed_file, prefix, use_defines): + """Find new ad-hoc configs in the configs_file + + Args: + configs_file: Filename containing CONFIG options to check + srcdir: Source directory to scan for Kconfig files + allowed_file: File containing allowed CONFIG options + prefix: Prefix to strip from the start of each Kconfig + (e.g. 'PLATFORM_EC_') + use_defines: True if each line of the file starts with #define + + Returns: + Exit code: 0 if OK, 1 if a problem was found + """ + new_adhoc, unneeded_adhoc, updated_adhoc = self.check_adhoc_configs( + configs_file, srcdir, allowed_file, prefix, use_defines) + if new_adhoc: + print("""Error: You must add new CONFIG options using Kconfig + +\tU-Boot uses Kconfig for configuration rather than ad-hoc #defines. +\tAny new CONFIG options must be added to Kconfig files. The following new +\tad-hoc CONFIG options were detected: + +%s + +Please add these via Kconfig instead. Find a suitable Kconfig +file in zephyr/ and add a 'config' or 'menuconfig' option. +Also see details in http://issuetracker.google.com/181253613 + +To temporarily disable this, use: ALLOW_CONFIG=1 make ... +""" % '\n'.join(['CONFIG_%s' % name for name in new_adhoc]), file=sys.stderr) + return 1 + + if unneeded_adhoc: + with open(NEW_ALLOWED_FNAME, 'w') as out: + for config in updated_adhoc: + print('CONFIG_%s' % config, file=out) + print("""Congratulations! The following options are now in Kconfig: + +%s + +Please run this to update the list of allowed ad-hoc CONFIGs and include this +update in your CL: + + cp %s util/config_allowed.txt +""" % ('\n'.join(['CONFIG_%s' % name for name in unneeded_adhoc]), + NEW_ALLOWED_FNAME)) + + return 0 + + +def main(argv): + """Main function""" + args = parse_args(argv) + if not args.debug: + sys.tracebacklimit = 0 + checker = KconfigCheck() + if args.cmd == 'check': + return checker.do_check(args.configs, args.srctree, args.allowed, + args.prefix, args.use_defines) + return 2 + + +if __name__ == '__main__': + sys.exit(main(sys.argv[1:])) diff --git a/scripts/test_kconfig_check.py b/scripts/test_kconfig_check.py new file mode 100755 index 00000000000..bc997bedfe1 --- /dev/null +++ b/scripts/test_kconfig_check.py @@ -0,0 +1,185 @@ +#!/usr/bin/python +# SPDX-License-Identifier: GPL-2.0+ +"""Test for Kconfig checker""" + +import contextlib +import io +import os +import re +import sys +import tempfile +import unittest + +import kconfig_check + +# Prefix that we strip from each Kconfig option, when considering whether it is +# equivalent to a CONFIG option with the same name +PREFIX = 'PLATFORM_EC_' + +(a)contextlib.contextmanager +def capture_sys_output(): + """Capture output for testing purposes + + Use this to suppress stdout/stderr output: + with capture_sys_output() as (stdout, stderr) + ...do something... + """ + capture_out, capture_err = io.StringIO(), io.StringIO() + old_out, old_err = sys.stdout, sys.stderr + try: + sys.stdout, sys.stderr = capture_out, capture_err + yield capture_out, capture_err + finally: + sys.stdout, sys.stderr = old_out, old_err + + +# Use unittest since it produced less verbose output than pytest and can be run +# directly from Python. You can still run this test with 'pytest' if you like. +class KconfigCheck(unittest.TestCase): + """Tests for the KconfigCheck class""" + def test_simple_check(self): + """Check it detected a new ad-hoc CONFIG""" + checker = kconfig_check.KconfigCheck() + self.assertEqual(['NEW_ONE'], checker.find_new_adhoc( + configs=['NEW_ONE', 'OLD_ONE', 'IN_KCONFIG'], + kconfigs=['IN_KCONFIG'], + allowed=['OLD_ONE'])) + + def test_sorted_check(self): + """Check it sorts the results in order""" + checker = kconfig_check.KconfigCheck() + self.assertSequenceEqual( + ['ANOTHER_NEW_ONE', 'NEW_ONE'], + checker.find_new_adhoc( + configs=['NEW_ONE', 'ANOTHER_NEW_ONE', 'OLD_ONE', 'IN_KCONFIG'], + kconfigs=['IN_KCONFIG'], + allowed=['OLD_ONE'])) + + def check_read_configs(self, use_defines): + checker = kconfig_check.KconfigCheck() + with tempfile.NamedTemporaryFile() as configs: + with open(configs.name, 'w') as out: + out.write("""{prefix}CONFIG_OLD_ONE{suffix}y +{prefix}NOT_A_CONFIG{suffix} +{prefix}CONFIG_STRING{suffix}"something" +{prefix}CONFIG_INT{suffix}123 +{prefix}CONFIG_HEX{suffix}45ab +""".format(prefix='#define ' if use_defines else '', + suffix=' ' if use_defines else '=')) + self.assertEqual(['OLD_ONE', 'STRING', 'INT', 'HEX'], + checker.read_configs(configs.name, use_defines)) + + def test_read_configs(self): + """Test KconfigCheck.read_configs()""" + self.check_read_configs(False) + + def test_read_configs_defines(self): + """Test KconfigCheck.read_configs() containing #defines""" + self.check_read_configs(True) + + @classmethod + def setup_srctree(cls, srctree): + """Set up some Kconfig files in a directory and subdirs + + Args: + srctree: Directory to write to + """ + with open(os.path.join(srctree, 'Kconfig'), 'w') as out: + out.write('''config %sMY_KCONFIG +\tbool "my kconfig" + +rsource "subdir/Kconfig.wibble" +''' % PREFIX) + subdir = os.path.join(srctree, 'subdir') + os.mkdir(subdir) + with open(os.path.join(subdir, 'Kconfig.wibble'), 'w') as out: + out.write('menuconfig %sMENU_KCONFIG\n' % PREFIX) + + # Add a directory which should be ignored + bad_subdir = os.path.join(subdir, 'Kconfig') + os.mkdir(bad_subdir) + with open(os.path.join(bad_subdir, 'Kconfig.bad'), 'w') as out: + out.write('menuconfig %sBAD_KCONFIG' % PREFIX) + + def test_scan_kconfigs(self): + """Test KconfigCheck.scan_configs()""" + checker = kconfig_check.KconfigCheck() + with tempfile.TemporaryDirectory() as srctree: + self.setup_srctree(srctree) + self.assertEqual(['MY_KCONFIG', 'MENU_KCONFIG'], + checker.scan_kconfigs(srctree, PREFIX)) + + @classmethod + def setup_allowed_and_configs(cls, allowed_fname, configs_fname, + add_new_one=True): + """Set up the 'allowed' and 'configs' files for tests + + Args: + allowed_fname: Filename to write allowed CONFIGs to + configs_fname: Filename to which CONFIGs to check should be written + add_new_one: True to add CONFIG_NEW_ONE to the configs_fname file + """ + with open(allowed_fname, 'w') as out: + out.write('CONFIG_OLD_ONE\n') + out.write('CONFIG_MENU_KCONFIG\n') + with open(configs_fname, 'w') as out: + to_add = ['CONFIG_OLD_ONE', 'CONFIG_MY_KCONFIG'] + if add_new_one: + to_add.append('CONFIG_NEW_ONE') + out.write('\n'.join(to_add)) + + def test_check_adhoc_configs(self): + """Test KconfigCheck.check_adhoc_configs()""" + checker = kconfig_check.KconfigCheck() + with tempfile.TemporaryDirectory() as srctree: + self.setup_srctree(srctree) + with tempfile.NamedTemporaryFile() as allowed: + with tempfile.NamedTemporaryFile() as configs: + self.setup_allowed_and_configs(allowed.name, configs.name) + new_adhoc, unneeded_adhoc, updated_adhoc = ( + checker.check_adhoc_configs( + configs.name, srctree, allowed.name, PREFIX)) + self.assertEqual(['NEW_ONE'], new_adhoc) + self.assertEqual(['MENU_KCONFIG'], unneeded_adhoc) + self.assertEqual(['OLD_ONE'], updated_adhoc) + + def test_check(self): + """Test running the 'check' subcommand""" + with capture_sys_output() as (stdout, stderr): + with tempfile.TemporaryDirectory() as srctree: + self.setup_srctree(srctree) + with tempfile.NamedTemporaryFile() as allowed: + with tempfile.NamedTemporaryFile() as configs: + self.setup_allowed_and_configs(allowed.name, + configs.name) + ret_code = kconfig_check.main( + ['-c', configs.name, '-s', srctree, + '-a', allowed.name, '-p', PREFIX, 'check']) + self.assertEqual(1, ret_code) + self.assertEqual('', stdout.getvalue()) + found = re.findall('(CONFIG_.*)', stderr.getvalue()) + self.assertEqual(['CONFIG_NEW_ONE'], found) + + def test_check_unneeded(self): + """Test running the 'check' subcommand with unneeded ad-hoc configs""" + with capture_sys_output() as (stdout, stderr): + with tempfile.TemporaryDirectory() as srctree: + self.setup_srctree(srctree) + with tempfile.NamedTemporaryFile() as allowed: + with tempfile.NamedTemporaryFile() as configs: + self.setup_allowed_and_configs(allowed.name, + configs.name, False) + ret_code = kconfig_check.main( + ['-c', configs.name, '-s', srctree, + '-a', allowed.name, '-p', PREFIX, 'check']) + self.assertEqual(0, ret_code) + self.assertEqual('', stderr.getvalue()) + found = re.findall('(CONFIG_.*)', stdout.getvalue()) + self.assertEqual(['CONFIG_MENU_KCONFIG'], found) + with open(kconfig_check.NEW_ALLOWED_FNAME) as inf: + allowed = inf.read().splitlines() + self.assertEqual(['CONFIG_OLD_ONE'], allowed) + + +if __name__ == '__main__': + unittest.main() -- 2.37.2.672.g94769d06f0-goog

2 7

[PATCH 0/2] Add HS configs for J7200 and J721S2 TI SOCs
by Jayesh Choudhary 15 Sep '22

15 Sep '22

This series adds the r5 and a72 defconfigs for 2 platforms: - J7200 HS - J721S2 HS Andrew Davis (1): configs: Add configs for J7200 High Security EVM Jayesh Choudhary (1): configs: Add configs for j721s2 High Security EVM MAINTAINERS | 4 + configs/j7200_hs_evm_a72_defconfig | 208 ++++++++++++++++++++++++++ configs/j7200_hs_evm_r5_defconfig | 172 ++++++++++++++++++++++ configs/j721s2_hs_evm_a72_defconfig | 217 ++++++++++++++++++++++++++++ configs/j721s2_hs_evm_r5_defconfig | 178 +++++++++++++++++++++++ 5 files changed, 779 insertions(+) create mode 100644 configs/j7200_hs_evm_a72_defconfig create mode 100644 configs/j7200_hs_evm_r5_defconfig create mode 100644 configs/j721s2_hs_evm_a72_defconfig create mode 100644 configs/j721s2_hs_evm_r5_defconfig -- 2.25.1

2 4

[PATCH 0/5] Fix, update and cleanup brppt1 board
by Bernhard Messerklinger 15 Sep '22

15 Sep '22

Drop board variants that were never produced, fix the SPL loader, and update environment. Bernhard Messerklinger (5): brppt1: Remove unused board variants brppt1: Fix SPL boot stage brppt1: Cleanup device tree include: configs: brppt1: Fix commit 0ea4fc4dcf90 brppt1: Update environment to support new boot concept arch/arm/dts/Makefile | 2 - arch/arm/dts/am335x-brppt1-mmc-u-boot.dtsi | 112 ++++++ arch/arm/dts/am335x-brppt1-mmc.dts | 201 ----------- arch/arm/dts/am335x-brppt1-nand.dts | 374 -------------------- arch/arm/dts/am335x-brppt1-spi.dts | 377 --------------------- board/BuR/brppt1/board.c | 4 +- board/BuR/brppt1/mux.c | 39 +-- configs/brppt1_mmc_defconfig | 6 +- configs/brppt1_nand_defconfig | 122 ------- configs/brppt1_spi_defconfig | 130 ------- include/configs/brppt1.h | 83 +---- 11 files changed, 135 insertions(+), 1315 deletions(-) create mode 100644 arch/arm/dts/am335x-brppt1-mmc-u-boot.dtsi delete mode 100644 arch/arm/dts/am335x-brppt1-nand.dts delete mode 100644 arch/arm/dts/am335x-brppt1-spi.dts delete mode 100644 configs/brppt1_nand_defconfig delete mode 100644 configs/brppt1_spi_defconfig -- 2.37.2

3 16

[PULL] Pull request for u-boot master / v2022.10 = u-boot-stm32-20220915
by Patrick DELAUNAY 15 Sep '22

15 Sep '22

Hi Tom, Please pull the STM32 related fixes for u-boot/master, v2022.10: u-boot-stm32-20220915 - Fixes on STM32 I2C drivers - Activate SCMI regulator for STM32MP15 defconfig, fix the usb start command for scmi device tree CI status: https://source.denx.de/u-boot/custodians/u-boot-stm/-/pipelines/13457 Thanks, Patrick git request-pull origin/master https://source.denx.de/u-boot/custodians/u-boot-stm.git/ u-boot-stm32-20220915 The following changes since commit d6a03711fde2a6c99614af20ee95a9efe7ad232b: Merge https://source.denx.de/u-boot/custodians/u-boot-marvell (2022-09-13 08:19:42 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-stm.git/ tags/u-boot-stm32-20220915 for you to fetch changes up to a22692dd815c20b3fc6354be954ce65922761ad1: i2c: stm32: fix usage of rise/fall device tree properties (2022-09-15 14:59:29 +0200) ---------------------------------------------------------------- - Fixes on STM32 I2C drivers - Activate SCMI regulator for STM32MP15 defconfig, fix the usb start command for scmi device tree ---------------------------------------------------------------- Alain Volmat (3): i2c: stm32: fix comment and remove unused AUTOEND bit i2c: stm32: remove unused stop parameter in start & reload handling i2c: stm32: do not set the STOP condition on error Jorge Ramirez-Ortiz (2): i2c: stm32f7: fix clearing the control register i2c: stm32: fix usage of rise/fall device tree properties Patrick Delaunay (1): configs: stm32mp15: activate DM_REGULATOR_SCMI configs/stm32mp15_defconfig | 1 + drivers/i2c/stm32f7_i2c.c | 33 ++++++++++++++++----------------- 2 files changed, 17 insertions(+), 17 deletions(-)

2 1

[PATCH v4 0/4] i2c: stm32: cleanup & stop handling fix
by Alain Volmat 15 Sep '22

15 Sep '22

This series corrects the handling of the stop condition and cleanup few bits in the driver stm32f7_i2c.c v4: additional patch to fix rise/fall timing settings v3: fix stop handling in patch 3/3 v2: update commit message in patch 3/3 Alain Volmat (3): i2c: stm32: fix comment and remove unused AUTOEND bit i2c: stm32: remove unused stop parameter in start & reload handling i2c: stm32: do not set the STOP condition on error Jorge Ramirez-Ortiz (1): i2c: stm32: fix usage of rise/fall device tree properties drivers/i2c/stm32f7_i2c.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) -- 2.25.1

4 19

[PATCHv2 1/2] i2c: stm32f7: fix clearing the control register
by Jorge Ramirez-Ortiz 15 Sep '22

15 Sep '22

Bits should be set to 0, not 1. Signed-off-by: Jorge Ramirez-Ortiz <jorge(a)foundries.io> --- drivers/i2c/stm32f7_i2c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c index bf2a6c9b4b..3a727e68ac 100644 --- a/drivers/i2c/stm32f7_i2c.c +++ b/drivers/i2c/stm32f7_i2c.c @@ -413,7 +413,7 @@ static int stm32_i2c_check_end_of_message(struct stm32_i2c_priv *i2c_priv) setbits_le32(&regs->icr, STM32_I2C_ICR_STOPCF); /* Clear control register 2 */ - setbits_le32(&regs->cr2, STM32_I2C_CR2_RESET_MASK); + clrbits_le32(&regs->cr2, STM32_I2C_CR2_RESET_MASK); } return ret; -- 2.34.1

4 8