From: Tom Rini Date: Mon, 2 Oct 2023 14:55:44 +0000 (-0400) Subject: Merge branch 'next' X-Git-Url: http://git.dujemihanovic.xyz/img/%7B%7B%20%28.OutputFormats.Get?a=commitdiff_plain;h=ac897385bbfa30cfdfb62ccf24acfcd4b274b2ff;p=u-boot.git Merge branch 'next' Signed-off-by: Tom Rini --- ac897385bbfa30cfdfb62ccf24acfcd4b274b2ff diff --cc .gitlab-ci.yml index 2ceeb947f7,981b95c00d..129234ba3d --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@@ -225,9 -211,22 +211,9 @@@ Run binman, buildman, dtoc, Kconfig an ./tools/patman/patman test; make testconfig -Run tests for Nokia RX-51 (aka N900): - extends: .testsuites - script: - - mkdir nokia_rx51_tmp; - ln -s /opt/nokia/u-boot-gen-combined nokia_rx51_tmp/; - ln -s /opt/nokia/qemu-n900.tar.gz nokia_rx51_tmp/; - ln -s /opt/nokia/kernel_2.6.28-20103103+0m5_armel.deb nokia_rx51_tmp/; - ln -s /opt/nokia/libc6_2.5.1-1eglibc27+0m5_armel.deb nokia_rx51_tmp/; - ln -s /opt/nokia/busybox_1.10.2.legal-1osso30+0m5_armel.deb nokia_rx51_tmp/; - ln -s /opt/nokia/qemu-system-arm nokia_rx51_tmp/; - export PATH=/opt/gcc-13.2.0-nolibc/arm-linux-gnueabi/bin:$PATH; - test/nokia_rx51_test.sh - # Check for any pylint regressions Run pylint: - stage: testsuites + extends: .testsuites script: - git config --global --add safe.directory "${CI_PROJECT_DIR}" - pip install -r test/py/requirements.txt diff --cc board/starfive/visionfive2/starfive_visionfive2.c index 19b7b4458b,05d8d2d657..78e118d5a0 --- a/board/starfive/visionfive2/starfive_visionfive2.c +++ b/board/starfive/visionfive2/starfive_visionfive2.c @@@ -90,10 -88,5 +90,10 @@@ void *board_fdt_blob_setup(int *err return (ulong *)(uintptr_t)gd->arch.firmware_fdt_addr; } - return (ulong *)&_end; + return (ulong *)_end; } + +int ft_board_setup(void *blob, struct bd_info *bd) +{ + return fdt_fixup_memory(blob, 0x40000000, gd->ram_size); +} diff --cc boot/expo_build.c index 702bf49890,bb33cc2a33..910f1b4798 --- a/boot/expo_build.c +++ b/boot/expo_build.c @@@ -280,9 -280,9 +280,9 @@@ static int menu_build(struct build_inf } /** - * menu_build() - Build an expo object and add it to a scene + * obj_build() - Build an expo object and add it to a scene * - * See doc/developer/expo.rst for a description of the format + * See doc/develop/expo.rst for a description of the format * * @info: Build information * @node: Node containing the object description diff --cc common/dlmalloc.c index dcecdb8623,ebf0f27e16..aa933bdf57 --- a/common/dlmalloc.c +++ b/common/dlmalloc.c @@@ -631,10 -618,9 +618,9 @@@ void mem_malloc_init(ulong start, ulon debug("using memory %#lx-%#lx for malloc()\n", mem_malloc_start, mem_malloc_end); -#ifdef CONFIG_SYS_MALLOC_CLEAR_ON_INIT +#if CONFIG_IS_ENABLED(SYS_MALLOC_CLEAR_ON_INIT) memset((void *)mem_malloc_start, 0x0, size); #endif - malloc_bin_reloc(); } /* field-extraction macros */ diff --cc configs/sam9x60_curiosity_mmc1_defconfig index 8f2f6d93e2,bb5e7d8ed0..a245370182 --- a/configs/sam9x60_curiosity_mmc1_defconfig +++ b/configs/sam9x60_curiosity_mmc1_defconfig @@@ -12,7 -12,9 +12,8 @@@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x2000bf CONFIG_ENV_SIZE=0x4000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91-sam9x60_curiosity" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_OF_LIBFDT_OVERLAY=y + CONFIG_DM_RESET=y CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=200000000 CONFIG_DEBUG_UART_BOARD_INIT=y diff --cc configs/sam9x60_curiosity_mmc_defconfig index 5999b5d614,a0f819c002..38ec241e7d --- a/configs/sam9x60_curiosity_mmc_defconfig +++ b/configs/sam9x60_curiosity_mmc_defconfig @@@ -12,7 -12,9 +12,8 @@@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x2000bf CONFIG_ENV_SIZE=0x4000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91-sam9x60_curiosity" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_OF_LIBFDT_OVERLAY=y + CONFIG_DM_RESET=y CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=200000000 CONFIG_DEBUG_UART_BOARD_INIT=y diff --cc configs/sam9x60ek_mmc_defconfig index 06680ac94c,c70c41c278..7cb4ab1085 --- a/configs/sam9x60ek_mmc_defconfig +++ b/configs/sam9x60ek_mmc_defconfig @@@ -13,7 -13,9 +13,8 @@@ CONFIG_SF_DEFAULT_SPEED=5000000 CONFIG_ENV_SIZE=0x4000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="sam9x60ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_OF_LIBFDT_OVERLAY=y + CONFIG_DM_RESET=y CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=200000000 CONFIG_DEBUG_UART_BOARD_INIT=y diff --cc configs/sam9x60ek_nandflash_defconfig index fea200deda,569b4e747c..4bfd0e807e --- a/configs/sam9x60ek_nandflash_defconfig +++ b/configs/sam9x60ek_nandflash_defconfig @@@ -12,7 -12,9 +12,8 @@@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x2000bf CONFIG_SF_DEFAULT_SPEED=50000000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="sam9x60ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_OF_LIBFDT_OVERLAY=y + CONFIG_DM_RESET=y CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=200000000 CONFIG_DEBUG_UART_BOARD_INIT=y diff --cc configs/sam9x60ek_qspiflash_defconfig index a1f8c9f902,135cd787f9..c7224dad46 --- a/configs/sam9x60ek_qspiflash_defconfig +++ b/configs/sam9x60ek_qspiflash_defconfig @@@ -12,7 -12,9 +12,8 @@@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x2000bf CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="sam9x60ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_OF_LIBFDT_OVERLAY=y + CONFIG_DM_RESET=y CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=200000000 CONFIG_DEBUG_UART_BOARD_INIT=y diff --cc configs/xilinx_versal_virt_defconfig index b13beadf8c,89566c7d52..388471dd9d --- a/configs/xilinx_versal_virt_defconfig +++ b/configs/xilinx_versal_virt_defconfig @@@ -5,7 -5,9 +5,8 @@@ CONFIG_SYS_INIT_SP_BSS_OFFSET=157286 CONFIG_ARCH_VERSAL=y CONFIG_TEXT_BASE=0x8000000 CONFIG_SYS_MALLOC_F_LEN=0x100000 + CONFIG_NR_DRAM_BANKS=36 CONFIG_DEFAULT_DEVICE_TREE="xilinx-versal-virt" -CONFIG_SYS_PROMPT="Versal> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_ENV_OFFSET_REDUND=0x7F00000