October 2021 - U-Boot

[PATCHv2] arm64: zynqmp: Print the secure boot status information
by Jorge Ramirez-Ortiz 04 Feb '22

04 Feb '22

Output the secure boot configuration to the console. Signed-off-by: Jorge Ramirez-Ortiz <jorge(a)foundries.io> --- v2: Michal review 12 Aug 2021 print information on SPL and UBOOT improve the print command add macros to mask the status arch/arm/mach-zynqmp/include/mach/hardware.h | 6 +++++- board/xilinx/zynqmp/zynqmp.c | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-zynqmp/include/mach/hardware.h b/arch/arm/mach-zynqmp/include/mach/hardware.h index eebf38551c..c6b1464a9f 100644 --- a/arch/arm/mach-zynqmp/include/mach/hardware.h +++ b/arch/arm/mach-zynqmp/include/mach/hardware.h @@ -141,8 +141,12 @@ struct apu_regs { #define ZYNQMP_SILICON_VER_MASK 0xF #define ZYNQMP_SILICON_VER_SHIFT 0 +#define ZYNQMP_CSU_STATUS_AUTHENTICATED BIT(0) +#define ZYNQMP_CSU_STATUS_ENCRYPTED BIT(1) + struct csu_regs { - u32 reserved0[4]; + u32 status; + u32 reserved0[3]; u32 multi_boot; u32 reserved1[11]; u32 idcode; diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index 000a7cde8d..3e7ca2e9c6 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -358,6 +358,18 @@ static int multi_boot(void) return multiboot; } +static void print_secure_boot(void) +{ + u32 status = 0; + + if (zynqmp_mmio_read((ulong)&csu_base->status, &status)) + return; + + printf("Secure Boot:\t%sauthenticated, %sencrypted\n", + status & ZYNQMP_CSU_STATUS_AUTHENTICATED ? "" : "not ", + status & ZYNQMP_CSU_STATUS_ENCRYPTED ? "" : "not "); +} + #define PS_SYSMON_ANALOG_BUS_VAL 0x3210 #define PS_SYSMON_ANALOG_BUS_REG 0xFFA50914 @@ -394,6 +406,8 @@ int board_init(void) fpga_add(fpga_xilinx, &zynqmppl); #endif + /* display secure boot information */ + print_secure_boot(); if (current_el() == 3) printf("Multiboot:\t%d\n", multi_boot()); -- 2.31.1

4 4

Question on running uboot_testpy with tbot
by Simon Glass 01 Feb '22

01 Feb '22

Hi, I am trying to run the pytests on my unit. The documentation doesn't really explain how it works. This is what I am trying: $ tbot -vv -l kea.py -b rpi3.py -T tbot/contrib -p 'testpy_args=["-k", "help", "-vv"]' uboot_testpy tbot starting ... ├─Parameters: │ testpy_args = ['-k', 'help', '-vv'] ├─Calling uboot_testpy ... │ ├─Logging in on sglass@kea:22 ... │ ├─[sglass] bash --norc --noprofile │ ├─Calling uboot_setup_testhooks ... │ │ ├─[sglass] echo " ${HOME}" │ │ │ ## /home/sglass │ │ ├─[sglass] mkdir -p /home/sglass/tbot-workdir │ │ ├─[sglass] test -d /home/sglass/tbot-workdir/uboot-testpy-tbot │ │ ├─Creating FIFOs ... │ │ ├─[sglass] rm -rf /home/sglass/tbot-workdir/uboot-testpy-tbot/fifo_console_send │ │ ├─[sglass] mkfifo /home/sglass/tbot-workdir/uboot-testpy-tbot/fifo_console_send │ │ ├─[sglass] rm -rf /home/sglass/tbot-workdir/uboot-testpy-tbot/fifo_console_recv │ │ ├─[sglass] mkfifo /home/sglass/tbot-workdir/uboot-testpy-tbot/fifo_console_recv │ │ ├─[sglass] rm -rf /home/sglass/tbot-workdir/uboot-testpy-tbot/fifo_commands │ │ ├─[sglass] mkfifo /home/sglass/tbot-workdir/uboot-testpy-tbot/fifo_commands │ │ ├─[sglass] cat /home/sglass/tbot-workdir/uboot-testpy-tbot/tbot-scripts.sha256 │ │ │ ## 2d30892b61eb713ce9413e06c4f2a0cd00d2a74b6b8c2ac6624e1e49909b1897 │ │ ├─Hooks are up to date, skipping deployment ... │ │ ├─Adding hooks to $PATH ... │ │ ├─[sglass] echo " ${PATH}" │ │ │ ## /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/cosarm/depot_tools:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/cosarm/depot_tools:/home/sglass/.local/bin:/vid/software/devel/ubtest/u-boot-test-hooks/bin:/vid/software/devel/ubtest/standalone-hdctools │ │ ├─[sglass] export PATH=/home/sglass/tbot-workdir/uboot-testpy-tbot:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/cosarm/depot_tools:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/cosarm/depot_tools:/home/sglass/.local/bin:/vid/software/devel/ubtest/u-boot-test-hooks/bin:/vid/software/devel/ubtest/standalone-hdctools │ │ ├─Open console & command channels ... │ │ ├─[sglass] /home/sglass/tbot-workdir/uboot-testpy-tbot/tbot-console │ │ ├─[sglass] /home/sglass/tbot-workdir/uboot-testpy-tbot/tbot-commands │ │ └─Done. (0.028s) │ ├─Calling uboot_checkout ... │ │ ├─Builder: rpi3 │ │ ├─[sglass] test -d /home/sglass/tbot-workdir/uboot-rpi3/.git │ │ ├─[sglass] git -C /home/sglass/tbot-workdir/uboot-rpi3 fetch │ │ └─Done. (0.121s) │ ├─[sglass] test -e /home/sglass/tbot-workdir/uboot-rpi3/.config │ ├─[sglass] test -e /home/sglass/tbot-workdir/uboot-rpi3/include/ autoconf.mk │ ├─[sglass] picocom -q -b 115200 /dev/ttyusb_port1 │ ├─POWERON (rpi3) │ ├─[sglass] sd-mux-ctrl --device-serial sdwire-18 --dut │ ├─[sglass] ykushcmd -s YK17698 -g 1 │ │ ## │ │ ## │ │ ## Downstream port 1 is OFF │ │ ## │ ├─[sglass] ykushcmd -s YK17698 -u 1 │ ├─UBOOT (rpi3-u-boot) │ │ <> │ │ <> │ │ <> U-Boot 2020.10-rc2-00140-g392aa09f310 (Oct 30 2021 - 12:38:07 -0600) │ │ <> │ │ <> DRAM: 992 MiB │ │ <> RPI 3 Model B (0xa22082) │ │ <> MMC: mmc@7e202000: 0, sdhci@7e300000: 1 │ │ <> Loading Environment from FAT... *** Warning - bad CRC, using default environment │ │ <> │ │ <> In: serial │ │ <> Out: vidconsole │ │ <> Err: vidconsole │ │ <> Net: No ethernet found. │ │ <> Hit any key to stop autoboot: 0 │ │ <> U-Boot> │ ├─[sglass] cd /home/sglass/tbot-workdir/uboot-rpi3 │ ├─[sglass] ./test/py/test.py --build-dir . --board-type unknown -k help -vv │ │ ## +u-boot-test-flash unknown na │ │ ## ============================= test session starts ============================== │ │ ## platform linux -- Python 3.6.9, pytest-5.2.1, py-1.8.0, pluggy-0.13.0 -- /usr/bin/python3 │ │ ## cachedir: .pytest_cache │ │ ## rootdir: /home/sglass/tbot-workdir/uboot-rpi3/test/py, inifile: pytest.ini │ │ ## collected 324 items / 322 deselected / 2 selected │ │ ## │ │ ## test/py/tests/test_fpga.py::test_fpga_help SKIPPED [ 50%]│ ├─[sglass] ykushcmd -s YK17698 -d 1 │ ├─[sglass] sd-mux-ctrl --device-serial sdwire-18 --ts │ ├─Exiting poweroff │ ├─[sglass] sd-mux-ctrl --device-serial sdwire-18 --dut │ ├─[sglass] ykushcmd -s YK17698 -g 1 │ │ ## │ │ ## │ │ ## Downstream port 1 is OFF │ │ ## │ ├─[sglass] ykushcmd -s YK17698 -u 1 │ ├─POWEROFF (rpi3) │ ├─[sglass] ykushcmd -s YK17698 -d 1 │ ├─[sglass] sd-mux-ctrl --device-serial sdwire-18 --ts │ ├─Exiting poweroff │ └─Fail. (38.376s) ├─Exception: │ Traceback (most recent call last): │ File "/home/sglass/.local/lib/python3.8/site-packages/tbot-0.9.2-py3.8.egg/tbot/main.py", line 345, in main │ func(**params) │ File "/home/sglass/.local/lib/python3.8/site-packages/tbot-0.9.2-py3.8.egg/tbot/decorators.py", line 92, in wrapped │ return tc(*args, **kwargs) │ File "/home/sglass/.local/lib/python3.8/site-packages/tbot-0.9.2-py3.8.egg/tbot/decorators.py", line 157, in wrapped │ return tc(lh, *args, **kwargs) │ File "/home/sglass/.local/lib/python3.8/site-packages/tbot-0.9.2-py3.8.egg/tbot/tc/uboot/testpy.py", line 321, in testpy │ os.write(chan_console.fileno(), data) │ OSError: [Errno 9] Bad file descriptor ├───────────────────────────────────────── └─FAILURE (38.488s) I don't see the output appearing and I'm not sure how pytest is sending the commands to the board? Regards, Simon

2 5

[PATCH 0/4] gpio: sunxi: Handle pin configuration flags
by Samuel Holland 30 Jan '22

30 Jan '22

This series updates the sunxi GPIO driver to handle pin pull-up/down, so consumer drivers do not need to call the non-DM sunxi_gpio_set_* functions. As an example, the last patch updates the MMC driver to use this functionality. The helpers added here will also be used for the upcoming DM_PINCTRL driver. Samuel Holland (4): sunxi: gpio: Return void from setter functions sunxi: gpio: Add per-bank drive and pull setters gpio: sunxi: Implement .set_flags mmc: sunxi: Use DM_GPIO flags to set pull-up arch/arm/include/asm/arch-sunxi/gpio.h | 6 ++- arch/arm/mach-sunxi/pinmux.c | 28 +++++++----- drivers/gpio/sunxi_gpio.c | 62 +++++++++++--------------- drivers/mmc/sunxi_mmc.c | 8 +--- 4 files changed, 51 insertions(+), 53 deletions(-) -- 2.32.0

5 16

[PATCH] dfu: handle short frame result of UPLOAD in state_dfu_idle
by Patrick Delaunay 28 Jan '22

28 Jan '22

In DFU v1.1 specification [1] the DFU_UPLOAD (Short Frame) is handled only in dfuUPLOADIDLE state: - Figure A.1 Interface state transition diagram - the state description in chapter A.2 A.2.3 State 2 dfuIDLE on Receipt of the DFU_UPLOAD request,and bitCanUpload = 1 the Next State is dfuUPLOADIDLE A.2.10 State 9 dfuUPLOAD-IDLE When the length of the data transferred by the device in response to a DFU_UPLOAD request is less than wLength. (Short frame) the Next State is dfuIDLE In current code, when an UPLOAD is completely performed after the first request (for example with wLength=200 and data read = 9), the DFU state stay at dfuUPLOADIDLE until receiving a DFU_UPLOAD or a DFU_ABORT request even it is unnecessary as the previous DFU_UPLOAD request already reached the EOF. This patch proposes to finish the DFU uploading (don't go to dfuUPLOADIDLE) and completes the control-read operation (go to DFU_STATE_dfuIDLE) when the first UPLOAD response has a short frame as an end of file (EOF) indicator even if it is not explicitly allowed in the DFU specification but this seems logical. [1] https://www.usb.org/sites/default/files/DFU_1.1.pdf Signed-off-by: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- Hi Lukasz, This case is correctly handle in dfu-util, see dfu_load.c dfuload_do_upload() { .... while (1) { ... rc = dfu_upload(dif->dev_handle, dif->interface, xfer_size, transaction++, buf); .... dfu_file_write_crc(fd, 0, buf, rc); total_bytes += rc; if (total_bytes < 0) errx(EX_SOFTWARE, "\nReceived too many bytes (wraparound)"); if (rc < xfer_size) { /* last block, return */ ret = 0; break; } } } In the upload loop the code doesn't make difference for the first request and the next one: the last block is detected as soon as the received data < requested size. So it is safe to do the same in U-Boot's DFU stack, skip the dfuUPLOADIDLE state when the upload operation is finished after the first request. This patch avoid to ABORT the unfinished UPLOAD request before the next command. This patch was previously sent as RFC = [RFC] dfu: handle short frame result of UPLOAD in state_dfu_idle http://patchwork.ozlabs.org/project/uboot/list/?series=248838&state=* Patrick. drivers/usb/gadget/f_dfu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/usb/gadget/f_dfu.c b/drivers/usb/gadget/f_dfu.c index 4bedc7d3a1..e9340ff5cb 100644 --- a/drivers/usb/gadget/f_dfu.c +++ b/drivers/usb/gadget/f_dfu.c @@ -336,6 +336,8 @@ static int state_dfu_idle(struct f_dfu *f_dfu, f_dfu->dfu_state = DFU_STATE_dfuUPLOAD_IDLE; f_dfu->blk_seq_num = 0; value = handle_upload(req, len); + if (value >= 0 && value < len) + f_dfu->dfu_state = DFU_STATE_dfuIDLE; break; case USB_REQ_DFU_ABORT: /* no zlp? */ -- 2.25.1

2 1

[PATCH] fastboot: fix fastboot_set_reboot_flag()
by Roman Stratiienko 28 Jan '22

28 Jan '22

In case CONFIG_FASTBOOT_FLASH_MMC_DEV == 0, compile-time condition is not met and fastboot_set_reboot_flag() fails. Fixes: a362ce214f03 ("fastboot: Implement generic fastboot_set_reboot_flag") Signed-off-by: Roman Stratiienko <r.stratiienko(a)gmail.com> --- drivers/fastboot/fb_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c index cbcc3683c47..ef399d0c4ab 100644 --- a/drivers/fastboot/fb_common.c +++ b/drivers/fastboot/fb_common.c @@ -91,7 +91,7 @@ void fastboot_okay(const char *reason, char *response) */ int __weak fastboot_set_reboot_flag(enum fastboot_reboot_reason reason) { -#if CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC_DEV) +#ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV static const char * const boot_cmds[] = { [FASTBOOT_REBOOT_REASON_BOOTLOADER] = "bootonce-bootloader", [FASTBOOT_REBOOT_REASON_FASTBOOTD] = "boot-fastboot", -- 2.27.0

4 3

[PATCH 1/3] dfu: use pointer to pass length to dfu_write()
by Frieder Schrempf 28 Jan '22

28 Jan '22

From: Frieder Schrempf <frieder.schrempf(a)kontron.de> This doesn't include any functional changes, but allows us to use the size parameter to report the actual written bytes back to the caller. This is useful in cases of unaligned writes to serial flash where the first write covers only a part of the buffer (until the next sector boundary) and the remaining bytes need to be written in a further call to dfu_write(). While at it, we also adjust the data type of the 'write' and 'left' variable in dfu_write_from_mem_addr() to match the values passed. Signed-off-by: Frieder Schrempf <frieder.schrempf(a)kontron.de> --- drivers/dfu/dfu.c | 23 ++++++++++++----------- include/dfu.h | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c index ff1859d946..5b2659ee7d 100644 --- a/drivers/dfu/dfu.c +++ b/drivers/dfu/dfu.c @@ -334,12 +334,12 @@ int dfu_flush(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) return ret; } -int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) +int dfu_write(struct dfu_entity *dfu, void *buf, int *size, int blk_seq_num) { int ret; debug("%s: name: %s buf: 0x%p size: 0x%x p_num: 0x%x offset: 0x%llx bufoffset: 0x%lx\n", - __func__, dfu->name, buf, size, blk_seq_num, dfu->offset, + __func__, dfu->name, buf, *size, blk_seq_num, dfu->offset, (unsigned long)(dfu->i_buf - dfu->i_buf_start)); ret = dfu_transaction_initiate(dfu, false); @@ -371,7 +371,7 @@ int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) dfu->i_blk_seq_num = (dfu->i_blk_seq_num + 1) & 0xffff; /* flush buffer if overflow */ - if ((dfu->i_buf + size) > dfu->i_buf_end) { + if ((dfu->i_buf + *size) > dfu->i_buf_end) { ret = dfu_write_buffer_drain(dfu); if (ret) { dfu_transaction_cleanup(dfu); @@ -381,19 +381,19 @@ int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) } /* we should be in buffer now (if not then size too large) */ - if ((dfu->i_buf + size) > dfu->i_buf_end) { + if ((dfu->i_buf + *size) > dfu->i_buf_end) { pr_err("Buffer overflow! (0x%p + 0x%x > 0x%p)\n", dfu->i_buf, - size, dfu->i_buf_end); + *size, dfu->i_buf_end); dfu_transaction_cleanup(dfu); dfu_error_callback(dfu, "Buffer overflow"); return -1; } - memcpy(dfu->i_buf, buf, size); - dfu->i_buf += size; + memcpy(dfu->i_buf, buf, *size); + dfu->i_buf += *size; /* if end or if buffer full flush */ - if (size == 0 || (dfu->i_buf + size) > dfu->i_buf_end) { + if (*size == 0 || (dfu->i_buf + *size) > dfu->i_buf_end) { ret = dfu_write_buffer_drain(dfu); if (ret) { dfu_transaction_cleanup(dfu); @@ -704,7 +704,8 @@ int dfu_get_alt(char *name) int dfu_write_from_mem_addr(struct dfu_entity *dfu, void *buf, int size) { - unsigned long dfu_buf_size, write, left = size; + unsigned int write, left = size; + unsigned long dfu_buf_size; int i, ret = 0; void *dp = buf; @@ -720,9 +721,9 @@ int dfu_write_from_mem_addr(struct dfu_entity *dfu, void *buf, int size) for (i = 0; left > 0; i++) { write = min(dfu_buf_size, left); - debug("%s: dp: 0x%p left: %lu write: %lu\n", __func__, + debug("%s: dp: 0x%p left: %lu write: %u\n", __func__, dp, left, write); - ret = dfu_write(dfu, dp, write, i); + ret = dfu_write(dfu, dp, &write, i); if (ret) { pr_err("DFU write failed\n"); return ret; diff --git a/include/dfu.h b/include/dfu.h index f6868982df..2df55e507e 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -335,7 +335,7 @@ int dfu_read(struct dfu_entity *de, void *buf, int size, int blk_seq_num); * @blk_seq_num: block sequence number * Return: 0 for success, -1 for error */ -int dfu_write(struct dfu_entity *de, void *buf, int size, int blk_seq_num); +int dfu_write(struct dfu_entity *de, void *buf, int *size, int blk_seq_num); /** * dfu_flush() - flush to dfu entity -- 2.33.0

2 3

[PATCH] introduce CONFIG_DEVICE_TREE_INCLUDES
by Rasmus Villemoes 26 Jan '22

26 Jan '22

The build system already automatically looks for and includes an in-tree *-u-boot.dtsi when building the control .dtb. However, there are some things that are awkward to maintain in such an in-tree file, most notably the metadata associated to public keys used for verified boot. The only "official" API to get that metadata into the .dtb is via mkimage, as a side effect of building an actual signed image. But there are multiple problems with that. First of all, the final U-Boot (be it U-Boot proper or an SPL) image is built based on a binary image, the .dtb, and possibly some other binary artifacts. So modifying the .dtb after the build requires the meta-buildsystem (Yocto, buildroot, whatnot) to know about and repeat some of the steps that are already known to and handled by U-Boot's build system, resulting in needless duplication of code. It's also somewhat annoying and inconsistent to have a .dtb file in the build folder which is not generated by the command listed in the corresponding .cmd file (that of course applies to any generated file). So the contents of the /signature node really needs to be baked into the .dtb file when it is first created, which means providing the relevant data in the form of a .dtsi file. One could in theory put that data into the *-u-boot.dtsi file, but it's more convenient to be able to provide it externally: For example, when developing for a customer, it's common to use a set of dummy keys for development, while the consultants do not (and should not) have access to the actual keys used in production. For such a setup, it's easier if the keys used are chosen via the meta-buildsystem and the path(s) patched in during the configure step. And of course, nothing prevents anybody from having DEVICE_TREE_INCLUDES point at files maintained in git, or for that matter from including the public key metadata in the *-u-boot.dtsi directly and ignore this feature. There are other uses for this, e.g. in combination with ENV_IMPORT_FDT it can be used for providing the contents of the /config/environment node, so I don't want to tie this exclusively to use for verified boot. Signed-off-by: Rasmus Villemoes <rasmus.villemoes(a)prevas.dk> --- Getting the public key metadata into .dtsi form can be done with a little scripting (roughly 'mkimage -K' of a dummy image followed by 'dtc -I dtb -O dts'). I have a script that does that, along with options to set 'required' and 'required-mode' properties, include u-boot,dm-spl properties in case one wants to check U-Boot proper from SPL with the verified boot mechanism, etc. I'm happy to share that script if this gets accepted, but it's moot if this is rejected. I have previously tried to get an fdt_add_pubkey tool accepted [1,2] to disentangle the kernel and u-boot builds (or u-boot and SPL builds for that matter!), but as I've since realized, that isn't quite enough - the above points re modifying the .dtb after it is created but before that is used to create further build artifacts still stand. However, such a tool could still be useful for creating the .dtsi info without the private keys being present, and my key2dtsi.sh script could easily be modified to use a tool like that should it ever appear. [1] https://lore.kernel.org/u-boot/20200211094818.14219-3-rasmus.villemoes@prev… [2] https://lore.kernel.org/u-boot/2184f1e6dd6247e48133c76205feeabe@kaspersky.c… dts/Kconfig | 9 +++++++++ scripts/Makefile.lib | 2 ++ 2 files changed, 11 insertions(+) diff --git a/dts/Kconfig b/dts/Kconfig index dabe0080c1..593dddbaf0 100644 --- a/dts/Kconfig +++ b/dts/Kconfig @@ -139,6 +139,15 @@ config DEFAULT_DEVICE_TREE It can be overridden from the command line: $ make DEVICE_TREE=<device-tree-name> +config DEVICE_TREE_INCLUDES + string "Extra .dtsi files to include when building DT control" + depends on OF_CONTROL + help + U-Boot's control .dtb is usually built from an in-tree .dts + file, plus (if available) an in-tree U-Boot-specific .dtsi + file. This option specifies a space-separated list of extra + .dtsi files that will also be used. + config OF_LIST string "List of device tree files to include for DT control" depends on SPL_LOAD_FIT || MULTI_DTB_FIT diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 78bbebe7e9..a2accba940 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -320,6 +320,8 @@ quiet_cmd_dtc = DTC $@ # Bring in any U-Boot-specific include at the end of the file cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ (cat $<; $(if $(u_boot_dtsi),echo '$(pound)include "$(u_boot_dtsi)"')) > $(pre-tmp); \ + $(foreach f,$(subst $(quote),,$(CONFIG_DEVICE_TREE_INCLUDES)), \ + echo '$(pound)include "$(f)"' >> $(pre-tmp);) \ $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $(pre-tmp) ; \ $(DTC) -O dtb -o $@ -b 0 \ -i $(dir $<) $(DTC_FLAGS) \ -- 2.31.1

5 23

[PATCH 00/27] Add F1C100s based PocketGo handheld support
by Yifan Gu 20 Jan '22

20 Jan '22

This series add support for the PocketGo handheld, a low cost portable gaming console that is based on the Allwinner F1C100s chip. A significant portion of this patchset is authored by: - Icenowy Zheng <icenowy(a)aosc.io> - George Hilliard <thirtythreeforty(a)gmail.com> This patchset includes 4 parts necessary to make PocketGo work: - suniv + f1c100s support by Icenowy Zheng <icenowy(a)aosc.io>, rebased by George Hilliard <thirtythreeforty(a)gmail.com> and then by me. See: https://github.com/Icenowy/u-boot/commits/f1c100s-spiflash - additional support for suniv clock and MMC controller by George Hilliard, rebased. See: https://github.com/thirtythreeforty/u-boot/tree/f1c100s-v2019.04 - additional support for serial uart1, and misc fixes for compilation, SPL -> U-Boot proper load on F1C100s. - DTS and defconfig for PocketGo I have accidentally CC'ed a few people while testing git send-email, I am awfully sorry for my lack of experience in email-patch based workflows. This is my first time attempting to contribute to U-Boot. Cc: Jagan Teki <jagan(a)amarulasolutions.com> Cc: Andre Przywara <andre.przywara(a)arm.com> Cc: Icenowy Zheng <icenowy(a)aosc.io> Cc: George Hilliard <thirtythreeforty(a)gmail.com> George Hilliard (6): sunxi: Don't provide enable_cache() on suniv sunxi: implement clock driver for suniv f1c100s sunxi: gpio: Add support for suniv-f1c100s sunxi: spi: restore bus speed and mode after reset sunxi: spi: Add suniv pin controller support sunxi: suniv: add device tree nodes for f1c100s MMC controllers Icenowy Zheng (12): arm: arm926ejs: start.S: port save_boot_params support from armv7 code arm: arm926ej-s: add sunxi code sunxi: add support for suniv architecture sunxi: suniv: add support for Lichee Pi Nano sunxi: suniv: add boot sequence for SPL to try sunxi: spi-spl: add support for SUNIV sunxi: add SPI0 node for suniv sunxi: enable SPI NOR on Lichee Pi Nano sunxi: add defconfig for Lichee Pi Nano with SPI Flash support sunxi: add support for UART at PF for suniv sunxi: do not set PF MMC0 pinmux when PF uart is used sunxi: allow to enable MMC driver when using PF UART0 Yifan Gu (9): arm: dts: sunxi: do not renumber if mmc2 does not exist board: licheepi_nano: set CONFIG_MMC_SUNXI_SLOT_EXTRA sunxi: suniv: add missing header include for udelay sunxi: suniv: allow serial connection on uart1 sunxi: suniv: do not detect boot sector on suniv sunxi: suniv: set SYS_TEXT_BASE default sunxi: suniv: disable mmc optimization for suniv arm: dts: suniv: define uart1 pins arm: dts: add pocketgo handheld support arch/arm/cpu/arm926ejs/Makefile | 1 + arch/arm/cpu/arm926ejs/start.S | 19 + arch/arm/cpu/arm926ejs/sunxi/Makefile | 16 + arch/arm/cpu/arm926ejs/sunxi/config.mk | 6 + arch/arm/cpu/arm926ejs/sunxi/fel_utils.S | 38 ++ arch/arm/cpu/arm926ejs/sunxi/lowlevel_init.S | 68 +++ arch/arm/cpu/arm926ejs/sunxi/start.c | 1 + arch/arm/cpu/arm926ejs/sunxi/timer.c | 114 ++++ arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds | 63 +++ arch/arm/dts/Makefile | 3 + arch/arm/dts/suniv-f1c100s-licheepi-nano.dts | 58 ++ arch/arm/dts/suniv-f1c100s-pocketgo.dts | 48 ++ arch/arm/dts/suniv-f1c100s.dtsi | 6 + arch/arm/dts/suniv.dtsi | 253 +++++++++ arch/arm/dts/sunxi-u-boot.dtsi | 2 + arch/arm/include/asm/arch-sunxi/clock.h | 2 +- arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 21 + arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | 8 + arch/arm/include/asm/arch-sunxi/dram.h | 2 + arch/arm/include/asm/arch-sunxi/dram_suniv.h | 47 ++ arch/arm/include/asm/arch-sunxi/gpio.h | 3 + arch/arm/mach-sunxi/Kconfig | 16 +- arch/arm/mach-sunxi/Makefile | 2 + arch/arm/mach-sunxi/board.c | 37 +- arch/arm/mach-sunxi/clock.c | 3 +- arch/arm/mach-sunxi/clock_sun6i.c | 47 +- arch/arm/mach-sunxi/cpu_info.c | 2 + arch/arm/mach-sunxi/dram_helpers.c | 4 + arch/arm/mach-sunxi/dram_suniv.c | 497 ++++++++++++++++++ arch/arm/mach-sunxi/spl_spi_sunxi.c | 13 + board/sunxi/board.c | 8 +- common/Kconfig.boot | 3 +- configs/licheepi_nano_defconfig | 10 + configs/licheepi_nano_spiflash_defconfig | 26 + configs/pocketgo_defconfig | 12 + drivers/clk/sunxi/Kconfig | 7 + drivers/clk/sunxi/Makefile | 1 + drivers/clk/sunxi/clk_f1c100s.c | 66 +++ drivers/gpio/sunxi_gpio.c | 6 + drivers/mmc/Kconfig | 2 +- drivers/mmc/sunxi_mmc.c | 6 +- drivers/spi/spi-sunxi.c | 12 +- include/configs/suniv.h | 15 + include/configs/sunxi-common.h | 69 ++- include/dt-bindings/clock/suniv-ccu.h | 69 +++ include/dt-bindings/reset/suniv-ccu.h | 37 ++ 46 files changed, 1715 insertions(+), 34 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/sunxi/Makefile create mode 100644 arch/arm/cpu/arm926ejs/sunxi/config.mk create mode 100644 arch/arm/cpu/arm926ejs/sunxi/fel_utils.S create mode 100644 arch/arm/cpu/arm926ejs/sunxi/lowlevel_init.S create mode 100644 arch/arm/cpu/arm926ejs/sunxi/start.c create mode 100644 arch/arm/cpu/arm926ejs/sunxi/timer.c create mode 100644 arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds create mode 100644 arch/arm/dts/suniv-f1c100s-licheepi-nano.dts create mode 100644 arch/arm/dts/suniv-f1c100s-pocketgo.dts create mode 100644 arch/arm/dts/suniv-f1c100s.dtsi create mode 100644 arch/arm/dts/suniv.dtsi create mode 100644 arch/arm/include/asm/arch-sunxi/dram_suniv.h create mode 100644 arch/arm/mach-sunxi/dram_suniv.c create mode 100644 configs/licheepi_nano_defconfig create mode 100644 configs/licheepi_nano_spiflash_defconfig create mode 100644 configs/pocketgo_defconfig create mode 100644 drivers/clk/sunxi/clk_f1c100s.c create mode 100644 include/configs/suniv.h create mode 100644 include/dt-bindings/clock/suniv-ccu.h create mode 100644 include/dt-bindings/reset/suniv-ccu.h -- 2.25.1

3 29

[PATCH] socfpga: enable EFI partition support for de0-nano-soc
by Frank Kunz 19 Jan '22

19 Jan '22

This fixes boot problems with distributions that use EFI boot like opensuse. Signed-off-by: Frank Kunz <mailinglists(a)kunz-im-inter.net> --- configs/socfpga_de0_nano_soc_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig index 17c160dd2a..3068f5615a 100644 --- a/configs/socfpga_de0_nano_soc_defconfig +++ b/configs/socfpga_de0_nano_soc_defconfig @@ -35,7 +35,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),-@1536k(UBI)" CONFIG_CMD_UBI=y # CONFIG_ISO_PARTITION is not set -# CONFIG_EFI_PARTITION is not set +# CONFIG_SPL_EFI_PARTITION is not set CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_VERSION_VARIABLE=y -- 2.33.1

2 2

[PATCH] gpio: mxc_gpio: Fix i.MX8M GPIO output status read
by Harm Berntsen 18 Jan '22

18 Jan '22

Currently the driver gets value from PSR register, but this register is only for input mode. For output mode, it always returns 0, not the value we set for output. This patch changes to use DR register, which returns the DR value for output mode, and PSR value for input mode. This patch is based on code from Ye Li <ye.li(a)nxp.com> Signed-off-by: Robert Krikke <robert.krikke(a)nedap.com> Signed-off-by: Harm Berntsen <harm.berntsen(a)nedap.com> CC: Ye Li <ye.li(a)nxp.com> CC: Stefano Babic <sbabic(a)denx.de> --- drivers/gpio/mxc_gpio.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c index 06e6b2279f..c30246399c 100644 --- a/drivers/gpio/mxc_gpio.c +++ b/drivers/gpio/mxc_gpio.c @@ -36,6 +36,17 @@ struct mxc_bank_info { struct gpio_regs *regs; }; +static int gpio_bank_get_value(struct gpio_regs *regs, int offset) +{ + u32 gpio_val; + + if (IS_ENABLED(CONFIG_ARCH_IMX8M)) + gpio_val = readl(&regs->gpio_dr); + else + gpio_val = readl(&regs->gpio_psr); + return (gpio_val >> offset) & 0x01; +} + #if !CONFIG_IS_ENABLED(DM_GPIO) #define GPIO_TO_PORT(n) ((n) / 32) @@ -125,18 +136,13 @@ int gpio_get_value(unsigned gpio) { unsigned int port = GPIO_TO_PORT(gpio); struct gpio_regs *regs; - u32 val; - if (port >= ARRAY_SIZE(gpio_ports)) return -1; gpio &= 0x1f; regs = (struct gpio_regs *)gpio_ports[port]; - - val = (readl(&regs->gpio_psr) >> gpio) & 0x01; - - return val; + return gpio_bank_get_value(regs, gpio); } int gpio_request(unsigned gpio, const char *label) @@ -211,7 +217,7 @@ static void mxc_gpio_bank_set_value(struct gpio_regs *regs, int offset, static int mxc_gpio_bank_get_value(struct gpio_regs *regs, int offset) { - return (readl(&regs->gpio_psr) >> offset) & 0x01; + return gpio_bank_get_value(regs, offset); } /* set GPIO pin 'gpio' as an input */ -- 2.32.0

2 5