September 2023 - U-Boot

[PATCH v3 0/3] enable power and clock Kconfig conditionally
by Udit Kumar 25 Sep '23

25 Sep '23

This series, updates enabling mutually exclusive power and clock configs for TI SOCs. Sorry to push clock and power changes in one series, managed by two maintainers. But In my quick grep, I am not able to active PR raise from both trees. So copying maintainers of clock and power for review. Change log Changes in v3: - Patch 1 and 2: Added reviewed by - Patch 3: Corrected Fixes in commit message link to v2: https://lore.kernel.org/all/20230912130645.1202325-1-u-kumar1@ti.com/ Changes in v2: - Patch 1 and 2) Added conditional support to enable Kconfig - Patch 3 No change link to v1: https://lore.kernel.org/all/20230911111946.749270-1-u-kumar1@ti.com/ Udit Kumar (3): power: domain: ti: Enable single config for power domain clk: ti: Add support to enable configs conditionally config: j7200: remove not needed power config configs/j7200_evm_r5_defconfig | 1 - drivers/clk/ti/Kconfig | 8 ++++---- drivers/power/domain/Kconfig | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) -- 2.34.1

3 5

Config fragments
by Simon Glass 25 Sep '23

25 Sep '23

Hi, Up until 2023.04 it has been possible to build all the defconfigs but with 2023.07 that changed. Tom mentioned this to me recently. Up until 2023.04 we can enumerate all the board configs that can be built. We can build any of them using a single name and a single defconfig. The boards.cfg file which buildman creates contains a full list of things that can be built. >From 2023.07 this changes and we now have random .config files sprinkled about the place. I say random because they are not connected to anything. For example, here is board/ti/am62x/MAINTAINERS: AM62x BOARD M: Dave Gerlach <d-gerlach(a)ti.com> M: Tom Rini <trini(a)konsulko.com> S: Maintained F: board/ti/am62x/ F: include/configs/am62x_evm.h F: configs/am62x_evm_r5_defconfig F: configs/am62x_evm_a53_defconfig BEAGLEPLAY BOARD M: Nishanth Menon <nm(a)ti.com> M: Robert Nelson <robertcnelson(a)gmail.com> M: Tom Rini <trini(a)konsulko.com> S: Maintained N: beagleplay In most cases the MAINTAINERS file tells us about each board and until [1] I had assumed that was the case. With that patch reverted, these are the only 'orphaned' MAINTAINERS entries (buildman --maintainer-check): WARNING: orphaned defconfig in board/armltd/vexpress64/MAINTAINERS ending at line 8 WARNING: orphaned defconfig in board/google/veyron/MAINTAINERS ending at line 44 WARNING: orphaned defconfig in board/mikrotik/crs3xx-98dx3236/MAINTAINERS ending at line 7 WARNING: orphaned defconfig in board/st/common/MAINTAINERS ending at line 6 WARNING: orphaned defconfig in board/ti/am62x/MAINTAINERS ending at line 15 But Tom advised me that MAINTAINERS is not intended for this purpose, so the check has been dropped. I am not suggesting we bring it back, necessarily, but if we did, we could use it to specify the .config and defconfig files which are used by each board. *Failing that*, I suggest a new 'name.brd' file in the board directory to contain this information, e.g. # Contents of board/ti/am62x/beagleplay.brd: beagleplay-r5: am62x_evm_r5_defconfig beagleplay_r5.config beagleplay-a53: am62x_evm_a53_defconfig beagleplay_a53.config This could be parsed by buildman and other tools, to produce a list of available boards and to build each using a single name (e.g. make beagleplay-r5_defconfig) What do people think? Regards, Simon [1] https://patchwork.ozlabs.org/project/uboot/patch/20230803185144.1760729-2-s…

5 13

[PATCH v6 1/2] schemas: Add some common reserved-memory usages
by Simon Glass 25 Sep '23

25 Sep '23

It is common to split firmware into 'Platform Init', which does the initial hardware setup and a "Payload" which selects the OS to be booted. Thus an handover interface is required between these two pieces. This aims to provide an small schema addition for the memory mapping needed to keep these two pieces working together well. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v6: - Drop mention of UEFI - Use compatible strings instead of node names Changes in v5: - Drop the memory-map node (should have done that in v4) - Tidy up schema a bit Changes in v4: - Make use of the reserved-memory node instead of creating a new one Changes in v3: - Reword commit message again - cc a lot more people, from the FFI patch - Split out the attributes into the /memory nodes Changes in v2: - Reword commit message .../reserved-memory/common-reserved.yaml | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 dtschema/schemas/reserved-memory/common-reserved.yaml diff --git a/dtschema/schemas/reserved-memory/common-reserved.yaml b/dtschema/schemas/reserved-memory/common-reserved.yaml new file mode 100644 index 0000000..4889f59 --- /dev/null +++ b/dtschema/schemas/reserved-memory/common-reserved.yaml @@ -0,0 +1,71 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/reserved-memory/common-reserved.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Common memory reservations + +description: | + Specifies that the reserved memory region can be used for the purpose + indicated by its compatible string. + + Clients may reuse this reserved memory if they understand what it is for, + subject to the notes below. + +maintainers: + - Simon Glass <sjg(a)chromium.org> + +allOf: + - $ref: reserved-memory.yaml + +properties: + compatible: + description: | + This describes some common memory reservations: + + acpi-reclaim: Contains ACPI tables; memory may be reclaimed when the + tables are no-longer needed + acpi-nvs: Contains ACPI Non-volatile-storage data; memory may be + reclaimed when the tables are no-longer needed + boot-code: Contains code used for booting; memory may be reclaimed by + the OS when it is running + boot-code: Contains data used for booting; memory may be reclaimed by + the OS when it is running + runtime-code: Contains code used for interacting with the system when + running; memory may be reclaimed if this code is not called + runtime-data: Contains data used for interacting with the system when + running; memory may be reclaimed if the runtime code is not used + enum: + - acpi-reclaim + - acpi-nvs + - boot-code + - boot-data + - runtime-code + - runtime-data + + reg: + description: region of memory that is reserved for the purpose indicated + by the compatible string. + +required: + - reg + +unevaluatedProperties: false + +examples: + - | + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + + reserved@12340000 { + compatible = "boot-code"; + reg = <0x12340000 0x00800000>; + }; + + reserved@43210000 { + compatible = "boot-data"; + reg = <0x43210000 0x00800000>; + }; + }; -- 2.42.0.283.g2d96d420d3-goog

3 10

[PATCH] bmips: Add Inteno XG6846 board
by Linus Walleij 25 Sep '23

25 Sep '23

This adds support for the Inteno XG6846 board based on the Broadcom MIPS 6328 SoC. The default boot will read a uImage from flash and boot it. Cc: Daniel Schwierzeck <daniel.schwierzeck(a)gmail.com> Signed-off-by: Linus Walleij <linus.walleij(a)linaro.org> --- arch/mips/dts/Makefile | 1 + arch/mips/dts/inteno,xg6846.dts | 57 ++++++++++++++++++++++ arch/mips/mach-bmips/Kconfig | 12 +++++ board/inteno/xg6846/Kconfig | 12 +++++ board/inteno/xg6846/MAINTAINERS | 6 +++ board/inteno/xg6846/Makefile | 3 ++ board/inteno/xg6846/xg6846.c | 6 +++ configs/inteno_xg6846_ram_defconfig | 74 +++++++++++++++++++++++++++++ include/configs/inteno_xg6846.h | 8 ++++ 9 files changed, 179 insertions(+) create mode 100644 arch/mips/dts/inteno,xg6846.dts create mode 100644 board/inteno/xg6846/Kconfig create mode 100644 board/inteno/xg6846/MAINTAINERS create mode 100644 board/inteno/xg6846/Makefile create mode 100644 board/inteno/xg6846/xg6846.c create mode 100644 configs/inteno_xg6846_ram_defconfig create mode 100644 include/configs/inteno_xg6846.h diff --git a/arch/mips/dts/Makefile b/arch/mips/dts/Makefile index 1b179116c9b2..14fbce597b9e 100644 --- a/arch/mips/dts/Makefile +++ b/arch/mips/dts/Makefile @@ -14,6 +14,7 @@ dtb-$(CONFIG_BOARD_COMTREND_CT5361) += comtrend,ct-5361.dtb dtb-$(CONFIG_BOARD_COMTREND_VR3032U) += comtrend,vr-3032u.dtb dtb-$(CONFIG_BOARD_COMTREND_WAP5813N) += comtrend,wap-5813n.dtb dtb-$(CONFIG_BOARD_HUAWEI_HG556A) += huawei,hg556a.dtb +dtb-$(CONFIG_BOARD_INTENO_XG6846) += inteno,xg6846.dtb dtb-$(CONFIG_BOARD_MT7620_RFB) += mediatek,mt7620-rfb.dtb dtb-$(CONFIG_BOARD_MT7620_MT7530_RFB) += mediatek,mt7620-mt7530-rfb.dtb dtb-$(CONFIG_BOARD_MT7621_RFB) += mediatek,mt7621-rfb.dtb diff --git a/arch/mips/dts/inteno,xg6846.dts b/arch/mips/dts/inteno,xg6846.dts new file mode 100644 index 000000000000..180cfdcac9d4 --- /dev/null +++ b/arch/mips/dts/inteno,xg6846.dts @@ -0,0 +1,57 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2023 Linus Walleij <linusw(a)kernel.org> + * + * This is a diet version of the device tree from Linux, + * suitable for U-Boot. + */ + +/dts-v1/; + +#include "brcm,bcm6328.dtsi" + +/ { + model = "Inteno XG6846"; + compatible = "inteno,xg6846", "brcm,bcm6328"; + + aliases { + serial0 = &uart0; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&leds { + status = "okay"; + + led@18 { + reg = <18>; + active-low; + label = "red:pwr"; + }; + + led@20 { + reg = <20>; + active-low; + label = "green:pwr"; + }; +}; + +&spi { + status = "okay"; + + spi-flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + #address-cells = <1>; + #size-cells = <1>; + spi-max-frequency = <33333334>; + }; +}; + +&uart0 { + bootph-all; + status = "okay"; +}; diff --git a/arch/mips/mach-bmips/Kconfig b/arch/mips/mach-bmips/Kconfig index 01d919f2dbe9..eb9ea34c52fe 100644 --- a/arch/mips/mach-bmips/Kconfig +++ b/arch/mips/mach-bmips/Kconfig @@ -203,6 +203,17 @@ config BOARD_HUAWEI_HG556A ethernet ports, 3 USB ports, 1 UART, GPIO buttons and LEDs, and a RT3062F/AR9223 (PCI). +config BOARD_INTENO_XG6846 + bool "Inteno XG6846" + depends on SOC_BMIPS_BCM6328 + select BMIPS_SUPPORTS_BOOT_RAM + help + Inteno XG6846 boards have a BCM6328 SoC with 64 MB of RAM and 16 + MB of flash (SPI). + Between its different peripherals there's an integrated switch with 4 + ethernet ports, 1 UART, GPIO buttons and LEDs, and a Marvell + DSA switch connected to a fiber SFP. + config BOARD_NETGEAR_CG3100D bool "Netgear CG3100D" depends on SOC_BMIPS_BCM3380 @@ -272,6 +283,7 @@ source "board/comtrend/ct5361/Kconfig" source "board/comtrend/vr3032u/Kconfig" source "board/comtrend/wap5813n/Kconfig" source "board/huawei/hg556a/Kconfig" +source "board/inteno/xg6846/Kconfig" source "board/netgear/cg3100d/Kconfig" source "board/netgear/dgnd3700v2/Kconfig" source "board/sagem/f@st1704/Kconfig" diff --git a/board/inteno/xg6846/Kconfig b/board/inteno/xg6846/Kconfig new file mode 100644 index 000000000000..4dd78b3b1960 --- /dev/null +++ b/board/inteno/xg6846/Kconfig @@ -0,0 +1,12 @@ +if BOARD_INTENO_XG6846 + +config SYS_BOARD + default "xg6846" + +config SYS_VENDOR + default "inteno" + +config SYS_CONFIG_NAME + default "inteno_xg6846" + +endif diff --git a/board/inteno/xg6846/MAINTAINERS b/board/inteno/xg6846/MAINTAINERS new file mode 100644 index 000000000000..ca41730940f8 --- /dev/null +++ b/board/inteno/xg6846/MAINTAINERS @@ -0,0 +1,6 @@ +INTENO XG6846 BOARD +M: Linus Walleij <linusw(a)kernel.org> +S: Maintained +F: board/inteno/xg6846 +F: include/configs/inteno_xg6846.h +F: configs/inteno_xg6846_ram_defconfig diff --git a/board/inteno/xg6846/Makefile b/board/inteno/xg6846/Makefile new file mode 100644 index 000000000000..311e1db7a775 --- /dev/null +++ b/board/inteno/xg6846/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0+ + +obj-y += xg6846.o diff --git a/board/inteno/xg6846/xg6846.c b/board/inteno/xg6846/xg6846.c new file mode 100644 index 000000000000..b3b6751a6256 --- /dev/null +++ b/board/inteno/xg6846/xg6846.c @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2023 Linus Walleij <linusw(a)kernel.org> + */ + +#include <common.h> diff --git a/configs/inteno_xg6846_ram_defconfig b/configs/inteno_xg6846_ram_defconfig new file mode 100644 index 000000000000..99c1ea6aa03e --- /dev/null +++ b/configs/inteno_xg6846_ram_defconfig @@ -0,0 +1,74 @@ +CONFIG_MIPS=y +CONFIG_SKIP_LOWLEVEL_INIT=y +CONFIG_TEXT_BASE=0x81c00000 +CONFIG_NR_DRAM_BANKS=1 +CONFIG_ENV_SIZE=0x2000 +CONFIG_DM_GPIO=y +CONFIG_DEFAULT_DEVICE_TREE="inteno,xg6846" +CONFIG_SYS_PROMPT="XG6846 # " +CONFIG_DM_RESET=y +CONFIG_IDENT_STRING="Inteno XG6846" +CONFIG_SYS_LOAD_ADDR=0x81000000 +CONFIG_ARCH_BMIPS=y +CONFIG_SOC_BMIPS_BCM6328=y +CONFIG_SYS_MIPS_TIMER_FREQ=160000000 +CONFIG_MIPS_CACHE_SETUP=y +CONFIG_MIPS_CACHE_DISABLE=y +# CONFIG_MIPS_BOOT_CMDLINE_LEGACY is not set +# CONFIG_MIPS_BOOT_ENV_LEGACY is not set +# CONFIG_BOOTSTD is not set +CONFIG_BOOTDELAY=1 +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Boot XG6846 in %d seconds\n" +CONFIG_USE_BOOTCOMMAND=y +CONFIG_BOOTCOMMAND="sf probe; sf read 0x81000000 0x40000 0x500000; bootm 0x81000000" +CONFIG_MIPS_BOOT_FDT=y +CONFIG_LZMA=y +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_REMAKE_ELF=y +CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_DISPLAY_CPUINFO=y +CONFIG_SYS_MALLOC_BOOTPARAMS=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_MAXARGS=24 +CONFIG_SYS_CBSIZE=512 +CONFIG_SYS_PBSIZE=541 +CONFIG_SYS_BOOTM_LEN=0x1000000 +CONFIG_CMD_CPU=y +CONFIG_CMD_LICENSE=y +# CONFIG_CMD_BOOTD is not set +# CONFIG_CMD_ELF is not set +# CONFIG_CMD_XIMG is not set +# CONFIG_CMD_EXPORTENV is not set +# CONFIG_CMD_IMPORTENV is not set +# CONFIG_CMD_EDITENV is not set +# CONFIG_CMD_SAVEENV is not set +# CONFIG_CMD_ENV_EXISTS is not set +# CONFIG_CMD_CRC32 is not set +CONFIG_CMD_MEMINFO=y +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_LOADS is not set +CONFIG_CMD_SPI=y +# CONFIG_CMD_SLEEP is not set +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +# CONFIG_DM_DEVICE_REMOVE is not set +CONFIG_DMA=y +CONFIG_BCM6348_IUDMA=y +CONFIG_LED=y +CONFIG_LED_BCM6328=y +CONFIG_LED_BLINK=y +CONFIG_MTD=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SPI_FLASH_SPANSION=y +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_SPI_FLASH_MTD=y +CONFIG_PHY_RESET_DELAY=20 +CONFIG_POWER_DOMAIN=y +CONFIG_BCM6328_POWER_DOMAIN=y +CONFIG_RESET_BCM6345=y +CONFIG_DM_SERIAL=y +CONFIG_BCM6345_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_BCM63XX_HSSPI=y diff --git a/include/configs/inteno_xg6846.h b/include/configs/inteno_xg6846.h new file mode 100644 index 000000000000..4f2a2f84010c --- /dev/null +++ b/include/configs/inteno_xg6846.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2023 Linus Walleij <linusw(a)kernel.org> + */ + +#include <configs/bmips_common.h> +#include <configs/bmips_bcm6328.h> + -- 2.41.0

3 9

Pull request: please pull u-boot-imx-20230905
by Stefano Babic 25 Sep '23

25 Sep '23

Hi Tom, some fixes for the release, please pull from u-boot-imx, thanks ! The following changes since commit 4cb31a9f3560b293670de95e76c1f3cf2f9e1ca8: Merge branch '2023-09-22-assorted-bugfixes' (2023-09-22 18:25:37 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git tags/u-boot-imx-20230923 for you to fetch changes up to 62a3c66a7c1ee733695b46542c4a9034f3a663a4: smegw01: Use CONFIG_SYS_LOAD_ADDR for loading fitImage (2023-09-23 18:45:34 +0200) ---------------------------------------------------------------- Fixes for 2023.10 ----------------- CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/17831 ---------------------------------------------------------------- Eduard Strehlau (2): imx: hab: Allow hab_auth_img_or_fail to be called without ivt_offset smegw01: Use CONFIG_SYS_LOAD_ADDR for loading fitImage Fabio Estevam (3): imx: hab: Improve the hab_auth_img_or_fail usage text imx: hab: Explain that ivt_offset is optional imx7: Disable CAAM Job Ring 0 Oleksandr Suvorov (1): mach-imx: bootaux: fix building with disabled bootelf arch/arm/dts/imx7d-colibri-eval-v3-u-boot.dtsi | 2 ++ arch/arm/dts/imx7d-pico-pi-u-boot.dtsi | 2 ++ arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi | 2 ++ arch/arm/dts/imx7d-sdb-u-boot.dtsi | 2 ++ arch/arm/dts/imx7d-smegw01-u-boot.dtsi | 3 +++ arch/arm/dts/imx7s-u-boot.dtsi | 7 +++++++ arch/arm/mach-imx/Kconfig | 1 + arch/arm/mach-imx/hab.c | 8 ++++---- board/storopack/smegw01/smegw01.env | 14 +++++++------- configs/smegw01_defconfig | 3 +++ 10 files changed, 33 insertions(+), 11 deletions(-) create mode 100644 arch/arm/dts/imx7d-smegw01-u-boot.dtsi create mode 100644 arch/arm/dts/imx7s-u-boot.dtsi Best regards, Stefano -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

2 1

Please pull u-boot-dm
by Simon Glass 25 Sep '23

25 Sep '23

Hi Tom, https://source.denx.de/u-boot/custodians/u-boot-dm/-/pipelines/17830 https://dev.azure.com/simon0972/u-boot/_build/results?buildId=48&view=resul… The following changes since commit 4cb31a9f3560b293670de95e76c1f3cf2f9e1ca8: Merge branch '2023-09-22-assorted-bugfixes' (2023-09-22 18:25:37 -0400) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/dm-pull-23sep23 for you to fetch changes up to e278ad9a2ea5e4a089773a8fd79a5ea0e8572316: trace: Fix alignment logic in flyrecord header (2023-09-23 09:00:37 -0600) ---------------------------------------------------------------- trace: correct format of flyrecord minor bug fixes ---------------------------------------------------------------- Fei Shao (1): patman: Respect include directive on Git config lookup Maxim Cournoyer (1): tools: Fix patman launcher script. Michal Simek (4): sandbox: test: Fix typo in test.dts trace: Use 64bit variable for start and len trace: Move trace_clocks description above record offset calculation trace: Fix alignment logic in flyrecord header Rong Tao (1): binman: Fix SyntaxWarning: invalid escape sequence '\(' Simon Glass (1): buildman: Fix full help for Python 3.8 arch/sandbox/dts/test.dts | 2 +- tools/binman/etype/section.py | 2 +- tools/buildman/main.py | 10 ++++++++-- tools/patman/gitutil.py | 4 ++-- tools/patman/pyproject.toml | 2 +- tools/proftool.c | 39 ++++++++++++++++++++++++++++++++++----- 6 files changed, 47 insertions(+), 12 deletions(-) Regards, Simon

2 1

[PATCH 0/2] serial: introduce CONFIG_CONSOLE_FLUSH_ON_NEWLINE
by Rasmus Villemoes 25 Sep '23

25 Sep '23

1/2 is trivial prep. Commit log from that 2/2: When debugging, one sometimes only gets partial output lines or nothing at all from the last printf, because the uart has a largish buffer, and the code after the printf() may cause the CPU to hang before the uart IP has time to actually emit all the characters. That can be very confusing, because one doesn't then know exactly where the hang happens. Introduce a config knob allowing one to wait for the uart fifo to drain whenever a newline character is printed, roughly corresponding to the effect of setvbuf(..., _IOLBF, ...) in ordinary C programs. Rasmus Villemoes (2): serial: serial-uclass.c: move definition of _serial_flush up a bit serial: introduce CONFIG_CONSOLE_FLUSH_ON_NEWLINE common/Kconfig | 11 +++++++++++ drivers/serial/serial-uclass.c | 28 ++++++++++++++++------------ 2 files changed, 27 insertions(+), 12 deletions(-) -- 2.37.2

3 4

[PATCH 0/2] make CONFIG_SPL_SYS_MALLOC_SIMPLE && CONFIG_SYS_SPL_MALLOC actually work
by Rasmus Villemoes 25 Sep '23

25 Sep '23

Currently, setting both CONFIG_SPL_SYS_MALLOC_SIMPLE and CONFIG_SYS_SPL_MALLOC (but not CONFIG_SPL_STACK_R) doesn't work as expected: The SIMPLE option means that all malloc etc. calls are directed at build-time to the implementation in malloc_simple.c, but the mem_alloc_init() call which is done in board_init_f() currently calls into dlmalloc.c, and updates the variables describing the dlmalloc arena - which is of course completely unused. And the malloc() implementation continues to hand out allocations from the initial SPL_SYS_MALLOC_F_LEN bytes. These two patches are an attempt at making the combination in $subject actually work as one would expect: define an area of sdram to be used as a malloc arena, but still manage that using the malloc_simple() implementation. Since this now changes the mem_alloc_init() from being a harmless no-op call to actually doing something, there's a risk of some boards breaking. The solution for those boards will probably be to just drop CONFIG_SYS_SPL_MALLOC, since that hasn't actually done anything. Rasmus Villemoes (2): spl: make SYS_SPL_MALLOC depend on !(SPL_STACK_R && SPL_SYS_MALLOC_SIMPLE) malloc_simple: add mem_malloc_init_simple() common/dlmalloc.c | 2 +- common/malloc_simple.c | 7 +++++++ common/spl/Kconfig | 1 + include/malloc.h | 7 +++++-- 4 files changed, 14 insertions(+), 3 deletions(-) -- 2.37.2

3 8

[PATCH v2] arm: rpi: remove boot_targets for default standard boot
by Date Huang 25 Sep '23

25 Sep '23

Raspberry pi supports standard boot without boot_targets Signed-off-by: Date Huang <tjjh89017(a)hotmail.com> --- board/raspberrypi/rpi/rpi.env | 2 -- 1 file changed, 2 deletions(-) diff --git a/board/raspberrypi/rpi/rpi.env b/board/raspberrypi/rpi/rpi.env index 30228285ed..8fb8d5d5f7 100644 --- a/board/raspberrypi/rpi/rpi.env +++ b/board/raspberrypi/rpi/rpi.env @@ -73,5 +73,3 @@ scriptaddr=0x02400000 pxefile_addr_r=0x02500000 fdt_addr_r=0x02600000 ramdisk_addr_r=0x02700000 - -boot_targets=mmc usb pxe dhcp -- 2.34.1

2 1

[PATCH 1/1] riscv: set fdtfile on VisionFive 2
by Heinrich Schuchardt 25 Sep '23

25 Sep '23

Multiple revisions of the StarFive VisionFive 2 board exist. They can be identified by reading their EEPROM. Linux uses two differently named device-tree files. To load the correct device-tree we need to set $fdtfile to the device-tree file name that matches the board revision. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- arch/riscv/Kconfig | 1 + .../visionfive2/starfive_visionfive2.c | 43 ++++++++++++++++++- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 6771d8d919..1c62c2345b 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -26,6 +26,7 @@ config TARGET_SIFIVE_UNMATCHED config TARGET_STARFIVE_VISIONFIVE2 bool "Support StarFive VisionFive2 Board" + select BOARD_LATE_INIT config TARGET_TH1520_LPI4A bool "Support Sipeed's TH1520 Lichee PI 4A Board" diff --git a/board/starfive/visionfive2/starfive_visionfive2.c b/board/starfive/visionfive2/starfive_visionfive2.c index d609262b67..05d8d2d657 100644 --- a/board/starfive/visionfive2/starfive_visionfive2.c +++ b/board/starfive/visionfive2/starfive_visionfive2.c @@ -5,14 +5,20 @@ */ #include <common.h> -#include <asm/io.h> -#include <asm/sections.h> #include <cpu_func.h> #include <dm.h> +#include <env.h> +#include <asm/arch/eeprom.h> +#include <asm/io.h> +#include <asm/sections.h> #include <linux/bitops.h> #define JH7110_L2_PREFETCHER_BASE_ADDR 0x2030000 #define JH7110_L2_PREFETCHER_HART_OFFSET 0x2000 +#define FDTFILE_VISIONFIVE2_1_2A \ + "starfive/jh7110-starfive-visionfive-2-v1.2a.dtb" +#define FDTFILE_VISIONFIVE2_1_3B \ + "starfive/jh7110-starfive-visionfive-2-v1.3b.dtb" /* enable U74-mc hart1~hart4 prefetcher */ static void enable_prefetcher(void) @@ -33,6 +39,31 @@ static void enable_prefetcher(void) } } +/** + * set_fdtfile() - set the $fdtfile variable based on the board revision + */ +static void set_fdtfile(void) +{ + u8 version; + const char *fdtfile; + + version = get_pcb_revision_from_eeprom(); + switch (version) { + case 'a': + case 'A': + fdtfile = FDTFILE_VISIONFIVE2_1_2A; + break; + + case 'b': + case 'B': + default: + fdtfile = FDTFILE_VISIONFIVE2_1_3B; + break; + }; + + env_set("fdtfile", fdtfile); +} + int board_init(void) { enable_caches(); @@ -41,6 +72,14 @@ int board_init(void) return 0; } +int board_late_init(void) +{ + if (CONFIG_IS_ENABLED(ID_EEPROM)) + set_fdtfile(); + + return 0; +} + void *board_fdt_blob_setup(int *err) { *err = 0; -- 2.40.1

4 4