From: Tom Rini Date: Mon, 21 Aug 2023 21:32:17 +0000 (-0400) Subject: Merge tag 'v2023.10-rc3' into next X-Git-Url: http://git.dujemihanovic.xyz/img/static/gitweb.css?a=commitdiff_plain;h=7e6e40c572332b3835c5cb48a08e1d8d404c871c;p=u-boot.git Merge tag 'v2023.10-rc3' into next Prepare v2023.10-rc3 Signed-off-by: Tom Rini --- 7e6e40c572332b3835c5cb48a08e1d8d404c871c diff --cc arch/x86/lib/spl.c index 73512d3d4c,f99df08fbe..58fa572b71 --- a/arch/x86/lib/spl.c +++ b/arch/x86/lib/spl.c @@@ -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 */