June 2018 - U-Boot

[U-Boot] [PATCH 0/6] mx6cuboxi: Add support for SOMs with eMMC
by Baruch Siach 23 Jul '18

23 Jul '18

The newer rev 1.5 of the SolidRun i.MX6 SOM can optionally come with eMMC on the SOM. This series adds support for the eMMC device on these SOMs. Since eMMC has card detect signal this series uses the new mmc_get_op_cond() function that is broken out of mmc_init_start(). Successful completion of mmc_get_op_cond() indicates that the eMMC is present. Finally, the last patch in this series constructs the name of the kernel device tree to load. This name is compatible with recent mainline kernels. This series depends on the patches adding support for SOM rev 1.5 that were posted earlier: https://patchwork.ozlabs.org/patch/926302/ https://patchwork.ozlabs.org/patch/926301/ Baruch Siach (2): mmc: drop mention of IN_PROGRESS status mx6cuboxi: drop CONFIG_SYS_FSL_USDHC_NUM Jon Nettleton (4): mmc: break out get_op_cond code to its own function mx6cuboxi: Add support for eMMC booting mx6cuboxi: Use mmc_get_op_cond() to check for an eMMC mx6cuboxi: Add emmc device tree suffix board/solidrun/mx6cuboxi/mx6cuboxi.c | 115 +++++++++++++++++++++++++-- drivers/mmc/mmc.c | 61 ++++++++------ include/configs/mx6cuboxi.h | 25 +++--- include/mmc.h | 12 ++- 4 files changed, 167 insertions(+), 46 deletions(-) -- 2.17.1

2 8

[U-Boot] [PATCH v1 1/5] ARM: PSCI: initialize stack pointer on secondary CPUs
by Stefan Agner 23 Jul '18

23 Jul '18

From: Stefan Agner <stefan.agner(a)toradex.com> A proper stack is required to safely use C code in psci_arch_cpu_entry. Fixes: 486daaa618e1 ("arm: psci: add a weak function psci_arch_cpu_entry") Cc: Patrick Delaunay <patrick.delaunay(a)st.com> Signed-off-by: Stefan Agner <stefan.agner(a)toradex.com> --- arch/arm/cpu/armv7/psci.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/cpu/armv7/psci.S b/arch/arm/cpu/armv7/psci.S index 08b5088675..983cd90442 100644 --- a/arch/arm/cpu/armv7/psci.S +++ b/arch/arm/cpu/armv7/psci.S @@ -331,6 +331,8 @@ ENTRY(psci_cpu_entry) bl _nonsec_init + bl psci_stack_setup + bl psci_arch_cpu_entry bl psci_get_cpu_id @ CPU ID => r0 -- 2.17.1

4 9

[U-Boot] [PATCH v2] arm, imx6: fix NOR/OneNAND boot mode mix-up
by Jay Carlson 23 Jul '18

23 Jul '18

This patch fixes the ordering of the EMI enum to match Table 8-8 in the i.MX6ULL Reference Manual, and has been spot-checked in two other i.MX reference manuals for accuracy. Signed-off-by: Jay Carlson <jay.d.carlson(a)gmail.com> --- arch/arm/include/asm/mach-imx/sys_proto.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h index d1d6cbc462..0acc3640f9 100644 --- a/arch/arm/include/asm/mach-imx/sys_proto.h +++ b/arch/arm/include/asm/mach-imx/sys_proto.h @@ -63,8 +63,8 @@ enum imx6_bmode_serial_rom { }; enum imx6_bmode_emi { - IMX6_BMODE_ONENAND, IMX6_BMODE_NOR, + IMX6_BMODE_ONENAND }; enum imx6_bmode { -- 2.16.1.windows.4

2 1

[U-Boot] [PATCH V2] eth: dm: fec: Add gpio phy reset binding
by Michael Trimarchi 23 Jul '18

23 Jul '18

Add the missing gpio phy reset binding to the gpio and reset time configuration Signed-off-by: Michael Trimarchi <michael(a)amarulasolutions.com> --- Changes v1 -> v2: - fix commit message - fix timeout property read --- drivers/net/fec_mxc.c | 43 +++++++++++++++++++++++++++++++++++++------ drivers/net/fec_mxc.h | 5 ++++- 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 694a0b2..dac07b6 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -15,7 +15,6 @@ #include <miiphy.h> #include <net.h> #include <netdev.h> -#include "fec_mxc.h" #include <asm/io.h> #include <linux/errno.h> @@ -24,6 +23,9 @@ #include <asm/arch/clock.h> #include <asm/arch/imx-regs.h> #include <asm/mach-imx/sys_proto.h> +#include <asm-generic/gpio.h> + +#include "fec_mxc.h" DECLARE_GLOBAL_DATA_PTR; @@ -1245,6 +1247,19 @@ static int fec_phy_init(struct fec_priv *priv, struct udevice *dev) return 0; } +#ifdef CONFIG_DM_GPIO +/* FEC GPIO reset */ +static void fec_gpio_reset(struct fec_priv *priv) +{ + debug("fec_gpio_reset: fec_gpio_reset(dev)\n"); + if (dm_gpio_is_valid(&priv->phy_reset_gpio)) { + dm_gpio_set_value(&priv->phy_reset_gpio, 1); + udelay(priv->reset_delay); + dm_gpio_set_value(&priv->phy_reset_gpio, 0); + } +} +#endif + static int fecmxc_probe(struct udevice *dev) { struct eth_pdata *pdata = dev_get_platdata(dev); @@ -1257,6 +1272,9 @@ static int fecmxc_probe(struct udevice *dev) if (ret) return ret; +#ifdef CONFIG_DM_GPIO + fec_gpio_reset(priv); +#endif /* Reset chip. */ writel(readl(&priv->eth->ecntrl) | FEC_ECNTRL_RESET, &priv->eth->ecntrl); @@ -1314,6 +1332,7 @@ static int fecmxc_remove(struct udevice *dev) static int fecmxc_ofdata_to_platdata(struct udevice *dev) { + int ret = 0; struct eth_pdata *pdata = dev_get_platdata(dev); struct fec_priv *priv = dev_get_priv(dev); const char *phy_mode; @@ -1331,12 +1350,24 @@ static int fecmxc_ofdata_to_platdata(struct udevice *dev) return -EINVAL; } - /* TODO - * Need to get the reset-gpio and related properties from DT - * and implemet the enet reset code on .probe call - */ +#ifdef CONFIG_DM_GPIO + ret = gpio_request_by_name(dev, "phy-reset-gpios", 0, + &priv->phy_reset_gpio, GPIOD_IS_OUT); + if (ret == 0) { + ret = dev_read_u32_array(dev, "phy-reset-duration", + &priv->reset_delay, 1); + } else if (ret == -ENOENT) { + priv->reset_delay = 1000; + ret = 0; + } - return 0; + if (priv->reset_delay > 1000) { + printf("FEX MXC: gpio reset timeout should be less the 1000\n"); + priv->reset_delay = 1000; + } +#endif + + return ret; } static const struct udevice_id fecmxc_ids[] = { diff --git a/drivers/net/fec_mxc.h b/drivers/net/fec_mxc.h index 3b935af..fd89443 100644 --- a/drivers/net/fec_mxc.h +++ b/drivers/net/fec_mxc.h @@ -250,7 +250,10 @@ struct fec_priv { int phy_id; int (*mii_postcall)(int); #endif - +#ifdef CONFIG_DM_GPIO + struct gpio_desc phy_reset_gpio; + uint32_t reset_delay; +#endif #ifdef CONFIG_DM_ETH u32 interface; #endif -- 2.7.4

6 5

[U-Boot] [PATCH v2] arm, imx6: add support for SD/MMC Manufacture Mode
by Jay Carlson 23 Jul '18

23 Jul '18

This patch adds support for booting blank i.MX6 devices in SD/MMC Manufacture Mode: a fallback mode which the boot ROM enters when no fuses or boot mode pins have been set, the USB serial downloader connection is inactive, and there is an SD card inserted into uSDHC1. The i.MX7 and i.MX8, which both have a Boot_SW_Info data structure which can be parsed to determine boot source, is unaffected by this patch. Signed-off-by: Jay Carlson <jay.d.carlson(a)gmail.com> --- arch/arm/mach-imx/spl.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index a20b30d154..8ecae8605c 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -43,6 +43,16 @@ u32 spl_boot_device(void) */ if (is_usbotg_phy_active()) return BOOT_DEVICE_BOARD; + + /** + * To support SD/MMC Manufacture Mode, we check that BOOT_MODE == 0 + * and that BT_FUSE_SEL == 0. If this was disabled via + * blowing DISABLE_SDMMC_MFG, or if SDMMC MFG mode failed, + * we would be in USB download mode, which the previous line would + * have detected. + */ + if (((bmode >> 24) & 0x03) == 0x00 && (bmode >> 4) == 0x00) + return BOOT_DEVICE_MMC1; /* BOOT_CFG1[7:4] - see IMX6DQRM Table 8-8 */ switch ((reg & IMX6_BMODE_MASK) >> IMX6_BMODE_SHIFT) { -- 2.16.1.windows.4

2 1

[U-Boot] [PATCH] env: Simplify Makefile using $(SPL_TPL_)
by York Sun 21 Jul '18

21 Jul '18

Add Kconfig options SPL_ENV_* and TPL_ENV_* and simplify Makefile. This allows SPL/TPL image has different environment setting from full feature U-Boot. Signed-off-by: York Sun <york.sun(a)nxp.com> --- env/Kconfig | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ env/Makefile | 40 ++++++--------------- 2 files changed, 126 insertions(+), 29 deletions(-) diff --git a/env/Kconfig b/env/Kconfig index f403906..154f84b 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -504,4 +504,119 @@ config ENV_VARS_UBOOT_RUNTIME_CONFIG run-time determined information about the hardware to the environment. These will be named board_name, board_rev. +if SPL_ENV_SUPPORT +config SPL_ENV_IS_NOWHERE + bool "SPL Environment is not stored" + default y if ENV_IS_NOWHERE + help + Similar to ENV_IS_NOWHERE, used for SPL environment. + +config SPL_ENV_IS_IN_MMC + bool "SPL Environment in an MMC device" + depends on !SPL_ENV_IS_NOWHERE + depends on ENV_IS_IN_MMC + default y + help + Similar to ENV_IS_IN_MMC, used for SPL environment. + +config SPL_ENV_IS_IN_FAT + bool "SPL Environment is in a FAT filesystem" + depends on !SPL_ENV_IS_NOWHERE + depends on ENV_IS_IN_FAT + default y + help + Similar to ENV_IS_IN_FAT, used for SPL environment. + +config SPL_ENV_IS_IN_EXT4 + bool "SPL Environment is in a EXT4 filesystem" + depends on !SPL_ENV_IS_NOWHERE + depends on ENV_IS_IN_EXT4 + default y + help + Similar to ENV_IS_IN_EXT4, used for SPL environment. + +config SPL_ENV_IS_IN_NAND + bool "SPL Environment in a NAND device" + depends on !SPL_ENV_IS_NOWHERE + depends on ENV_IS_IN_NAND + default y + help + Similar to ENV_IS_IN_NAND, used for SPL environment. + +config SPL_ENV_IS_IN_SPI_FLASH + bool "SPL Environment is in SPI flash" + depends on !SPL_ENV_IS_NOWHERE + depends on ENV_IS_IN_SPI_FLASH + default y + help + Similar to ENV_IS_IN_SPI_FLASH, used for SPL environment. + +config SPL_ENV_IS_IN_FLASH + bool "SPL Environment in flash memory" + depends on !SPL_ENV_IS_NOWHERE + depends on ENV_IS_IN_FLASH + default y + help + Similar to ENV_IS_IN_FLASH, used for SPL environment. + +endif + +if TPL_ENV_SUPPORT + +config TPL_ENV_IS_NOWHERE + bool "TPL Environment is not stored" + default y if ENV_IS_NOWHERE + help + Similar to ENV_IS_NOWHERE, used for TPL environment. + +config TPL_ENV_IS_IN_MMC + bool "TPL Environment in an MMC device" + depends on !TPL_ENV_IS_NOWHERE + depends on ENV_IS_IN_MMC + default y + help + Similar to ENV_IS_IN_MMC, used for TPL environment. + +config TPL_ENV_IS_IN_FAT + bool "TPL Environment is in a FAT filesystem" + depends on !TPL_ENV_IS_NOWHERE + depends on ENV_IS_IN_FAT + default y + help + Similar to ENV_IS_IN_FAT, used for TPL environment. + +config TPL_ENV_IS_IN_EXT4 + bool "TPL Environment is in a EXT4 filesystem" + depends on !TPL_ENV_IS_NOWHERE + depends on ENV_IS_IN_EXT4 + default y + help + Similar to ENV_IS_IN_EXT4, used for TPL environment. + +config TPL_ENV_IS_IN_NAND + bool "TPL Environment in a NAND device" + depends on !TPL_ENV_IS_NOWHERE + depends on ENV_IS_IN_NAND + default y + help + Similar to ENV_IS_IN_NAND, used for TPL environment. + +config TPL_ENV_IS_IN_SPI_FLASH + bool "TPL Environment is in SPI flash" + depends on !TPL_ENV_IS_NOWHERE + depends on ENV_IS_IN_SPI_FLASH + default y + help + Similar to ENV_IS_IN_SPI_FLASH, used for TPL environment. + +config TPL_ENV_IS_IN_FLASH + bool "TPL Environment in flash memory" + depends on !TPL_ENV_IS_NOWHERE + depends on ENV_IS_IN_FLASH + default y + help + Similar to ENV_IS_IN_FLASH, used for TPL environment. + +endif + endmenu diff --git a/env/Makefile b/env/Makefile index fa635c8..90144d6 100644 --- a/env/Makefile +++ b/env/Makefile @@ -14,41 +14,23 @@ extra-$(CONFIG_ENV_IS_EMBEDDED) += embedded.o obj-$(CONFIG_ENV_IS_IN_EEPROM) += embedded.o extra-$(CONFIG_ENV_IS_IN_FLASH) += embedded.o obj-$(CONFIG_ENV_IS_IN_NVRAM) += embedded.o -obj-$(CONFIG_ENV_IS_IN_FLASH) += flash.o -obj-$(CONFIG_ENV_IS_IN_MMC) += mmc.o -obj-$(CONFIG_ENV_IS_IN_FAT) += fat.o -obj-$(CONFIG_ENV_IS_IN_EXT4) += ext4.o -obj-$(CONFIG_ENV_IS_IN_NAND) += nand.o obj-$(CONFIG_ENV_IS_IN_NVRAM) += nvram.o obj-$(CONFIG_ENV_IS_IN_ONENAND) += onenand.o obj-$(CONFIG_ENV_IS_IN_SATA) += sata.o -obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += sf.o obj-$(CONFIG_ENV_IS_IN_REMOTE) += remote.o obj-$(CONFIG_ENV_IS_IN_UBI) += ubi.o -obj-$(CONFIG_ENV_IS_NOWHERE) += nowhere.o -endif - -ifdef CONFIG_SPL_BUILD -obj-$(CONFIG_ENV_IS_IN_FLASH) += flash.o -# environment -ifdef CONFIG_TPL_BUILD -obj-$(CONFIG_TPL_ENV_SUPPORT) += attr.o -obj-$(CONFIG_TPL_ENV_SUPPORT) += flags.o -obj-$(CONFIG_TPL_ENV_SUPPORT) += callback.o else -obj-$(CONFIG_SPL_ENV_SUPPORT) += attr.o -obj-$(CONFIG_SPL_ENV_SUPPORT) += flags.o -obj-$(CONFIG_SPL_ENV_SUPPORT) += callback.o -endif -ifneq ($(CONFIG_TPL_ENV_SUPPORT)$(CONFIG_SPL_ENV_SUPPORT),) -obj-$(CONFIG_ENV_IS_NOWHERE) += nowhere.o -obj-$(CONFIG_ENV_IS_IN_MMC) += mmc.o -obj-$(CONFIG_ENV_IS_IN_FAT) += fat.o -obj-$(CONFIG_ENV_IS_IN_EXT4) += ext4.o -obj-$(CONFIG_ENV_IS_IN_NAND) += nand.o -obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += sf.o -obj-$(CONFIG_ENV_IS_IN_FLASH) += flash.o -endif +obj-$(CONFIG_$(SPL_TPL_)ENV_SUPPORT) += attr.o +obj-$(CONFIG_$(SPL_TPL_)ENV_SUPPORT) += flags.o +obj-$(CONFIG_$(SPL_TPL_)ENV_SUPPORT) += callback.o endif +obj-$(CONFIG_$(SPL_TPL_)ENV_IS_NOWHERE) += nowhere.o +obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_MMC) += mmc.o +obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_FAT) += fat.o +obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_EXT4) += ext4.o +obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_NAND) += nand.o +obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_SPI_FLASH) += sf.o +obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_FLASH) += flash.o + CFLAGS_embedded.o := -Wa,--no-warn -DENV_CRC=$(shell tools/envcrc 2>/dev/null) -- 2.7.4

2 1

[U-Boot] [PATCH 1/1] env: typo in description of ENV_IS_IN_REMOTE
by Heinrich Schuchardt 21 Jul '18

21 Jul '18

%s/remove/remote/ Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- env/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env/Kconfig b/env/Kconfig index a3c6298273e..5c673a0aaac 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -277,7 +277,7 @@ config ENV_IS_IN_ONENAND provision. config ENV_IS_IN_REMOTE - bool "Environment is in remove memory space" + bool "Environment is in remote memory space" depends on !CHAIN_OF_TRUST help Define this if you have a remote memory space which you -- 2.16.2

2 1

[U-Boot] Support of kernels > 16 MiB on Raspberry Pi
by Alexander Kurtz 21 Jul '18

21 Jul '18

Hi! I am using U-Boot to boot Debian Buster arm64 (standard kernel with a dracut-based initramfs) via an extlinux.conf on my Raspberry Pi 3. Recently, the Debian kernel grew beyond 16 MiB: 4.13: /boot/vmlinuz-4.13.0-1-arm64 == 16448000 bytes (< 16 MiB) [0] 4.14: /boot/vmlinuz-4.14.0-3-arm64 == 17539584 bytes (> 16 MiB) [1] 4.15: /boot/vmlinuz-4.15.0-1-arm64 == 17867264 bytes (> 16 MiB) [2] https://github.com/u-boot/u-boot/blob/master/include/configs/rpi.h#L129 says: #define ENV_MEM_LAYOUT_SETTINGS \ "fdt_high=ffffffff\0" \ "initrd_high=ffffffff\0" \ "fdt_addr_r=0x00000100\0" \ "pxefile_addr_r=0x00100000\0" \ "kernel_addr_r=0x01000000\0" \ "scriptaddr=0x02000000\0" \ "ramdisk_addr_r=0x02100000\0" \ Am I correct in assuming that this default configuration will break with kernels > 16 MiB? The Readme [3] seems to confirm this, but I wanted to ask for explicit confirmation here. The background is that ever since the upgrade to 4.14, the kernel has been failing to unpack the initramfs, complaining about "junk in [the] compressed archive" and I am currently trying to find where to best file a bug report about this! Best regards Alexander Kurtz [0] http://snapshot.debian.org/package/linux/4.13.13-1/#linux-image-4.13.0-1-ar… [1] http://snapshot.debian.org/package/linux/4.14.17-1/#linux-image-4.14.0-3-ar… [2] http://snapshot.debian.org/package/linux/4.15.4-1/#linux-image-4.15.0-1-arm… [3] https://github.com/u-boot/u-boot/blob/master/doc/README.distro#L250

5 7

[U-Boot] [PATCH] spl: mmc: Skip RAW mode ARGS sectors if not defined
by York Sun 21 Jul '18

21 Jul '18

RAW mode ARGS sector doesn't have to be used for all falcon boot. Skip loading ARGS sectors if not defined. Signed-off-by: York Sun <york.sun(a)nxp.com> --- common/spl/spl_mmc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index db5be3d..0b2f059 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -191,9 +191,11 @@ static int mmc_load_image_raw_partition(struct spl_image_info *spl_image, static int mmc_load_image_raw_os(struct spl_image_info *spl_image, struct mmc *mmc) { - unsigned long count; int ret; +#if defined(CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR) + unsigned long count; + count = blk_dread(mmc_get_blk_desc(mmc), CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR, CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS, @@ -204,6 +206,7 @@ static int mmc_load_image_raw_os(struct spl_image_info *spl_image, #endif return -1; } +#endif /* CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR */ ret = mmc_load_image_raw_sector(spl_image, mmc, CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR); -- 2.7.4

2 1

[U-Boot] [PATCH] mtd: spi: spi_flash: fix build with dma enabled
by Grygorii Strashko 20 Jul '18

20 Jul '18

Fix build with CONFIG_DMA enabled drivers/mtd/spi/spi_flash.c:376: undefined reference to `dma_memcpy' Signed-off-by: Grygorii Strashko <grygorii.strashko(a)ti.com> --- drivers/mtd/spi/spi_flash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index c159124..d6cbdf2 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -457,7 +457,7 @@ int spi_flash_read_common(struct spi_flash *flash, const u8 *cmd, */ void __weak spi_flash_copy_mmap(void *data, void *offset, size_t len) { -#ifdef CONFIG_DMA +#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_DMA) if (!dma_memcpy(data, offset, len)) return; #endif -- 2.10.5

2 2