February 2018 - U-Boot

[U-Boot] [PATCH 1/2] rockchip: rk3288: Add TPL_LDSCRIPT
by Jagan Teki 20 Feb '18

20 Feb '18

Due to size limitations in SPL by adding falcon mode, rk3288 support TPL. In order to not overlap SPL_TEXT_BASE add TPL_TEXT_BASE with u-boot-tpl.lds that intern call u-boot-spl.lds with proper TEXT_BASE values. Signed-off-by: Jagan Teki <jagan(a)amarulasolutions.com> --- arch/arm/mach-rockchip/Kconfig | 7 +++++++ arch/arm/mach-rockchip/rk3288/u-boot-tpl.lds | 10 ++++++++++ 2 files changed, 17 insertions(+) create mode 100644 arch/arm/mach-rockchip/rk3288/u-boot-tpl.lds diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 1e5a7bb..d9218da 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -72,6 +72,13 @@ config ROCKCHIP_RK3288 and video codec support. Peripherals include Gigabit Ethernet, USB2 host and OTG, SDIO, I2S, UARTs, SPI, I2C and PWMs. +if ROCKCHIP_RK3288 + +config TPL_LDSCRIPT + default "arch/arm/mach-rockchip/rk3288/u-boot-tpl.lds" + +endif + config ROCKCHIP_RK3328 bool "Support Rockchip RK3328" select ARM64 diff --git a/arch/arm/mach-rockchip/rk3288/u-boot-tpl.lds b/arch/arm/mach-rockchip/rk3288/u-boot-tpl.lds new file mode 100644 index 0000000..c7a6092 --- /dev/null +++ b/arch/arm/mach-rockchip/rk3288/u-boot-tpl.lds @@ -0,0 +1,10 @@ +/* + * Copyright (C) 2018 Jagan Teki <jagan(a)amarulasolutions.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#undef CONFIG_SPL_TEXT_BASE +#define CONFIG_SPL_TEXT_BASE CONFIG_TPL_TEXT_BASE + +#include "../../cpu/u-boot-spl.lds" -- 2.7.4

2 6

[U-Boot] [ANN] v2018.03-rc3 delayed a day
by Tom Rini 20 Feb '18

20 Feb '18

Hey all, As it's still technically Monday here, I'm letting everyone know that I'm not going to release today, but I expect to release tomorrow. I'm testing the MMC PR now, and that's what I've been waiting on due to some important fixes being included. -- Tom

1 0

[U-Boot] Please pull u-boot-dm
by Simon Glass 20 Feb '18

20 Feb '18

Hi Tom, Here is another crack at sandbox64 and a few more patches in my queue. I've also including the dtc warning fixes. The following changes since commit 32fe36574ea5e6ea55313e16547b98a984af7767: Merge git://git.denx.de/u-boot-arc (2018-02-15 14:07:04 -0500) are available in the Git repository at: git://git.denx.de/u-boot-dm.git for you to fetch changes up to c6b89f31806df06a5d7b688a65f9d2e6e6119a55: sandbox: Add 64-bit sandbox (2018-02-18 15:53:48 -0700) ---------------------------------------------------------------- Alexey Brodkin (1): fdt: Implement weak arch_fixup_fdt() Mario Six (1): sandbox: Add 64-bit sandbox Simon Glass (2): sandbox: Correct dtc warning in /chosen node sandbox: Rename 'num-gpios' property to avoid dtc warning Thierry Reding (1): fdt: Fixup only valid memory banks arch/arc/lib/bootm.c | 5 - arch/microblaze/lib/bootm.c | 5 - arch/mips/lib/bootm.c | 6 +- arch/nds32/lib/bootm.c | 6 - arch/powerpc/lib/bootm.c | 5 - arch/sandbox/Kconfig | 16 +- arch/sandbox/cpu/cpu.c | 2 +- arch/sandbox/dts/Makefile | 4 + arch/sandbox/dts/sandbox.dts | 4 +- arch/sandbox/dts/sandbox64.dts | 317 +++++++++++++++++++++++++++++++++++++++ arch/sandbox/dts/test.dts | 6 +- arch/sandbox/include/asm/io.h | 6 + arch/sandbox/include/asm/types.h | 17 ++- arch/sandbox/lib/bootm.c | 5 - arch/x86/lib/bootm.c | 5 - board/sandbox/MAINTAINERS | 8 + board/sandbox/README.sandbox | 7 +- cmd/demo.c | 6 +- common/fdt_support.c | 8 +- common/image-fdt.c | 5 + configs/sandbox64_defconfig | 201 +++++++++++++++++++++++++ drivers/demo/demo-simple.c | 2 +- drivers/gpio/sandbox.c | 3 +- include/fdtdec.h | 2 +- 24 files changed, 593 insertions(+), 58 deletions(-) create mode 100644 arch/sandbox/dts/sandbox64.dts create mode 100644 configs/sandbox64_defconfig Regards, Simon

2 1

[U-Boot] Pull request: u-boot-ubi/master
by Heiko Schocher 20 Feb '18

20 Feb '18

Hello Tom, please pull from u-boot-ubi master The following changes since commit 02b0895c215e252cff50d9edf53a972d2bbbfd30: Merge git://git.denx.de/u-boot-sh (2018-02-17 16:06:59 -0500) are available in the Git repository at: git://git.denx.de/u-boot-ubi.git master for you to fetch changes up to f82290afc84716a16a8e300d5d17702858ba84ea: mtd: ubi: Fix worker handling (2018-02-19 08:22:58 +0100) ---------------------------------------------------------------- Richard Weinberger (1): mtd: ubi: Fix worker handling drivers/mtd/ubi/build.c | 10 +--------- drivers/mtd/ubi/ubi.h | 2 +- drivers/mtd/ubi/wl.c | 53 ++++++++++++++++++++++++++++++++++++++--------------- 3 files changed, 40 insertions(+), 25 deletions(-) No errors on travis build: https://travis-ci.org/hsdenx/u-boot-ubi bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs(a)denx.de

2 1

[U-Boot] [PATCH v2] vexpress: Sign up as maintainer
by Linus Walleij 20 Feb '18

20 Feb '18

These ARM boards are in nice shape and still being used a lot with e.g. QEMU, so I can maintain them. Signed-off-by: Linus Walleij <linus.walleij(a)linaro.org> --- ChangeLog v1->v2: - Amend patch to take maintainership of all the Versatile Express boards. --- board/armltd/vexpress/MAINTAINERS | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/board/armltd/vexpress/MAINTAINERS b/board/armltd/vexpress/MAINTAINERS index a6943d742690..7b3fb42e5651 100644 --- a/board/armltd/vexpress/MAINTAINERS +++ b/board/armltd/vexpress/MAINTAINERS @@ -1,13 +1,9 @@ -VEXPRESS BOARD -#M: - +VERSATILE EXPRESS BOARDS +M: Linus Walleij <linus.walleij(a)linaro.org> S: Maintained F: board/armltd/vexpress/ F: include/configs/vexpress_ca15_tc2.h F: configs/vexpress_ca15_tc2_defconfig - -VEXPRESS_CA5X2 BOARD -#M: Matt Waddel <matt.waddel(a)linaro.org> -S: Orphan (since 2014-08) F: include/configs/vexpress_ca5x2.h F: configs/vexpress_ca5x2_defconfig F: include/configs/vexpress_ca9x4.h -- 2.14.3

2 1

[U-Boot] [PULL] u-boot-sh/master
by Marek Vasut 20 Feb '18

20 Feb '18

The following changes since commit 02b0895c215e252cff50d9edf53a972d2bbbfd30: Merge git://git.denx.de/u-boot-sh (2018-02-17 16:06:59 -0500) are available in the Git repository at: git://git.denx.de/u-boot-sh.git master for you to fetch changes up to 5abcbd7847cf7ea87744bfedaaf0b4a6b99e7b02: net: sh_eth: Fix DT base address fetching (2018-02-18 11:20:18 +0100) ---------------------------------------------------------------- Marek Vasut (4): net: sh_eth: Zap port variable net: sh_eth: Return directly from sh_eth_recv_start net: sh_eth: Fix checkpatch warning net: sh_eth: Fix DT base address fetching drivers/net/sh_eth.c | 53 +++++++++++++++++++++-------------------------------- 1 file changed, 21 insertions(+), 32 deletions(-)

2 1

[U-Boot] [GIT] Pull request: u-boot-dfu (19.02.2018)
by Lukasz Majewski 19 Feb '18

19 Feb '18

Dear Marek, Travis CI: https://travis-ci.org/lmajewski/u-boot-dfu/builds/343146205 Tested-by: Lukasz Majewski <lukma(a)denx.de> Test HW: Beagle Bone Black It is on your discression if this code "lands" in this release or shall it wait till next merge window. My recommendation is to add it to this release (as it fixes obvious shortcomming of dfu tftp command). The following changes since commit 61a1c379964ae701759cf8d89497391c76ffe889: usb: gadget: sdp: fix pointer cast warnings for 64bit archs (2018-02-19 05:20:00 +0100) are available in the git repository at: git://git.denx.de/u-boot-dfu.git for you to fetch changes up to 41a89fb9485be56525e5e862f52aa0cffbcedd04: dfu: tftp: Fix arm64 build warnings (2018-02-19 20:54:35 +0100) ---------------------------------------------------------------- Marek Vasut (3): dfu: Fix up the Kconfig mess dfu: Rename _FUNCTION_DFU to DFU_OVER_ dfu: tftp: Fix arm64 build warnings README | 2 +- board/siemens/common/factoryset.c | 4 ++-- cmd/Kconfig | 2 +- cmd/dfu.c | 18 +++++++++++++----- common/Makefile | 6 ++++-- drivers/dfu/Kconfig | 14 ++++++++++++-- drivers/dfu/Makefile | 2 +- drivers/dfu/dfu_tftp.c | 4 ++-- drivers/usb/gadget/Makefile | 2 +- include/configs/tegra-common-post.h | 2 +- 10 files changed, 38 insertions(+), 18 deletions(-) Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de

3 2

[U-Boot] [PATCH 1/4] net: sh_eth: Zap port variable
by Marek Vasut 19 Feb '18

19 Feb '18

Inline this variable which is quite useless. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> Cc: Joe Hershberger <joe.hershberger(a)ni.com> --- drivers/net/sh_eth.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index 5a5c6bc39e..b3c0509989 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -63,8 +63,8 @@ static int sh_eth_send_common(struct sh_eth_dev *eth, void *packet, int len) { - int port = eth->port, ret = 0, timeout; - struct sh_eth_info *port_info = &eth->port_info[port]; + int ret = 0, timeout; + struct sh_eth_info *port_info = &eth->port_info[eth->port]; if (!packet || len > 0xffff) { printf(SHETHER_NAME ": %s: Invalid argument\n", __func__); @@ -120,8 +120,8 @@ err: static int sh_eth_recv_start(struct sh_eth_dev *eth) { - int port = eth->port, len = 0; - struct sh_eth_info *port_info = &eth->port_info[port]; + int len = 0; + struct sh_eth_info *port_info = &eth->port_info[eth->port]; /* Check if the rx descriptor is ready */ invalidate_cache(port_info->rx_desc_cur, sizeof(struct rx_desc_s)); @@ -192,9 +192,9 @@ static int sh_eth_reset(struct sh_eth_dev *eth) static int sh_eth_tx_desc_init(struct sh_eth_dev *eth) { - int port = eth->port, i, ret = 0; + int i, ret = 0; u32 alloc_desc_size = NUM_TX_DESC * sizeof(struct tx_desc_s); - struct sh_eth_info *port_info = &eth->port_info[port]; + struct sh_eth_info *port_info = &eth->port_info[eth->port]; struct tx_desc_s *cur_tx_desc; /* @@ -245,9 +245,9 @@ err: static int sh_eth_rx_desc_init(struct sh_eth_dev *eth) { - int port = eth->port, i, ret = 0; + int i, ret = 0; u32 alloc_desc_size = NUM_RX_DESC * sizeof(struct rx_desc_s); - struct sh_eth_info *port_info = &eth->port_info[port]; + struct sh_eth_info *port_info = &eth->port_info[eth->port]; struct rx_desc_s *cur_rx_desc; u8 *rx_buf; @@ -318,8 +318,7 @@ err: static void sh_eth_tx_desc_free(struct sh_eth_dev *eth) { - int port = eth->port; - struct sh_eth_info *port_info = &eth->port_info[port]; + struct sh_eth_info *port_info = &eth->port_info[eth->port]; if (port_info->tx_desc_alloc) { free(port_info->tx_desc_alloc); @@ -329,8 +328,7 @@ static void sh_eth_tx_desc_free(struct sh_eth_dev *eth) static void sh_eth_rx_desc_free(struct sh_eth_dev *eth) { - int port = eth->port; - struct sh_eth_info *port_info = &eth->port_info[port]; + struct sh_eth_info *port_info = &eth->port_info[eth->port]; if (port_info->rx_desc_alloc) { free(port_info->rx_desc_alloc); @@ -523,7 +521,7 @@ static int sh_eth_start_common(struct sh_eth_dev *eth) static int sh_eth_phy_config_legacy(struct sh_eth_dev *eth) { int port = eth->port, ret = 0; - struct sh_eth_info *port_info = &eth->port_info[port]; + struct sh_eth_info *port_info = &eth->port_info[eth->port]; struct eth_device *dev = port_info->dev; struct phy_device *phydev; @@ -546,7 +544,7 @@ static int sh_eth_send_legacy(struct eth_device *dev, void *packet, int len) static int sh_eth_recv_common(struct sh_eth_dev *eth) { int port = eth->port, len = 0; - struct sh_eth_info *port_info = &eth->port_info[port]; + struct sh_eth_info *port_info = &eth->port_info[eth->port]; uchar *packet = (uchar *)ADDR_TO_P2(port_info->rx_desc_cur->rd2); len = sh_eth_recv_start(eth); @@ -750,8 +748,8 @@ static int sh_eth_phy_config(struct udevice *dev) struct sh_ether_priv *priv = dev_get_priv(dev); struct eth_pdata *pdata = dev_get_platdata(dev); struct sh_eth_dev *eth = &priv->shdev; - int port = eth->port, ret = 0; - struct sh_eth_info *port_info = &eth->port_info[port]; + int ret = 0; + struct sh_eth_info *port_info = &eth->port_info[eth->port]; struct phy_device *phydev; int mask = 0xffffffff; -- 2.15.1

2 7

[U-Boot] [PATCH 1/5] sh: Use -m2a-nofpu only
by Tom Rini 19 Feb '18

19 Feb '18

Based on reading over the GCC manual, passing both -m2a and -m2a-nofpu are redundant, as -m2a-nofpu will provide functional code for both. As -m2a-nofpu functions with more toolchains and does what is expected, switch. Cc: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- arch/sh/cpu/sh2/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/sh/cpu/sh2/config.mk b/arch/sh/cpu/sh2/config.mk index 12e202d539a0..a063e8361c98 100644 --- a/arch/sh/cpu/sh2/config.mk +++ b/arch/sh/cpu/sh2/config.mk @@ -8,7 +8,7 @@ ENDIANNESS += -EB ifdef CONFIG_CPU_SH2A -PLATFORM_CPPFLAGS += -m2a -m2a-nofpu -mb +PLATFORM_CPPFLAGS += -m2a-nofpu -mb else # SH2 PLATFORM_CPPFLAGS += -m3e -mb endif -- 2.7.4

3 11

[U-Boot] [PATCH V2 1/3] dfu: Fix up the Kconfig mess
by Marek Vasut 19 Feb '18

19 Feb '18

Clean up the screaming mess of configuration options that DFU is. It was impossible to configure DFU such that TFTP is enabled and USB is not, this patch fixes that and assures that DFU TFTP and DFU USB can be enabled separatelly and that the correct pieces of code are compiled in. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Lukasz Majewski <lukma(a)denx.de> --- V2: Do not imply TFTP if net, we do not want this turned on by default. --- cmd/Kconfig | 2 +- cmd/dfu.c | 18 +++++++++++++----- common/Makefile | 6 ++++-- drivers/dfu/Kconfig | 12 +++++++++++- drivers/dfu/Makefile | 2 +- 5 files changed, 30 insertions(+), 10 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 7368b6df52..1caddc4072 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -582,7 +582,7 @@ config CMD_DEMO config CMD_DFU bool "dfu" - select USB_FUNCTION_DFU + select DFU help Enables the command "dfu" which is used to have U-Boot create a DFU class device via USB. This command requires that the "dfu_alt_info" diff --git a/cmd/dfu.c b/cmd/dfu.c index 04291f6c08..76b89ca5ed 100644 --- a/cmd/dfu.c +++ b/cmd/dfu.c @@ -25,12 +25,14 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (argc < 4) return CMD_RET_USAGE; +#ifdef CONFIG_USB_FUNCTION_DFU char *usb_controller = argv[1]; +#endif char *interface = argv[2]; char *devstring = argv[3]; - int ret; -#ifdef CONFIG_DFU_TFTP + int ret = 0; +#ifdef CONFIG_TFTP_FUNCTION_DFU unsigned long addr = 0; if (!strcmp(argv[1], "tftp")) { if (argc == 5) @@ -39,7 +41,7 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return update_tftp(addr, interface, devstring); } #endif - +#ifdef CONFIG_USB_FUNCTION_DFU ret = dfu_init_env_entities(interface, devstring); if (ret) goto done; @@ -56,18 +58,24 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) done: dfu_free_entities(); +#endif return ret; } U_BOOT_CMD(dfu, CONFIG_SYS_MAXARGS, 1, do_dfu, "Device Firmware Upgrade", +#ifdef CONFIG_USB_FUNCTION_DFU "<USB_controller> <interface> <dev> [list]\n" " - device firmware upgrade via <USB_controller>\n" " on device <dev>, attached to interface\n" " <interface>\n" " [list] - list available alt settings\n" -#ifdef CONFIG_DFU_TFTP - "dfu tftp <interface> <dev> [<addr>]\n" +#endif +#ifdef CONFIG_TFTP_FUNCTION_DFU +#ifdef CONFIG_USB_FUNCTION_DFU + "dfu " +#endif + "tftp <interface> <dev> [<addr>]\n" " - device firmware upgrade via TFTP\n" " on device <dev>, attached to interface\n" " <interface>\n" diff --git a/common/Makefile b/common/Makefile index c7bde239c1..cdd0ab19d8 100644 --- a/common/Makefile +++ b/common/Makefile @@ -66,7 +66,9 @@ endif # !CONFIG_SPL_BUILD obj-$(CONFIG_$(SPL_TPL_)BOOTSTAGE) += bootstage.o ifdef CONFIG_SPL_BUILD -obj-$(CONFIG_SPL_DFU_SUPPORT) += dfu.o +ifdef CONFIG_SPL_DFU_SUPPORT +obj-$(CONFIG_USB_FUNCTION_DFU) += dfu.o +endif obj-$(CONFIG_SPL_DFU_SUPPORT) += cli_hush.o obj-$(CONFIG_SPL_HASH_SUPPORT) += hash.o obj-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o @@ -128,7 +130,7 @@ endif obj-y += cli.o obj-$(CONFIG_FSL_DDR_INTERACTIVE) += cli_simple.o cli_readline.o -obj-$(CONFIG_CMD_DFU) += dfu.o +obj-$(CONFIG_USB_FUNCTION_DFU) += dfu.o obj-y += command.o obj-$(CONFIG_$(SPL_)LOG) += log.o obj-$(CONFIG_$(SPL_)LOG_CONSOLE) += log_console.o diff --git a/drivers/dfu/Kconfig b/drivers/dfu/Kconfig index fa27efbb40..b077444059 100644 --- a/drivers/dfu/Kconfig +++ b/drivers/dfu/Kconfig @@ -1,12 +1,22 @@ menu "DFU support" +config DFU + bool + imply USB_FUNCTION_DFU if USB_GADGET + config USB_FUNCTION_DFU bool select HASH + depends on USB_GADGET + +config TFTP_FUNCTION_DFU + bool + depends on NET -if CMD_DFU +if DFU config DFU_TFTP bool "DFU via TFTP" + select TFTP_FUNCTION_DFU help This option allows performing update of DFU-managed medium with data sent via TFTP boot. diff --git a/drivers/dfu/Makefile b/drivers/dfu/Makefile index 61f2b71f91..7f35871ddc 100644 --- a/drivers/dfu/Makefile +++ b/drivers/dfu/Makefile @@ -5,7 +5,7 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-$(CONFIG_USB_FUNCTION_DFU) += dfu.o +obj-$(CONFIG_DFU) += dfu.o obj-$(CONFIG_DFU_MMC) += dfu_mmc.o obj-$(CONFIG_DFU_NAND) += dfu_nand.o obj-$(CONFIG_DFU_RAM) += dfu_ram.o -- 2.15.1

2 3