November 2019 - U-Boot

[U-Boot] [PATCH v2 0/5] imx: dm: Update mccmon6 board to only use DM/DTS in U-Boot proper
by Lukasz Majewski 04 Nov '19

04 Nov '19

This patch series converts mccmon6 to use Driver Model and Device Tree in U-Boot proper. As the SPL is size constrained (and most notably the device has a strict boot time requirements) for this board (and uses falcon boot) - its conversion to DM/DTB will be added with separate patch series. The SPL/U-Boot proper now uses fitImage instead of legacy uImage and DTB. Some notable changes: - Use fitImage to boot Linux kernel (and also use of SPL's Falcon mode when running from parallel NOR flash) - DTS sync with kernel (tag: v4.20) - Decoupling SPL and U-Boot proper for easy future SPL DM/DTS conversion - Conversion to DM_MMC, DM_SPI, and BLK (U-Boot proper) Travis-CI: https://travis-ci.org/lmajewski/u-boot-dfu/builds/597730941 Applied on top of i.MX -next tree: SHA1: 6891152a4596d38ac25d2fe1238e3b6a938554b8 Lukasz Majewski (5): ARM: imx: Covnert mccmon6 to use DM/DTS in the u-boot proper ARM: imx: Decouple mccmon6's SPL and u-boot proper code spl: nor: Provide falcon boot support for NOR memories ARM: imx: Convert mccmon6 to use fitImage instead of uImage+DTB mccmon6: defconfig: nor: Enable usage of *_TINY_* drivers in SPL arch/arm/dts/Makefile | 1 + arch/arm/dts/imx6q-mccmon6.dts | 382 ++++++++++++++++++++++++++ arch/arm/mach-imx/mx6/Kconfig | 7 + board/liebherr/mccmon6/Makefile | 7 +- board/liebherr/mccmon6/mccmon6.c | 446 ------------------------------- board/liebherr/mccmon6/spl.c | 279 ++++++++++++++++++- common/spl/spl_nor.c | 5 + configs/mccmon6_nor_defconfig | 41 ++- configs/mccmon6_sd_defconfig | 34 ++- include/configs/mccmon6.h | 70 ++--- 10 files changed, 769 insertions(+), 503 deletions(-) create mode 100644 arch/arm/dts/imx6q-mccmon6.dts -- 2.20.1

3 11

[U-Boot] [PATCH 02/10] imx8m: clock: improve irq response latency
by sbabic＠denx.de 04 Nov '19

04 Nov '19

> Improve the IRQ response latency by setting GIC root clock source to > sys_pll2_200m from osc. > Signed-off-by: Peng Fan <peng.fan(a)nxp.com> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

1 0

[U-Boot] [PATCH] imx: Enable RTC (ds1307) support in the U-Boot proper on TPC70 board
by Lukasz Majewski 04 Nov '19

04 Nov '19

The TPC70 is equipped with DS1307 RTC device. Add code to enable support for it. Signed-off-by: Lukasz Majewski <lukma(a)denx.de> --- arch/arm/dts/imx6q-kp.dts | 5 +++++ configs/kp_imx6q_tpc_defconfig | 2 ++ 2 files changed, 7 insertions(+) diff --git a/arch/arm/dts/imx6q-kp.dts b/arch/arm/dts/imx6q-kp.dts index 12d6db6f80..48ade9eeac 100644 --- a/arch/arm/dts/imx6q-kp.dts +++ b/arch/arm/dts/imx6q-kp.dts @@ -76,6 +76,11 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c1>; status = "okay"; + + ds1307: rtc@32 { + compatible = "dallas,ds1307"; + reg = <0x32>; + }; }; &i2c2 { diff --git a/configs/kp_imx6q_tpc_defconfig b/configs/kp_imx6q_tpc_defconfig index 3d93c20999..2484e91635 100644 --- a/configs/kp_imx6q_tpc_defconfig +++ b/configs/kp_imx6q_tpc_defconfig @@ -62,6 +62,8 @@ CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_IMX6=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_SPL_DM_REGULATOR_FIXED=y +CONFIG_DM_RTC=y +CONFIG_RTC_DS1307=y # CONFIG_REQUIRE_SERIAL_CONSOLE is not set CONFIG_MXC_UART=y CONFIG_SYSRESET=y -- 2.20.1

2 1

[U-Boot] [PATCH V3 5/6] net: fec_mxc: support i.MX8M with CLK_CCF
by sbabic＠denx.de 04 Nov '19

04 Nov '19

> Add more clks for fec_mxc according to Linux Kernel 5.4.0-rc1 > drivers/net/ethernet/freescale/fec_main.c. > Since i.MX8MQ not support CLK_CCF, so add a check to restrict > the code only effect when CONFIG_IMX8M and CONFIG_CLK_CCF both defined. > Signed-off-by: Peng Fan <peng.fan(a)nxp.com> > Reviewed-by: Frieder Schrempf <frieder.schrempf(a)kontron.de> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

1 0

[U-Boot] [PATCH v5] imx: support i.MX8QM ROM 7720 a1 board
by sbabic＠denx.de 04 Nov '19

04 Nov '19

> Add i.MX8QM ROM 7720a1 board support > Boot log as below: > U-Boot 2019.10-rc3-00004-gd073e0242f (Sep 20 2019 - 08:24:13 +0200) > CPU: NXP i.MX8QM RevB A53 at 1200 MHz > Model: Advantech iMX8QM Qseven series > Board: ROM-7720-A1 4GB > Build: SCFW 65afe5f6 > Boot: SD2 > DRAM: 4 GiB > MMC: FSL_SDHC: 0, FSL_SDHC: 1, FSL_SDHC: 2 > Loading Environment from MMC... OK > In: serial@5a060000 > Out: serial@5a060000 > Err: serial@5a060000 > Net: eth0: ethernet@5b040000Could not get PHY for FEC1: addr 1 > , eth-1: ethernet@5b050000 > Hit any key to stop autoboot: 0 > Signed-off-by: Oliver Graute <oliver.graute(a)kococonnector.com> > Cc: Stefano Babic <sbabic(a)denx.de> > Cc: Fabio Estevam <festevam(a)gmail.com> > Cc: Peng Fan <peng.fan(a)nxp.com> > Cc: Simon Glass <sjg(a)chromium.org> > Cc: Ye Li <ye.li(a)nxp.com> > Cc: uboot-imx <uboot-imx(a)nxp.com> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

1 0

[U-Boot] [PATCH 10/10] imx8mm: evk: enable bd71837 pmic
by sbabic＠denx.de 04 Nov '19

04 Nov '19

> Enable bd71837 pmic for i.MX8MM EVK board, need to set voltage for > DRAM and linux suspend voltage requirement. > Signed-off-by: Peng Fan <peng.fan(a)nxp.com> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

1 0

[U-Boot] [PATCH v2 1/3] imx6ul: opos6ul: migrate to DM_ETH
by Sébastien Szymanski 04 Nov '19

04 Nov '19

Migrate to DM_ETH and remove code that is no longer necessary. Reviewed-by: Peng Fan <peng.fan(a)nxp.com> Signed-off-by: Sébastien Szymanski <sebastien.szymanski(a)armadeus.com> --- Changes for v2: - added Reviewed-by tag arch/arm/mach-imx/mx6/opos6ul.c | 76 +++------------------------------ configs/opos6uldev_defconfig | 2 + include/configs/opos6uldev.h | 8 ---- 3 files changed, 8 insertions(+), 78 deletions(-) diff --git a/arch/arm/mach-imx/mx6/opos6ul.c b/arch/arm/mach-imx/mx6/opos6ul.c index c5fafb9f8e..50aec5171c 100644 --- a/arch/arm/mach-imx/mx6/opos6ul.c +++ b/arch/arm/mach-imx/mx6/opos6ul.c @@ -6,11 +6,7 @@ #include <asm/arch/clock.h> #include <asm/arch/crm_regs.h> #include <asm/arch/imx-regs.h> -#include <asm/arch/iomux.h> -#include <asm/arch/mx6-pins.h> #include <asm/arch/sys_proto.h> -#include <asm/gpio.h> -#include <asm/mach-imx/iomux-v3.h> #include <asm/io.h> #include <common.h> #include <env.h> @@ -20,43 +16,6 @@ DECLARE_GLOBAL_DATA_PTR; #ifdef CONFIG_FEC_MXC #include <miiphy.h> -#define MDIO_PAD_CTRL ( \ - PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ - PAD_CTL_DSE_40ohm \ -) - -#define ENET_PAD_CTRL_PU ( \ - PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ - PAD_CTL_DSE_40ohm \ -) - -#define ENET_PAD_CTRL_PD ( \ - PAD_CTL_HYS | PAD_CTL_PUS_100K_DOWN | PAD_CTL_SPEED_MED | \ - PAD_CTL_DSE_40ohm \ -) - -#define ENET_CLK_PAD_CTRL ( \ - PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_LOW | \ - PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST \ -) - -static iomux_v3_cfg_t const fec1_pads[] = { - MX6_PAD_GPIO1_IO06__ENET1_MDIO | MUX_PAD_CTRL(MDIO_PAD_CTRL), - MX6_PAD_GPIO1_IO07__ENET1_MDC | MUX_PAD_CTRL(MDIO_PAD_CTRL), - MX6_PAD_ENET1_RX_ER__ENET1_RX_ER | MUX_PAD_CTRL(ENET_PAD_CTRL_PD), - MX6_PAD_ENET1_RX_EN__ENET1_RX_EN | MUX_PAD_CTRL(ENET_PAD_CTRL_PD), - MX6_PAD_ENET1_RX_DATA1__ENET1_RDATA01 | MUX_PAD_CTRL(ENET_PAD_CTRL_PD), - MX6_PAD_ENET1_RX_DATA0__ENET1_RDATA00 | MUX_PAD_CTRL(ENET_PAD_CTRL_PD), - MX6_PAD_ENET1_TX_DATA0__ENET1_TDATA00 | MUX_PAD_CTRL(ENET_PAD_CTRL_PU), - MX6_PAD_ENET1_TX_DATA1__ENET1_TDATA01 | MUX_PAD_CTRL(ENET_PAD_CTRL_PU), - MX6_PAD_ENET1_TX_EN__ENET1_TX_EN | MUX_PAD_CTRL(ENET_PAD_CTRL_PU), - /* PHY Int */ - MX6_PAD_NAND_DQS__GPIO4_IO16 | MUX_PAD_CTRL(ENET_PAD_CTRL_PU), - /* PHY Reset */ - MX6_PAD_NAND_DATA00__GPIO4_IO02 | MUX_PAD_CTRL(ENET_PAD_CTRL_PD), - MX6_PAD_ENET1_TX_CLK__ENET1_REF_CLK1 | MUX_PAD_CTRL(ENET_CLK_PAD_CTRL), -}; - int board_phy_config(struct phy_device *phydev) { phy_write(phydev, MDIO_DEVAD_NONE, 0x1f, 0x8190); @@ -67,43 +26,16 @@ int board_phy_config(struct phy_device *phydev) return 0; } -int board_eth_init(bd_t *bis) +static int setup_fec(void) { struct iomuxc *const iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR; - struct gpio_desc rst; - int ret; /* Use 50M anatop loopback REF_CLK1 for ENET1, * clear gpr1[13], set gpr1[17] */ clrsetbits_le32(&iomuxc_regs->gpr[1], IOMUX_GPR1_FEC1_MASK, IOMUX_GPR1_FEC1_CLOCK_MUX1_SEL_MASK); - ret = enable_fec_anatop_clock(0, ENET_50MHZ); - if (ret) - return ret; - - enable_enet_clk(1); - - imx_iomux_v3_setup_multiple_pads(fec1_pads, ARRAY_SIZE(fec1_pads)); - - ret = dm_gpio_lookup_name("GPIO4_2", &rst); - if (ret) { - printf("Cannot get GPIO4_2\n"); - return ret; - } - - ret = dm_gpio_request(&rst, "phy-rst"); - if (ret) { - printf("Cannot request GPIO4_2\n"); - return ret; - } - - dm_gpio_set_dir_flags(&rst, GPIOD_IS_OUT); - dm_gpio_set_value(&rst, 0); - udelay(1000); - dm_gpio_set_value(&rst, 1); - - return fecmxc_initialize(bis); + return enable_fec_anatop_clock(0, ENET_50MHZ); } #endif /* CONFIG_FEC_MXC */ @@ -112,6 +44,10 @@ int board_init(void) /* Address of boot parameters */ gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; +#ifdef CONFIG_FEC_MXC + setup_fec(); +#endif + return 0; } diff --git a/configs/opos6uldev_defconfig b/configs/opos6uldev_defconfig index 5eef6527cd..44236e99bc 100644 --- a/configs/opos6uldev_defconfig +++ b/configs/opos6uldev_defconfig @@ -73,6 +73,8 @@ CONFIG_FSL_USDHC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y +CONFIG_DM_ETH=y +CONFIG_DM_MDIO=y CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h index b13e476027..b10071eaaf 100644 --- a/include/configs/opos6uldev.h +++ b/include/configs/opos6uldev.h @@ -41,14 +41,6 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #endif -/* Ethernet */ -#ifdef CONFIG_FEC_MXC -#define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_MXC_PHYADDR 0x1 -#define CONFIG_FEC_XCV_TYPE RMII -#define CONFIG_ETHPRIME "FEC" -#endif - /* LCD */ #ifndef CONFIG_SPL_BUILD #ifdef CONFIG_VIDEO -- 2.21.0

3 6

[U-Boot] [PATCH v3 RESEND 1/2] ARM: imx: Fix bmode detection from grp10
by Claudius Heine 04 Nov '19

04 Nov '19

imx6_is_bmode_from_gpr9 always returns false, because IMX6_SRC_GPR10_BMODE is 1<<28 and gets casted to u8 on return. This moves the function body into imx6_src_get_boot_mode, since that is the only one using it and it is on the same abstraction level (accessing registers directly). Signed-off-by: Claudius Heine <ch(a)denx.de> --- arch/arm/include/asm/mach-imx/sys_proto.h | 5 ----- arch/arm/mach-imx/init.c | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h index 4925dd7894..041f93f484 100644 --- a/arch/arm/include/asm/mach-imx/sys_proto.h +++ b/arch/arm/include/asm/mach-imx/sys_proto.h @@ -89,11 +89,6 @@ enum imx6_bmode { IMX6_BMODE_NAND_MAX = 0xf, }; -static inline u8 imx6_is_bmode_from_gpr9(void) -{ - return readl(&src_base->gpr10) & IMX6_SRC_GPR10_BMODE; -} - u32 imx6_src_get_boot_mode(void); void gpr_init(void); diff --git a/arch/arm/mach-imx/init.c b/arch/arm/mach-imx/init.c index b8d8d12372..d18e3c740a 100644 --- a/arch/arm/mach-imx/init.c +++ b/arch/arm/mach-imx/init.c @@ -118,7 +118,7 @@ void boot_mode_apply(unsigned cfg_val) #if defined(CONFIG_MX6) u32 imx6_src_get_boot_mode(void) { - if (imx6_is_bmode_from_gpr9()) + if (readl(&src_base->gpr10) & IMX6_SRC_GPR10_BMODE) return readl(&src_base->gpr9); else return readl(&src_base->sbmr1); -- 2.21.0

2 3

[U-Boot] [PATCH] arm: mxs: Increase VDDD voltage to match specification
by Marek Vasut 04 Nov '19

04 Nov '19

According to IMX28CEC rev. 4, 10/2018, Table 15. Recommended Operating Conditions, page 16, the VDDD should be set to 1.55V when the CPU is operating at 454MHz. This is the case in U-Boot, hence increase the VDDD voltage. This fixes instability when performing TFTP transfers. Increase the brownout threshold to 1.4V. The documentation recommends 1.45V setting for the brownout, however, this triggers failure during power block init, so keep the brownout slightly lower. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Stefano Babic <sbabic(a)denx.de> --- arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c index a5c528a18d..7a1b39844e 100644 --- a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c +++ b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c @@ -1254,8 +1254,8 @@ void mxs_power_init(void) debug("SPL: Setting VDDIO to 3V3 (brownout @ 3v15)\n"); mxs_power_set_vddx(&mxs_vddio_cfg, 3300, 3150); - debug("SPL: Setting VDDD to 1V5 (brownout @ 1v315)\n"); - mxs_power_set_vddx(&mxs_vddd_cfg, 1500, 1315); + debug("SPL: Setting VDDD to 1V55 (brownout @ 1v400)\n"); + mxs_power_set_vddx(&mxs_vddd_cfg, 1550, 1400); #ifdef CONFIG_MX23 debug("SPL: Setting mx23 VDDMEM to 2V5 (brownout @ 1v7)\n"); mxs_power_set_vddx(&mxs_vddmem_cfg, 2500, 1700); -- 2.23.0

3 2

[U-Boot] [PATCH] imx: update i.MX8MQ device trees
by sbabic＠denx.de 04 Nov '19

04 Nov '19

> This updates the i.MX8MQ device trees and, necessarily, also the > i.MX8MQ clock bindings. These are taken verbatim from from the > Linux kernel version v5.4-rc2, which three small changes which > were already part of the previous device tree: > * Keep the PSCI reserved memory range > * Keep the alias for ethernet, so that the MAC address can be set > * Keep the modified #include for the IOMUXC pins > Signed-off-by: Patrick Wildt <patrick(a)blueri.se> > Acked-by: Peng Fan <peng.fan(a)nxp.com> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

1 0