September 2015 - U-Boot

[U-Boot] [PATCH v5 07/16] dts: zc770-xm010: Enable zynq qspi controller node
by Jagan Teki 04 Sep '15

04 Sep '15

Enabled zynq qspi controller node for zc770-xm010 board. => sf probe 0 -- bus1 for selecting qspi controller => sf probe 1 -- bus0 for selecting spi controller Signed-off-by: Jagan Teki <jteki(a)openedev.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Siva Durga Prasad Paladugu <sivadur(a)xilinx.com> Cc: Michal Simek <michal.simek(a)xilinx.com> --- Changes for v2. v3, v4: - none Changes for v5: - Make qspi as spi0 arch/arm/dts/zynq-zc770-xm010.dts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/dts/zynq-zc770-xm010.dts b/arch/arm/dts/zynq-zc770-xm010.dts index 680f24c..cf56ac8 100644 --- a/arch/arm/dts/zynq-zc770-xm010.dts +++ b/arch/arm/dts/zynq-zc770-xm010.dts @@ -16,7 +16,8 @@ ethernet0 = &gem0; i2c0 = &i2c0; serial0 = &uart1; - spi0 = &spi1; + spi0 = &qspi; + spi1 = &spi1; }; chosen { @@ -53,6 +54,10 @@ }; }; +&qspi { + status = "okay"; +}; + &can0 { status = "okay"; }; -- 1.9.1

2 5

[U-Boot] [PATCH 1/1] spi: tegra20: Add support for mode selection
by Mirza Krak 04 Sep '15

04 Sep '15

From: Mirza Krak <mirza.krak(a)hostmobility.com> Respect the mode passed in claim_bus call. Signed-off-by: Mirza Krak <mirza.krak(a)hostmobility.com> --- drivers/spi/tegra20_slink.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/spi/tegra20_slink.c b/drivers/spi/tegra20_slink.c index f6fb89b393f0..271e2adbb2e1 100644 --- a/drivers/spi/tegra20_slink.c +++ b/drivers/spi/tegra20_slink.c @@ -36,6 +36,11 @@ DECLARE_GLOBAL_DATA_PTR; #define SLINK_CMD_ENB (1 << 31) #define SLINK_CMD_GO (1 << 30) #define SLINK_CMD_M_S (1 << 28) +#define SLINK_CMD_IDLE_SCLK_DRIVE_LOW (0 << 24) +#define SLINK_CMD_IDLE_SCLK_DRIVE_HIGH (1 << 24) +#define SLINK_CMD_IDLE_SCLK_PULL_LOW (2 << 24) +#define SLINK_CMD_IDLE_SCLK_PULL_HIGH (3 << 24) +#define SLINK_CMD_IDLE_SCLK_MASK (3 << 24) #define SLINK_CMD_CK_SDA (1 << 21) #define SLINK_CMD_CS_POL (1 << 13) #define SLINK_CMD_CS_VAL (1 << 12) @@ -146,6 +151,7 @@ static int tegra30_spi_claim_bus(struct udevice *dev) struct udevice *bus = dev->parent; struct tegra30_spi_priv *priv = dev_get_priv(bus); struct spi_regs *regs = priv->regs; + unsigned int mode = priv->mode; u32 reg; /* Change SPI clock to correct frequency, PLLP_OUT0 source */ @@ -161,6 +167,17 @@ static int tegra30_spi_claim_bus(struct udevice *dev) /* Set master mode and sw controlled CS */ reg = readl(&regs->command); reg |= SLINK_CMD_M_S | SLINK_CMD_CS_SOFT; + + /* Set CPOL and CPHA */ + reg &= ~SLINK_CMD_IDLE_SCLK_MASK & ~SLINK_CMD_CK_SDA; + if (mode & SPI_CPHA) + reg |= SLINK_CMD_CK_SDA; + + if (mode & SPI_CPOL) + reg |= SLINK_CMD_IDLE_SCLK_DRIVE_HIGH; + else + reg |= SLINK_CMD_IDLE_SCLK_DRIVE_LOW; + writel(reg, &regs->command); debug("%s: COMMAND = %08x\n", __func__, readl(&regs->command)); -- 2.1.0

2 4

[U-Boot] [PATCH] arm: socfpga: Do not call board_init_r() from board_init_f()
by Marek Vasut 04 Sep '15

04 Sep '15

Instead of calling board_init_r() directly from board_init_f(), just return from board_init_f(). This will make the code continue executing in crt0.S _main(), from which the board_init_r() is called. This patch aligns the SoCFPGA SPL with the correct SPL design as well as reduces the stack utilisation slightly. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Dinh Nguyen <dinguyen(a)opensource.altera.com> --- arch/arm/mach-socfpga/spl.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/mach-socfpga/spl.c b/arch/arm/mach-socfpga/spl.c index 13ec24b..775a827 100644 --- a/arch/arm/mach-socfpga/spl.c +++ b/arch/arm/mach-socfpga/spl.c @@ -180,6 +180,4 @@ void board_init_f(ulong dummy) /* Configure simple malloc base pointer into RAM. */ gd->malloc_base = CONFIG_SYS_TEXT_BASE + (1024 * 1024); - - board_init_r(NULL, 0); } -- 2.1.4

1 1

[U-Boot] [PATCH] dts: Add a comment about CONFIG_OF_EMBED being for local use
by Simon Glass 04 Sep '15

04 Sep '15

This comment from README.fdt-control did not end up in the Kconfig, which is what most people will see. Add it with a few tweaks. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- dts/Kconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dts/Kconfig b/dts/Kconfig index a04bb96..a66b9e3 100644 --- a/dts/Kconfig +++ b/dts/Kconfig @@ -37,7 +37,9 @@ config OF_EMBED bool "Embedded DTB for DT control" help If this option is enabled, the device tree will be picked up and - built into the U-Boot image. + built into the U-Boot image. This is suitable for local debugging + and development only and is not recommended for production devices. + Boards in the mainline U-Boot tree should not use it. config OF_HOSTFILE bool "Host filed DTB for DT control" -- 2.5.0.457.gab17608

2 2

[U-Boot] [PATCH 1/7] kwbimage: Align payload size to 4 bytes
by Stefan Roese 04 Sep '15

04 Sep '15

The MVEBU BootROM does not allow non word aligned payloads. Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Luka Perkov <luka.perkov(a)sartura.hr> --- tools/kwbimage.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/kwbimage.c b/tools/kwbimage.c index 3fa90d3..886682d 100644 --- a/tools/kwbimage.c +++ b/tools/kwbimage.c @@ -775,6 +775,9 @@ static void kwbimage_set_header(void *ptr, struct stat *sbuf, int ifd, exit(EXIT_FAILURE); } + /* The MVEBU BootROM does not allow non word aligned payloads */ + sbuf->st_size = ALIGN_SUP(sbuf->st_size, 4); + version = image_get_version(); switch (version) { /* -- 2.5.1

3 13

[U-Boot] [RFC] Adding support for NI Ettus Research USRP E3XX series
by Moritz Fischer 04 Sep '15

04 Sep '15

Hi all, this patch adds basic support for NI Ettus Research E3XX series boards. I tagged this RFC because I'm not sure if the boards/xilinx/zynq subdirectory is the correct place for this, as I'll have some follow up patches that read the devices EEPROM for ethernet address etc. Would putting it under boards/ni/zynq be the correct way of integrating it? While technically a Zynq device there are a lot of custom modifications, that I wouldn't like to force into board/xilinx/zynq/board.c in my follow up patches. However duplicating the entire board.c doesn't seem like a good idea neither. Any suggestions? For future reference do you want me to split out dts etc in a separate patch? Thanks for your feedback & suggestions, Moritz Moritz Fischer (1): zynq: Add support for E3xx board. arch/arm/dts/Makefile | 3 +- arch/arm/dts/zynq-e3xx.dts | 35 + arch/arm/mach-zynq/Kconfig | 4 + board/xilinx/zynq/Makefile | 2 + board/xilinx/zynq/e3xx_hw_platform/ps7_init_gpl.c | 13446 ++++++++++++++++++++ board/xilinx/zynq/e3xx_hw_platform/ps7_init_gpl.h | 130 + configs/zynq_e3xx_defconfig | 12 + include/configs/zynq_e3xx.h | 29 + 8 files changed, 13660 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/zynq-e3xx.dts create mode 100644 board/xilinx/zynq/e3xx_hw_platform/ps7_init_gpl.c create mode 100644 board/xilinx/zynq/e3xx_hw_platform/ps7_init_gpl.h create mode 100644 configs/zynq_e3xx_defconfig create mode 100644 include/configs/zynq_e3xx.h -- 2.5.1

4 5

[U-Boot] [PATCH 2/2] net: parse DHCP options from overloaded file/sname fields
by Stefan Brüns 03 Sep '15

03 Sep '15

Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- net/bootp.c | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/net/bootp.c b/net/bootp.c index 0575a1e..c6b0847 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -768,14 +768,12 @@ void bootp_request(void) } #if defined(CONFIG_CMD_DHCP) -static void dhcp_process_options(uchar *popt, struct bootp_hdr *bp) +static void dhcp_process_options(uchar *popt, uchar *end) { - uchar *end = popt + BOOTP_HDR_SIZE; int oplen, size; #if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_TIMEOFFSET) int *to_ptr; #endif - dhcp_option_overload = 0; while (popt < end && *popt != 0xff) { oplen = *(popt + 1); @@ -859,6 +857,35 @@ static void dhcp_process_options(uchar *popt, struct bootp_hdr *bp) } } +static void dhcp_packet_process_options(struct bootp_hdr *bp) +{ + uchar *popt = (uchar *)&bp->bp_vend[4]; + uchar *end = popt + BOOTP_HDR_SIZE; + + if (net_read_u32((u32 *)&bp->bp_vend[0]) != htonl(BOOTP_VENDOR_MAGIC)) + return; + + dhcp_option_overload = 0; + + /* + * The 'options' field MUST be interpreted first, 'file' next, + * 'sname' last. + */ + dhcp_process_options(popt, end); + + if (dhcp_option_overload & OVERLOAD_FILE) { + popt = (uchar *)bp->bp_file; + end = popt + sizeof(bp->bp_file); + dhcp_process_options(popt, end); + } + + if (dhcp_option_overload & OVERLOAD_SNAME) { + popt = (uchar *)bp->bp_sname; + end = popt + sizeof(bp->bp_sname); + dhcp_process_options(popt, end); + } +} + static int dhcp_message_type(unsigned char *popt) { if (net_read_u32((u32 *)popt) != htonl(BOOTP_VENDOR_MAGIC)) @@ -976,14 +1003,11 @@ static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip, CONFIG_SYS_BOOTFILE_PREFIX, strlen(CONFIG_SYS_BOOTFILE_PREFIX)) == 0) { #endif /* CONFIG_SYS_BOOTFILE_PREFIX */ + dhcp_packet_process_options(bp); debug("TRANSITIONING TO REQUESTING STATE\n"); dhcp_state = REQUESTING; - if (net_read_u32((u32 *)&bp->bp_vend[0]) == - htonl(BOOTP_VENDOR_MAGIC)) - dhcp_process_options((u8 *)&bp->bp_vend[4], bp); - net_set_timeout_handler(5000, bootp_timeout_handler); dhcp_send_request_packet(bp); #ifdef CONFIG_SYS_BOOTFILE_PREFIX @@ -996,9 +1020,7 @@ static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip, debug("DHCP State: REQUESTING\n"); if (dhcp_message_type((u8 *)bp->bp_vend) == DHCP_ACK) { - if (net_read_u32((u32 *)&bp->bp_vend[0]) == - htonl(BOOTP_VENDOR_MAGIC)) - dhcp_process_options((u8 *)&bp->bp_vend[4], bp); + dhcp_packet_process_options(bp); /* Store net params from reply */ store_net_params(bp); dhcp_state = BOUND; -- 2.1.4

2 1

[U-Boot] [PATCH 1/2] net: Do not overwrite options found in overloaded 'file' field
by Stefan Brüns 03 Sep '15

03 Sep '15

If 'file' is overloaded, it is wrong to get or put the bootfile name from it/to it. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- net/bootp.c | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/net/bootp.c b/net/bootp.c index 7fd29ee..0575a1e 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -64,6 +64,9 @@ char net_root_path[64] = {0,}; /* Our bootpath */ static dhcp_state_t dhcp_state = INIT; static u32 dhcp_leasetime; static struct in_addr dhcp_server_ip; +static u8 dhcp_option_overload; +#define OVERLOAD_FILE 1 +#define OVERLOAD_SNAME 2 static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip, unsigned src, unsigned len); @@ -146,9 +149,11 @@ static void store_net_params(struct bootp_hdr *bp) net_copy_ip(&net_server_ip, &bp->bp_siaddr); memcpy(net_server_ethaddr, ((struct ethernet_hdr *)net_rx_packet)->et_src, 6); - if (strlen(bp->bp_file) > 0) + if (!(dhcp_option_overload & OVERLOAD_FILE) && + (strlen(bp->bp_file) > 0)) { copy_filename(net_boot_file_name, bp->bp_file, sizeof(net_boot_file_name)); + } debug("net_boot_file_name: %s\n", net_boot_file_name); @@ -770,6 +775,7 @@ static void dhcp_process_options(uchar *popt, struct bootp_hdr *bp) #if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_TIMEOFFSET) int *to_ptr; #endif + dhcp_option_overload = 0; while (popt < end && *popt != 0xff) { oplen = *(popt + 1); @@ -821,6 +827,8 @@ static void dhcp_process_options(uchar *popt, struct bootp_hdr *bp) case 51: net_copy_u32(&dhcp_leasetime, (u32 *)(popt + 2)); break; + case 52: + dhcp_option_overload = popt[2]; case 53: /* Ignore Message Type Option */ break; case 54: @@ -832,31 +840,11 @@ static void dhcp_process_options(uchar *popt, struct bootp_hdr *bp) break; case 66: /* Ignore TFTP server name */ break; - case 67: /* vendor opt bootfile */ - /* - * I can't use dhcp_vendorex_proc here because I need - * to write into the bootp packet - even then I had to - * pass the bootp packet pointer into here as the - * second arg - */ - size = truncate_sz("Opt Boot File", - sizeof(bp->bp_file), - oplen); - if (bp->bp_file[0] == '\0' && size > 0) { - /* - * only use vendor boot file if we didn't - * receive a boot file in the main non-vendor - * part of the packet - god only knows why - * some vendors chose not to use this perfectly - * good spot to store the boot file (join on - * Tru64 Unix) it seems mind bogglingly crazy - * to me - */ - printf("*** WARNING: using vendor " - "optional boot file\n"); - memcpy(bp->bp_file, popt + 2, size); - bp->bp_file[size] = '\0'; - } + case 67: /* Bootfile option */ + size = truncate_sz("Bootfile", + sizeof(net_boot_file_name), oplen); + memcpy(&net_boot_file_name, popt + 2, size); + net_boot_file_name[size] = 0; break; default: #if defined(CONFIG_BOOTP_VENDOREX) -- 2.1.4

2 1

[U-Boot] [PATCH] doc: Fix inconsistent filename in PXE config example
by Stefan Brüns 03 Sep '15

03 Sep '15

The default config includes base.menu, not linux.list Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- doc/README.pxe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/README.pxe b/doc/README.pxe index d017f60..bd175eb 100644 --- a/doc/README.pxe +++ b/doc/README.pxe @@ -170,7 +170,7 @@ Example ------- Here's a couple of example files to show how this works. -------------/tftpboot/pxelinux.cfg/menus/linux.list---------- +------------/tftpboot/pxelinux.cfg/menus/base.menu----------- menu title Linux selections # This is the default label -- 2.1.4

3 2

[U-Boot] [PATCH] doc: document the fdtdir PXE command
by Stefan Brüns 03 Sep '15

03 Sep '15

Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- doc/README.pxe | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/README.pxe b/doc/README.pxe index f67605c..d017f60 100644 --- a/doc/README.pxe +++ b/doc/README.pxe @@ -155,6 +155,13 @@ fdt <path> - if this label is chosen, use tftp to retrieve the fdt blob the fdt_addr_r environment variable, and that address will be passed to bootm. +fdtdir <path> - if this label is chosen, use tftp to retrieve a fdt blob + relative to <path>. If the fdtfile environment variable + is set, <path>/<fdtfile> is retrieved. Otherwise, the + filename is generated from the soc and board environment + variables, i.e. <path>/<soc>-<board>.dtb is retrieved. + If the fdt command is specified, fdtdir is ignored. + localboot <flag> - Run the command defined by "localcmd" in the environment. <flag> is ignored and is only here to match the syntax of PXELINUX config files. -- 2.1.4

2 1