June 2018 - U-Boot

[U-Boot] [PATCH] dts: gpio: Sync header with Linux 4.17
by Marek Vasut 14 Jun '18

14 Jun '18

Sync the gpio.h header with Linux 4.17, which contains new macros. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Tom Rini <trini(a)konsulko.com> --- include/dt-bindings/gpio/gpio.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/dt-bindings/gpio/gpio.h b/include/dt-bindings/gpio/gpio.h index e6b1e0a808..2cc10ae4bb 100644 --- a/include/dt-bindings/gpio/gpio.h +++ b/include/dt-bindings/gpio/gpio.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * This header provides constants for most GPIO bindings. * @@ -9,7 +10,27 @@ #ifndef _DT_BINDINGS_GPIO_GPIO_H #define _DT_BINDINGS_GPIO_GPIO_H +/* Bit 0 express polarity */ #define GPIO_ACTIVE_HIGH 0 #define GPIO_ACTIVE_LOW 1 +/* Bit 1 express single-endedness */ +#define GPIO_PUSH_PULL 0 +#define GPIO_SINGLE_ENDED 2 + +/* Bit 2 express Open drain or open source */ +#define GPIO_LINE_OPEN_SOURCE 0 +#define GPIO_LINE_OPEN_DRAIN 4 + +/* + * Open Drain/Collector is the combination of single-ended open drain interface. + * Open Source/Emitter is the combination of single-ended open source interface. + */ +#define GPIO_OPEN_DRAIN (GPIO_SINGLE_ENDED | GPIO_LINE_OPEN_DRAIN) +#define GPIO_OPEN_SOURCE (GPIO_SINGLE_ENDED | GPIO_LINE_OPEN_SOURCE) + +/* Bit 3 express GPIO suspend/resume and reset persistence */ +#define GPIO_PERSISTENT 0 +#define GPIO_TRANSITORY 8 + #endif -- 2.17.1

1 0

[U-Boot] [PATCH] efi_loader: Allocate memory handle for mem dp
by Alexander Graf 14 Jun '18

14 Jun '18

When we boot using memdp (bootefi on an address without previous load that populates the device path) then the memory device path we pass in is not backed by any handle. That can result in weird effects. For example grub gets very grumpy about this inside the efi_net module and just loops endlessly. So let's expose a simple handle that the memory device path is backed on. That way any code that looks for the device the dp is on, finds one. Signed-off-by: Alexander Graf <agraf(a)suse.de> --- cmd/bootefi.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 707d159bac..f55a40dc84 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -263,6 +263,7 @@ static efi_status_t do_bootefi_exec(void *efi, { struct efi_loaded_image loaded_image_info = {}; struct efi_object loaded_image_info_obj = {}; + struct efi_object mem_obj = {}; struct efi_device_path *memdp = NULL; efi_status_t ret; @@ -279,6 +280,12 @@ static efi_status_t do_bootefi_exec(void *efi, /* actual addresses filled in after efi_load_pe() */ memdp = efi_dp_from_mem(0, 0, 0); device_path = image_path = memdp; + efi_add_handle(&mem_obj); + + ret = efi_add_protocol(mem_obj.handle, &efi_guid_device_path, + device_path); + if (ret != EFI_SUCCESS) + goto exit; } else { assert(device_path && image_path); } @@ -343,6 +350,8 @@ static efi_status_t do_bootefi_exec(void *efi, exit: /* image has returned, loaded-image obj goes *poof*: */ list_del(&loaded_image_info_obj.link); + if (mem_obj.handle) + list_del(&mem_obj.link); return ret; } -- 2.12.3

1 1

[U-Boot] [PATCH] common: bootm: reserve memory bank
by Jason Zhu 14 Jun '18

14 Jun '18

Actually the DRAM is not only seperated in one bank. The DRAM bank information is stored in gd->bd->bi_dram, so reserve lmb according to gd->bd->bi_dram. Signed-off-by: Jason Zhu <jason.zhu(a)rock-chips.com> --- common/bootm.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/common/bootm.c b/common/bootm.c index e789f68..46689fa 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -53,16 +53,23 @@ __weak void board_quiesce_devices(void) #ifdef CONFIG_LMB static void boot_start_lmb(bootm_headers_t *images) { + lmb_init(&images->lmb); +#ifdef CONFIG_NR_DRAM_BANKS + int i; + + for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) { + lmb_add(&images->lmb, gd->bd->bi_dram[i].start, + gd->bd->bi_dram[i].size); + } +#else ulong mem_start; phys_size_t mem_size; - lmb_init(&images->lmb); - mem_start = env_get_bootm_low(); mem_size = env_get_bootm_size(); lmb_add(&images->lmb, (phys_addr_t)mem_start, mem_size); - +#endif arch_lmb_reserve(&images->lmb); board_lmb_reserve(&images->lmb); } -- 1.9.1

1 0

[U-Boot] [PATCH] usb: sunxi: don't touch reset bits in ccm if CONFIG_SUNXI_GEN_SUN6I is not defined
by Vasily Khoruzhick 14 Jun '18

14 Jun '18

CCM in sun4i and sun5i doesn't have reset. Fixes commit 1ed9c1118 ("usb: sunxi: ehci: get rid of ifdefs") and commit 56830cee3 ("usb: sunxi: ohci: get rid of ifdefs") Signed-off-by: Vasily Khoruzhick <anarsoul(a)gmail.com> --- drivers/usb/host/ehci-sunxi.c | 10 ++++++++-- drivers/usb/host/ohci-sunxi.c | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/drivers/usb/host/ehci-sunxi.c b/drivers/usb/host/ehci-sunxi.c index 35fbe03331..f5b661ef12 100644 --- a/drivers/usb/host/ehci-sunxi.c +++ b/drivers/usb/host/ehci-sunxi.c @@ -85,9 +85,12 @@ no_phy: setbits_le32(&priv->ccm->ahb_gate0, priv->ahb_gate_mask | extra_ahb_gate_mask); - if (priv->cfg->has_reset) + if (priv->cfg->has_reset) { +#ifdef CONFIG_SUNXI_GEN_SUN6I setbits_le32(&priv->ccm->ahb_reset0_cfg, priv->ahb_gate_mask | extra_ahb_gate_mask); +#endif + } hcor = (struct ehci_hcor *)((uintptr_t)hccr + HC_LENGTH(ehci_readl(&hccr->cr_capbase))); @@ -112,8 +115,11 @@ static int ehci_usb_remove(struct udevice *dev) if (ret) return ret; - if (priv->cfg->has_reset) + if (priv->cfg->has_reset) { +#ifdef CONFIG_SUNXI_GEN_SUN6I clrbits_le32(&priv->ccm->ahb_reset0_cfg, priv->ahb_gate_mask); +#endif + } clrbits_le32(&priv->ccm->ahb_gate0, priv->ahb_gate_mask); return 0; diff --git a/drivers/usb/host/ohci-sunxi.c b/drivers/usb/host/ohci-sunxi.c index 2b99169da6..c8c9e1d2fe 100644 --- a/drivers/usb/host/ohci-sunxi.c +++ b/drivers/usb/host/ohci-sunxi.c @@ -92,9 +92,12 @@ no_phy: priv->ahb_gate_mask | extra_ahb_gate_mask); setbits_le32(&priv->ccm->usb_clk_cfg, priv->usb_gate_mask | priv->cfg->extra_usb_gate_mask); - if (priv->cfg->has_reset) + if (priv->cfg->has_reset) { +#ifdef CONFIG_SUNXI_GEN_SUN6I setbits_le32(&priv->ccm->ahb_reset0_cfg, priv->ahb_gate_mask | extra_ahb_gate_mask); +#endif + } return ohci_register(dev, regs); } @@ -116,8 +119,11 @@ static int ohci_usb_remove(struct udevice *dev) if (ret) return ret; - if (priv->cfg->has_reset) + if (priv->cfg->has_reset) { +#ifdef CONFIG_SUNXI_GEN_SUN6I clrbits_le32(&priv->ccm->ahb_reset0_cfg, priv->ahb_gate_mask); +#endif + } clrbits_le32(&priv->ccm->usb_clk_cfg, priv->usb_gate_mask); clrbits_le32(&priv->ccm->ahb_gate0, priv->ahb_gate_mask); -- 2.17.1

3 5

[U-Boot] [PATCH] configs: db410c: Set eMMC env partition to BOOT2
by Ramon Fried 14 Jun '18

14 Jun '18

BOOT2 partition is empty and free for using to store the environment. Use that instead of the default user partition. Signed-off-by: Ramon Fried <ramon.fried(a)gmail.com> --- include/configs/dragonboard410c.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index 86fa735470..46a7179f1b 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -94,6 +94,7 @@ REFLASH(dragonboard/u-boot.img, 8)\ #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_SYS_MMC_ENV_DEV 0 /* mmc0 = emmc, mmc1 = sd */ +#define CONFIG_SYS_MMC_ENV_PART 2 /* Set env partition to BOOT2 partition */ /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_8M) -- 2.17.1

1 0

[U-Boot] [PATCH] clk: rmobile: Add R8A77995 RPC clock
by Marek Vasut 14 Jun '18

14 Jun '18

Add missing RPC entry into the R8A77995 clock driver tables. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> --- drivers/clk/renesas/r8a77995-cpg-mssr.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/clk/renesas/r8a77995-cpg-mssr.c b/drivers/clk/renesas/r8a77995-cpg-mssr.c index 17592db3d3..e9c3aec960 100644 --- a/drivers/clk/renesas/r8a77995-cpg-mssr.c +++ b/drivers/clk/renesas/r8a77995-cpg-mssr.c @@ -41,6 +41,7 @@ enum clk_ids { CLK_S2, CLK_S3, CLK_SDSRC, + CLK_RPCSRC, CLK_SSPSRC, /* Module Clocks */ @@ -67,6 +68,7 @@ static const struct cpg_core_clk r8a77995_core_clks[] = { DEF_FIXED(".s2", CLK_S2, CLK_PLL1, 4, 1), DEF_FIXED(".s3", CLK_S3, CLK_PLL1, 6, 1), DEF_FIXED(".sdsrc", CLK_SDSRC, CLK_PLL1, 2, 1), + DEF_FIXED(".rpcsrc", CLK_RPCSRC, CLK_PLL1, 2, 1), /* Core Clock Outputs */ DEF_FIXED("z2", R8A77995_CLK_Z2, CLK_PLL0D3, 1, 1), @@ -89,6 +91,8 @@ static const struct cpg_core_clk r8a77995_core_clks[] = { DEF_FIXED("osc", R8A77995_CLK_OSC, CLK_EXTAL, 384, 1), DEF_FIXED("r", R8A77995_CLK_R, CLK_EXTAL, 1536, 1), + DEF_GEN3_RPC("rpc", R8A77995_CLK_RPC, CLK_RPCSRC, 0x238), + DEF_GEN3_PE("s1d4c", R8A77995_CLK_S1D4C, CLK_S1, 4, CLK_PE, 2), DEF_GEN3_PE("s3d1c", R8A77995_CLK_S3D1C, CLK_S3, 1, CLK_PE, 1), DEF_GEN3_PE("s3d2c", R8A77995_CLK_S3D2C, CLK_S3, 2, CLK_PE, 2), @@ -153,6 +157,7 @@ static const struct mssr_mod_clk r8a77995_mod_clks[] = { DEF_MOD("can-fd", 914, R8A77995_CLK_S3D2), DEF_MOD("can-if1", 915, R8A77995_CLK_S3D4), DEF_MOD("can-if0", 916, R8A77995_CLK_S3D4), + DEF_MOD("rpc", 917, R8A77995_CLK_RPC), DEF_MOD("i2c3", 928, R8A77995_CLK_S3D2), DEF_MOD("i2c2", 929, R8A77995_CLK_S3D2), DEF_MOD("i2c1", 930, R8A77995_CLK_S3D2), -- 2.17.1

1 0

[U-Boot] [PATCH] ARM: rmobile: Enable RPCHF on Draak
by Marek Vasut 14 Jun '18

14 Jun '18

Enable the Renesas RPC HF driver on R8A77995 D3 Draak. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> --- configs/r8a77995_draak_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/r8a77995_draak_defconfig b/configs/r8a77995_draak_defconfig index d3cccec8fc..f451950add 100644 --- a/configs/r8a77995_draak_defconfig +++ b/configs/r8a77995_draak_defconfig @@ -46,6 +46,7 @@ CONFIG_RENESAS_SDHI=y CONFIG_MTD=y CONFIG_MTD_NOR_FLASH=y CONFIG_CFI_FLASH=y +CONFIG_RENESAS_RPC_HF=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_DM_ETH=y -- 2.17.1

1 0

Re: [U-Boot] [PATCH 1/2] net: Add option to prefer bootp/dhcp serverip
by Rick Chen 14 Jun '18

14 Jun '18

> From: Alexander Graf [mailto:agraf@suse.de] > Sent: Wednesday, June 06, 2018 8:32 PM > To: u-boot(a)lists.denx.de > Cc: Rick Jian-Zhi Chen(陳建志); Joe Hershberger; Simon Glass > Subject: [PATCH 1/2] net: Add option to prefer bootp/dhcp serverip > > Currently we can choose between 2 different types of behavior for the serverip > variable: > > 1) Always overwrite it with the DHCP server IP address (default) > 2) Ignore what the DHCP server says (CONFIG_BOOTP_SERVERIP) > > This patch adds a 3rd option: > > 3) Use serverip from DHCP if no serverip is given > (CONFIG_BOOTP_PREFER_SERVERIP) > > With this new option, we can have the default case that a boot file gets loaded > from the DHCP provided TFTP server work while allowing users to specify their > own serverip variable to explicitly use a different tftp server. > > Signed-off-by: Alexander Graf <agraf(a)suse.de> > --- > README | 5 +++++ > cmd/Kconfig | 9 +++++++++ > net/bootp.c | 7 ++++++- > 3 files changed, 20 insertions(+), 1 deletion(-) > > diff --git a/README b/README > index fb331f910d..d8a99281ca 100644 > --- a/README > +++ b/README > @@ -1511,10 +1511,15 @@ The following options need to be configured: > CONFIG_BOOTP_TIMEOFFSET > CONFIG_BOOTP_VENDOREX > CONFIG_BOOTP_MAY_FAIL > + CONFIG_BOOTP_PREFER_SERVERIP > > CONFIG_BOOTP_SERVERIP - TFTP server will be the serverip > environment variable, not the BOOTP server. > > + CONFIG_BOOTP_PREFER_SERVERIP - TFTP server will be the > + serverip environment variable if previously unset, otherwise > + the DHCP provided serverip is used. > + > CONFIG_BOOTP_MAY_FAIL - If the DHCP server is not found > after the configured retry count, the call will fail > instead of starting over. This can be used to fail over diff --git > a/cmd/Kconfig b/cmd/Kconfig index e283cb9a8a..e77a4131b3 100644 > --- a/cmd/Kconfig > +++ b/cmd/Kconfig > @@ -1121,6 +1121,15 @@ config BOOTP_HOSTNAME > help > The name may or may not be qualified with the local domain name. > > +config BOOTP_PREFER_SERVERIP > + bool "Leave serverip variable in place if existing" > + default n > + depends on CMD_BOOTP > + help > + By default a BOOTP/DHCP reply will overwrite the tftp target ip > + address. With this option enabled, it will leave it alone if > + already specified, but populate it if no serverip is specified. > + > config BOOTP_SUBNETMASK > bool "Request & store 'netmask' from BOOTP/DHCP server" > default y > diff --git a/net/bootp.c b/net/bootp.c > index 9d7cb5d30c..91de4cd426 100644 > --- a/net/bootp.c > +++ b/net/bootp.c > @@ -147,9 +147,14 @@ static void store_net_params(struct bootp_hdr *bp) > { #if !defined(CONFIG_BOOTP_SERVERIP) > struct in_addr tmp_ip; > + bool overwrite_serverip = true; > + > +#if defined(CONFIG_BOOTP_PREFER_SERVERIP) > + overwrite_serverip = false; > +#endif > > net_copy_ip(&tmp_ip, &bp->bp_siaddr); > - if (tmp_ip.s_addr != 0) > + if (tmp_ip.s_addr != 0 && (overwrite_serverip || > +!net_server_ip.s_addr)) > net_copy_ip(&net_server_ip, &bp->bp_siaddr); > memcpy(net_server_ethaddr, > ((struct ethernet_hdr *)net_rx_packet)->et_src, 6); > -- > 2.12.3 Hi Alex I have apply those two patchs and verify U-Boot-1-2-net-Add-option-to-prefer-bootp-dhcp-serverip.patch U-Boot-2-2-ax25-Switch-to-CONFIG_BOOTP_PREFER_SERVERIP.patch But it still fail in dhcp command as below case 1 serverip is null RISC-V # set serverip RISC-V # env print baudrate=38400 bootcmd=fatload mmc 0:1 0x20000000 ae350_64.dtb;fatload mmc 0:1 0x0 bbl-ae350.bin;go 0x0 bootdelay=3 bootfile=pxelinux.0 ethact=mac@e0100000 fdtcontroladdr=3fedf290 fileaddr=600000 filesize=1bb7d34 stderr=serial@f0300000 stdin=serial@f0300000 stdout=serial@f0300000 Environment size: 304/8188 bytes RISC-V # dhcp 0x600000 10.0.4.97:boomimage-310y-ag101p.bin BOOTP broadcast 1 BOOTP broadcast 2 BOOTP broadcast 3 BOOTP broadcast 4 DHCP client bound to address 10.0.4.191 (4603 ms) Using mac@e0100000 device TFTP from server 255.255.255.255; our IP address is 10.0.4.191; sending through gateway 10.0.4.254 Filename 'pxelinux.0'. Load address: 0x600000 Loading: * TFTP error: 'File not found' (1) Not retrying... TFTP error: 'File not found' (1) Not retrying... case 2 serverip has value RISC-V # setenv serverip 10.0.4.97 ; RISC-V # dhcp 0x600000 boomimage-310y-ag101p.bin BOOTP broadcast 1 BOOTP broadcast 2 BOOTP broadcast 3 BOOTP broadcast 4 DHCP client bound to address 10.0.4.191 (4592 ms) Using mac@e0100000 device TFTP from server 10.0.4.97; our IP address is 10.0.4.191 Filename 'pxelinux.0'. Load address: 0x600000 Loading: * TFTP error: 'File not found' (1) Not retrying... TFTP error: 'File not found' (1) Not retrying... RISC-V # Rick

2 4

[U-Boot] [PATCH 0/3] efi_loader: ARM: add support for ARMV7_NONSEC=y
by Mark Kettenis 14 Jun '18

14 Jun '18

This series makes it possible to run EFI applications in non-secure mode. It allows me to run OpenBSD on the imx7d-pico-pi board while using the PSCI implementation provided by U-Boot. Mark Kettenis (3): ARM: HYP/non-sec: save and restore stack efi_loader: ARM: run EFI payloads non-secure Revert "efi_loader: no support for ARMV7_NONSEC=y" arch/arm/cpu/armv7/nonsec_virt.S | 6 ++++-- cmd/bootefi.c | 32 ++++++++++++++++++++++++++++++++ doc/README.uefi | 2 -- lib/efi_loader/Kconfig | 2 -- 4 files changed, 36 insertions(+), 6 deletions(-) -- 2.16.2

4 11

[U-Boot] [PATCH v2 0/3] efi_loader: ARM: add support for ARMV7_NONSEC=y
by Mark Kettenis 14 Jun '18

14 Jun '18

This series makes it possible to run EFI applications in non-secure mode. It allows me to run OpenBSD on the Technexion PICO-PI-IMX7 and Banana Pi boards using the PSCI implementation provided by U-Boot. This second version avoid using r3 to pass the original stack pointer. For some reason that register gets clobbered on the Banana Pi. Instead this version just migrates SP_svc to SP_hyp. Mark Kettenis (3): ARM: HYP/non-sec: migrate stack efi_loader: ARM: run EFI payloads non-secure Revert "efi_loader: no support for ARMV7_NONSEC=y" arch/arm/cpu/armv7/nonsec_virt.S | 6 ++++-- cmd/bootefi.c | 32 ++++++++++++++++++++++++++++++++ doc/README.uefi | 2 -- lib/efi_loader/Kconfig | 2 -- 4 files changed, 36 insertions(+), 6 deletions(-) -- 2.16.2

1 3