July 2018 - U-Boot

[U-Boot] [PATCH 01/16] pico-imx7d: Convert to distro config
by Otavio Salvador 23 Jul '18

23 Jul '18

From: Fabio Estevam <festevam(a)gmail.com> Instead of keeping a custom environment, use a more generic approach by switching to disto config. Signed-off-by: Fabio Estevam <festevam(a)gmail.com> Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- include/configs/pico-imx7d.h | 55 +++++++++--------------------------- 1 file changed, 14 insertions(+), 41 deletions(-) diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index d2ffa70fc5..243c12faea 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -41,48 +41,21 @@ "console=ttymxc4\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ - "fdt_file=imx7d-pico-pi.dtb\0" \ + "fdtfile=imx7d-pico-pi.dtb\0" \ "fdt_addr=0x83000000\0" \ - "ip_dyn=yes\0" \ - "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ - "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ - "finduuid=part uuid mmc 0:2 uuid\0" \ - "mmcargs=setenv bootargs console=${console},${baudrate} " \ - "root=PARTUUID=${uuid} rootwait rw\0" \ - "loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ - "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ - "mmcboot=echo Booting from mmc ...; " \ - "run finduuid; " \ - "run mmcargs; " \ - "if run loadfdt; then " \ - "bootz ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "echo WARN: Cannot load the DT; " \ - "fi;\0" \ - "netargs=setenv bootargs console=${console},${baudrate} " \ - "root=/dev/nfs " \ - "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ - "netboot=echo Booting from net ...; " \ - "run netargs; " \ - "if test ${ip_dyn} = yes; then " \ - "setenv get_cmd dhcp; " \ - "else " \ - "setenv get_cmd tftp; " \ - "fi; " \ - "${get_cmd} ${image}; " \ - "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ - "bootz ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "echo WARN: Cannot load the DT; " \ - "fi;\0" - -#define CONFIG_BOOTCOMMAND \ - "if mmc rescan; then " \ - "if run loadimage; then " \ - "run mmcboot; " \ - "else run netboot; " \ - "fi; " \ - "else run netboot; fi" + "fdt_addr_r=0x83000000\0" \ + "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "ramdisk_addr_r=0x83000000\0" \ + "ramdiskaddr=0x83000000\0" \ + "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ + BOOTENV + +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(DHCP, dhcp, na) + +#include <config_distro_bootcmd.h> #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x20000000) -- 2.18.0

3 17

[U-Boot] [PATCH] arm,imx6: add alternative PAD_CTL_DSE constants
by Mark Jonas 23 Jul '18

23 Jul '18

Not all i.MX6 pads use the same drive strength table. So far only the 240 Ohm to 34 Ohm table was available. Because the constants used have speaking names it can be confusing to use e.g. PAD_CTL_DSE_48ohm when according to the reference manual 52 Ohm is the correct value. This patch adds the 260 Ohm to 37 Ohm table. For example, the IOMUXC_SW_PAD_CTL_PAD_SD2_CLK register (SD-card clock) uses the added table. --- arch/arm/include/asm/mach-imx/iomux-v3.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm/include/asm/mach-imx/iomux-v3.h b/arch/arm/include/asm/mach-imx/iomux-v3.h index bb93058..63f4b33 100644 --- a/arch/arm/include/asm/mach-imx/iomux-v3.h +++ b/arch/arm/include/asm/mach-imx/iomux-v3.h @@ -163,6 +163,14 @@ typedef u64 iomux_v3_cfg_t; #define PAD_CTL_DSE_40ohm (6 << 3) #define PAD_CTL_DSE_34ohm (7 << 3) +#define PAD_CTL_DSE_260ohm (1 << 3) +#define PAD_CTL_DSE_130ohm (2 << 3) +#define PAD_CTL_DSE_88ohm (3 << 3) +#define PAD_CTL_DSE_65ohm (4 << 3) +#define PAD_CTL_DSE_52ohm (5 << 3) +#define PAD_CTL_DSE_43ohm (6 << 3) +#define PAD_CTL_DSE_37ohm (7 << 3) + /* i.MX6SL/SLL */ #define PAD_CTL_LVE (1 << 1) #define PAD_CTL_LVE_BIT (1 << 22) -- 2.7.4

3 5

[U-Boot] [PATCH] arm: imx7d: cl-som-imx7: sf: support all SF types
by Yaniv Levinsky 23 Jul '18

23 Jul '18

From: Uri Mashiach <uri.mashiach(a)compulab.co.il> Enable the support for all SPI flash types. Signed-off-by: Uri Mashiach <uri.mashiach(a)compulab.co.il> Signed-off-by: Yaniv Levinsky <yaniv.levinsky(a)compulab.co.il> --- configs/cl-som-imx7_defconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configs/cl-som-imx7_defconfig b/configs/cl-som-imx7_defconfig index 6d403eed7a..8692241029 100644 --- a/configs/cl-som-imx7_defconfig +++ b/configs/cl-som-imx7_defconfig @@ -47,7 +47,14 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_ATMEL=y +CONFIG_SPI_FLASH_EON=y +CONFIG_SPI_FLASH_GIGADEVICE=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y +CONFIG_SPI_FLASH_SST=y +CONFIG_SPI_FLASH_WINBOND=y CONFIG_SPI=y CONFIG_MXC_SPI=y CONFIG_USB=y -- 2.17.1

2 1

[U-Boot] [PATCH] imx: mx6: Fix implementantion reset_misc
by Michael Trimarchi 23 Jul '18

23 Jul '18

lcdif_power_down should not be included in spl build to avoid build failure introduced by commit eb111bb31d882877e75e6b8083808dcaf6493b92 Signed-off-by: Michael Trimarchi <michael(a)amarulasolutions.com> --- arch/arm/mach-imx/mx6/soc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c index e8b6f77..ffc2951 100644 --- a/arch/arm/mach-imx/mx6/soc.c +++ b/arch/arm/mach-imx/mx6/soc.c @@ -548,9 +548,11 @@ const struct boot_mode soc_boot_modes[] = { void reset_misc(void) { +#ifndef CONFIG_SPL_BUILD #ifdef CONFIG_VIDEO_MXS lcdif_power_down(); #endif +#endif } void s_init(void) -- 2.7.4

4 3

[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] microblaze: Add missing quotes around XILINX_MICROBLAZE0_HW_VER
by Michal Simek 23 Jul '18

23 Jul '18

This issue is reported by kconfiglib: warning: style: quotes recommended around default value for string symbol XILINX_MICROBLAZE0_HW_VER (defined at board/xilinx/microblaze-generic/Kconfig:37) Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- board/xilinx/microblaze-generic/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/xilinx/microblaze-generic/Kconfig b/board/xilinx/microblaze-generic/Kconfig index 6e93a3d948d4..f2fa0f72b13f 100644 --- a/board/xilinx/microblaze-generic/Kconfig +++ b/board/xilinx/microblaze-generic/Kconfig @@ -36,6 +36,6 @@ config XILINX_MICROBLAZE0_USE_HW_MUL config XILINX_MICROBLAZE0_HW_VER string "Core version number" - default 7.10.d + default "7.10.d" endif -- 1.9.1

1 0