July 2021 - U-Boot

[PATCHv4] Azure/GitLab: Move to gcc-11.1.0 and LLVM-11
by Tom Rini 07 Jul '21

07 Jul '21

- Move to gcc-11.1.0 builds from kernel.org for supported platforms and LLVM-11 for those tests. - As Heinrich has noted, the RISC-V platform specification has a profile OS-A for running rich operating systems like Linux and BSD. This profile requires 64bit and UEFI conforming to the EBBR. Only the 'embedded' profile may use 32bit. Given this, drop grub for 32bit RISC-V as it no longer compiles with gcc-11.1 and upstream is unlikely to fix it: https://www.mail-archive.com/grub-devel@gnu.org/msg30736.html - Update to grub-2.06 release to address other issues of building with gcc-11.1. - Update to newer Xtensa (gcc-9.2.0) and ARC (gcc-10.2) toolchains Cc: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Cc: Bin Meng <bmeng.cn(a)gmail.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Rick Chen <rick(a)andestech.com> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- Changes in v4: - Given Heinrich's explanation, continue dropping grub for riscv32 and explain why we can better in the commit message. - The x86 build problem noted in v3 has been fixed, thanks Bin! Changes in v3: - Post the right patch this time. - Switch to gcc-11.1.0 builds rather than pre-release - grub-2.06 is out, use that rather than -rc1 - Update Xtensa and ARC toolchains. - Note that right now this causes x86 to fail to link, which I did not see with gcc-11.0 tests. Changes in v2: - None, I re-sent v1 by accident --- .azure-pipelines.yml | 3 +- .gitlab-ci.yml | 3 +- tools/docker/Dockerfile | 85 +++++++++++++++++------------------------ 3 files changed, 36 insertions(+), 55 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 5ac4d648ec9e..3d4cd76c6061 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -2,7 +2,7 @@ variables: windows_vm: vs2017-win2016 ubuntu_vm: ubuntu-18.04 macos_vm: macOS-10.15 - ci_runner_image: trini/u-boot-gitlab-ci-runner:focal-20210416-10Jun2021 + ci_runner_image: trini/u-boot-gitlab-ci-runner:focal-20210416-14Jun2021 # Add '-u 0' options for Azure pipelines, otherwise we get "permission # denied" error when it tries to "useradd -m -u 1001 vsts_azpcontainer", # since our $(ci_runner_image) user is not root. @@ -300,7 +300,6 @@ jobs: cp ~/grub_x86.efi ${UBOOT_TRAVIS_BUILD_DIR}/ cp ~/grub_x64.efi ${UBOOT_TRAVIS_BUILD_DIR}/ cp /opt/grub/grubriscv64.efi ${UBOOT_TRAVIS_BUILD_DIR}/grub_riscv64.efi - cp /opt/grub/grubriscv32.efi ${UBOOT_TRAVIS_BUILD_DIR}/grub_riscv32.efi cp /opt/grub/grubaa64.efi ${UBOOT_TRAVIS_BUILD_DIR}/grub_arm64.efi cp /opt/grub/grubarm.efi ${UBOOT_TRAVIS_BUILD_DIR}/grub_arm.efi virtualenv -p /usr/bin/python3 /tmp/venv diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 41a2c18fa180..b7c049825102 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ # Grab our configured image. The source for this is found at: # https://source.denx.de/u-boot/gitlab-ci-runner -image: trini/u-boot-gitlab-ci-runner:focal-20210416-10Jun2021 +image: trini/u-boot-gitlab-ci-runner:focal-20210416-14Jun2021 # We run some tests in different order, to catch some failures quicker. stages: @@ -38,7 +38,6 @@ stages: - cp ~/grub_x86.efi $UBOOT_TRAVIS_BUILD_DIR/ - cp ~/grub_x64.efi $UBOOT_TRAVIS_BUILD_DIR/ - cp /opt/grub/grubriscv64.efi $UBOOT_TRAVIS_BUILD_DIR/grub_riscv64.efi - - cp /opt/grub/grubriscv32.efi $UBOOT_TRAVIS_BUILD_DIR/grub_riscv32.efi - cp /opt/grub/grubaa64.efi $UBOOT_TRAVIS_BUILD_DIR/grub_arm64.efi - cp /opt/grub/grubarm.efi $UBOOT_TRAVIS_BUILD_DIR/grub_arm.efi - virtualenv -p /usr/bin/python3 /tmp/venv diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 95951f4bef89..d0e2642da585 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -12,24 +12,24 @@ ENV DEBIAN_FRONTEND=noninteractive # Add LLVM repository RUN apt-get update && apt-get install -y gnupg2 wget xz-utils && rm -rf /var/lib/apt/lists/* RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - -RUN echo deb http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main | tee /etc/apt/sources.list.d/llvm.list +RUN echo deb http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main | tee /etc/apt/sources.list.d/llvm.list -# Manually install the kernel.org "Crosstool" based toolchains for gcc-7.3 -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/9.2.0/… | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/9.2.0/… | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/9.2.0/… | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/9.2.0/… | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/9.2.0/… | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/9.2.0/… | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/9.2.0/… | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/9.2.0/… | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/9.2.0/… | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/9.2.0/… | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/9.2.0/… | tar -C /opt -xJ +# Manually install the kernel.org "Crosstool" based toolchains for gcc-11.1.0 +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/11.1.0… | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/11.1.0… | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/11.1.0… | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/11.1.0… | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/11.1.0… | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/11.1.0… | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/11.1.0… | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/11.1.0… | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/11.1.0… | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/11.1.0… | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/11.1.0… | tar -C /opt -xJ # Manually install other toolchains -RUN wget -O - https://github.com/foss-xtensa/toolchain/releases/download/2018.02/x86_64-2… | tar -C /opt -xz -RUN wget -O - https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/… | tar --no-same-owner -C /opt -xz +RUN wget -O - https://github.com/foss-xtensa/toolchain/releases/download/2020.07/x86_64-2… | tar -C /opt -xz +RUN wget -O - https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/… | tar --no-same-owner -C /opt -xz RUN wget -O - https://github.com/vincentzwc/prebuilt-nds32-toolchain/releases/download/20… | tar -C /opt -xz # Update and install things from apt now @@ -100,9 +100,6 @@ RUN apt-get update && apt-get install -y \ zip \ && rm -rf /var/lib/apt/lists/* -# Manually install libmpfr4 for the toolchains -RUN wget http://mirrors.kernel.org/ubuntu/pool/main/m/mpfr4/libmpfr4_3.1.4-1_amd64.d… && dpkg -i libmpfr4_3.1.4-1_amd64.deb && rm libmpfr4_3.1.4-1_amd64.deb - # Manually install a new enough version of efitools (must be v1.5.2 or later) RUN wget http://mirrors.kernel.org/ubuntu/pool/universe/e/efitools/efitools_1.8.1-0u… && sudo dpkg -i efitools_1.8.1-0ubuntu2_amd64.deb && rm efitools_1.8.1-0ubuntu2_amd64.deb @@ -119,16 +116,16 @@ RUN git clone https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.g # Build GRUB UEFI targets for ARM & RISC-V, 32-bit and 64-bit RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ cd /tmp/grub && \ - git checkout grub-2.04 && \ + git checkout grub-2.06 && \ ./bootstrap && \ mkdir -p /opt/grub && \ ./configure --target=aarch64 --with-platform=efi \ CC=gcc \ - TARGET_CC=/opt/gcc-9.2.0-nolibc/aarch64-linux/bin/aarch64-linux-gcc \ - TARGET_OBJCOPY=/opt/gcc-9.2.0-nolibc/aarch64-linux/bin/aarch64-linux-objcopy \ - TARGET_STRIP=/opt/gcc-9.2.0-nolibc/aarch64-linux/bin/aarch64-linux-strip \ - TARGET_NM=/opt/gcc-9.2.0-nolibc/aarch64-linux/bin/aarch64-linux-nm \ - TARGET_RANLIB=/opt/gcc-9.2.0-nolibc/aarch64-linux/bin/aarch64-linux-ranlib && \ + TARGET_CC=/opt/gcc-11.1.0-nolibc/aarch64-linux/bin/aarch64-linux-gcc \ + TARGET_OBJCOPY=/opt/gcc-11.1.0-nolibc/aarch64-linux/bin/aarch64-linux-objcopy \ + TARGET_STRIP=/opt/gcc-11.1.0-nolibc/aarch64-linux/bin/aarch64-linux-strip \ + TARGET_NM=/opt/gcc-11.1.0-nolibc/aarch64-linux/bin/aarch64-linux-nm \ + TARGET_RANLIB=/opt/gcc-11.1.0-nolibc/aarch64-linux/bin/aarch64-linux-ranlib && \ make && \ ./grub-mkimage -O arm64-efi -o /opt/grub/grubaa64.efi --prefix= -d \ grub-core cat chain configfile echo efinet ext2 fat halt help linux \ @@ -138,11 +135,11 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ make clean && \ ./configure --target=arm --with-platform=efi \ CC=gcc \ - TARGET_CC=/opt/gcc-9.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-gcc \ - TARGET_OBJCOPY=/opt/gcc-9.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-objcopy \ - TARGET_STRIP=/opt/gcc-9.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-strip \ - TARGET_NM=/opt/gcc-9.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-nm \ - TARGET_RANLIB=/opt/gcc-9.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-ranlib && \ + TARGET_CC=/opt/gcc-11.1.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-gcc \ + TARGET_OBJCOPY=/opt/gcc-11.1.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-objcopy \ + TARGET_STRIP=/opt/gcc-11.1.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-strip \ + TARGET_NM=/opt/gcc-11.1.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-nm \ + TARGET_RANLIB=/opt/gcc-11.1.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-ranlib && \ make && \ ./grub-mkimage -O arm-efi -o /opt/grub/grubarm.efi --prefix= -d \ grub-core cat chain configfile echo efinet ext2 fat halt help linux \ @@ -152,31 +149,17 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ make clean && \ ./configure --target=riscv64 --with-platform=efi \ CC=gcc \ - TARGET_CC=/opt/gcc-9.2.0-nolibc/riscv64-linux/bin/riscv64-linux-gcc \ - TARGET_OBJCOPY=/opt/gcc-9.2.0-nolibc/riscv64-linux/bin/riscv64-linux-objcopy \ - TARGET_STRIP=/opt/gcc-9.2.0-nolibc/riscv64-linux/bin/riscv64-linux-strip \ - TARGET_NM=/opt/gcc-9.2.0-nolibc/riscv64-linux/bin/riscv64-linux-nm \ - TARGET_RANLIB=/opt/gcc-9.2.0-nolibc/riscv64-linux/bin/riscv64-linux-ranlib && \ + TARGET_CC=/opt/gcc-11.1.0-nolibc/riscv64-linux/bin/riscv64-linux-gcc \ + TARGET_OBJCOPY=/opt/gcc-11.1.0-nolibc/riscv64-linux/bin/riscv64-linux-objcopy \ + TARGET_STRIP=/opt/gcc-11.1.0-nolibc/riscv64-linux/bin/riscv64-linux-strip \ + TARGET_NM=/opt/gcc-11.1.0-nolibc/riscv64-linux/bin/riscv64-linux-nm \ + TARGET_RANLIB=/opt/gcc-11.1.0-nolibc/riscv64-linux/bin/riscv64-linux-ranlib && \ make && \ ./grub-mkimage -O riscv64-efi -o /opt/grub/grubriscv64.efi --prefix= -d \ grub-core cat chain configfile echo efinet ext2 fat halt help linux \ lsefisystab loadenv lvm minicmd normal part_msdos part_gpt reboot \ search search_fs_file search_fs_uuid search_label serial sleep test \ true && \ - make clean && \ - ./configure --target=riscv32 --with-platform=efi \ - CC=gcc \ - TARGET_CC=/opt/gcc-9.2.0-nolibc/riscv32-linux/bin/riscv32-linux-gcc \ - TARGET_OBJCOPY=/opt/gcc-9.2.0-nolibc/riscv32-linux/bin/riscv32-linux-objcopy \ - TARGET_STRIP=/opt/gcc-9.2.0-nolibc/riscv32-linux/bin/riscv32-linux-strip \ - TARGET_NM=/opt/gcc-9.2.0-nolibc/riscv32-linux/bin/riscv32-linux-nm \ - TARGET_RANLIB=/opt/gcc-9.2.0-nolibc/riscv32-linux/bin/riscv32-linux-ranlib && \ - make && \ - ./grub-mkimage -O riscv32-efi -o /opt/grub/grubriscv32.efi --prefix= -d \ - grub-core cat chain configfile echo efinet ext2 fat halt help linux \ - lsefisystab loadenv lvm minicmd normal part_msdos part_gpt reboot \ - search search_fs_file search_fs_uuid search_label serial sleep test \ - true && \ rm -rf /tmp/grub RUN git clone git://git.qemu.org/qemu.git /tmp/qemu && \ @@ -194,9 +177,9 @@ USER uboot:uboot # Create the buildman config file RUN /bin/echo -e "[toolchain]\nroot = /usr" > ~/.buildman -RUN /bin/echo -e "kernelorg = /opt/gcc-9.2.0-nolibc/*" >> ~/.buildman -RUN /bin/echo -e "arc = /opt/arc_gnu_2019.09_prebuilt_uclibc_le_archs_linux_install" >> ~/.buildman -RUN /bin/echo -e "\n[toolchain-prefix]\nxtensa = /opt/2018.02/xtensa-dc233c-elf/bin/xtensa-dc233c-elf-" >> ~/.buildman; +RUN /bin/echo -e "kernelorg = /opt/gcc-11.1.0-nolibc/*" >> ~/.buildman +RUN /bin/echo -e "arc = /opt/arc_gnu_2021.03_prebuilt_uclibc_le_archs_linux_install" >> ~/.buildman +RUN /bin/echo -e "\n[toolchain-prefix]\nxtensa = /opt/2020.07/xtensa-dc233c-elf/bin/xtensa-dc233c-elf-" >> ~/.buildman; RUN /bin/echo -e "\nnds32 = /opt/nds32le-linux-glibc-v3-upstream/bin/nds32le-linux-" >> ~/.buildman; RUN /bin/echo -e "\n[toolchain-alias]\nsh = sh2" >> ~/.buildman RUN /bin/echo -e "\nriscv = riscv64" >> ~/.buildman -- 2.17.1

2 3

[PULL] u-boot-riscv/master
by Leo Liang 07 Jul '21

07 Jul '21

Hi Tom, This is a follow up PR for OpenPiton's dts. Thanks for the catch. The following changes since commit 5617efd2c882562b716a61bc0dc0edda46b045df: Merge branch '2021-07-06-platform-updates' (2021-07-06 18:10:10 -0400) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-riscv.git for you to fetch changes up to c9135d5a7af2df0e273e0f7e2f6c8132b34aba82: riscv: dts: add OpenPiton RISC-V board dts support (2021-07-07 20:34:02 +0800) CI result shows no issue: https://source.denx.de/u-boot/custodians/u-boot-riscv/-/pipelines/8100 ---------------------------------------------------------------- Tianrui Wei (1): riscv: dts: add OpenPiton RISC-V board dts support arch/riscv/dts/openpiton-riscv64.dts | 4 ++-- board/openpiton/riscv64/MAINTAINERS | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) Best regards, Leo

2 1

[PULL] u-boot-atmel-fixes-2021.10-a
by Eugen.Hristev＠microchip.com 07 Jul '21

07 Jul '21

Hello Tom, Please pull tag u-boot-atmel-fixes-2021.10-a , the first set of atmel fixes for the 2021.10 cycle. This small fixes set is dedicated to fixing the onewire subsystem for the at91 boards which was broken since 2020.04. Thanks, Eugen The following changes since commit 1311dd37ecf476be041d0452d4ee38619aadd5de: Merge branch '2021-07-01-update-CI-containers' (2021-07-05 15:29:44 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-atmel.git tags/u-boot-atmel-fixes-2021.10-a for you to fetch changes up to 89bd68a7484880900b47bcadd1b5671c52592d16: ARM: dts: at91: fix the GPIO polarity for onewire (2021-07-06 15:17:10 +0300) ---------------------------------------------------------------- First set of u-boot-atmel fixes for 2021.10 cycle ---------------------------------------------------------------- Eugen Hristev (2): w1: w1-gpio: claim the gpio with correct initial flag ARM: dts: at91: fix the GPIO polarity for onewire arch/arm/dts/at91-sama5d27_som1_ek.dts | 3 ++- arch/arm/dts/at91-sama5d27_wlsom1_ek.dts | 3 ++- arch/arm/dts/at91-sama5d2_ptc_ek.dts | 2 +- arch/arm/dts/at91-sama5d2_xplained.dts | 3 ++- arch/arm/dts/at91-sama5d3_xplained.dts | 2 +- arch/arm/dts/at91-sama5d4_xplained.dts | 2 +- arch/arm/dts/sam9x60ek.dts | 2 +- drivers/w1/w1-gpio.c | 2 +- 8 files changed, 11 insertions(+), 8 deletions(-)

2 1

U-boot integration in the bootloader process of Rasperry Pi CM4
by Anthony Arrascue 07 Jul '21

07 Jul '21

Hello everyone, I am learning about u-boot and how this works in the Raspberry Pi system. This is what I understood so far: - The first stage from the RPI cannot or should be modified. In this stage the BootROM simply loads the bootloader from the flash EEPROM. - In the second stage the EEPROM boot loader finds and loads start.elf, whose task is to load the kernel. It first reads* config.txt* which contains a kernel parameter. This is where u-boot is "injected". *kernel=u-boot.bin* Then u-boot can then in turn load the actual kernel. For a CM4 this would be "*kernel7l.img*". I would be super satisfied with this knowledge, but in practice I have (possibly) seen other ways of integrating u-boot. I am here referring, for example, to Yocto recipes for the CM4 (meta-raspberrypi / u-boot). The boot directory of such an image contains: *boot.scr*, *uboot.env*, and *uImage*. The readable part of boot.scr specifies that uImage will be loaded: *value bootargs /chosen bootargsfatload mmc 0:1 ${kernel_addr_r} uImageif test ! -e mmc 0:1 uboot.env; then saveenv; fi;bootm ${kernel_addr_r} - ${fdt_addr}* config.txt does not contain a kernel parameter. *So here my questions:* 1) start.elf cannot be modified since it is proprietary. How can it load u-boot if there is no kernel parameter in config.txt pointing to a binary u-boot? boot.scr is supposed to run before u-boot.bin. Who reads and executes boot.scr? 2) is uImage just another name for u-boot.bin? 3) In this scheme how does u-boot know it should load "*kernel7l.img*"? 4) Are there other ways of integrating u-boot in a RaspberryPi? Is there any documentation which describes these different integration schemes? Thank you very much for your help! Best, Anthony Arrascue

2 3

[PATCH] xilinx: zynqmp: increase CONFIG_SYS_SPL_MALLOC_SIZE to 16MB
by Ricardo Salveti 07 Jul '21

07 Jul '21

commit 03f1f78a9b44 ("spl: fit: Prefer a malloc()'d buffer for loading images")' changed the way buffer allocation worked for SPL to a more flexible method. For xilinx zynqmp the 1MB buffer is not necessarily enough when dealing with complex fit images (e.g. containing FPGA/TF-A/OP-TEE/U-Boot proper), which can easily reach up to 10MB, so increase the default CONFIG_SYS_SPL_MALLOC_SIZE size to 16MB to cover more advanced scenarios. Signed-off-by: Ricardo Salveti <ricardo(a)foundries.io> --- include/configs/xilinx_zynqmp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index cadaf1a9631..bfe8a204279 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -261,7 +261,7 @@ #endif #define CONFIG_SYS_SPL_MALLOC_START 0x20000000 -#define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 +#define CONFIG_SYS_SPL_MALLOC_SIZE 0x1000000 #ifdef CONFIG_SPL_SYS_MALLOC_SIMPLE # error "Disable CONFIG_SPL_SYS_MALLOC_SIMPLE. Full malloc needs to be used" -- 2.32.0

2 1

[U-Boot] [PATCH v3 00/20] Bring NAND support to Nintendo NES Classic
by Miquel Raynal 07 Jul '21

07 Jul '21

Hello, This series first adds fixes and enhancements to sunxi NAND drivers (SPL and U-Boot). Once this is done, the SPL NAND driver is converted to use PIO instead of DMA with the goal to support all SoCs with this IP without the need for DMA-related code. Finally, NAND support is added to Nintendo NES Classic through Kconfig and DT additions. Thanks, Miquèl Changes since v2: ================= - Added Boris and Maxime Acked-by tags. - Removed extra space in nand_reset_column() - Fixed the useless wait period on failure in nand_change_column(). - Changed the title "sunxi: allow NAND support to be compiled for..." (removed the "in SPL" precision which is wrong). - Enbraced the deassertion of the reset line by #if statements about the SoCs in use. Wolfgang Denk made a comment on my proposal but I could not find a better solution, so I kept it for now. - s/alwinner,[pin,functions]/[pin,functions]/ in the DT. - Change Alwinner-specific parts in the SPL to generic sentences. Changes since v1: ================= All: ---- - Enhance all commit messages. - Rebased on top of master branch (I should have done that earlier but I forgot I was on an old revision). Fix binman_sym output check --------------------------- - SPL seems to be broken for a few weeks when using raw NAND, fix it by changing the error condition. Fix strength ------------ - Add comment explaining the added line and moved the line for clarification on why it is needed. - Add forgotten Boris' Suggested-by tag. Fix second case of modulo by zero error ---------------------------------------- - Added a reference to the first occurence of this issue. Allow SPL to be compiled for sun8i platforms -------------------------------------------- - This commit is not about compiling the SPL, but the NAND support in the SPL, as corrected by Maxime. Enhancements and cleaning ------------------------- - Patch split into several logical chunks, as requested. - Removed useless udelay(1), that was added for debugging purpose. - Introduced the nand_exec_cmd() helper to mutualize code one step further. - Add an udelay(1) after changing the column to respect the minimum tCCS delay (Change Column Setup time). - Canceled moving to global scope the ecc_strength array. Use PIO instead of DMA ---------------------- - Change commit message/title. - Cancel removing NFC related definitions: they can be useful as the this IP is quite under-documented. - Merge nand_reset_column and nand_change_column (in another patch). - Moved the copy of the data after the check of the ECC status. - ECC chunks are read manually, return if the first chunk is empty only (needed for configuration research), otherwise it should not be treated as an error. Add NAND node to sun8i ---------------------- - U-Boot master branch already has this node, remove the patch. Enable NAND on NES classic -------------------------- - Change the DT cells size from 2 to 1. Add NAND support for NES classic -------------------------------- - Split in several patches, moving SPL_NAND_SUPPORT and NAND_SUNXI out of the defconfig files (NES and CHIP pro) to be automatically selected depending on NAND_SUNXI and ARCH_SUNXI. - Moved the NAND parameters to Kconfig (only for SUNXI because the tool did not work as expected, maybe due to some definitions that are not "numbers" but multiplications and sometimes use other definitions (NAND page size, 2K_SZ, etc). Miquel Raynal (20): spl: fix binman_sym output check mtd: nand: sunxi: fix ECC strength choice spl: nand: sunxi: fix second case of modulo by zero error spl: nand: sunxi: fix typo on register name spl: nand: sunxi: introduce the nand_wait_int() helper spl: nand: sunxi: introduce the nand_wait_cmd_fifo_empty() helper spl: nand: sunxi: add missing status clear spl: nand: sunxi: create an helper to handle command execution spl: nand: sunxi: ensure enough time has passed after changing the column spl: nand: sunxi: make the reset column helper more generic sunxi: spl: deassert the NAND controller reset line spl: nand: sunxi: declare the ecc_bytes array globally spl: nand: sunxi: use PIO instead of DMA sunxi: spl: remove DMA related settings of the NAND controller sunxi: allow NAND support to be compiled for sun8i platforms sunxi: dts: enable NAND on NES classic sunxi: automatically select SPL_NAND_SUPPORT in Kconfig sunxi: make NAND_SUNXI use ARCH_SUNXI as default in Kconfig sunxi: move the NAND parameters to Kconfig configs: add NAND support for NES Classic arch/arm/dts/sun8i-a23-a33.dtsi | 17 ++ .../dts/sun8i-r16-nintendo-nes-classic-edition.dts | 14 ++ arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 6 + board/sunxi/board.c | 7 +- common/spl/spl.c | 10 +- configs/CHIP_pro_defconfig | 6 +- configs/Nintendo_NES_Classic_Edition_defconfig | 4 + drivers/mtd/nand/Kconfig | 26 ++- drivers/mtd/nand/sunxi_nand.c | 8 +- drivers/mtd/nand/sunxi_nand_spl.c | 242 ++++++++++----------- 10 files changed, 208 insertions(+), 132 deletions(-) -- 2.14.1

5 31

Re: Illegal instruction - While starting Linux kernel.
by Venkatakrishnan Sutharsan 07 Jul '21

07 Jul '21

Hi, I have been writing SPI Driver in U-Boot for a RISCV Board and is currently trying to use that to boot linux kernel from SD Card. Right now, I have the card detected and can view files in various partitions in the SD Card. After that I try to copy the uImage (created using mkimage command and vmlinux image file) and dtb into the memory and start the kernel using the following command (the kernel encounters illegal instruction and terminates): => ext4load mmc 0:1 ${kernel_addr_r} /boot/uImage; ext4load mmc 0:1 ${fdt_addr_r} /boot/shakti_100t.dtb; bootm ${kernel_addr_r} - ${fdt_addr_r} 16131968 bytes read in 1227747 ms (12.7 KiB/s) 2852 bytes read in 504 ms (4.9 KiB/s) ## Booting kernel from Legacy Image at 84000000 ... Image Name: Shakti-Vajra Image Type: RISC-V Linux Kernel Image (uncompressed) Data Size: 16131904 Bytes = 15.4 MiB Load Address: 84000000 Entry Point: 84000000 Verifying Checksum ... OK ## Flattened Device Tree blob at 88000000 Booting using the fdt blob at 0x88000000 Loading Kernel Image Using Device Tree in place at 0000000088000000, end 0000000088003b23 Starting kernel ... Unhandled exception: Illegal instruction EPC: 0000000084000000 RA: 000000008ff9905c TVAL: 00000000464c457f EPC: 0000000074268000 RA: 000000008020105c reloc adjusted resetting ... reset not supported yet ### ERROR ### Please RESET the board ### And to check the dump I was not able to create the dump using riscv64-unknown-elf-objdump command in my computer so I used the md.b command to get the dump from the RAM in the board. The dump were as follows : 84000000: 27 05 19 56 02 e3 5d 33 60 e2 a7 a5 00 f6 27 40 '..V..]3`.....'@ 84000010: 84 00 00 00 84 00 00 00 ee 5e 8f 20 05 1a 02 00 .........^. .... 84000020: 53 68 61 6b 74 69 2d 56 61 6a 72 61 00 00 00 00 Shakti-Vajra.... 84000030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 84000040: 7f 45 4c 46 02 01 01 00 00 00 00 00 00 00 00 00 .ELF............ 84000050: 02 00 f3 00 01 00 00 00 00 00 00 00 e0 ff ff ff ................ 84000060: 40 00 00 00 00 00 00 00 00 22 f6 00 00 00 00 00 @........"...... 84000070: 00 00 00 00 40 00 38 00 04 00 40 00 15 00 14 00 ....@.8...@..... 84000080: 01 00 00 00 05 00 00 00 00 10 00 00 00 00 00 00 ................ 84000090: 00 00 00 00 e0 ff ff ff 00 00 00 00 00 00 00 00 ................ 840000a0: f4 ab 01 00 00 00 00 00 f4 ab 01 00 00 00 00 00 ................ 840000b0: 00 10 00 00 00 00 00 00 01 00 00 00 07 00 00 00 ................ 840000c0: 00 c0 01 00 00 00 00 00 00 b0 01 00 e0 ff ff ff ................ 840000d0: 00 b0 01 00 00 00 00 00 c0 a4 e6 00 00 00 00 00 ................ 840000e0: c0 a4 e6 00 00 00 00 00 00 10 00 00 00 00 00 00 ................ 840000f0: 04 00 00 00 04 00 00 00 c0 78 e1 00 00 00 00 00 .........x...... 84000100: c0 68 e1 00 e0 ff ff ff c0 68 e1 00 00 00 00 00 .h.......h...... 84000110: 3c 00 00 00 00 00 00 00 3c 00 00 00 00 00 00 00 <.......<....... 84000120: 04 00 00 00 00 00 00 00 51 e5 74 64 06 00 00 00 ........Q.td.... 84000130: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 84000140: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 84000150: 00 00 00 00 00 00 00 00 10 00 00 00 00 00 00 00 ................ 84000160: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 84000170: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 84000180: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 84000190: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 840001a0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 840001b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 840001c0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 840001d0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 840001e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 840001f0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 84000200: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 84000210: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 84000220: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 84000230: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 84000240: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 84000250: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 84000260: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ while the FDT loading seems to happen correctly as from the dump I can see non-zero values. => md.b ${fdt_addr_r} 88000000: d0 0d fe ed 00 00 0b 24 00 00 00 38 00 00 08 54 .......$...8...T 88000010: 00 00 00 28 00 00 00 11 00 00 00 10 00 00 00 00 ...(............ 88000020: 00 00 02 d0 00 00 08 1c 00 00 00 00 00 00 00 00 ................ 88000030: 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 ................ 88000040: 00 00 00 03 00 00 00 04 00 00 00 00 00 00 00 02 ................ 88000050: 00 00 00 03 00 00 00 04 00 00 00 0f 00 00 00 02 ................ 88000060: 00 00 00 03 00 00 00 16 00 00 00 1b 73 68 61 6b ............shak 88000070: 74 69 2c 73 70 69 6b 65 2d 62 61 72 65 2d 64 65 ti,spike-bare-de 88000080: 76 00 00 00 00 00 00 03 00 00 00 12 00 00 00 26 v..............& 88000090: 73 68 61 6b 74 69 2c 73 70 69 6b 65 2d 62 61 72 shakti,spike-bar 880000a0: 65 00 00 00 00 00 00 01 63 70 75 73 00 00 00 00 e.......cpus.... 880000b0: 00 00 00 03 00 00 00 04 00 00 00 00 00 00 00 01 ................ 880000c0: 00 00 00 03 00 00 00 04 00 00 00 0f 00 00 00 00 ................ 880000d0: 00 00 00 03 00 00 00 04 00 00 00 2c 00 00 80 00 ...........,.... 880000e0: 00 00 00 01 63 70 75 40 30 00 00 00 00 00 00 03 ....cpu@0....... 880000f0: 00 00 00 04 00 00 00 3f 63 70 75 00 00 00 00 03 .......?cpu..... 88000100: 00 00 00 04 00 00 00 4b 00 00 00 00 00 00 00 03 .......K........ 88000110: 00 00 00 05 00 00 00 4f 6f 6b 61 79 00 00 00 00 .......Ookay.... 88000120: 00 00 00 03 00 00 00 06 00 00 00 1b 72 69 73 63 ............risc 88000130: 76 00 00 00 00 00 00 03 00 00 00 09 00 00 00 56 v..............V 88000140: 72 76 36 34 69 6d 61 63 00 00 00 00 00 00 00 03 rv64imac........ 88000150: 00 00 00 0b 00 00 00 60 72 69 73 63 76 2c 73 76 .......`riscv,sv 88000160: 33 39 00 00 00 00 00 03 00 00 00 04 00 00 00 69 39.............i 88000170: 02 fa f0 80 00 00 00 01 69 6e 74 65 72 72 75 70 ........interrup 88000180: 74 2d 63 6f 6e 74 72 6f 6c 6c 65 72 00 00 00 00 t-controller.... 88000190: 00 00 00 03 00 00 00 04 00 00 00 79 00 00 00 01 ...........y.... 880001a0: 00 00 00 03 00 00 00 00 00 00 00 8a 00 00 00 03 ................ 880001b0: 00 00 00 0f 00 00 00 1b 72 69 73 63 76 2c 63 70 ........riscv,cp 880001c0: 75 2d 69 6e 74 63 00 00 00 00 00 03 00 00 00 04 u-intc.......... 880001d0: 00 00 00 9f 00 00 00 01 00 00 00 02 00 00 00 02 ................ 880001e0: 00 00 00 02 00 00 00 01 6d 65 6d 6f 72 79 40 38 ........memory@8 880001f0: 30 30 30 30 30 30 30 00 00 00 00 03 00 00 00 07 0000000......... Also, I printed the FDT using the fdt print command. => load mmc 0:1 ${fdt_addr_r} /boot/shakti_100t.dtb 2852 bytes read in 519 ms (4.9 KiB/s) => fdt print No FDT memory address configured. Please configure the FDT address via "fdt addr <address>" command. Aborting! => fdt addr ${fdt_addr_r} => fdt print / { #address-cells = <0x00000002>; #size-cells = <0x00000002>; compatible = "shakti,spike-bare-dev"; model = "shakti,spike-bare"; cpus { #address-cells = <0x00000001>; #size-cells = <0x00000000>; timebase-frequency = <0x00008000>; cpu@0 { device_type = "cpu"; reg = <0x00000000>; status = "okay"; compatible = "riscv"; riscv,isa = "rv64imac"; mmu-type = "riscv,sv39"; clock-frequency = <0x02faf080>; interrupt-controller { #interrupt-cells = <0x00000001>; interrupt-controller; compatible = "riscv,cpu-intc"; phandle = <0x00000001>; }; }; }; memory@80000000 { device_type = "memory"; reg = <0x00000000 0x80000000 0x00000000 0x10000000>; }; soc { #address-cells = <0x00000002>; #size-cells = <0x00000002>; compatible = "shakti,spike-bare-soc", "simple-bus"; ranges; clint@2000000 { compatible = "riscv,clint0"; interrupts-extended = <0x00000001 0x00000003 0x00000001 0x00000007>; reg = <0x00000000 0x02000000 0x00000000 0x000c0000>; }; interrupt-controller@c000000 { #interrupt-cells = <0x00000002>; compatible = "riscv,plic0"; interrupt-controller; reg = <0x00000000 0x0c000000 0x00000000 0x04000000>; interrupts-extended = <0x00000001 0x0000000b 0x00000001 0x00000009>; reg-names = "control"; riscv,max-priority = <0x00000007>; riscv,ndev = <0x0000001d>; phandle = <0x00000002>; }; ethernet@44000 { #address-cells = <0x00000002>; #size-cells = <0x00000002>; device_type = "network"; compatible = "xlnx,xps-ethernetlite-3.00.a", "xlnx,xps-ethernetlite-1.00.a"; interrupt-parent = <0x00000002>; interrupts = <0x0000001d 0x00000001>; local-mac-address = [00 0a 35 00 00 00]; phy-handle = <0x00000003>; reg = <0x00000000 0x00044000 0x00000000 0x00004000>; xlnx,duplex = <0x00000001>; xlnx,include-global-buffers = <0x00000001>; xlnx,include-internal-loopback = <0x00000001>; xlnx,include-mdio = <0x00000001>; xlnx,instance = "axi_ethernetlite_inst"; xlnx,rx-ping-pong = <0x00000001>; xlnx,s-axi-id-width = <0x00000001>; xlnx,tx-ping-pong = <0x00000001>; threshold = <0x00000040>; sensitivity = <0x00000006>; mdio { #address-cells = <0x00000001>; #size-cells = <0x00000000>; phy@1 { device_type = "ethernet-phy"; compatible = "ethernet-phy-ieee802.3-c22"; ti,rx-internal-delay = <0x3b9aca00>; ti,tx-internal-delay = <0x3b9aca00>; ti,fifo-depth = <0x00001000>; reg = <0x00000001>; status = "okay"; phandle = <0x00000003>; }; }; }; oscillator { #clock-cells = <0x00000000>; compatible = "fixed-clock"; clock-frequency = <0x02faf080>; phandle = <0x00000004>; }; spi@20100 { compatible = "shakti,spi1"; reg = <0x00000000 0x00020100 0x00000000 0x00000100>; clocks = <0x00000004>; shakti,controller = <0x00000001>; shakti,spi-frequency = <0x001e8480>; shakti,lsb-first = <0x00000000>; shakti,communication-mode = <0x00000003>; shakti,cpha = <0x00000000>; shakti,cpol = <0x00000000>; shakti,cs-high = <0x00000001>; shakti,fifo-depth = <0x0000001f>; mmc-slot@0 { compatible = "mmc-spi-slot"; reg = <0x00000000>; voltage-ranges = <0x00000ce4 0x00000ce4>; spi-max-frequency = <0x002625a0>; }; }; }; uart { compatible = "shakti,uart0"; reg = <0x00000000 0x00011300 0x00000000 0x00001000>; }; }; >From this I think that the SPI Driver is working, but I still cannot figure why the kernel is not booting. Any suggestions/comments on how to solve this issue is highly appreciated. Thanks in advance. *Regards,* *Venkatakrishnan Sutharsan*

1 0

[PATCH] riscv: dts: add OpenPiton RISC-V board dts support
by Tianrui Wei 07 Jul '21

07 Jul '21

Previous device tree for OpenPitonemits a warning during compilation, thus was rejected by Tom. This commit fixes the previous warning and adds dts to the OpenPiton RISC-V board and added the device tree to MAINTAINER file. Signed-off-by: Tianrui Wei <tianrui-wei(a)outlook.com> Reported-by: Tom Rini <trini(a)konsulko.com> --- arch/riscv/dts/openpiton-riscv64.dts | 4 ++-- board/openpiton/riscv64/MAINTAINERS | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/riscv/dts/openpiton-riscv64.dts b/arch/riscv/dts/openpiton-riscv64.dts index 45951e1236..abc6016a0b 100644 --- a/arch/riscv/dts/openpiton-riscv64.dts +++ b/arch/riscv/dts/openpiton-riscv64.dts @@ -80,8 +80,8 @@ }; soc { - #address-cells = <1>; - #size-cells = <1>; + #address-cells = <2>; + #size-cells = <2>; compatible = "openpiton,chipset", "simple-bus"; ranges; diff --git a/board/openpiton/riscv64/MAINTAINERS b/board/openpiton/riscv64/MAINTAINERS index f91c000c83..f80f5b0495 100644 --- a/board/openpiton/riscv64/MAINTAINERS +++ b/board/openpiton/riscv64/MAINTAINERS @@ -1,8 +1,9 @@ Openpiton BOARD -M: Tianrui Wei<tianrui-wei(a)outlook.com> +M: Tianrui Wei <tianrui-wei(a)outlook.com> S: Maintained F: board/openpiton/riscv64/ F: include/configs/openpiton-riscv64.h F: configs/openpiton_riscv64_defconfig F: configs/openpiton_riscv64_spl_defconfig F: drivers/mmc/piton_mmc.c +F: arch/riscv/dts/openpiton-riscv64.dts -- 2.32.0

2 2

[PATCH 1/1] efi_loader: improve block device integration with DM
by Heinrich Schuchardt 07 Jul '21

07 Jul '21

Up to now when devices became available after executing the UEFI sub-system initialization where not available for EFI applications. With the patch block devices are added to the UEFI object list whenever they are probed. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- drivers/core/device.c | 7 +++ include/efi_loader.h | 6 +++ lib/efi_driver/Makefile | 1 + lib/efi_driver/efi_dm_integration.c | 36 +++++++++++++++ lib/efi_loader/efi_disk.c | 72 +++++++++++++++++------------ 5 files changed, 93 insertions(+), 29 deletions(-) create mode 100644 lib/efi_driver/efi_dm_integration.c diff --git a/drivers/core/device.c b/drivers/core/device.c index cb960f8ec4..7355a5c2a9 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -14,6 +14,7 @@ #include <asm/global_data.h> #include <asm/io.h> #include <clk.h> +#include <efi_loader.h> #include <fdtdec.h> #include <fdt_support.h> #include <malloc.h> @@ -579,6 +580,12 @@ int device_probe(struct udevice *dev) if (dev->parent && device_get_uclass_id(dev) == UCLASS_PINCTRL) pinctrl_select_state(dev, "default"); + if (CONFIG_IS_ENABLED(EFI_LOADER)) { + ret = efi_post_probe_device(dev); + if (ret) + goto fail_uclass; + } + return 0; fail_uclass: if (device_remove(dev, DM_REMOVE_NORMAL)) { diff --git a/include/efi_loader.h b/include/efi_loader.h index 0a9c82a257..78dd687913 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -17,6 +17,7 @@ #include <pe.h> struct blk_desc; +struct udevice; static inline int guidcmp(const void *g1, const void *g2) { @@ -28,6 +29,9 @@ static inline void *guidcpy(void *dst, const void *src) return memcpy(dst, src, sizeof(efi_guid_t)); } +/* Called by device_probe() */ +int efi_post_probe_device(struct udevice *dev); + /* No need for efi loader support in SPL */ #if CONFIG_IS_ENABLED(EFI_LOADER) @@ -420,6 +424,8 @@ efi_status_t EFIAPI efi_convert_pointer(efi_uintn_t debug_disposition, void efi_carve_out_dt_rsv(void *fdt); /* Called by bootefi to make console interface available */ efi_status_t efi_console_register(void); +/* Called when a block devices has been probed */ +efi_status_t efi_block_device_register(struct udevice *dev); /* Called by bootefi to make all disk storage accessible as EFI objects */ efi_status_t efi_disk_register(void); /* Called by efi_init_obj_list() to install EFI_RNG_PROTOCOL */ diff --git a/lib/efi_driver/Makefile b/lib/efi_driver/Makefile index 83baa1c9a4..f0d5fa5074 100644 --- a/lib/efi_driver/Makefile +++ b/lib/efi_driver/Makefile @@ -5,6 +5,7 @@ # This file only gets included with CONFIG_EFI_LOADER set, so all # object inclusion implicitly depends on it +obj-y += efi_dm_integration.o obj-y += efi_uclass.o ifeq ($(CONFIG_BLK)$(CONFIG_PARTITIONS),yy) obj-y += efi_block_device.o diff --git a/lib/efi_driver/efi_dm_integration.c b/lib/efi_driver/efi_dm_integration.c new file mode 100644 index 0000000000..9c6c339473 --- /dev/null +++ b/lib/efi_driver/efi_dm_integration.c @@ -0,0 +1,36 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2021, Heinrich Schuchardt <xypron.glpk(a)gmx.de> + */ + +#define LOG_CATEGORY LOGC_EFI + +#include <common.h> +#include <dm.h> +#include <efi_loader.h> +#include <log.h> + +/** + * efi_post_probe_device() - set up handle for probed device + * + * This function is called by device_probe(). After the UEFI sub-system is + * initialized this function adds handles for new devices. + * + * @dev: probed device + * Return: 0 on success + */ +int efi_post_probe_device(struct udevice *dev) +{ + if (!dev || !dev->uclass) + return -EINVAL; + + switch (dev->uclass->uc_drv->id) { + case UCLASS_BLK: + if (efi_block_device_register(dev) != EFI_SUCCESS) + log_err("Failed to register %s\n", dev->name); + default: + break; + } + + return 0; +} diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c index 988907ecb9..b798cab345 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c @@ -10,6 +10,7 @@ #include <common.h> #include <blk.h> #include <dm.h> +#include <dm/device-internal.h> #include <efi_loader.h> #include <fs.h> #include <log.h> @@ -535,6 +536,41 @@ int efi_disk_create_partitions(efi_handle_t parent, struct blk_desc *desc, return disks; } +/** + * efi_block_device_register() - register a block device in the UEFI sub-system + * + * @dev: block device + * Return: status code + */ +efi_status_t efi_block_device_register(struct udevice *dev) +{ + struct blk_desc *desc = dev_get_uclass_plat(dev); + const char *if_typename = blk_get_if_type_name(desc->if_type); + struct efi_disk_obj *disk; + efi_status_t ret; + + /* Add block device for the full device */ + ret = device_probe(dev); + if (ret) + return EFI_NOT_FOUND; + log_info("Scanning disk %s...\n", dev->name); + ret = efi_disk_add_dev(NULL, NULL, if_typename, + desc, desc->devnum, NULL, 0, &disk); + if (ret == EFI_NOT_READY) { + log_notice("Disk %s not ready\n", dev->name); + return ret; + } else if (ret != EFI_SUCCESS) { + log_err("ERROR: failure to add disk device %s, r = %lu\n", + dev->name, ret & ~EFI_ERROR_MASK); + return ret; + } + + /* Partitions show up as block devices in EFI */ + efi_disk_create_partitions(&disk->header, desc, if_typename, + desc->devnum, dev->name); + return ret; +} + /** * efi_disk_register() - register block devices * @@ -552,38 +588,16 @@ int efi_disk_create_partitions(efi_handle_t parent, struct blk_desc *desc, */ efi_status_t efi_disk_register(void) { - struct efi_disk_obj *disk; - int disks = 0; - efi_status_t ret; #ifdef CONFIG_BLK struct udevice *dev; - + /* Probe all block devices */ for (uclass_first_device_check(UCLASS_BLK, &dev); dev; - uclass_next_device_check(&dev)) { - struct blk_desc *desc = dev_get_uclass_plat(dev); - const char *if_typename = blk_get_if_type_name(desc->if_type); - - /* Add block device for the full device */ - log_info("Scanning disk %s...\n", dev->name); - ret = efi_disk_add_dev(NULL, NULL, if_typename, - desc, desc->devnum, NULL, 0, &disk); - if (ret == EFI_NOT_READY) { - log_notice("Disk %s not ready\n", dev->name); - continue; - } - if (ret) { - log_err("ERROR: failure to add disk device %s, r = %lu\n", - dev->name, ret & ~EFI_ERROR_MASK); - return ret; - } - disks++; - - /* Partitions show up as block devices in EFI */ - disks += efi_disk_create_partitions( - &disk->header, desc, if_typename, - desc->devnum, dev->name); - } + uclass_next_device_check(&dev)) + ; #else + struct efi_disk_obj *disk; + int disks = 0; + efi_status_t ret; int i, if_type; /* Search for all available disk devices */ @@ -630,8 +644,8 @@ efi_status_t efi_disk_register(void) if_typename, i, devname); } } -#endif log_info("Found %d disks\n", disks); +#endif return EFI_SUCCESS; } -- 2.30.2

4 4

[PATCH v2] riscv: dts: add OpenPiton RISC-V board dts support
by Tianrui Wei 07 Jul '21

07 Jul '21

Previous device tree for OpenPiton emits a warning during compilation. This commit fixes the previous warning adds dts to the OpenPiton RISC-V board and added the device tree to MAINTAINER file. Signed-off-by: Tianrui Wei <tianrui-wei(a)outlook.com> Reported-by: Tom Rini <trini(a)konsulko.com> Reviewed-by: Leo Yu-Chi Liang <ycliang(a)andestech.com> --- Changes for v2: - fix typo and commit message arch/riscv/dts/openpiton-riscv64.dts | 4 ++-- board/openpiton/riscv64/MAINTAINERS | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/riscv/dts/openpiton-riscv64.dts b/arch/riscv/dts/openpiton-riscv64.dts index 45951e1236..abc6016a0b 100644 --- a/arch/riscv/dts/openpiton-riscv64.dts +++ b/arch/riscv/dts/openpiton-riscv64.dts @@ -80,8 +80,8 @@ }; soc { - #address-cells = <1>; - #size-cells = <1>; + #address-cells = <2>; + #size-cells = <2>; compatible = "openpiton,chipset", "simple-bus"; ranges; diff --git a/board/openpiton/riscv64/MAINTAINERS b/board/openpiton/riscv64/MAINTAINERS index f91c000c83..f80f5b0495 100644 --- a/board/openpiton/riscv64/MAINTAINERS +++ b/board/openpiton/riscv64/MAINTAINERS @@ -1,8 +1,9 @@ Openpiton BOARD -M: Tianrui Wei<tianrui-wei(a)outlook.com> +M: Tianrui Wei <tianrui-wei(a)outlook.com> S: Maintained F: board/openpiton/riscv64/ F: include/configs/openpiton-riscv64.h F: configs/openpiton_riscv64_defconfig F: configs/openpiton_riscv64_spl_defconfig F: drivers/mmc/piton_mmc.c +F: arch/riscv/dts/openpiton-riscv64.dts -- 2.32.0

1 0