December 2021 - U-Boot

In spl falcon mode, and when in BOOT_DEVICE_RAM, why does it 'load' from RAM to RAM? when it's already loaded..
by Chan Kim 22 Dec '21

22 Dec '21

Hello all, I'm trying booting from RAM using SPL falcon mode. Another scp chip loads the image (FIT image) to SDRAM before u-boot-spl starts. Since the FPGA's DDR interface is not ready, we have on chip 8MB SRAM at the start of DDR address range. (so it's faking DDR) I made a 5.8MiB sized FIT image containing (4.6MiB linux kernel, 8.1KiB dtb, 1.1MB initramfs.cpio.gz). CONFIG_SPL_RAM_SUPPORT and CONFIG_SPL_RAM_DEVICE are both turned on and the spl_boot_list[0] was set to BOOT_DEVICE_RAM. When I run it, at some point it in board_init_r function(common/spl/spl.c), the functions below are called. (A->B means A calls B) Boot_from_devices -> spl_ram_load_image -> spl_load_simple_fit -> spl_simple_fit_read -> spl_get_fit_load_buffer -> malloc. I found in spl_get_fit_load_buffer, it tries to get a buffer the size of the FIT image. I spl_simple_fit_read, before calling spl_get_fit_load_buffer function, I see thise comment. /* * So far we only have one block of data from the FIT. Read the entire * thing, including that first block. * * For FIT with data embedded, data is loaded as part of FIT image. * For FIT with external data, data is not loaded in this step. */ In my case, the whole FIT image is already on (fake) DDR starting at 0x80000000. But the comment sounds like it is reading the remainder into a buffer for that FIT image.(and malloc failed while getting the buffer for that) Why is it allocating the buffer when the whole data is already loaded? Because my fake SDRAM size is only 8MB and the FIT image itself is 5.8MB, I don't have any more big space for the FIT image. I can't figure out what went wrong. (I tried setting CONFIG_SYS_SPL_MALLOC_START and CONFIG_SYS_SPL_MALLOC_SIZE which didn't work. Just no space..) Is there any method I can run it without copying the already loaded FIT image in RAM to another buffer? I think u-boot-spl regards the RAM as a storage media, so it is tryng to 'load' from the 'media' to RAM, when it doesn't need to 'load' it. Thank you for reading and any comment will be really appreciated. Chan Kim

1 0

printf works but how can I make debug() printed to serial port console?
by Chan Kim 22 Dec '21

22 Dec '21

Hello all, I'm trying to boot from RAM using SPL only. (Another scp processor loads the FIT image to the SDRAM before starting u-boot-spl is started) Since the debugger doesn't work yet, I have to rely on prints to debug. The printf works fine (I once asked about initializing serial port here, and later found serial_init is done in board_init_f ). I tried to make debug(xxx) printed to serial port but couldn't figure out how to do it. I tried 1. Adding #define DEBUG to the relevant source file 2. Giving DEBUG=1 in the make command (or CFLAGS=-DDEBUG) But it doesn't work (of course I can change debug to printf to see it). How can I make debug( ) macro output to the serial port? Thank you! Chan Kim

2 1

extend environment with file
by Frank Wunderlich 21 Dec '21

21 Dec '21

Hi, currently i use distroboot on my board which sets some environment-variables, some other (memory addresses) were set in my soc-specific header file (include/configs/rk3568_common.h). But distroboot is a bit too limited for my needs (no tftp, no script, ...), so imho i need to use the bootmenu way here, but for local kernel-bootup run distro_bootcmd. I want to add some more variables (e.g. for bootmenu) and for easier maintaining i used a txt-file for it and defined CONFIG_DEFAULT_ENV_FILE="uEnv_r2pro.txt" but this option seems to clear the previous environment from distroboot and soc header file...i have now only the vars from the file defined. i tried adding CONFIG_ENV_APPEND=y but i have still only the vars from the file. Is there a way to append (distrocmd + soc-header + uenv-file) instead of overwriting? regards Frank

1 1

[PATCH] riscv: cancel the limitation that NR_CPUS is less than or equal to 32
by Xiang W 21 Dec '21

21 Dec '21

Various specifications of riscv allow the number of hart to be greater than 32. The limit of 32 is determined by gd->arch.available_harts. We can eliminate this limitation through bitmaps. Currently, the number of hart is limited to 4095, and 4095 is the limit of the RISC-V Advanced Core Local Interruptor Specification. Test on sifive unmatched. Signed-off-by: Xiang W <wxjstz(a)126.com> --- arch/riscv/Kconfig | 4 ++-- arch/riscv/cpu/start.S | 19 ++++++++++++++----- arch/riscv/include/asm/global_data.h | 4 +++- arch/riscv/lib/smp.c | 2 +- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index ba29e70acf..7b9c7f5bca 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -220,8 +220,8 @@ config SPL_SMP all, single processor machines. config NR_CPUS - int "Maximum number of CPUs (2-32)" - range 2 32 + int "Maximum number of CPUs (2-4095)" + range 2 4095 depends on SMP || SPL_SMP default 8 help diff --git a/arch/riscv/cpu/start.S b/arch/riscv/cpu/start.S index 76850ec9be..1f97240713 100644 --- a/arch/riscv/cpu/start.S +++ b/arch/riscv/cpu/start.S @@ -166,11 +166,20 @@ wait_for_gd_init: mv gp, s0 /* register available harts in the available_harts mask */ - li t1, 1 - sll t1, t1, tp - LREG t2, GD_AVAILABLE_HARTS(gp) - or t2, t2, t1 - SREG t2, GD_AVAILABLE_HARTS(gp) + LREG t1, GD_AVAILABLE_HARTS(gp) +#if defined(CONFIG_ARCH_RV64I) + srli t2, tp, 6 + slli t2, t2, 3 +#elif defined(CONFIG_ARCH_RV32I) + srli t2, tp, 5 + slli t2, t2, 2 +#endif + add t1, t1, t2 + LREG t2, 0(t1) + li t3, 1 + sll t3, t3, tp + or t2, t2, t3 + SREG t2, 0(t1) amoswap.w.rl zero, zero, 0(t0) diff --git a/arch/riscv/include/asm/global_data.h b/arch/riscv/include/asm/global_data.h index 095484a635..6de2ee0b25 100644 --- a/arch/riscv/include/asm/global_data.h +++ b/arch/riscv/include/asm/global_data.h @@ -10,9 +10,11 @@ #ifndef __ASM_GBL_DATA_H #define __ASM_GBL_DATA_H +#include <config.h> #include <asm/smp.h> #include <asm/u-boot.h> #include <compiler.h> +#include <linux/bitops.h> /* Architecture-specific global data */ struct arch_global_data { @@ -28,7 +30,7 @@ struct arch_global_data { struct ipi_data ipi[CONFIG_NR_CPUS]; #endif #ifndef CONFIG_XIP - ulong available_harts; + ulong available_harts[BITS_TO_LONGS(CONFIG_NR_CPUS)]; #endif }; diff --git a/arch/riscv/lib/smp.c b/arch/riscv/lib/smp.c index ba992100ad..e8e391fd41 100644 --- a/arch/riscv/lib/smp.c +++ b/arch/riscv/lib/smp.c @@ -47,7 +47,7 @@ static int send_ipi_many(struct ipi_data *ipi, int wait) #ifndef CONFIG_XIP /* skip if hart is not available */ - if (!(gd->arch.available_harts & (1 << reg))) + if (!test_bit(reg, gd->arch.available_harts)) continue; #endif -- 2.30.2

1 0

[PATCH 1/1] doc: remove duplicate page inclusion
by Heinrich Schuchardt 21 Dec '21

21 Dec '21

doc/usage/index.rst in branch origin/next includes usage/environment twice. Remove the duplicate entry. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- Hello Tom, this seems to be merge error. We need this patch to build 'make htmldocs'. Please, apply to origin/next without further pull request. Best regards Heinrich --- doc/usage/index.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/usage/index.rst b/doc/usage/index.rst index 3905540735..33761af96a 100644 --- a/doc/usage/index.rst +++ b/doc/usage/index.rst @@ -11,7 +11,6 @@ Use U-Boot netconsole partitions cmdline - environment Shell commands -------------- -- 2.33.1

2 2

[PATCH 1/4] Convert CONFIG_KEEP_SERVERADDR to Kconfig
by Simon Glass 21 Dec '21

21 Dec '21

This converts the following to Kconfig: CONFIG_KEEP_SERVERADDR Drop the preprocessor usage also. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- README | 6 ------ include/configs/sandbox.h | 1 - net/Kconfig | 9 +++++++++ net/arp.c | 5 ++--- scripts/config_whitelist.txt | 1 - 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README b/README index 056b717557b..eaf9170e952 100644 --- a/README +++ b/README @@ -1193,12 +1193,6 @@ The following options need to be configured: server to contact when using the "tftboot" command. (Environment variable "serverip") - CONFIG_KEEP_SERVERADDR - - Keeps the server's MAC address, in the env 'serveraddr' - for passing to bootargs (like Linux's netconsole option) - -- Gateway IP address: CONFIG_GATEWAYIP Defines a default value for the IP address of the diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index cd7d99ec69c..1dd21d5e925 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -25,7 +25,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} -#define CONFIG_KEEP_SERVERADDR #define CONFIG_UDP_CHECKSUM #define CONFIG_TIMESTAMP #define CONFIG_BOOTP_SERVERIP diff --git a/net/Kconfig b/net/Kconfig index 7a2d1450188..fb6420f9bbe 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -98,4 +98,13 @@ config SERVERIP_FROM_PROXYDHCP_DELAY_MS receiving response from main DHCP server. Has no effect if SERVERIP_FROM_PROXYDHCP is false. +config KEEP_SERVERADDR + bool "Write the server's MAC address to 'serveraddr'" + default y if SANDBOX + help + Keeps the server's MAC address, in the env 'serveraddr' + for passing to bootargs (like Linux's netconsole option). If this is + enabled, when an ARP reply is received, the server's IP address is + written there. + endif # if NET diff --git a/net/arp.c b/net/arp.c index 1d06ed25722..0b086dc8d21 100644 --- a/net/arp.c +++ b/net/arp.c @@ -196,13 +196,12 @@ void arp_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) if (!arp_is_waiting()) break; -#ifdef CONFIG_KEEP_SERVERADDR - if (net_server_ip.s_addr == net_arp_wait_packet_ip.s_addr) { + if (IS_ENABLED(CONFIG_KEEP_SERVERADDR) && + net_server_ip.s_addr == net_arp_wait_packet_ip.s_addr) { char buf[20]; sprintf(buf, "%pM", &arp->ar_sha); env_set("serveraddr", buf); } -#endif reply_ip_addr = net_read_ip(&arp->ar_spa); diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 6d961ccb3e6..3285d3cd30e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -639,7 +639,6 @@ CONFIG_JFFS2_PART_SIZE CONFIG_JFFS2_SUMMARY CONFIG_JRSTARTR_JR0 CONFIG_JTAG_CONSOLE -CONFIG_KEEP_SERVERADDR CONFIG_KEY_REVOCATION CONFIG_KIRKWOOD_EGIGA_INIT CONFIG_KIRKWOOD_GPIO -- 2.34.1.173.g76aa8bc2d0-goog

3 8

[PATCH u-boot-marvell 00/10] PCI mvebu and aardvark changes
by Marek Behún 21 Dec '21

21 Dec '21

From: Marek Behún <marek.behun(a)nic.cz> Hello Stefan, we have some more fixes for PCI (mvebu and aardvark), and one patch for Turris MOX board code. Marek Marek Behún (2): pci: pci_mvebu, pci_aardvark: Fix size of configuration cache arm: mvebu: turris_mox: Remove extra newline after module topology Pali Rohár (8): pci: pci_mvebu: Wait 100ms for Link Up in mvebu_pcie_probe() arm: mvebu: a38x: serdes: Move non-serdes PCIe code to pci_mvebu.c pci: pci_mvebu: Move setup for BAR[0] where other BARs are setup pci: pci_mvebu: Replace MBUS_PCI_*_SIZE by resource_size() pci: pci_mvebu: Do not allow setting ROM BAR on PCI Bridge pci: pci_mvebu: Fix PCIe MEM and IO resources assignment and mbus mapping pci: pci_mvebu: Remove unused DECLARE_GLOBAL_DATA_PTR arm: a37xx: pci: Do not allow setting ROM BAR on PCI Bridge arch/arm/mach-mvebu/include/mach/cpu.h | 4 +- arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.h | 4 - .../serdes/a38x/high_speed_env_spec.c | 15 -- board/CZ.NIC/turris_mox/turris_mox.c | 3 - drivers/pci/pci-aardvark.c | 54 +++-- drivers/pci/pci_mvebu.c | 205 ++++++++++++------ 6 files changed, 175 insertions(+), 110 deletions(-) -- 2.32.0

3 56

[PATCH 1/1] mmc: unconditionally define mmc_deinit()
by Heinrich Schuchardt 20 Dec '21

20 Dec '21

We want to replace '#ifdef' by 'if (IS_ENABLED(CONFIG_...))' in our code. Therefore functions should be defined unconditionally even if they are not implemented. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- include/mmc.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/include/mmc.h b/include/mmc.h index b92e255340..244d2dc592 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -786,12 +786,7 @@ int mmc_init_device(int num); int mmc_init(struct mmc *mmc); int mmc_send_tuning(struct mmc *mmc, u32 opcode, int *cmd_error); int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data); - -#if CONFIG_IS_ENABLED(MMC_UHS_SUPPORT) || \ - CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) || \ - CONFIG_IS_ENABLED(MMC_HS400_SUPPORT) int mmc_deinit(struct mmc *mmc); -#endif /** * mmc_of_parse() - Parse the device tree to get the capabilities of the host -- 2.33.1

3 3

[PATCH 0/8] arm: kirkwood: Add support for Pogoplug V4
by Tony Dinh 20 Dec '21

20 Dec '21

Pogoplug V4 specifications: Kirkwood 88F6192 SoC 800 MHz CPU 1Gbs Ethernet 128 MB RAM 128 MB NAND 1x USB 2.0 2x USB 3.0 (on PCIe bus) 1 SDHC slot 1x External SATA port (USM enclosure form factor slot) Tony Dinh (8): arm: kirkwood: Pogoplug-V4 : Add DTS files arm: kirkwood: Pogoplug V4 : Add board defconfig file arm: kirkwood: Pogoplug-V4 : Add Kconfig files arm: kirkwood: Pogoplug-V4 : Add board include configs file arm: kirkwood: Pogoplug-V4 : Add board kwbimage file arm: kirkwood: Pogoplug-V4 : Add board implementation header arm: kirkwood: Pogoplug-V4 : Add board implementation arm: kirkwood: Pogoplug-V4 : Add board maintainer arch/arm/dts/Makefile | 1 + arch/arm/dts/kirkwood-pogoplug_v4.dts | 145 +++++++++++++++++ arch/arm/mach-kirkwood/Kconfig | 4 + board/cloudengines/pogo_v4/Kconfig | 16 ++ board/cloudengines/pogo_v4/MAINTAINERS | 6 + board/cloudengines/pogo_v4/Makefile | 10 ++ board/cloudengines/pogo_v4/kwbimage.cfg | 148 +++++++++++++++++ board/cloudengines/pogo_v4/pogo_v4.c | 204 ++++++++++++++++++++++++ board/cloudengines/pogo_v4/pogo_v4.h | 36 +++++ configs/pogo_v4_defconfig | 97 +++++++++++ include/configs/pogo_v4.h | 94 +++++++++++ 11 files changed, 761 insertions(+) create mode 100644 arch/arm/dts/kirkwood-pogoplug_v4.dts create mode 100644 board/cloudengines/pogo_v4/Kconfig create mode 100644 board/cloudengines/pogo_v4/MAINTAINERS create mode 100644 board/cloudengines/pogo_v4/Makefile create mode 100644 board/cloudengines/pogo_v4/kwbimage.cfg create mode 100644 board/cloudengines/pogo_v4/pogo_v4.c create mode 100644 board/cloudengines/pogo_v4/pogo_v4.h create mode 100644 configs/pogo_v4_defconfig create mode 100644 include/configs/pogo_v4.h -- 2.20.1

5 25

[PATCH 0/2] Arm Juno board documentation
by Andre Przywara 20 Dec '21

20 Dec '21

Hi, The Arm Ltd. Juno development board is an open, vendor-neutral, Armv8-A development platform. U-Boot is one of the two supported normal world payloads in the firmware design, though U-Boot never really described the process of building or installing it. Fix that by adding documentation for the board in the doc/board directory. Cheers, Andre Andre Przywara (1): doc: add Arm Juno board documentation Peter Hoyes (1): doc: Add documentation for the Arm VExpress64 board configs doc/board/armltd/fvp64.rst | 30 ++++++++++ doc/board/armltd/index.rst | 11 ++++ doc/board/armltd/juno.rst | 117 +++++++++++++++++++++++++++++++++++++ doc/board/index.rst | 1 + 4 files changed, 159 insertions(+) create mode 100644 doc/board/armltd/fvp64.rst create mode 100644 doc/board/armltd/index.rst create mode 100644 doc/board/armltd/juno.rst -- 2.25.1

4 10