July 2020 - U-Boot

[PATCH 1/1] sandbox: spi: sandbox_sf_state_name() is required
by Heinrich Schuchardt 06 Jul '20

06 Jul '20

Compiling drivers/mtd/spi/sandbox.c fails when compiled with CONFIG_LOG=n: In file included from include/common.h:20, from drivers/mtd/spi/sandbox.c:13: drivers/mtd/spi/sandbox.c:295:15: error: format ‘%s’ expects argument of type ‘char *’, but argument 7 has type ‘int’ [-Werror=format=] 295 | log_content(" cmd: transition to %s state\n", | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/linux/printk.h:37:21: note: in definition of macro ‘pr_fmt’ 37 | #define pr_fmt(fmt) fmt | ^~~ include/log.h:128:30: note: in expansion of macro ‘log_nop’ 128 | #define log_content(_fmt...) log_nop(LOG_CATEGORY, \ | ^~~~~~~ drivers/mtd/spi/sandbox.c:295:3: note: in expansion of macro ‘log_content’ 295 | log_content(" cmd: transition to %s state\n", | ^~~~~~~~~~~ drivers/mtd/spi/sandbox.c:295:37: note: format string is defined here 295 | log_content(" cmd: transition to %s state\n", | ~^ | | | char * | %d Supply function sandbox_sf_state_name() independent of CONFIG_LOG. Fixes: c3aed5db591e ("sandbox: spi: Add more logging") Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- drivers/mtd/spi/sandbox.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c index 8cbe97ee20..0b602dc914 100644 --- a/drivers/mtd/spi/sandbox.c +++ b/drivers/mtd/spi/sandbox.c @@ -44,7 +44,6 @@ enum sandbox_sf_state { SF_WRITE_STATUS, /* write the flash's status register */ }; -#if CONFIG_IS_ENABLED(LOG) static const char *sandbox_sf_state_name(enum sandbox_sf_state state) { static const char * const states[] = { @@ -53,7 +52,6 @@ static const char *sandbox_sf_state_name(enum sandbox_sf_state state) }; return states[state]; } -#endif /* LOG */ /* Bits for the status register */ #define STAT_WIP (1 << 0) -- 2.26.2

2 3

[PATCH v4 0/6] patman: Support old Python 3 versions
by Simon Glass 06 Jul '20

06 Jul '20

With the move to supporting only Python 3, patman is reliant on whatever version of Python 3 is available on the host machine. For old distributions such as Ubuntu 14.04 this means Python 3.4.0 which seems to have some problems with importing modules. This series updates patman to work correctly in this case. Changes in v4: - Add a new patch to drop import of test_util in test_util - Add a cover letter Changes in v3: - Split out the gitutil change into a separate patch - Add more patches based on testing on a dusty Ubuntu 14.04 Changes in v2: - Update gitutil as well Simon Glass (6): patman: Drop unnecessary import in gitutil patman: Avoid circular dependency between command and tools patman: Use a dict in gitutil to avoid importing series patman: Pass in maintainer dirs to avoid and import patman: Avoid importing gitutil in settings patman: Drop import of test_util in test_util tools/patman/command.py | 7 +++---- tools/patman/get_maintainer.py | 14 +++++++------- tools/patman/gitutil.py | 10 ++++------ tools/patman/main.py | 2 +- tools/patman/series.py | 3 ++- tools/patman/settings.py | 7 +++---- tools/patman/test_util.py | 1 - 7 files changed, 20 insertions(+), 24 deletions(-) -- 2.27.0.278.ge193c7cf3a9-goog

1 12

[PATCH 1/1] log: uclass_get_name() depends on CONFIG_SPL_DM
by Heinrich Schuchardt 06 Jul '20

06 Jul '20

If CONFIG_SPL_DM=n and CONFIG_SPL_LOG=y a build error occurs: ld.bfd: common/built-in.o: in function `log_get_cat_name': common/log.c:48: undefined reference to `uclass_get_name' make[1]: *** [scripts/Makefile.spl:422: spl/u-boot-spl] Error 1 Call uclass_get_name() only if DM is enabled. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- common/log.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/log.c b/common/log.c index c5b9b489ca..d7ce74f6b3 100644 --- a/common/log.c +++ b/common/log.c @@ -45,7 +45,11 @@ const char *log_get_cat_name(enum log_category_t cat) if (cat >= LOGC_NONE) return log_cat_name[cat - LOGC_NONE]; +#if CONFIG_IS_ENABLED(DM) name = uclass_get_name((enum uclass_id)cat); +#else + name = NULL; +#endif return name ? name : "<missing>"; } -- 2.26.2

2 2

[PATCH 1/1] sandbox: make RAM size configurable
by Heinrich Schuchardt 06 Jul '20

06 Jul '20

Up to now the RAM size of the sandbox is hard coded as 128 MiB. This does not allow testing the correct handling of addresses outside the 32bit range. 128 MiB is also rather small when tracing functions where the trace is written to RAM. Provide configuration variable CONFIG_SANDBOX_RAM_SIZE_MB to set the RAM size in MiB. It defaults to 128 MiB with a minimum of 64 MiB. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- arch/sandbox/Kconfig | 10 ++++++++++ arch/sandbox/include/asm/state.h | 2 +- include/configs/sandbox.h | 5 ++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig index 2a08533c4b..65f988e736 100644 --- a/arch/sandbox/Kconfig +++ b/arch/sandbox/Kconfig @@ -15,6 +15,16 @@ config SANDBOX64 select PHYS_64BIT select HOST_64BIT +config SANDBOX_RAM_SIZE_MB + int "RAM size in MiB" + default 128 + range 64 4095 if !SANDBOX64 + range 64 268435456 if SANDBOX64 + help + Memory size of the sandbox in MiB. The default value is 128 MiB. + The minimum value is 64 MiB. The maximum value is 4095 MiB for the + 32bit sandbox. + config SANDBOX_SPL bool "Enable SPL for sandbox" select SUPPORT_SPL diff --git a/arch/sandbox/include/asm/state.h b/arch/sandbox/include/asm/state.h index 705645d714..1bfad305f1 100644 --- a/arch/sandbox/include/asm/state.h +++ b/arch/sandbox/include/asm/state.h @@ -73,7 +73,7 @@ struct sandbox_state { char **argv; /* Command line arguments */ const char *jumped_fname; /* Jumped from previous U_Boot */ uint8_t *ram_buf; /* Emulated RAM buffer */ - unsigned int ram_size; /* Size of RAM buffer */ + unsigned long ram_size; /* Size of RAM buffer */ const char *ram_buf_fname; /* Filename to use for RAM buffer */ bool ram_buf_rm; /* Remove RAM buffer file after read */ bool write_ram_buf; /* Write RAM buffer on exit */ diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 2a81f3a9bc..3d46ee0d46 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -47,8 +47,11 @@ #define CONFIG_PHYSMEM /* Size of our emulated memory */ +#define SB_CONCAT(x, y) x ## y +#define SB_TO_UL(s) SB_CONCAT(s, UL) #define CONFIG_SYS_SDRAM_BASE 0 -#define CONFIG_SYS_SDRAM_SIZE (128 << 20) +#define CONFIG_SYS_SDRAM_SIZE \ + (SB_TO_UL(CONFIG_SANDBOX_RAM_SIZE_MB) << 20) #define CONFIG_SYS_MONITOR_BASE 0 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ -- 2.26.2

2 2

[PATCH] dm: core: Correct comment on uclass_id_foreach_dev()
by Simon Glass 06 Jul '20

06 Jul '20

This parameter should be a struct uclass, not struct udevice. Correct it. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- include/dm/uclass.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dm/uclass.h b/include/dm/uclass.h index 70fca79b44..67ff7466c8 100644 --- a/include/dm/uclass.h +++ b/include/dm/uclass.h @@ -390,7 +390,7 @@ int uclass_resolve_seq(struct udevice *dev); * @id: enum uclass_id ID to use * @pos: struct udevice * to hold the current device. Set to NULL when there * are no more devices. - * @uc: temporary uclass variable (struct udevice *) + * @uc: temporary uclass variable (struct uclass *) */ #define uclass_id_foreach_dev(id, pos, uc) \ if (!uclass_get(id, &uc)) \ -- 2.27.0.290.gba653c62da-goog

2 2

[PATCH 0/5] patman: Add tests for U-Boot-specific checkpatch checks
by Simon Glass 06 Jul '20

06 Jul '20

It is quite likely that the number of U-Boot-specific tests in checkpatch.pl will increase over time. We should have tests for these to avoid undefined behaviour and bugs being introduced, which might cause people to ignore the warnings. This series adds the tests and modifies one check to be more specific. Simon Glass (5): patman: Rename test.py to test_checkpatch.py patman: Add a test for the 'possible new uclass' check patman: Decode output from the '--show-types' option patman: Add tests for the rest of the checkpatch checks checkpatch: Don't warn about PREFER_IF in headers/DT files scripts/checkpatch.pl | 2 +- tools/patman/checkpatch.py | 24 ++-- tools/patman/main.py | 4 +- tools/patman/{test.py => test_checkpatch.py} | 125 ++++++++++++++++++- 4 files changed, 139 insertions(+), 16 deletions(-) rename tools/patman/{test.py => test_checkpatch.py} (69%) -- 2.27.0.290.gba653c62da-goog

1 9

[PATCH v4 0/2] log: don't show function by default
by Heinrich Schuchardt 06 Jul '20

06 Jul '20

When replacing printf() by log function calls it is not desirable to output calling function name. So we should adjust the default log format to show the message only. Using the BIT() macro makes the log format related coding more readable. v4: leave an empty line in enum log_fmt before composite values rebase on origin/master Heinrich Schuchardt (2): log: don't show function by default log: use BIT() instead of 1 << cmd/log.c | 4 ++-- common/Kconfig | 18 ++++++++++++++++++ common/log.c | 2 +- common/log_console.c | 14 +++++++------- common/log_syslog.c | 14 +++++++------- include/log.h | 18 +++++++++++++++++- test/log/syslog_test.c | 20 ++++++++++++++------ test/py/tests/test_log.py | 2 ++ 8 files changed, 68 insertions(+), 24 deletions(-) -- 2.27.0

2 5

[PATCH 1/1] cmd: fdt: remove CMD_FDT_MAX_DUMP
by Heinrich Schuchardt 06 Jul '20

06 Jul '20

When printing the device tree we want to get an output that can be used as input for the device tree compiler. This requires that we do not write bogus lines like pcie@10000000 { interrupt-map = * 0x4000127c [0x00000280]; For instance the QEMU virt device has a property interrupt-map with 640 bytes which exceeds CMD_FDT_MAX_DUMP=64. So lets do away with the artificial limitation to 64 bytes. As indicated in commit f0a29d43313c ("fdt: Limit printed hex in fdt print and list commands") if a device tree contains binary blobs, it may still be desirable to limit the output length. Provide environment variable fdt_max_dump for this purpose. Fixes: 5d927b428622 ("Kconfig: Drop CONFIG_CMD_FDT_MAX_DUMP") Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- cmd/fdt.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cmd/fdt.c b/cmd/fdt.c index 99b1b5b3fc..89ab572d8d 100644 --- a/cmd/fdt.c +++ b/cmd/fdt.c @@ -21,7 +21,6 @@ #define MAX_LEVEL 32 /* how deeply nested we will go */ #define SCRATCHPAD 1024 /* bytes of scratchpad memory */ -#define CMD_FDT_MAX_DUMP 64 /* * Global data (for the gd->bd) @@ -934,11 +933,17 @@ static int is_printable_string(const void *data, int len) static void print_data(const void *data, int len) { int j; + const char *env_max_dump; + ulong max_dump = ULONG_MAX; /* no data, don't print */ if (len == 0) return; + env_max_dump = env_get("fdt_max_dump"); + if (env_max_dump) + max_dump = simple_strtoul(env_max_dump, NULL, 16); + /* * It is a string, but it may have multiple strings (embedded '\0's). */ @@ -957,7 +962,7 @@ static void print_data(const void *data, int len) } if ((len %4) == 0) { - if (len > CMD_FDT_MAX_DUMP) + if (len > max_dump) printf("* 0x%p [0x%08x]", data, len); else { const __be32 *p; @@ -969,7 +974,7 @@ static void print_data(const void *data, int len) printf(">"); } } else { /* anything else... hexdump */ - if (len > CMD_FDT_MAX_DUMP) + if (len > max_dump) printf("* 0x%p [0x%08x]", data, len); else { const u8 *s; -- 2.27.0

2 2

[PATCH v4 1/3] test/dm: fdtdec: Add the missing gd declaration
by Bin Meng 06 Jul '20

06 Jul '20

From: Bin Meng <bin.meng(a)windriver.com> Add DECLARE_GLOBAL_DATA_PTR since it is referenced in the test codes. Signed-off-by: Bin Meng <bin.meng(a)windriver.com> Reviewed-by: Simon Glass <sjg(a)chromium.org> --- Changes in v4: - drop the first 2 patches that are already applied - rebase against u-boot/next branch test/dm/fdtdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/dm/fdtdec.c b/test/dm/fdtdec.c index b2f75b5..c2f7b94 100644 --- a/test/dm/fdtdec.c +++ b/test/dm/fdtdec.c @@ -9,6 +9,8 @@ #include <dm/test.h> #include <test/ut.h> +DECLARE_GLOBAL_DATA_PTR; + static int dm_test_fdtdec_set_carveout(struct unit_test_state *uts) { struct fdt_memory resv; -- 2.7.4

2 5

[PATCH v4 00/14] improve OF_PLATDATA support
by Walter Lozano 06 Jul '20

06 Jul '20

When using OF_PLATDATA dtbs are converted to C structs in order to save space as we can remove both dtbs and libraries from TPL/SPL binaries. This patchset tries to improve its support by overcoming some limitations in the current implementation First, the support for scan and check for valid driver/aliases is added in order to generate U_BOOT_DEVICE entries with valid driver names. Secondly, the way information about linked noded (phandle) is generated in C structs is improved in order to make it easier to get a device associated to its data. Lastly the support for the property cd-gpios is added, which is used to configure the card detection gpio on MMC is added. This implementation is based in discussion in [1], [2] and [3] [1] https://patchwork.ozlabs.org/patch/1249198/ [2] https://patchwork.ozlabs.org/project/uboot/list/?series=167495&state=* [3] https://patchwork.ozlabs.org/project/uboot/list/?series=176759&state=* Changes for v4 - Fix syntax error on dtoc Changes for v3 - Split patches to separate core from tools changes - Squash patches to avoid errors on tests - Fix lines longer than 80 chars Changes for v2 - Rename drivers to match compatible strings - Fix out-of-trees usage of dtoc - Fix test coverage - Improve documentation - Improve format Walter Lozano (14): drivers: rename drivers to match compatible string dtoc: add missing code comments core: add support for U_BOOT_DRIVER_ALIAS dtoc: add support to scan drivers dtoc: add option to disable warnings dm: doc: update of-plat with the support for driver aliases core: drop const for struct driver_info core: extend struct driver_info to point to device sandbox: Move section u_boot_list to make it RW dtoc: extend dtoc to use struct driver_info when linking nodes dm: doc: update of-plat with new phandle support arm: dts: include gpio nodes for card detect dtoc: update dtb_platdata to support cd-gpios dtoc: add test for cd-gpios arch/arm/dts/da850-evm-u-boot.dtsi | 4 + arch/arm/dts/da850-lcdk-u-boot.dtsi | 4 + arch/arm/dts/rk3288-u-boot.dtsi | 4 + arch/arm/dts/rk3288-veyron-speedy-u-boot.dtsi | 2 +- arch/arm/dts/rk3288-veyron-u-boot.dtsi | 11 + .../mach-at91/arm926ejs/at91sam9260_devices.c | 6 +- .../arm926ejs/at91sam9m10g45_devices.c | 10 +- arch/arm/mach-rockchip/rk3328/syscon_rk3328.c | 4 +- arch/sandbox/cpu/u-boot-spl.lds | 2 +- board/davinci/da8xxevm/omapl138_lcdk.c | 2 +- board/sandbox/sandbox.c | 2 +- doc/driver-model/of-plat.rst | 38 ++- drivers/clk/at91/clk-master.c | 4 +- drivers/clk/at91/clk-peripheral.c | 4 +- drivers/clk/at91/pmc.c | 6 +- drivers/clk/clk-uclass.c | 11 +- drivers/core/device.c | 28 +- drivers/core/root.c | 6 +- drivers/core/simple-bus.c | 4 +- drivers/gpio/at91_gpio.c | 4 +- drivers/gpio/da8xx_gpio.c | 4 +- drivers/gpio/mxs_gpio.c | 8 +- drivers/gpio/rk_gpio.c | 4 +- drivers/gpio/sandbox.c | 6 +- drivers/i2c/rk_i2c.c | 6 +- drivers/input/cros_ec_keyb.c | 4 +- drivers/misc/cros_ec_sandbox.c | 4 +- drivers/misc/irq-uclass.c | 10 +- drivers/mmc/davinci_mmc.c | 4 +- drivers/mmc/ftsdc010_mci.c | 2 +- drivers/mmc/mxsmmc.c | 7 +- drivers/mmc/rockchip_dw_mmc.c | 7 +- drivers/mmc/rockchip_sdhci.c | 2 +- drivers/mtd/spi/sf-uclass.c | 2 +- drivers/mtd/spi/sf_probe.c | 6 +- drivers/pinctrl/nxp/pinctrl-mxs.c | 6 +- drivers/pinctrl/pinctrl-at91.c | 6 +- drivers/pinctrl/rockchip/pinctrl-rk3188.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rk3288.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rk3328.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rk3368.c | 2 +- drivers/power/pmic/rk8xx.c | 6 +- drivers/power/regulator/fixed.c | 4 +- drivers/ram/rockchip/dmc-rk3368.c | 2 +- drivers/ram/rockchip/sdram_rk3188.c | 2 +- drivers/ram/rockchip/sdram_rk3288.c | 2 +- drivers/ram/rockchip/sdram_rk3328.c | 2 +- drivers/ram/rockchip/sdram_rk3399.c | 2 +- drivers/serial/ns16550.c | 4 + drivers/serial/sandbox.c | 6 +- drivers/spi/mxs_spi.c | 8 +- drivers/spi/rk_spi.c | 10 +- drivers/spi/sandbox_spi.c | 4 +- drivers/tpm/tpm_tis_sandbox.c | 4 +- drivers/video/rockchip/rk3288_vop.c | 4 +- drivers/video/sandbox_sdl.c | 4 +- drivers/watchdog/at91sam9_wdt.c | 4 +- include/clk.h | 4 +- include/dm/device-internal.h | 2 +- include/dm/device.h | 22 ++ include/dm/platdata.h | 14 + test/dm/gpio.c | 2 +- test/dm/spi.c | 6 +- test/py/tests/test_bind.py | 54 ++-- tools/dtoc/dtb_platdata.py | 143 ++++++++- tools/dtoc/dtoc_test_invalid_driver.dts | 15 + tools/dtoc/dtoc_test_phandle_cd_gpios.dts | 42 +++ tools/dtoc/test_dtoc.py | 287 +++++++++++++----- 68 files changed, 672 insertions(+), 239 deletions(-) create mode 100644 arch/arm/dts/rk3288-veyron-u-boot.dtsi create mode 100644 tools/dtoc/dtoc_test_invalid_driver.dts create mode 100644 tools/dtoc/dtoc_test_phandle_cd_gpios.dts -- 2.20.1

4 45