January 2022 - U-Boot

[PATCH] armv8: sec_firmware: drop unneeded ARMV8_SEC_FIRMWARE_SUPPORT check
by Michael Walle 06 Apr '22

06 Apr '22

This module will only be compiled if this symbol is set. Remove the useless check. While at it, invert the return code, to return 0 if the function succeeds. The only user of this function in arch/arm/cpu/armv8/fsl-layerscape/fdt.c doesn't check the return code anyway, so its safe change it. Signed-off-by: Michael Walle <michael(a)walle.cc> --- arch/arm/cpu/armv8/sec_firmware.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c index 267894fbcb..e62e9dc380 100644 --- a/arch/arm/cpu/armv8/sec_firmware.c +++ b/arch/arm/cpu/armv8/sec_firmware.c @@ -458,47 +458,45 @@ int sec_firmware_init(const void *sec_firmware_img, /* * fdt_fix_kaslr - Add kalsr-seed node in Device tree * @fdt: Device tree - * @eret: 0 in case of error, 1 for success + * + * Returns 0 on success and 1 in case of an error. */ int fdt_fixup_kaslr(void *fdt) { int nodeoffset; - int err, ret = 0; + int err; u8 rand[8]; -#if defined(CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT) /* Check if random seed generation is supported */ if (sec_firmware_support_hwrng() == false) { printf("WARNING: SEC firmware not running, no kaslr-seed\n"); - return 0; + return 1; } ret = sec_firmware_get_random(rand, 8); if (ret < 0) { printf("WARNING: No random number to set kaslr-seed\n"); - return 0; + return 1; } err = fdt_check_header(fdt); if (err < 0) { printf("fdt_chosen: %s\n", fdt_strerror(err)); - return 0; + return 1; } /* find or create "/chosen" node. */ nodeoffset = fdt_find_or_add_subnode(fdt, 0, "chosen"); if (nodeoffset < 0) - return 0; + return 1; err = fdt_setprop(fdt, nodeoffset, "kaslr-seed", rand, sizeof(rand)); if (err < 0) { printf("WARNING: can't set kaslr-seed %s.\n", fdt_strerror(err)); - return 0; + return 1; } - ret = 1; -#endif - return ret; + return 0; } -- 2.30.2

2 3

[RESEND PATCH v2 0/3] sunxi: Improve automatic eMMC boot partition support
by Andre Przywara 06 Apr '22

06 Apr '22

(resent to also include forgotten U-Boot list) The Allwinner BootROM supports loading the SPL from eMMC boot partitions, but so far the SPL support for this case was a bit lacking, as it was a compile time decision, and even required a manual config change. This actually got accidentally fixed in v2021.04 (c0b417b2f1a3 "sunxi: support loading with SPL > 32KB"), but still some gaps remain: When just enabling an eMMC boot partition, but having no bootable code there, the BROM will just continue with booting from the user data partition, but U-Boot does not detect this and will try to load U-Boot proper from that boot partition. This series fixes this, by replicating the BROMs decisions in the SPL, to decide on the partition to continue loading from. Patch 1/3 prepares a generic function to take an extra argument, while patch 2/3 implements the actual algorithm. As this now allows to always have eMMC boot support on, patch 3/3 just activates this for a number of boards I could test it on. I'd like to encourage other people to test this on boards with eMMC, to enable this in the respective defconfig, maybe even centrally. Some more details on eMMC boot partition support and how to install U-Boot in there can be found in the linux-sunxi Wiki: http://linux-sunxi.org/Bootable_eMMC Cheers, Andre Changelog v1 .. v2: - drop patch 1/5 (bugfix): already merged - drop patch 3/5, as it was obsoleted by c0b417b2f1a3 - remove check for 32KB SPL limit (not applicable for H6 and beyond) - remove extra sector offset adjustment (obsoleted by c0b417b2f1a3) Andre Przywara (3): spl: mmc: extend spl_mmc_boot_mode() to take mmc argument sunxi: eMMC: Improve automatic boot source detection sunxi: defconfig: enable eMMC boot partition support arch/arm/mach-imx/spl.c | 2 +- arch/arm/mach-k3/am6_init.c | 2 +- arch/arm/mach-k3/j721e_init.c | 2 +- arch/arm/mach-omap2/boot-common.c | 2 +- arch/arm/mach-rockchip/spl.c | 2 +- arch/arm/mach-socfpga/spl_a10.c | 2 +- arch/arm/mach-socfpga/spl_gen5.c | 2 +- arch/arm/mach-stm32mp/spl.c | 2 +- arch/arm/mach-sunxi/board.c | 80 ++++++++++++++++++++++ arch/arm/mach-uniphier/mmc-boot-mode.c | 5 +- common/spl/spl_mmc.c | 4 +- configs/bananapi_m64_defconfig | 1 + configs/emlid_neutis_n5_devboard_defconfig | 1 + configs/pine64-lts_defconfig | 1 + configs/pine_h64_defconfig | 1 + include/spl.h | 3 +- 16 files changed, 97 insertions(+), 15 deletions(-) -- 2.17.5

3 7

[PATCH 0/3] sunxi: H6/H616: PRCM updates
by Jernej Skrabec 06 Apr '22

06 Apr '22

During H616 boot0 blob and H6 boot0 sources analysis, I noticed that SPL doesn't set resistor calibration and PLL LDO on H6. Tests didn't show any observable difference, but nevertheless it's better to mimick boot0 behaviour. In the process I also added names for few PRCM registers so it's clearer what code does. Please take a look. Best regards, Jernej Jernej Skrabec (3): sunxi: prcm: Add a few registers sunxi: clock: H6/H616: Add resistor calibration sunxi: clock: H6: Adjust PLL LDO before clock setup arch/arm/include/asm/arch-sunxi/prcm_sun50i.h | 10 ++++++++++ arch/arm/mach-sunxi/clock_sun50i_h6.c | 20 ++++++++++++++++--- arch/arm/mach-sunxi/dram_sun50i_h6.c | 8 +++++--- arch/arm/mach-sunxi/dram_sun50i_h616.c | 7 +++++-- 4 files changed, 37 insertions(+), 8 deletions(-) -- 2.35.1

3 5

[PATCH v2 0/4] mkimage: sunxi_egon: add riscv support
by Icenowy Zheng 06 Apr '22

06 Apr '22

This patchset tries to make mkimage -T sunxi_egon to be able to generate an eGON.BT0 image for Allwinner RISC-V SoCs (e.g. D1). In addition, to keep the compatibility, it will still consider the architecture to be ARM when no architecture is specified. Icenowy Zheng (4): mkimage: add a flag to describe whether -A is specified mkimage: sunxi_egon: refactor for multi-architecture support mkimage: sunxi_egon: add support for riscv sunxi: specify architecture when generating SPL boot image scripts/Makefile.spl | 2 +- tools/imagetool.h | 1 + tools/mkimage.c | 1 + tools/sunxi_egon.c | 86 ++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 82 insertions(+), 8 deletions(-) -- 2.30.2

5 16

[PATCH 1/2] sunxi: add H2+ config option
by Angelo Dureghello 06 Apr '22

06 Apr '22

Add H2+ Kconfig oiption to display proper cpu at boot time, and for other future uses, if needed, to differentiate against H3. The patch does not change any board defconfig at this stage, so that nothing is broken. Tested this CONFIG_MACH_SUN8I_H2_PLUS to work properly on banana pi m2 zero. Signed-off-by: Angelo Dureghello <angelo.dureghello(a)timesys.com> --- arch/arm/cpu/armv7/sunxi/Makefile | 1 + arch/arm/cpu/armv7/sunxi/psci.c | 2 ++ arch/arm/cpu/armv7/sunxi/tzpc.c | 2 +- arch/arm/dts/Makefile | 5 +++++ arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | 4 ++-- arch/arm/mach-sunxi/Kconfig | 9 +++++++++ arch/arm/mach-sunxi/board.c | 3 ++- arch/arm/mach-sunxi/cpu_info.c | 6 ++++-- arch/arm/mach-sunxi/dram_sunxi_dw.c | 4 ++-- drivers/clk/sunxi/Makefile | 1 + drivers/video/sunxi/sunxi_de2.c | 2 +- 11 files changed, 30 insertions(+), 9 deletions(-) diff --git a/arch/arm/cpu/armv7/sunxi/Makefile b/arch/arm/cpu/armv7/sunxi/Makefile index 1d40d6a18d..5fdfe45401 100644 --- a/arch/arm/cpu/armv7/sunxi/Makefile +++ b/arch/arm/cpu/armv7/sunxi/Makefile @@ -8,6 +8,7 @@ obj-y += timer.o obj-$(CONFIG_MACH_SUN6I) += tzpc.o +obj-$(CONFIG_MACH_SUN8I_H2_PLUS) += tzpc.o obj-$(CONFIG_MACH_SUN8I_H3) += tzpc.o ifndef CONFIG_SPL_BUILD diff --git a/arch/arm/cpu/armv7/sunxi/psci.c b/arch/arm/cpu/armv7/sunxi/psci.c index 1ac50f558a..bcdbe888bc 100644 --- a/arch/arm/cpu/armv7/sunxi/psci.c +++ b/arch/arm/cpu/armv7/sunxi/psci.c @@ -79,6 +79,7 @@ static void __secure __mdelay(u32 ms) static void __secure clamp_release(u32 __maybe_unused *clamp) { #if defined(CONFIG_MACH_SUN6I) || defined(CONFIG_MACH_SUN7I) || \ + defined(CONFIG_MACH_SUN8I_H2_PLUS) || \ defined(CONFIG_MACH_SUN8I_H3) || \ defined(CONFIG_MACH_SUN8I_R40) u32 tmp = 0x1ff; @@ -94,6 +95,7 @@ static void __secure clamp_release(u32 __maybe_unused *clamp) static void __secure clamp_set(u32 __maybe_unused *clamp) { #if defined(CONFIG_MACH_SUN6I) || defined(CONFIG_MACH_SUN7I) || \ + defined(CONFIG_MACH_SUN8I_H2_PLUS) || \ defined(CONFIG_MACH_SUN8I_H3) || \ defined(CONFIG_MACH_SUN8I_R40) writel(0xff, clamp); diff --git a/arch/arm/cpu/armv7/sunxi/tzpc.c b/arch/arm/cpu/armv7/sunxi/tzpc.c index 0c86a21a3f..44640509ff 100644 --- a/arch/arm/cpu/armv7/sunxi/tzpc.c +++ b/arch/arm/cpu/armv7/sunxi/tzpc.c @@ -17,7 +17,7 @@ void tzpc_init(void) writel(SUN6I_TZPC_DECPORT0_RTC, &tzpc->decport0_set); #endif -#ifdef CONFIG_MACH_SUN8I_H3 +#if defined(CONFIG_MACH_SUN8I_H2_PLUS) || defined(CONFIG_MACH_SUN8I_H3) /* Enable non-secure access to all peripherals */ writel(SUN8I_H3_TZPC_DECPORT0_ALL, &tzpc->decport0_set); writel(SUN8I_H3_TZPC_DECPORT1_ALL, &tzpc->decport1_set); diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index b8a382d153..2e58815769 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -598,6 +598,11 @@ dtb-$(CONFIG_MACH_SUN8I_A83T) += \ sun8i-a83t-bananapi-m3.dtb \ sun8i-a83t-cubietruck-plus.dtb \ sun8i-a83t-tbs-a711.dtb +dtb-$(CONFIG_MACH_SUN8I_H2_PLUS) += \ + sun8i-h2-plus-bananapi-m2-zero.dtb \ + sun8i-h2-plus-libretech-all-h3-cc.dtb \ + sun8i-h2-plus-orangepi-r1.dtb \ + sun8i-h2-plus-orangepi-zero.dtb dtb-$(CONFIG_MACH_SUN8I_H3) += \ sun8i-h2-plus-bananapi-m2-zero.dtb \ sun8i-h2-plus-libretech-all-h3-cc.dtb \ diff --git a/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h b/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h index d4c795d89c..b7a66b91e7 100644 --- a/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h +++ b/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h @@ -15,7 +15,7 @@ !defined(CONFIG_MACH_SUN8I_R40) && \ !defined(CONFIG_MACH_SUN8I_V3S) #define SUNXI_SRAM_A2_BASE 0x00040000 -#ifdef CONFIG_MACH_SUN8I_H3 +#if defined(CONFIG_MACH_SUN8I_H2_PLUS) || defined(CONFIG_MACH_SUN8I_H3) #define SUNXI_SRAM_A2_SIZE (48 * 1024) /* 16+32 kiB */ #else #define SUNXI_SRAM_A2_SIZE (80 * 1024) /* 16+64 kiB */ @@ -174,7 +174,7 @@ defined(CONFIG_MACH_SUN50I) /* module sram */ #define SUNXI_SRAM_C_BASE 0x01d00000 -#ifndef CONFIG_MACH_SUN8I_H3 +#if !defined(CONFIG_MACH_SUN8I_H2_PLUS) && !defined(CONFIG_MACH_SUN8I_H3) #define SUNXI_DE_FE0_BASE 0x01e00000 #else #define SUNXI_TVE0_BASE 0x01e00000 diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index 1d4a4fdd0c..eae8a0e68b 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -288,6 +288,15 @@ config MACH_SUN8I_A83T select MMC_SUNXI_HAS_MODE_SWITCH select SUPPORT_SPL +config MACH_SUN8I_H2_PLUS + bool "sun8i (Allwinner H2+)" + select CPU_V7A + select CPU_V7_HAS_NONSEC + select CPU_V7_HAS_VIRT + select ARCH_SUPPORT_PSCI + select MACH_SUNXI_H3_H5 + select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT + config MACH_SUN8I_H3 bool "sun8i (Allwinner H3)" select CPU_V7A diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index d9b04f75fc..adb63e93e7 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c @@ -228,7 +228,8 @@ void s_init(void) "mcr p15, 0, r0, c1, c0, 1\n" ::: "r0"); #endif -#if defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN8I_H3 +#if defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN8I_H2_PLUS || \ + defined CONFIG_MACH_SUN8I_H3 /* Enable non-secure access to some peripherals */ tzpc_init(); #endif diff --git a/arch/arm/mach-sunxi/cpu_info.c b/arch/arm/mach-sunxi/cpu_info.c index ba33ef2430..429e5ce283 100644 --- a/arch/arm/mach-sunxi/cpu_info.c +++ b/arch/arm/mach-sunxi/cpu_info.c @@ -85,6 +85,8 @@ int print_cpuinfo(void) printf("CPU: Allwinner A33 (SUN8I %04x)\n", sunxi_get_sram_id()); #elif defined CONFIG_MACH_SUN8I_A83T printf("CPU: Allwinner A83T (SUN8I %04x)\n", sunxi_get_sram_id()); +#elif defined CONFIG_MACH_SUN8I_H2_PLUS + printf("CPU: Allwinner H2+ (SUN8I %04x)\n", sunxi_get_sram_id()); #elif defined CONFIG_MACH_SUN8I_H3 printf("CPU: Allwinner H3 (SUN8I %04x)\n", sunxi_get_sram_id()); #elif defined CONFIG_MACH_SUN8I_R40 @@ -109,7 +111,7 @@ int print_cpuinfo(void) } #endif -#ifdef CONFIG_MACH_SUN8I_H3 +#if defined(CONFIG_MACH_SUN8I_H2_PLUS) || defined(CONFIG_MACH_SUN8I_H3) #define SIDC_PRCTL 0x40 #define SIDC_RDKEY 0x60 @@ -143,7 +145,7 @@ int sunxi_get_sid(unsigned int *sid) { #ifdef CONFIG_AXP221_POWER return axp_get_sid(sid); -#elif defined CONFIG_MACH_SUN8I_H3 +#elif defined(CONFIG_MACH_SUN8I_H2_PLUS) || defined(CONFIG_MACH_SUN8I_H3) /* * H3 SID controller has a bug, which makes the initial value of * SUNXI_SID_BASE at boot wrong. diff --git a/arch/arm/mach-sunxi/dram_sunxi_dw.c b/arch/arm/mach-sunxi/dram_sunxi_dw.c index 9107b114df..f28c23d0c6 100644 --- a/arch/arm/mach-sunxi/dram_sunxi_dw.c +++ b/arch/arm/mach-sunxi/dram_sunxi_dw.c @@ -863,7 +863,7 @@ unsigned long sunxi_dram_init(void) } }, -#if defined(CONFIG_MACH_SUN8I_H3) +#if defined(CONFIG_MACH_SUN8I_H2_PLUS) || defined(CONFIG_MACH_SUN8I_H3) .dx_read_delays = SUN8I_H3_DX_READ_DELAYS, .dx_write_delays = SUN8I_H3_DX_WRITE_DELAYS, .ac_delays = SUN8I_H3_AC_DELAYS, @@ -890,7 +890,7 @@ unsigned long sunxi_dram_init(void) * the static functions. This saves us #ifdefs, but still keeps the binary * small. */ -#if defined(CONFIG_MACH_SUN8I_H3) +#if defined(CONFIG_MACH_SUN8I_H2_PLUS) || defined(CONFIG_MACH_SUN8I_H3) uint16_t socid = SOCID_H3; #elif defined(CONFIG_MACH_SUN8I_R40) uint16_t socid = SOCID_R40; diff --git a/drivers/clk/sunxi/Makefile b/drivers/clk/sunxi/Makefile index 4f9282a8b9..d8565b3946 100644 --- a/drivers/clk/sunxi/Makefile +++ b/drivers/clk/sunxi/Makefile @@ -16,6 +16,7 @@ obj-$(CONFIG_CLK_SUN8I_A83T) += clk_a83t.o obj-$(CONFIG_CLK_SUN8I_R40) += clk_r40.o obj-$(CONFIG_CLK_SUN8I_V3S) += clk_v3s.o obj-$(CONFIG_CLK_SUN9I_A80) += clk_a80.o +obj-$(CONFIG_CLK_SUN8I_H2_PLUS) += clk_h3.o obj-$(CONFIG_CLK_SUN8I_H3) += clk_h3.o obj-$(CONFIG_CLK_SUN50I_H6) += clk_h6.o obj-$(CONFIG_CLK_SUN50I_H616) += clk_h616.o diff --git a/drivers/video/sunxi/sunxi_de2.c b/drivers/video/sunxi/sunxi_de2.c index e02d359cd2..2af2ae4cac 100644 --- a/drivers/video/sunxi/sunxi_de2.c +++ b/drivers/video/sunxi/sunxi_de2.c @@ -84,7 +84,7 @@ static void sunxi_de2_mode_set(int mux, const struct display_timing *mode, u32 format; /* enable clock */ -#ifdef CONFIG_MACH_SUN8I_H3 +#if defined(CONFIG_MACH_SUN8I_H2_PLUS) || defined(CONFIG_MACH_SUN8I_H3) setbits_le32(&de_clk_regs->rst_cfg, (mux == 0) ? 1 : 4); #else setbits_le32(&de_clk_regs->rst_cfg, BIT(mux)); -- 2.32.0

2 5

[PATCH 0/3] efi_loader: setting boot device
by Heinrich Schuchardt 04 Apr '22

04 Apr '22

Up to now the bootefi command uses the last file loaded to determine the boot partition. This has led to user irritation when the fdt has been loaded from another partition after the EFI binary. Before setting the boot device from a loaded file check if it is a PE-COFF image. The first patch carves out the test function. The second make use of the PE-COFF check. The third add the display of the boot device and file path for easier testing. Heinrich Schuchardt (3): efi_loader: print boot device and file path in helloworld efi_loader: carve out efi_check_pe() efi_loader: setting boot device cmd/bootefi.c | 14 ++- doc/uefi/uefi.rst | 11 +- fs/fs.c | 3 +- include/efi_loader.h | 8 +- lib/efi_loader/efi_image_loader.c | 80 ++++++++------ lib/efi_loader/helloworld.c | 167 ++++++++++++++++++++++++------ net/tftp.c | 9 +- 7 files changed, 211 insertions(+), 81 deletions(-) -- 2.29.2

4 18

[PATCH] ARM: dts: colibri-imx6ull: fix mac address passing
by Francesco Dolcini 01 Apr '22

01 Apr '22

colibri-imx6ull ethernet device is fec2, while the optional secondary ethernet is fec1, update the ethernet aliases in the .dts file so that ethaddr is set to fec2 and eth1addr to fec1. Without this change the ethernet interfaces have a different mac address between Linux and U-Boot. Signed-off-by: Francesco Dolcini <francesco.dolcini(a)toradex.com> --- arch/arm/dts/imx6ull-colibri.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/dts/imx6ull-colibri.dtsi b/arch/arm/dts/imx6ull-colibri.dtsi index b7bf79f28c..104207be97 100644 --- a/arch/arm/dts/imx6ull-colibri.dtsi +++ b/arch/arm/dts/imx6ull-colibri.dtsi @@ -8,6 +8,12 @@ #include "imx6ull.dtsi" / { + /* Ethernet aliases to ensure correct MAC addresses */ + aliases { + ethernet0 = &fec2; + ethernet1 = &fec1; + }; + chosen { stdout-path = &uart1; }; -- 2.25.1

4 12

[PATCH 0/7] clk: Make clk_free return void
by Sean Anderson 30 Mar '22

30 Mar '22

clk_free cleans up resources allocated by clk_request et. al. It returns an error code, but it really shouldn't. Much like regular free(), there is typically no way to handle an error, and errors from clk_free shouldn't prevent progress in the rest of the program. Make clk_free (and rfree) return void. Sean Anderson (7): clk: Make rfree return void dma: bcm6348: Don't check clk_free net: bcm63xx: Don't check clk_free phy: bcm63xx: Don't check clk_free spi: bcm63xx: Don't check clk_free spi: dw: Don't check clk_free clk: Make clk_free return void drivers/clk/clk-uclass.c | 15 ++++++--------- drivers/clk/clk_sandbox.c | 6 +++--- drivers/clk/clk_sandbox_test.c | 9 +++------ drivers/dma/bcm6348-iudma.c | 6 +----- drivers/net/bcm6348-eth.c | 6 +----- drivers/net/bcm6368-eth.c | 6 +----- drivers/phy/bcm6318-usbh-phy.c | 4 +--- drivers/phy/bcm6348-usbh-phy.c | 4 +--- drivers/phy/bcm6368-usbh-phy.c | 8 ++------ drivers/spi/bcm63xx_hsspi.c | 8 ++------ drivers/spi/bcm63xx_spi.c | 4 +--- drivers/spi/designware_spi.c | 2 +- include/clk-uclass.h | 8 +++----- include/clk.h | 8 ++++---- 14 files changed, 30 insertions(+), 64 deletions(-) -- 2.34.1

2 19

[PATCH v1 1/2] hexdump: Introduce debug APIs
by Andy Shevchenko 30 Mar '22

30 Mar '22

debug_hex_dump() and debug_hex_dump_bytes() conditionally print the dump based on DEBUG definition. Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- include/hexdump.h | 4 ++++ lib/hexdump.c | 60 ++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 56 insertions(+), 8 deletions(-) diff --git a/include/hexdump.h b/include/hexdump.h index f2ca4793d699..390af4c8da1e 100644 --- a/include/hexdump.h +++ b/include/hexdump.h @@ -147,6 +147,8 @@ int hex_dump_to_buffer(const void *buf, size_t len, int rowsize, int groupsize, */ int print_hex_dump(const char *prefix_str, int prefix_type, int rowsize, int groupsize, const void *buf, size_t len, bool ascii); +int debug_hex_dump(const char *prefix_str, int prefix_type, int rowsize, + int groupsize, const void *buf, size_t len, bool ascii); /** * print_hex_dump_bytes - shorthand form of print_hex_dump() with default params @@ -162,5 +164,7 @@ int print_hex_dump(const char *prefix_str, int prefix_type, int rowsize, */ void print_hex_dump_bytes(const char *prefix_str, int prefix_type, const void *buf, size_t len); +void debug_hex_dump_bytes(const char *prefix_str, int prefix_type, + const void *buf, size_t len); #endif /* HEXDUMP_H */ diff --git a/lib/hexdump.c b/lib/hexdump.c index 149c93ead8b8..39c9e86649a0 100644 --- a/lib/hexdump.c +++ b/lib/hexdump.c @@ -125,8 +125,9 @@ overflow1: return ascii ? ascii_column + len : (groupsize * 2 + 1) * ngroups - 1; } -int print_hex_dump(const char *prefix_str, int prefix_type, int rowsize, - int groupsize, const void *buf, size_t len, bool ascii) +static int do_print_hex_dump(const char *prefix_str, int prefix_type, int rowsize, + int groupsize, const void *buf, size_t len, bool ascii, + bool dbg) { const u8 *ptr = buf; int i, linelen, remaining = len; @@ -146,15 +147,27 @@ int print_hex_dump(const char *prefix_str, int prefix_type, int rowsize, switch (prefix_type) { case DUMP_PREFIX_ADDRESS: - printf("%s%0*lx: %s\n", prefix_str, - IS_ENABLED(CONFIG_PHYS_64BIT) ? 16 : 8, - (ulong)map_to_sysmem(ptr) + i, linebuf); + if (dbg) { + debug("%s%0*lx: %s\n", prefix_str, + IS_ENABLED(CONFIG_PHYS_64BIT) ? 16 : 8, + (ulong)map_to_sysmem(ptr) + i, linebuf); + } else } + printf("%s%0*lx: %s\n", prefix_str, + IS_ENABLED(CONFIG_PHYS_64BIT) ? 16 : 8, + (ulong)map_to_sysmem(ptr) + i, linebuf); + } break; case DUMP_PREFIX_OFFSET: - printf("%s%.8x: %s\n", prefix_str, i, linebuf); + if (dbg) + debug("%s%.8x: %s\n", prefix_str, i, linebuf); + else + printf("%s%.8x: %s\n", prefix_str, i, linebuf); break; default: - printf("%s%s\n", prefix_str, linebuf); + if (dbg) + debug("%s%s\n", prefix_str, linebuf); + else + printf("%s%s\n", prefix_str, linebuf); break; } if (!IS_ENABLED(CONFIG_SPL_BUILD) && ctrlc()) @@ -164,10 +177,30 @@ int print_hex_dump(const char *prefix_str, int prefix_type, int rowsize, return 0; } +int print_hex_dump(const char *prefix_str, int prefix_type, int rowsize, + int groupsize, const void *buf, size_t len, bool ascii) +{ + return do_print_hex_dump(prefix_str, prefix_type, rowsize, groupsize, + buf, len, ascii, false); +} + +int debug_hex_dump(const char *prefix_str, int prefix_type, int rowsize, + int groupsize, const void *buf, size_t len, bool ascii) +{ + return do_print_hex_dump(prefix_str, prefix_type, rowsize, groupsize, + buf, len, ascii, true); +} + void print_hex_dump_bytes(const char *prefix_str, int prefix_type, const void *buf, size_t len) { - print_hex_dump(prefix_str, prefix_type, 16, 1, buf, len, true); + do_print_hex_dump(prefix_str, prefix_type, 16, 1, buf, len, true, false); +} + +void debug_hex_dump_bytes(const char *prefix_str, int prefix_type, + const void *buf, size_t len) +{ + do_print_hex_dump(prefix_str, prefix_type, 16, 1, buf, len, true, true); } #else /* @@ -180,8 +213,19 @@ int print_hex_dump(const char *prefix_str, int prefix_type, int rowsize, return -ENOSYS; } +int debug_hex_dump(const char *prefix_str, int prefix_type, int rowsize, + int groupsize, const void *buf, size_t len, bool ascii) +{ + return -ENOSYS; +} + void print_hex_dump_bytes(const char *prefix_str, int prefix_type, const void *buf, size_t len) { } + +void debug_hex_dump_bytes(const char *prefix_str, int prefix_type, + const void *buf, size_t len) +{ +} #endif /* CONFIG_HEXDUMP */ -- 2.33.0

3 5

[ANN] U-Boot v2022.04-rc1 released
by Tom Rini 30 Mar '22

30 Mar '22

Hey all, It's release day and so here's v2022.04-rc1. While there's much in here that needed to come in, there's a few big things outstanding, including but not limited to i.MX and layerscape syncs and further sunxi changes. In terms of a changelog, git log --merges v2022.01..v2022.04-rc1 contains what I've pulled but as always, better PR messages and tags will provide better results here. So we're now looking at regular releases every other Monday, and with final release on April 4th, 2022. Thanks all! -- Tom

5 13