April 2019 - U-Boot

[U-Boot] [PATCH 0/4] fpga: collected patches
by Alexander Dahl 16 Apr '19

16 Apr '19

Hello everyone, while digging in board support code for a board featuring an Altera Cyclone IV FPGA, I fixed some minor issues annoying me. Hope you find that useful. You may drop any patch you don't like, or just send comments, so I can improve it. Greets Alex Alexander Dahl (4): fpga: altera: Add some more device sizes fpga: altera: cyclon2: Fix indentation fpga: altera: cyclon2: Check function pointer before calling cmd: fpga: Return values of type command_ret_t only cmd/fpga.c | 29 +++++++++++++++++------------ drivers/fpga/cyclon2.c | 41 +++++++++++++++++++++++------------------ include/ACEX1K.h | 10 ++++++++++ 3 files changed, 50 insertions(+), 30 deletions(-) -- 2.11.0

2 6

Re: [U-Boot] [PATCH v2 1/2] Fix compilation error if CONFIG_USB is disabled
by Matthias Brugger 16 Apr '19

16 Apr '19

On 11/04/2019 07:23, akaher wrote: > There are compilation errors, if CONFIG_CMD_USB is enabled > and CONFIG_USB is disabled. > > CONFIG_CMD_USB depends upon CONFIG_USB, so CONFIG_CMD_USB > should not be enabled if CONFIG_USB is disabled. > > Signed-off-by: Ajay Kaher <akaher(a)vmware.com> > Reviewed-by: Matthias Brugger <mbrugger(a)suse.com> > --- > cmd/Kconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/cmd/Kconfig b/cmd/Kconfig > index 4bcc5c4557..96e665a1c9 100644 > --- a/cmd/Kconfig > +++ b/cmd/Kconfig > @@ -1059,6 +1059,7 @@ config CMD_UNIVERSE > config CMD_USB > bool "usb" > select HAVE_BLOCK_DEVICE > + depends on USB > help > USB support. > >

1 0

[U-Boot] Board specific files
by Linder Pascal 16 Apr '19

16 Apr '19

Hello everyone, I am new to U-Boot and I am trying to understand what I need to code for using my own board with the bootloader. The device tree files I have already found under ./arch/arm/dts/. Can I just add my device tree under this directory? Also, what is the difference between the configuration files under ./configs/ and ./include/configs/? Do I need to add a file in both of the named directories? If someone knows a well documented guide to add a new board to the mainline, I would be very grateful. Sincerely, Pascal Linder Student Telekommunikation Netzwerke und Sicherheit Klasse T-3b

3 2

[U-Boot] Booting from network
by U.Mutlu 16 Apr '19

16 Apr '19

I'm booting over the network (GbE) from a tftp server. It works, but is IMHO very slow. Is there a faster method for booting over the net? boot.cmd: dhcp 0x49000000 tftpboot 0x46000000 192.168.1.201:uImage tftpboot 0x49000000 192.168.1.201:u-boot.dtb setenv bootargs console=ttyS0,115200 root=/dev/sda1 rootwait panic=10 rootfstype=ext4 rw ${extra} bootm 0x46000000 - 0x49000000 Btw, in the above script, can I safely replace the addresses with ${kloadaddr} and ${fdtaddr} ? I wonder where these variables get set or obtained from. (I saw these variables somewhere on the net, but there was no initialisation, so I assumed it must be something internal/intrinsic, right?) And: though my board can output via HDMI, I've no monitor attached, and a serial cable (TTY to USB) I don't have at the moment. Is there another method to get the u-boot output (or log) to be sent to a remote host/log? Thx -- U.Mutlu

4 4

[U-Boot] [PATCH] clk: sunxi: r40: Fix GMAC reset reg offset
by Jagan Teki 16 Apr '19

16 Apr '19

GMAC reset reg offset added by below commit seems to assume it as EMAC but R40 indeed using GMAC. "clk: sunxi: Implement EMAC, GMAC clocks, resets" (sha1: 68620c9698f109c1f001f80d282138a5c67cabef) So, fix by updating the reg offset for RST_BUS_GMAC. Signed-off-by: Jagan Teki <jagan(a)amarulasolutions.com> --- drivers/clk/sunxi/clk_r40.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/clk/sunxi/clk_r40.c b/drivers/clk/sunxi/clk_r40.c index 30beac98bb..44abc4f536 100644 --- a/drivers/clk/sunxi/clk_r40.c +++ b/drivers/clk/sunxi/clk_r40.c @@ -62,7 +62,6 @@ static struct ccu_reset r40_resets[] = { [RST_BUS_MMC1] = RESET(0x2c0, BIT(9)), [RST_BUS_MMC2] = RESET(0x2c0, BIT(10)), [RST_BUS_MMC3] = RESET(0x2c0, BIT(11)), - [RST_BUS_GMAC] = RESET(0x2c0, BIT(17)), [RST_BUS_SPI0] = RESET(0x2c0, BIT(20)), [RST_BUS_SPI1] = RESET(0x2c0, BIT(21)), [RST_BUS_SPI2] = RESET(0x2c0, BIT(22)), @@ -75,6 +74,8 @@ static struct ccu_reset r40_resets[] = { [RST_BUS_OHCI1] = RESET(0x2c0, BIT(30)), [RST_BUS_OHCI2] = RESET(0x2c0, BIT(31)), + [RST_BUS_GMAC] = RESET(0x2c4, BIT(17)), + [RST_BUS_UART0] = RESET(0x2d8, BIT(16)), [RST_BUS_UART1] = RESET(0x2d8, BIT(17)), [RST_BUS_UART2] = RESET(0x2d8, BIT(18)), -- 2.18.0.321.gffc6fa0e3

1 0

[U-Boot] [PATCH] arm64: zynqmp: fix preprocessor check for SPL_ZYNQMP_TWO_SDHCI
by Luca Ceresoli 16 Apr '19

16 Apr '19

A missing CONFIG_ prefix while checking for this Kconfig variable makes the check always fail. Fix it. While there also switch from the '#if defined' form to the '#ifdef' form as the other checks in this function. Fixes: 35e2b92344b1 ("arm64: zynqmp: Fix logic around CONFIG_ZYNQ_SDHCI") Signed-off-by: Luca Ceresoli <luca(a)lucaceresoli.net> --- arch/arm/mach-zynqmp/spl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c index f6f5414201b5..b7d2ecdf7257 100644 --- a/arch/arm/mach-zynqmp/spl.c +++ b/arch/arm/mach-zynqmp/spl.c @@ -85,7 +85,7 @@ u32 spl_boot_device(void) case SD_MODE1: case SD1_LSHFT_MODE: /* not working on silicon v1 */ /* if both controllers enabled, then these two are the second controller */ -#if defined(SPL_ZYNQMP_TWO_SDHCI) +#ifdef CONFIG_SPL_ZYNQMP_TWO_SDHCI return BOOT_DEVICE_MMC2; /* else, fall through, the one SDHCI controller that is enabled is number 1 */ #endif -- 2.21.0

2 1

[U-Boot] [PATCH 1/3] dm: core: Add dev_read_bytes()
by Thierry Reding 16 Apr '19

16 Apr '19

From: Thierry Reding <treding(a)nvidia.com> This function can be used to read a binary property into a buffer. One example where this is needed is to read a MAC address from device tree. Signed-off-by: Thierry Reding <treding(a)nvidia.com> --- drivers/core/of_access.c | 21 +++++++++++++++++++++ drivers/core/ofnode.c | 13 +++++++++++++ drivers/core/read.c | 6 ++++++ include/dm/of_access.h | 15 +++++++++++++++ include/dm/ofnode.h | 11 +++++++++++ include/dm/read.h | 17 +++++++++++++++++ 6 files changed, 83 insertions(+) diff --git a/drivers/core/of_access.c b/drivers/core/of_access.c index 945b81448cce..d110d171a3ea 100644 --- a/drivers/core/of_access.c +++ b/drivers/core/of_access.c @@ -446,6 +446,27 @@ static void *of_find_property_value_of_size(const struct device_node *np, return prop->value; } +int of_read_bytes(const struct device_node *np, const char *propname, + u8 *buffer, int size) +{ + const fdt32_t *value; + + debug("%s: %s: ", __func__, propname); + + if (!np) + return -EINVAL; + + value = of_find_property_value_of_size(np, propname, size); + if (IS_ERR(value)) { + debug("(not found)\n"); + return PTR_ERR(value); + } + + memcpy(buffer, value, size); + + return 0; +} + int of_read_u32(const struct device_node *np, const char *propname, u32 *outp) { const __be32 *val; diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c index 785f5c3acf7a..21b24e5aa00e 100644 --- a/drivers/core/ofnode.c +++ b/drivers/core/ofnode.c @@ -15,6 +15,19 @@ #include <linux/err.h> #include <linux/ioport.h> +int ofnode_read_bytes(ofnode node, const char *propname, u8 *buffer, int size) +{ + assert(ofnode_valid(node)); + debug("%s: %s: ", __func__, propname); + + if (ofnode_is_np(node)) + return of_read_bytes(ofnode_to_np(node), propname, buffer, + size); + + return fdtdec_get_byte_array(gd->fdt_blob, ofnode_to_offset(node), + propname, buffer, size); +} + int ofnode_read_u32(ofnode node, const char *propname, u32 *outp) { assert(ofnode_valid(node)); diff --git a/drivers/core/read.c b/drivers/core/read.c index 6bda077a34b9..9919ec19d4d8 100644 --- a/drivers/core/read.c +++ b/drivers/core/read.c @@ -11,6 +11,12 @@ #include <mapmem.h> #include <dm/of_access.h> +int dev_read_bytes(struct udevice *dev, const char *propname, u8 *buffer, + int size) +{ + return ofnode_read_bytes(dev_ofnode(dev), propname, buffer, size); +} + int dev_read_u32(struct udevice *dev, const char *propname, u32 *outp) { return ofnode_read_u32(dev_ofnode(dev), propname, outp); diff --git a/include/dm/of_access.h b/include/dm/of_access.h index 13fedb7cf5e6..fc6a86959b23 100644 --- a/include/dm/of_access.h +++ b/include/dm/of_access.h @@ -218,6 +218,21 @@ struct device_node *of_find_node_by_prop_value(struct device_node *from, */ struct device_node *of_find_node_by_phandle(phandle handle); +/** + * of_read_bytes() - Find and read an array of bytes from a property + * + * Search for a property in a device node and read an array of bytes from it. + * + * @np: device node from which the property is to be read + * @propname: name of the property to be read + * @buffer: buffer to read the property value into + * @size: number of bytes to read + * + * @return 0 on success, or a negative error-code on failure. + */ +int of_read_bytes(const struct device_node *np, const char *propname, + u8 *buffer, int size); + /** * of_read_u32() - Find and read a 32-bit integer from a property * diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h index d206ee2caab7..5158296dfd96 100644 --- a/include/dm/ofnode.h +++ b/include/dm/ofnode.h @@ -192,6 +192,17 @@ static inline ofnode ofnode_null(void) return node; } +/** + * ofnode_read_bytes() - Read an array of bytes from a property + * + * @node: valid node reference to read property from + * @propname: name of the property to read from + * @buffer: buffer to read the value into + * @size: size of @buffer + * @return 0 on success, or a negative error code on failure + */ +int ofnode_read_bytes(ofnode node, const char *propname, u8 *buffer, int size); + /** * ofnode_read_u32() - Read a 32-bit integer from a property * diff --git a/include/dm/read.h b/include/dm/read.h index 60b727cbd821..cb9776b39721 100644 --- a/include/dm/read.h +++ b/include/dm/read.h @@ -44,6 +44,18 @@ static inline bool dev_of_valid(struct udevice *dev) } #ifndef CONFIG_DM_DEV_READ_INLINE +/** + * dev_read_bytes() - read an array of bytes from a device's DT property + * + * @dev: device to read DT property from + * @propname: name of the property to read from + * @buffer: buffer to read the value into + * @size: size of @buffer + * @return 0 on success, or a negative error code on failure + */ +int dev_read_bytes(struct udevice *dev, const char *propname, u8 *buffer, + int size); + /** * dev_read_u32() - read a 32-bit integer from a device's DT property * @@ -522,6 +534,11 @@ u64 dev_translate_address(struct udevice *dev, const fdt32_t *in_addr); int dev_read_alias_highest_id(const char *stem); #else /* CONFIG_DM_DEV_READ_INLINE is enabled */ +static inline int dev_read_bytes(struct udevice *dev, const char *propname, + u8 *buffer, int size) +{ + return ofnode_read_bytes(dev_ofnode(dev), propname, buffer, size); +} static inline int dev_read_u32(struct udevice *dev, const char *propname, u32 *outp) -- 2.21.0

2 7

[U-Boot] rk3288 SPL size
by Wadim Egorov 16 Apr '19

16 Apr '19

Hi, it seems the new common rockchip pinctrl driver does not really fit into our phycore-rk3288 SPL setup. It works for every other rk3288 based board because they don't need special power configurations at the SPL stage. So my question is: is there any work going on to reduce the SPL size even more? Besides that, I think I can remove the power stuff at the SPL stage from our board. The SOM was redesigned and is equipped with an STM8 connected to the RK818. The required setup we did before in the SPL is now done by the ST controller. I know there are only a few SOMs without the STM8 out in the wild. So if I remove it it will affect only a few people who probably already have both boards. Regards, Wadim

4 4

[U-Boot] [PATCH] arm: socfpga: Fix mailbox command length checking
by Ley Foon Tan 16 Apr '19

16 Apr '19

A mailbox command including header + arguments. But, "len" only including length of arguments, it missed the length of header in checking. Includes length of header (1) when checking the space size. Signed-off-by: Ley Foon Tan <ley.foon.tan(a)intel.com> Signed-off-by: Chee Hong Ang <chee.hong.ang(a)intel.com> --- arch/arm/mach-socfpga/mailbox_s10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-socfpga/mailbox_s10.c b/arch/arm/mach-socfpga/mailbox_s10.c index 3c33223936..8363c93e90 100644 --- a/arch/arm/mach-socfpga/mailbox_s10.c +++ b/arch/arm/mach-socfpga/mailbox_s10.c @@ -59,7 +59,7 @@ static __always_inline int mbox_fill_cmd_circular_buff(u32 header, u32 len, */ if (((cin + 1) % MBOX_CMD_BUFFER_SIZE) == cout || ((MBOX_CMD_BUFFER_SIZE - cin + cout - 1) % - MBOX_CMD_BUFFER_SIZE) < len) + MBOX_CMD_BUFFER_SIZE) < (len + 1)) return -ENOMEM; /* write header to circular buffer */ -- 2.19.0

2 3

[U-Boot] [RFC PATCH] common: fdt_support: Remove fdt_add_mem_rsv in fdt_shrink_to_minimum
by Keerthy 16 Apr '19

16 Apr '19

With introduction of commit: a156c47e39ad: tftp: prevent overwriting reserved memory tftp with loadaddr is failing for Images of the size bigger than SPL. The issue is that SPL image is located at bootaddr and dtb is allocated at bootaddr + spl_size. The region where dtb is present is marked reserved. So when the tftp tries to load the Image it tries to find a location from loadaddr to the first reserved memory region which is the dtb base address. The max_size obtained is pretty less and hence tftp fails with the below error: TFTP error: trying to overwrite reserved memory... Signed-off-by: Keerthy <j-keerthy(a)ti.com> --- I am sure there are better solutions so just wanted to know if there is one. common/fdt_support.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/common/fdt_support.c b/common/fdt_support.c index 42583e3ed8..2bb101e56e 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -633,11 +633,6 @@ int fdt_shrink_to_minimum(void *blob, uint extrasize) /* Change the fdt header to reflect the correct size */ fdt_set_totalsize(blob, actualsize); - /* Add the new reservation */ - ret = fdt_add_mem_rsv(blob, map_to_sysmem(blob), actualsize); - if (ret < 0) - return ret; - return actualsize; } -- 2.17.1

4 4