September 2018 - U-Boot

[U-Boot] [RFC] colibri_imx7: Do not hardcode the memory size
by Fabio Estevam 19 Sep '18

19 Sep '18

Instead of hardcoding the memory size, use the generic imx_ddr_size() function, which extracts the memory size in runtime by reading the DDR controller registers. This helps in supporting 512MB and 1GB modules. Signed-off-by: Fabio Estevam <festevam(a)gmail.com> --- Hi Stefan, I don't have the hardware to test, but I think we should be good by using imx_ddr_size() here. board/toradex/colibri_imx7/colibri_imx7.c | 2 +- include/configs/colibri_imx7.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c index 2b7591e..9029c0b 100644 --- a/board/toradex/colibri_imx7/colibri_imx7.c +++ b/board/toradex/colibri_imx7/colibri_imx7.c @@ -52,7 +52,7 @@ DECLARE_GLOBAL_DATA_PTR; int dram_init(void) { - gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE); + gd->ram_size = imx_ddr_size(); return 0; } diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index ff6bd67..02849ba 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -14,7 +14,6 @@ #include "mx7_common.h" /*#define CONFIG_DBG_MONITOR*/ -#define PHYS_SDRAM_SIZE SZ_1G /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M) -- 2.7.4

2 2

[U-Boot] misspelled "BOARD_LATE_INIT" in armadillo-800eva.h
by rpjday＠crashcourse.ca 19 Sep '18

19 Sep '18

apologies in that i am not in front of a mailer that can reliably transmit a patch that it won't mangle, but just noticed: include/configs/armadillo-800eva.h:#define BOARD_LATE_INIT i'm guessing that should say "CONFIG_BOARD_LATE_INIT". i did a quick search, that's the only example i found in the current code base. if someone wants to patch it, go wild. rday

1 0

[U-Boot] [PATCH v5] arm: socfpga: fix U-Boot running from fpga OnChip RAM
by Simon Goldschmidt 19 Sep '18

19 Sep '18

gd->env_addr points to pre-relocation address even after relocation. This leads to an abort in env_callback_init when loading the environment. Fix this by enabling CONFIG_SYS_EXTRA_ENV_RELOC. Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt(a)gmail.com> --- Changes in v5: Improve comments Changes in v4: enable this fix for all socfpga, not for gen5 only Changes in v3: this patch is new in v3 Changes in v2: None include/configs/socfpga_common.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 8ebf6b85fe..8b9f0427c0 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -284,6 +284,18 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #define CONFIG_SPL_STACK CONFIG_SYS_SPL_MALLOC_START #endif +/* + * When U-Boot is started from FPGA, prevent gd->env_addr to point into + * FPGA OnChip RAM after relocation + */ +#define CONFIG_SYS_EXTRA_ENV_RELOC +/* + * CONFIG_SYS_EXTRA_ENV_RELOC code needs this to calculate the relocation + * offset for gd->env_addr. Since this is based on gd->relocaddr, we need + * to use CONFIG_SYS_TEXT_BASE here. + */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE + /* Extra Environment */ #ifndef CONFIG_SPL_BUILD -- 2.17.1

2 19

[U-Boot] [PATCH v3] gpio: dwapb_gpio: Change to use devm_kcalloc()
by Ley Foon Tan 19 Sep '18

19 Sep '18

Change to use managed resource function devm_kcalloc(), so it will auto free memory when driver is removed. Signed-off-by: Ley Foon Tan <ley.foon.tan(a)intel.com> --- v3: - Remove goto and return directly. v2: - Remove free() function. --- drivers/gpio/dwapb_gpio.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/gpio/dwapb_gpio.c b/drivers/gpio/dwapb_gpio.c index 0f6574d..68836a7 100644 --- a/drivers/gpio/dwapb_gpio.c +++ b/drivers/gpio/dwapb_gpio.c @@ -171,8 +171,7 @@ static int gpio_dwapb_bind(struct udevice *dev) if (!fdtdec_get_bool(blob, node, "gpio-controller")) continue; - plat = NULL; - plat = calloc(1, sizeof(*plat)); + plat = devm_kcalloc(dev, 1, sizeof(*plat), GFP_KERNEL); if (!plat) return -ENOMEM; @@ -181,23 +180,17 @@ static int gpio_dwapb_bind(struct udevice *dev) plat->pins = fdtdec_get_int(blob, node, "snps,nr-gpios", 0); plat->name = fdt_stringlist_get(blob, node, "bank-name", 0, NULL); - if (ret) - goto err; ret = device_bind(dev, dev->driver, plat->name, plat, -1, &subdev); if (ret) - goto err; + return ret; dev_set_of_offset(subdev, node); bank++; } return 0; - -err: - free(plat); - return ret; } static int gpio_dwapb_remove(struct udevice *dev) -- 2.2.2

2 1

[U-Boot] [PATCH] ARM: da850evm_direct_nor_defconfig: Enable DM_SERIAL
by Adam Ford 19 Sep '18

19 Sep '18

With DM enabled, this patch enables DM_SERIAL and removes the NS16550 initialization from da850_lowlevel since the driver will take care of that itself. Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/arch/arm/mach-davinci/da850_lowlevel.c b/arch/arm/mach-davinci/da850_lowlevel.c index 95dc93a24f..8ceb1779f9 100644 --- a/arch/arm/mach-davinci/da850_lowlevel.c +++ b/arch/arm/mach-davinci/da850_lowlevel.c @@ -288,10 +288,10 @@ int arch_cpu_init(void) /* GPIO setup */ board_gpio_init(); - +#if !defined(CONFIG_DM_SERIAL) NS16550_init((NS16550_t)(CONFIG_SYS_NS16550_COM1), CONFIG_SYS_NS16550_CLK / 16 / CONFIG_BAUDRATE); - +#endif /* * Fix Power and Emulation Management Register * see sprufw3a.pdf page 37 Table 24 diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig index bb8fa3bd6e..baadd01c2c 100644 --- a/configs/da850evm_direct_nor_defconfig +++ b/configs/da850evm_direct_nor_defconfig @@ -5,7 +5,6 @@ CONFIG_TARGET_DA850EVM=y CONFIG_DA850_LOWLEVEL=y CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_DEFAULT_DEVICE_TREE="da850-evm" -# CONFIG_SYS_MALLOC_F is not set CONFIG_SYS_EXTRA_OPTIONS="USE_NOR,DIRECT_NOR_BOOT" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y @@ -45,6 +44,8 @@ CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y +CONFIG_SPECIFY_CONSOLE_INDEX=y +CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_DM_SPI=y -- 2.17.1

2 2

[U-Boot] [Patch V2] ARM: da850evm_direct_nor_defconfig: Enable DM_SERIAL
by Adam Ford 19 Sep '18

19 Sep '18

With DM enabled, this patch enables DM_SERIAL and removes the NS16550 initialization from da850_lowlevel since the driver will take care of that itself. Signed-off-by: Adam Ford <aford173(a)gmail.com> --- V2: Rebase against Master Use CONFIG_IS_ENABLED instead of defined so this can be enabled/disabled in SPL independently. Enable CONFIG_SYS_MALLOC_F to allow relocation allowing the serial to build correctly diff --git a/arch/arm/mach-davinci/da850_lowlevel.c b/arch/arm/mach-davinci/da850_lowlevel.c index 95dc93a24f..822e0dc4a1 100644 --- a/arch/arm/mach-davinci/da850_lowlevel.c +++ b/arch/arm/mach-davinci/da850_lowlevel.c @@ -288,10 +288,10 @@ int arch_cpu_init(void) /* GPIO setup */ board_gpio_init(); - +#if !CONFIG_IS_ENABLED(DM_SERIAL) NS16550_init((NS16550_t)(CONFIG_SYS_NS16550_COM1), CONFIG_SYS_NS16550_CLK / 16 / CONFIG_BAUDRATE); - +#endif /* * Fix Power and Emulation Management Register * see sprufw3a.pdf page 37 Table 24 diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig index 4039d0ee59..42cb4127fd 100644 --- a/configs/da850evm_direct_nor_defconfig +++ b/configs/da850evm_direct_nor_defconfig @@ -5,7 +5,6 @@ CONFIG_TARGET_DA850EVM=y CONFIG_DA850_LOWLEVEL=y CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_NR_DRAM_BANKS=1 -# CONFIG_SYS_MALLOC_F is not set CONFIG_SYS_EXTRA_OPTIONS="USE_NOR,DIRECT_NOR_BOOT" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y @@ -50,6 +49,8 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_MII=y CONFIG_DRIVER_TI_EMAC=y +CONFIG_SPECIFY_CONSOLE_INDEX=y +CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_DM_SPI=y -- 2.17.1

1 0

[U-Boot] [PATCH] net: Fix potential tx packet corruption by response to ARP request
by Bin Meng 19 Sep '18

19 Sep '18

At present the response to ARP request is copied to the transmit packet buffer ('net_tx_packet') and sent out. This won't fail on most cases, but unfortunately is potentially broken under certain circumstances. For example, considering the following packet sequence: 1: placed an ARP request to the other end, initiated by 'ping' 2: received an ARP request from the other end 3: received the ARP reply from the other end The ICMP echo request packet was created in step #1, stored in the transmit packet buffer, but was corrupted in step #2 when handling the response to ARP request using the same buffer, and finally the same buffer was sent out in step #3 as the follow-up on ARP reply. This leads to 'ping' timeout since the ICMP echo request was never sent out to the other end, instead a duplicated ARP reply packet was sent out and ignored by the other end. Similar corruption can happen with other protocols like TFTP, which leads to TFTP transfer timeout. Use the dedicated ARP transmit packet buffer ('arp_tx_packet') to avoid such issue. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- net/arp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/arp.c b/net/arp.c index b8a7168..e625c59 100644 --- a/net/arp.c +++ b/net/arp.c @@ -182,8 +182,8 @@ void arp_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) (net_read_ip(&arp->ar_spa).s_addr & net_netmask.s_addr)) udelay(5000); #endif - memcpy(net_tx_packet, et, eth_hdr_size + ARP_HDR_SIZE); - net_send_packet(net_tx_packet, eth_hdr_size + ARP_HDR_SIZE); + memcpy(arp_tx_packet, et, eth_hdr_size + ARP_HDR_SIZE); + net_send_packet(arp_tx_packet, eth_hdr_size + ARP_HDR_SIZE); return; case ARPOP_REPLY: /* arp reply */ -- 2.7.4

2 1

Re: [U-Boot] sandbox does not complete efi_selftest
by Simon Glass 19 Sep '18

19 Sep '18

Hi Heinrich, On 15 September 2018 at 22:02, Heinrich Schuchardt <xypron.glpk(a)gmx.de> wrote: > Hello Simon, > > in the chat with Alex you indicated that you see a problem with > efi_selftest expecting an input before resetting the board. > > I do not understand why this should be a problem with sandbox. There > never was a problem with the Python tests for any other board. > > Could you, please, detail where the issue is and how it can be reproduced. Using u-boot-dm/ef-working I see this: $ make tests ./test/run +make O=build-sandbox -s sandbox_defconfig +make O=build-sandbox -s -j8 ============================= test session starts ============================== platform linux2 -- Python 2.7.13, pytest-3.0.6, py-1.4.34, pluggy-0.4.0 rootdir: test/py, inifile: pytest.ini collected 326 items test/py/tests/test_000_version.py . test/py/tests/test_avb.py sssss test/py/tests/test_bind.py .. test/py/tests/test_dfu.py s test/py/tests/test_efi_loader.py .sssss test/py/tests/test_efi_selftest.py FF INTERNALERROR> Traceback (most recent call last): INTERNALERROR> File "/usr/lib/python2.7/dist-packages/_pytest/main.py", line 98, in wrap_session INTERNALERROR> session.exitstatus = doit(config, session) or 0 INTERNALERROR> File "/usr/lib/python2.7/dist-packages/_pytest/main.py", line 133, in _main INTERNALERROR> config.hook.pytest_runtestloop(session=session) INTERNALERROR> File "/usr/lib/python2.7/dist-packages/_pytest/vendored_packages/pluggy.py", line 745, in __call__ INTERNALERROR> return self._hookexec(self, self._nonwrappers + self._wrappers, kwargs) INTERNALERROR> File "/usr/lib/python2.7/dist-packages/_pytest/vendored_packages/pluggy.py", line 339, in _hookexec INTERNALERROR> return self._inner_hookexec(hook, methods, kwargs) INTERNALERROR> File "/usr/lib/python2.7/dist-packages/_pytest/vendored_packages/pluggy.py", line 334, in <lambda> INTERNALERROR> _MultiCall(methods, kwargs, hook.spec_opts).execute() INTERNALERROR> File "/usr/lib/python2.7/dist-packages/_pytest/vendored_packages/pluggy.py", line 614, in execute INTERNALERROR> res = hook_impl.function(*args) INTERNALERROR> File "/usr/lib/python2.7/dist-packages/_pytest/main.py", line 154, in pytest_runtestloop INTERNALERROR> item.config.hook.pytest_runtest_protocol(item=item, nextitem=nextitem) INTERNALERROR> File "/usr/lib/python2.7/dist-packages/_pytest/vendored_packages/pluggy.py", line 745, in __call__ INTERNALERROR> return self._hookexec(self, self._nonwrappers + self._wrappers, kwargs) INTERNALERROR> File "/usr/lib/python2.7/dist-packages/_pytest/vendored_packages/pluggy.py", line 339, in _hookexec INTERNALERROR> return self._inner_hookexec(hook, methods, kwargs) INTERNALERROR> File "/usr/lib/python2.7/dist-packages/_pytest/vendored_packages/pluggy.py", line 334, in <lambda> INTERNALERROR> _MultiCall(methods, kwargs, hook.spec_opts).execute() INTERNALERROR> File "/usr/lib/python2.7/dist-packages/_pytest/vendored_packages/pluggy.py", line 613, in execute INTERNALERROR> return _wrapped_call(hook_impl.function(*args), self.execute) INTERNALERROR> File "/usr/lib/python2.7/dist-packages/_pytest/vendored_packages/pluggy.py", line 254, in _wrapped_call INTERNALERROR> return call_outcome.get_result() INTERNALERROR> File "/usr/lib/python2.7/dist-packages/_pytest/vendored_packages/pluggy.py", line 280, in get_result INTERNALERROR> _reraise(*ex) # noqa INTERNALERROR> File "/usr/lib/python2.7/dist-packages/_pytest/vendored_packages/pluggy.py", line 265, in __init__ INTERNALERROR> self.result = func() INTERNALERROR> File "/usr/lib/python2.7/dist-packages/_pytest/vendored_packages/pluggy.py", line 614, in execute INTERNALERROR> res = hook_impl.function(*args) INTERNALERROR> File "test/py/conftest.py", line 577, in pytest_runtest_protocol INTERNALERROR> console.drain_console() INTERNALERROR> File "test/py/u_boot_console_base.py", line 306, in drain_console INTERNALERROR> self.p.expect(['This should never match U-Boot output']) INTERNALERROR> File "test/py/u_boot_spawn.py", line 174, in expect INTERNALERROR> c = os.read(self.fd, 1024) INTERNALERROR> OSError: [Errno 5] Input/output error =============== 2 failed, 4 passed, 11 skipped in 17.08 seconds ================ +make O=build-sandbox_spl -s sandbox_spl_defconfig +make O=build-sandbox_spl -s -j8 ============================= test session starts ============================== platform linux2 -- Python 2.7.13, pytest-3.0.6, py-1.4.34, pluggy-0.4.0 rootdir: test/py, inifile: pytest.ini collected 320 items test/py/tests/test_ofplatdata.py . ============================= 319 tests deselected ============================= =================== 1 passed, 319 deselected in 0.21 seconds =================== +make O=build-sandbox_flattree -s sandbox_flattree_defconfig +make O=build-sandbox_flattree -s -j8 ============================= test session starts ============================== platform linux2 -- Python 2.7.13, pytest-3.0.6, py-1.4.34, pluggy-0.4.0 rootdir: test/py, inifile: pytest.ini collected 321 items test/py/tests/test_000_version.py . test/py/tests/test_avb.py sssss test/py/tests/test_bind.py ss test/py/tests/test_dfu.py s test/py/tests/test_efi_loader.py .sssss test/py/tests/test_efi_selftest.py sss test/py/tests/test_env.py ............ test/py/tests/test_fit.py s test/py/tests/test_fpga.py sssssssssssssssssssssssssss test/py/tests/test_gpt.py sssssss test/py/tests/test_help.py . test/py/tests/test_hush_if_test.py ......................................................s test/py/tests/test_log.py .. test/py/tests/test_md.py .. test/py/tests/test_mmc_rd.py s test/py/tests/test_net.py .sssss test/py/tests/test_ofplatdata.py s test/py/tests/test_sandbox_exit.py ss test/py/tests/test_sf.py ssss test/py/tests/test_shell_basics.py .... test/py/tests/test_sleep.py . test/py/tests/test_tpm2.py ........... test/py/tests/test_ums.py s test/py/tests/test_unknown_cmd.py . test/py/tests/test_ut.py ................................................................................................................................................................... test/py/tests/test_vboot.py s ==================== 254 passed, 67 skipped in 9.23 seconds ==================== <unittest.result.TestResult run=110 errors=0 failures=0> <unittest.result.TestResult run=12 errors=0 failures=0> Checking: https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/7.3.0/ <unittest.result.TestResult run=35 errors=0 failures=1> Traceback (most recent call last): File "tools/buildman/test.py", line 426, in testToolchainDownload self.toolchains.LocateArchUrl('arm')) AssertionError: 'https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.9.0/x86_64-gc…' != 'https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/7.3.0/x86_64-gc…' /tmp/binman.ddKM14/source.dtb: Warning (clocks_property): /phandle-source:clocks: Could not get phandle node for (cell 0) /tmp/binman.ddKM14/source.dtb: Warning (clocks_property): /phandle-source2: Missing property '#clock-cells' in node /phandle-target or bad phandle (referred from clocks[0]) <unittest.result.TestResult run=22 errors=0 failures=0> <unittest.result.TestResult run=110 errors=0 failures=0> 100% /tmp/binman.Z_3MuD/source.dtb: Warning (clocks_property): /phandle-source:clocks: Could not get phandle node for (cell 0) /tmp/binman.Z_3MuD/source.dtb: Warning (clocks_property): /phandle-source2: Missing property '#clock-cells' in node /phandle-target or bad phandle (referred from clocks[0]) <unittest.result.TestResult run=22 errors=0 failures=0> 100% <unittest.result.TestResult run=31 errors=0 failures=0> 100% Tests FAILED Makefile:1711: recipe for target 'tests' failed make: *** [tests] Error 1 When I run $ sandbox/u-boot -D -c "bootefi selftest" I get at the end the network timeout failure: Setting up 'simple network protocol' Failed to open socket: 1 Operation not permitted Failed to open socket: 1 Operation not permitted Failed to open socket: 1 Operation not permitted Setting up 'simple network protocol' succeeded Executing 'simple network protocol' DHCP Discover DHCP Discover DHCP Discover DHCP Discover DHCP Discover DHCP Discover DHCP Discover DHCP Discover DHCP Discover DHCP Discover lib/efi_selftest/efi_selftest_snp.c(311): ERROR: Timeout occurred lib/efi_selftest/efi_selftest.c(109): ERROR: Executing 'simple network protocol' failed Tearing down 'simple network protocol' Tearing down 'simple network protocol' succeeded and then at the end: Summary: 1 failures Preparing for reset. Press any key... resetting ... Here it hangs waiting for a key. Also can I suggest removing some of the output when it runs the tests? For example, this seems like boilerplate to me: Setting up 'event services' Setting up 'event services' succeeded Executing 'event services' Executing 'event services' succeeded Regards, Simon

3 9

[U-Boot] [PATCH V2] MMC: davinici_mmc: Enable CD and WP with DM and OF_CONTROL
by Adam Ford 18 Sep '18

18 Sep '18

When used with a device tree, this will extract the card detect and write protect pins from the device tree and configure them accordingly. This assumes the GPIO_ACTIVE_LOW/HIGH is supported by da8xx_gpio. Signed-off-by: Adam Ford <aford173(a)gmail.com> --- V2: Wrap the CD and WP GPIO references around DM_GPIO to prevent errors diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c index db950ea5ec..0d63279db0 100644 --- a/drivers/mmc/davinci_mmc.c +++ b/drivers/mmc/davinci_mmc.c @@ -15,6 +15,7 @@ #include <malloc.h> #include <asm/io.h> #include <asm/arch/sdmmc_defs.h> +#include <asm-generic/gpio.h> #define DAVINCI_MAX_BLOCKS (32) #define WATCHDOG_COUNT (100000) @@ -35,6 +36,8 @@ struct davinci_mmc_priv { struct davinci_mmc_regs *reg_base; /* Register base address */ uint input_clk; /* Input clock to MMC controller */ uint version; /* MMC Controller version */ + struct gpio_desc cd_gpio; /* Card Detect GPIO */ + struct gpio_desc wp_gpio; /* Write Protect GPIO */ }; struct davinci_mmc_plat @@ -425,9 +428,41 @@ static const struct mmc_ops dmmc_ops = { .init = dmmc_init, }; #else + +static int davinci_mmc_getcd(struct udevice *dev) +{ + int value = -1; +#if CONFIG_IS_ENABLED(DM_GPIO) + struct davinci_mmc_priv *priv = dev_get_priv(dev); + value = dm_gpio_get_value(&priv->cd_gpio); +#endif + /* if no CD return as 1 */ + if (value < 0) + return 1; + + return value; +} + +static int davinci_mmc_getwp(struct udevice *dev) +{ + int value = -1; +#if CONFIG_IS_ENABLED(DM_GPIO) + struct davinci_mmc_priv *priv = dev_get_priv(dev); + + value = dm_gpio_get_value(&priv->wp_gpio); +#endif + /* if no WP return as 0 */ + if (value < 0) + return 0; + + return value; +} + static const struct dm_mmc_ops davinci_mmc_ops = { .send_cmd = davinci_mmc_send_cmd, .set_ios = davinci_mmc_set_ios, + .get_cd = davinci_mmc_getcd, + .get_wp = davinci_mmc_getwp, }; #endif @@ -475,6 +510,12 @@ static int davinci_mmc_probe(struct udevice *dev) priv->reg_base = (struct davinci_mmc_regs *)dev_read_addr(dev); priv->input_clk = clk_get(DAVINCI_MMCSD_CLKID); +#if CONFIG_IS_ENABLED(DM_GPIO) + /* These GPIOs are optional */ + gpio_request_by_name(dev, "cd-gpios", 0, &priv->cd_gpio, GPIOD_IS_IN); + gpio_request_by_name(dev, "wp-gpios", 0, &priv->wp_gpio, GPIOD_IS_IN); +#endif + upriv->mmc = &plat->mmc; return davinci_dm_mmc_init(dev); -- 2.17.1

2 1

[U-Boot] [PATCH 1/2] Configs: am3517_evm: Remove TWL4030 reference
by Adam Ford 18 Sep '18

18 Sep '18

This SOM and kit do not nor have they ever had a twl4030 PMIC. This patch removes the references to it. Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig index 41ab3fd373..61a401c4c1 100644 --- a/configs/am3517_evm_defconfig +++ b/configs/am3517_evm_defconfig @@ -43,6 +43,7 @@ CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000 CONFIG_SPL_NAND_SIMPLE=y +# CONFIG_TWL4030_POWER is not set CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_SPI=y -- 2.17.1

3 4