December 2018 - U-Boot

[U-Boot] [PATCH] spi: soft_spi: Fix null ptr when probing soft_spi.
by Horatiu Vultur 29 Dec '18

29 Dec '18

When probing soft_spi the result of dev_get_parent_priv(dev) in probe function is null ptr because the spi is on the ahb bus which has per_child_auto_alloc_size set to 0. Therefore it would generate an Ooops messages when accessing spi_slave structure. The fix consist of delaying the read of dm_spi_slave_platdata until a child under the spi is probed, to be able to read SPI mode. Therefore implement .child_pre_probe in which updates soft_spi_platdata based on child dm_spi_slave_platdata. Signed-off-by: Horatiu Vultur <horatiu.vultur(a)microchip.com> --- drivers/spi/soft_spi.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c index b06883f..e28591b 100644 --- a/drivers/spi/soft_spi.c +++ b/drivers/spi/soft_spi.c @@ -210,18 +210,13 @@ static int soft_spi_ofdata_to_platdata(struct udevice *dev) static int soft_spi_probe(struct udevice *dev) { - struct spi_slave *slave = dev_get_parent_priv(dev); struct soft_spi_platdata *plat = dev->platdata; - int cs_flags, clk_flags; int ret; - cs_flags = (slave->mode & SPI_CS_HIGH) ? 0 : GPIOD_ACTIVE_LOW; - clk_flags = (slave->mode & SPI_CPOL) ? GPIOD_ACTIVE_LOW : 0; - if (gpio_request_by_name(dev, "cs-gpios", 0, &plat->cs, - GPIOD_IS_OUT | cs_flags) || + GPIOD_IS_OUT) || gpio_request_by_name(dev, "gpio-sck", 0, &plat->sclk, - GPIOD_IS_OUT | clk_flags)) + GPIOD_IS_OUT)) return -EINVAL; ret = gpio_request_by_name(dev, "gpio-mosi", 0, &plat->mosi, @@ -241,6 +236,20 @@ static int soft_spi_probe(struct udevice *dev) return 0; } +static int soft_spi_child_pre_probe(struct udevice *dev) +{ + struct udevice *bus = dev_get_parent(dev); + struct dm_spi_slave_platdata *slave = dev_get_parent_platdata(dev); + struct soft_spi_platdata *plat = bus->platdata; + + if (!(slave->mode & SPI_CS_HIGH)) + plat->cs.flags |= GPIOD_ACTIVE_LOW; + if (slave->mode & SPI_CPOL) + plat->sclk.flags |= GPIOD_ACTIVE_LOW; + + return 0; +} + static const struct udevice_id soft_spi_ids[] = { { .compatible = "spi-gpio" }, { } @@ -254,5 +263,6 @@ U_BOOT_DRIVER(soft_spi) = { .ofdata_to_platdata = soft_spi_ofdata_to_platdata, .platdata_auto_alloc_size = sizeof(struct soft_spi_platdata), .priv_auto_alloc_size = sizeof(struct soft_spi_priv), + .child_pre_probe = soft_spi_child_pre_probe, .probe = soft_spi_probe, }; -- 2.7.4

4 3

[U-Boot] [PATCH 1/3] video: Add information about using TrueType fonts
by Simon Glass 28 Dec '18

28 Dec '18

U-Boot supports using TrueType fonts on the console, which is useful for presenting a nice UI to users, e.g. for system recovery. Add information about how to compile this on ARM platforms, since this is not obvious. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- doc/README.video | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/doc/README.video b/doc/README.video index 09a26b17936..7a30512c96d 100644 --- a/doc/README.video +++ b/doc/README.video @@ -75,3 +75,23 @@ The sunxi U-Boot driver supports the following video-mode options: For example to always use the hdmi connector, even if no cable is inserted, using edid info when available and otherwise initalizing it at 1024x768@60Hz, use: "setenv video-mode sunxi:1024x768-24@60,monitor=dvi,hpd=0,edid=1". + + +TrueType fonts +-------------- + +U-Boot supports the use of antialiased TrueType fonts on some platforms. This +has been tested in x86, ARMv7 and sandbox. + +To enable this, select CONFIG_CONSOLE_TRUETYPE. You can choose between several +fonts, with CONSOLE_TRUETYPE_NIMBUS being the default. + +TrueType supports requires floating point at present. On ARMv7 platforms you +need to disable use of the private libgcc. You can do this by disabling +CONFIG_USE_PRIVATE_LIBGCC. See chromebook_jerry for an example. Note that this +increases U-Boot's size by about 70KB at present. + +On ARM you should also make sure your toolchain supports hardfp. This is +normally given in the name of your toolchain, e.g. arm-linux-gnueabihf (hf +means hardware floating point). You can also run gcc with -v to see if it has +this option. -- 2.20.1.415.g653613c723-goog

3 8

[U-Boot] [PATCH v2 1/2] dm: pci: MIGRATION: Add migration plan for PCI
by Simon Glass 28 Dec '18

28 Dec '18

Add a migration plan for PCI which is an important subsystem in U-Boot. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v2: None Makefile | 10 ++++++++++ doc/driver-model/MIGRATION.txt | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/Makefile b/Makefile index a8461dd611d..af086fa30d4 100644 --- a/Makefile +++ b/Makefile @@ -946,6 +946,16 @@ ifeq ($(CONFIG_LIBATA)$(CONFIG_DM_SCSI)$(CONFIG_MVSATA_IDE),y) @echo >&2 "See doc/driver-model/MIGRATION.txt for more info." @echo >&2 "====================================================" endif +ifeq ($(CONFIG_PCI),y) +ifneq ($(CONFIG_DM_PCI),y) + @echo >&2 "===================== WARNING ======================" + @echo >&2 "This board does not use CONFIG_DM_PCI Please update" + @echo >&2 "the board to use CONFIG_DM_PCI before the v2019.07 release." + @echo >&2 "Failure to update by the deadline may result in board removal." + @echo >&2 "See doc/driver-model/MIGRATION.txt for more info." + @echo >&2 "====================================================" +endif +endif ifeq ($(CONFIG_OF_EMBED),y) @echo >&2 "===================== WARNING ======================" @echo >&2 "CONFIG_OF_EMBED is enabled. This option should only" diff --git a/doc/driver-model/MIGRATION.txt b/doc/driver-model/MIGRATION.txt index dce4aa3e1dc..03a2cae7976 100644 --- a/doc/driver-model/MIGRATION.txt +++ b/doc/driver-model/MIGRATION.txt @@ -82,3 +82,13 @@ Partially converted: -- Jagan Teki <jagan(a)openedev.com> 03/14/2018 + + +CONFIG_DM_PCI +------------- +Deadline: 2019.07 + +The PCI subsystem has supported driver model since mid 2015. Maintainers should +submit patches switching over to using CONFIG_DM_PCI and other base driver +model options in time for inclusion in the 2019.04 rerelease. + -- 2.20.1.415.g653613c723-goog

1 2

[U-Boot] [PATCH 00/21] Various patches for verified boot support
by Simon Glass 28 Dec '18

28 Dec '18

This is (for now) the last series to enable Chromium OS verified boot in U-Boot. It includes: - Sandbox valgrind spport - Minor TPM enhancements and fixes - Resurection of inttypes.h - Args checking for log functions - Sandbox fix for time jitter - Various other minir things Simon Glass (21): sandbox: Fix up the debug message for the image filename sandbox: Check the filename in jump_to_image_no_args() sandbox: physmem: Use mapping to support sandbox sandbox: net: Correct name copy in eth_raw_bus_post_bind() sandbox: sysreset: Update to support power-on reset sandbox: Zero the ram buffer on startup sandbox: Use 'extras' to specify 'head' files sandbox: Allow running from valgrind tpm: Remove use of build-time TPM versions tpm: Export tpm_clear_and_reenable() tpm: Add non-volatile index attributes needed for v2 tpm: Fix a logging warning in unpack_byte_string() cros: Correct a printf() string and comment cros_ec: Adjust to use v1 vboot context only input: i8042: Use remove() instead of exported functions video: backlight: Fix log message in enable_sequence() time: Update mdelay() to delay in one large chunk log: Check printf() arguments Add UINT32_MAX and UINT64_MAX Add inttypes.h RFC: Makefile: Build U-Boot as a library Makefile | 9 +- arch/sandbox/Makefile | 4 +- arch/sandbox/config.mk | 7 +- arch/sandbox/cpu/Makefile | 5 +- arch/sandbox/cpu/os.c | 39 ++-- arch/sandbox/cpu/spl.c | 8 +- arch/sandbox/cpu/start.c | 7 + arch/sandbox/include/asm/state.h | 1 + drivers/input/i8042.c | 35 ++-- drivers/misc/cros_ec.c | 4 +- drivers/misc/cros_ec_sandbox.c | 10 +- drivers/net/sandbox-raw-bus.c | 2 +- drivers/sysreset/sysreset_sandbox.c | 8 +- drivers/video/pwm_backlight.c | 2 +- include/i8042.h | 15 -- include/inttypes.h | 271 ++++++++++++++++++++++++++++ include/linux/delay.h | 3 +- include/linux/kernel.h | 4 + include/log.h | 3 +- include/tpm-common.h | 19 ++ include/tpm-v2.h | 33 ++++ lib/physmem.c | 4 +- lib/tpm-common.c | 9 +- lib/tpm-v1.c | 22 +-- scripts/Makefile.spl | 17 +- test/dm/sysreset.c | 4 +- 26 files changed, 462 insertions(+), 83 deletions(-) create mode 100644 include/inttypes.h -- 2.20.0.rc0.387.gc7a69e6b6c-goog

6 45

[U-Boot] [PATCH] sandbox: add memset_io(..), memcpy_fromio(..) and memcpy_toio(..)
by Christian Gmeiner 28 Dec '18

28 Dec '18

From: Christian GMEINER <christian.GMEINER(a)bachmann.info> These functions could be used by drivers. Signed-off-by: Christian GMEINER <christian.GMEINER(a)bachmann.info> --- arch/sandbox/include/asm/io.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/sandbox/include/asm/io.h b/arch/sandbox/include/asm/io.h index 81b7750628..2a350a826c 100644 --- a/arch/sandbox/include/asm/io.h +++ b/arch/sandbox/include/asm/io.h @@ -173,6 +173,18 @@ static inline void _outsw(volatile u16 *port, const void *buf, int ns) { } +static inline void memset_io(volatile void *addr, unsigned char val, int count) +{ +} + +static inline void memcpy_fromio(void *dst, const volatile void *src, int count) +{ +} + +static inline void memcpy_toio(volatile void *dst, const void *src, int count) +{ +} + #define insw(port, buf, ns) _insw((u16 *)port, buf, ns) #define outsw(port, buf, ns) _outsw((u16 *)port, buf, ns) -- 2.19.2

3 2

[U-Boot] [PATCH 1/3] buildman: Drop comment about Ctrl-C problem
by Simon Glass 28 Dec '18

28 Dec '18

This bug is now fixed, so drop this comment. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- tools/buildman/README | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/buildman/README b/tools/buildman/README index 5a709c6ff9e..d688b7cf006 100644 --- a/tools/buildman/README +++ b/tools/buildman/README @@ -1169,8 +1169,6 @@ access to log files. Also it would be nice if buildman could 'hunt' for problems, perhaps by building a few boards for each arch, or checking commits for changed files and building only boards which use those files. -A specific problem to fix is that Ctrl-C does not exit buildman cleanly when -multiple builder threads are active. Credits ======= -- 2.20.0.rc1.387.gf8505762e3-goog

3 7

[U-Boot] [PATCH] dm: Tidy up 'dm tree' output when there are many devices
by Simon Glass 28 Dec '18

28 Dec '18

At present the 'Index' column assumes there is only one digit. But on some devices (e.g. snow) there are a lot of regulators and GPIO banks. Adjust the output to allow for two digits without messing up the display. Also capatalise the heading to match. Fixes: 5197dafc42 (dm: core: Widen the dump tree to show more of the driver's name.) Signed-off-by: Simon Glass <sjg(a)chromium.org> --- drivers/core/dump.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/core/dump.c b/drivers/core/dump.c index 04217cbde87..8fbfd93fb5e 100644 --- a/drivers/core/dump.c +++ b/drivers/core/dump.c @@ -16,7 +16,7 @@ static void show_devices(struct udevice *dev, int depth, int last_flag) struct udevice *child; /* print the first 20 characters to not break the tree-format. */ - printf(" %-10.10s %d [ %c ] %-20.20s ", dev->uclass->uc_drv->name, + printf(" %-10.10s %2d [ %c ] %-20.20s ", dev->uclass->uc_drv->name, dev_get_uclass_index(dev, NULL), dev->flags & DM_FLAG_ACTIVATED ? '+' : ' ', dev->driver->name); @@ -49,7 +49,7 @@ void dm_dump_all(void) root = dm_root(); if (root) { - printf(" Class index Probed Driver Name\n"); + printf(" Class Index Probed Driver Name\n"); printf("-----------------------------------------------------------\n"); show_devices(root, -1, 0); } -- 2.20.0.rc1.387.gf8505762e3-goog

3 2

[U-Boot] [PATCH v2] common: fdt_support: print hexadecimal numbers in debug
by Sekhar Nori 28 Dec '18

28 Dec '18

We usually deal with hexadecimal addresses and sizes in device-tree. Its much easier if debug logs print hexadecimal values too. Reviewed-by: Simon Glass <sjg(a)chromium.org> Signed-off-by: Sekhar Nori <nsekhar(a)ti.com> --- common/fdt_support.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/fdt_support.c b/common/fdt_support.c index 3440e42a257b..42583e3ed8c8 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -1025,7 +1025,7 @@ static u64 of_bus_default_map(fdt32_t *addr, const fdt32_t *range, s = fdt_read_number(range + na + pna, ns); da = fdt_read_number(addr, na); - debug("OF: default map, cp=%llu, s=%llu, da=%llu\n", cp, s, da); + debug("OF: default map, cp=%llx, s=%llx, da=%llx\n", cp, s, da); if (da < cp || da >= (cp + s)) return OF_BAD_ADDR; @@ -1080,7 +1080,7 @@ static u64 of_bus_isa_map(fdt32_t *addr, const fdt32_t *range, s = fdt_read_number(range + na + pna, ns); da = fdt_read_number(addr + 1, na - 1); - debug("OF: ISA map, cp=%llu, s=%llu, da=%llu\n", cp, s, da); + debug("OF: ISA map, cp=%llx, s=%llx, da=%llx\n", cp, s, da); if (da < cp || da >= (cp + s)) return OF_BAD_ADDR; -- 2.16.2

4 3

[U-Boot] [PATCH v2] imx8m: clock: Fix oscillator values
by Fabio Estevam 28 Dec '18

28 Dec '18

OSC_27M_CLK should return 27MHz and OSC_32K_CLK should return 32768Hz to reflect the reality. This also keeps the values in sync with the Linux clock tree. Signed-off-by: Fabio Estevam <festevam(a)gmail.com> --- Changes since v1: - Fixed typo in the Subject line (oscillator) arch/arm/mach-imx/imx8m/clock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/imx8m/clock.c b/arch/arm/mach-imx/imx8m/clock.c index 3766d988ba..289b9417aa 100644 --- a/arch/arm/mach-imx/imx8m/clock.c +++ b/arch/arm/mach-imx/imx8m/clock.c @@ -250,9 +250,9 @@ static u32 get_root_src_clk(enum clk_root_src root_src) case OSC_25M_CLK: return 25000000; case OSC_27M_CLK: - return 25000000; + return 27000000; case OSC_32K_CLK: - return 32000; + return 32768; case ARM_PLL_CLK: return decode_frac_pll(root_src); case SYSTEM_PLL1_800M_CLK: -- 2.17.1

1 0

[U-Boot] [PATCH] imx8m: clock: Fix oscilattor values
by Fabio Estevam 28 Dec '18

28 Dec '18

OSC_27M_CLK should return 27MHz and OSC_32K_CLK should return 32768Hz to reflect the reality. This also keeps the values in sync with the Linux clock tree. Signed-off-by: Fabio Estevam <festevam(a)gmail.com> --- arch/arm/mach-imx/imx8m/clock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/imx8m/clock.c b/arch/arm/mach-imx/imx8m/clock.c index 3766d988ba..289b9417aa 100644 --- a/arch/arm/mach-imx/imx8m/clock.c +++ b/arch/arm/mach-imx/imx8m/clock.c @@ -250,9 +250,9 @@ static u32 get_root_src_clk(enum clk_root_src root_src) case OSC_25M_CLK: return 25000000; case OSC_27M_CLK: - return 25000000; + return 27000000; case OSC_32K_CLK: - return 32000; + return 32768; case ARM_PLL_CLK: return decode_frac_pll(root_src); case SYSTEM_PLL1_800M_CLK: -- 2.17.1

1 0