]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Merge tag 'v2023.10-rc3' into next
authorTom Rini <trini@konsulko.com>
Mon, 21 Aug 2023 21:32:17 +0000 (17:32 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 21 Aug 2023 21:32:17 +0000 (17:32 -0400)
Prepare v2023.10-rc3

Signed-off-by: Tom Rini <trini@konsulko.com>
14 files changed:
1  2 
.azure-pipelines.yml
.gitlab-ci.yml
MAINTAINERS
arch/arm/mach-rockchip/Kconfig
arch/mips/mach-jz47xx/jz4780/jz4780.c
arch/x86/lib/spl.c
board/xilinx/common/board.c
cmd/Kconfig
common/board_f.c
configs/sandbox64_defconfig
configs/sandbox_defconfig
doc/board/ti/k3.rst
drivers/scsi/scsi.c
drivers/video/Kconfig

Simple merge
diff --cc .gitlab-ci.yml
Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
index 73512d3d4c8c8bf4ea848f17f4540a7eb2c4f59e,f99df08fbece065e26ebe88c97be70aaf047cf68..58fa572b71aea03062692442284442f6690b2868
@@@ -137,10 -138,9 +138,9 @@@ static int x86_spl_init(void
        }
  
  #ifndef CONFIG_SYS_COREBOOT
-       log_debug("bss\n");
 -      debug("BSS clear from %lx to %lx len %lx\n", (ulong)&__bss_start,
 -            (ulong)&__bss_end, (ulong)&__bss_end - (ulong)&__bss_start);
 -      memset(&__bss_start, 0, (ulong)&__bss_end - (ulong)&__bss_start);
 +      debug("BSS clear from %lx to %lx len %lx\n", (ulong)__bss_start,
 +            (ulong)__bss_end, (ulong)__bss_end - (ulong)__bss_start);
 +      memset(__bss_start, 0, (ulong)__bss_end - (ulong)__bss_start);
  # ifndef CONFIG_TPL
  
        /* TODO(sjg@chromium.org): Consider calling cpu_init_r() here */
Simple merge
diff --cc cmd/Kconfig
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge