configs: Sync all baseboard specific pico-imx7d
Subsystems (3)
PATCH v2 1/8 configs: Sync all baseboard specific pico-imx7d
This syncs all baseboard specific defconfig using the pico-imx7d_defconfig as base. It changes:
- pico-dwarf-imx7d_defconfig
- pico-hobbit-imx7d_defconfig
- pico-nymph-imx7d_defconfig
- pico-pi-imx7d_defconfig
--- configs/pico-dwarf-imx7d_defconfig | 3 ++- configs/pico-hobbit-imx7d_defconfig | 2 +- configs/pico-nymph-imx7d_defconfig | 3 ++- configs/pico-pi-imx7d_defconfig | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-)
configs/pico-dwarf-imx7d_defconfig +2 -1
@@ -12,12 +12,12 @@ CONFIG_SPL=y CONFIG_ARMV7_BOOT_SEC_DEFAULT=y CONFIG_IMX_RDC=y CONFIG_IMX_BOOTAUX=y +CONFIG_SPL_TEXT_BASE=0x00911000 CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx7d-pico-dwarf.dtb" CONFIG_BOUNCE_BUFFER=y -CONFIG_SPL_TEXT_BASE=0x00911000 CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_USB_HOST_SUPPORT=y CONFIG_SPL_USB_GADGET=y
@@ -58,6 +58,7 @@ CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX7=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_MXC_USB_OTG_HACTIVE=y CONFIG_USB_GADGET=y
configs/pico-hobbit-imx7d_defconfig +1 -1
@@ -12,12 +12,12 @@ CONFIG_SPL=y CONFIG_ARMV7_BOOT_SEC_DEFAULT=y CONFIG_IMX_RDC=y CONFIG_IMX_BOOTAUX=y +CONFIG_SPL_TEXT_BASE=0x00911000 CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb" CONFIG_BOUNCE_BUFFER=y -CONFIG_SPL_TEXT_BASE=0x00911000 CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_USB_HOST_SUPPORT=y CONFIG_SPL_USB_GADGET=y
configs/pico-nymph-imx7d_defconfig +2 -1
@@ -12,12 +12,12 @@ CONFIG_SPL=y CONFIG_ARMV7_BOOT_SEC_DEFAULT=y CONFIG_IMX_RDC=y CONFIG_IMX_BOOTAUX=y +CONFIG_SPL_TEXT_BASE=0x00911000 CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx7d-pico-dwarf.dtb" CONFIG_BOUNCE_BUFFER=y -CONFIG_SPL_TEXT_BASE=0x00911000 CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_USB_HOST_SUPPORT=y CONFIG_SPL_USB_GADGET=y
@@ -58,6 +58,7 @@ CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX7=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_MXC_USB_OTG_HACTIVE=y CONFIG_USB_GADGET=y
configs/pico-pi-imx7d_defconfig +1 -1
@@ -12,12 +12,12 @@ CONFIG_SPL=y CONFIG_ARMV7_BOOT_SEC_DEFAULT=y CONFIG_IMX_RDC=y CONFIG_IMX_BOOTAUX=y +CONFIG_SPL_TEXT_BASE=0x00911000 CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx7d-pico-pi.dtb" CONFIG_BOUNCE_BUFFER=y -CONFIG_SPL_TEXT_BASE=0x00911000 CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_USB_HOST_SUPPORT=y CONFIG_SPL_USB_GADGET=y
Signature · 1 line
2.23.0
PATCH v2 2/8 mx53loco: Fix U-Boot corruption after saving the environment
From: Fabio Estevam <[email protected]>
U-Boot binary has grown in such a way that it goes beyond the reserved area for the environment variables.
Running "saveenv" causes U-Boot to hang because of this overlap.
Fix this problem by increasing the CONFIG_ENV_OFFSET size.
Also, in order to prevent this same problem in the future, use CONFIG_BOARD_SIZE_LIMIT, which will detect the overlap in build-time.
CONFIG_BOARD_SIZE_LIMIT does not accept math expressions, so declare CONFIG_ENV_OFFSET with its direct value instead.
--- include/configs/mx53loco.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
include/configs/mx53loco.h +12 -2
@@ -163,8 +163,18 @@#define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* environment organization */ -#define CONFIG_ENV_OFFSET (6 * 64 * 1024) +/* Environment starts at 768k = 768 * 1024 = 786432 */ +#define CONFIG_ENV_OFFSET 786432 +/* +* Detect overlap between U-Boot image and environment area in build-time +* +* CONFIG_BOARD_SIZE_LIMIT = CONFIG_ENV_OFFSET - u-boot.imx offset +* CONFIG_BOARD_SIZE_LIMIT = 768k - 1k = 767k = 785408 +* +* Currently CONFIG_BOARD_SIZE_LIMIT does not handle expressions, so +* write the direct value here +*/ +#define CONFIG_BOARD_SIZE_LIMIT 785408#define CONFIG_ENV_SIZE (8 * 1024)#define CONFIG_SYS_MMC_ENV_DEV 0
Signature · 1 line
2.23.0
PATCH v2 3/8 mx6: clock: Allow enable_ipu_clock() to be built for SPL code
In reply to Otavio SalvadorFrom: Fabio Estevam <[email protected]>
Allow enable_ipu_clock() to be built for SPL code. This is done in preparation for configuring the NoC registers on i.MX6QP in SPL.
--- arch/arm/mach-imx/mx6/clock.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
arch/arm/mach-imx/mx6/clock.c +16 -16
@@ -1275,6 +1275,22 @@ unsigned int mxc_get_clock(enum mxc_clock clk)return 0 ; } +#ifndef CONFIG_MX6SX +void enable_ipu_clock (void ) +{ +struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR ; +int reg; + reg =readl (&mxc_ccm->CCGR3); + reg |=MXC_CCM_CCGR3_IPU1_IPU_MASK ; +writel (reg, &mxc_ccm->CCGR3); + +if (is_mx6dqp ()) { +setbits_le32 (&mxc_ccm->CCGR6,MXC_CCM_CCGR6_PRG_CLK0_MASK ); +setbits_le32 (&mxc_ccm->CCGR3,MXC_CCM_CCGR3_IPU2_IPU_MASK ); + } +} +#endif +#ifndef CONFIG_SPL_BUILD /* * Dump some core clockes.
@@ -1311,22 +1327,6 @@ int do_mx6_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])return 0 ; } -#ifndef CONFIG_MX6SX -void enable_ipu_clock (void ) -{ -struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR ; -int reg; - reg =readl (&mxc_ccm->CCGR3); - reg |=MXC_CCM_CCGR3_IPU1_IPU_MASK ; -writel (reg, &mxc_ccm->CCGR3); - -if (is_mx6dqp ()) { -setbits_le32 (&mxc_ccm->CCGR6,MXC_CCM_CCGR6_PRG_CLK0_MASK ); -setbits_le32 (&mxc_ccm->CCGR3,MXC_CCM_CCGR3_IPU2_IPU_MASK ); - } -} -#endif -#if defined(CONFIG_MX6Q ) || defined(CONFIG_MX6D ) || defined(CONFIG_MX6DL ) || \ defined(CONFIG_MX6S )static void disable_ldb_di_clock_sources (void )
Signature · 1 line
2.23.0
PATCH v2 4/8 pico-imx6: Add initial support
In reply to Otavio SalvadorFrom: Fabio Estevam <[email protected]>
Add the initial support for the pico-imx6 variants.
DDR initialization is based on the TechNexion's U-Boot code.
--- arch/arm/dts/Makefile | 2 + arch/arm/dts/imx6dl-pico.dts | 17 + arch/arm/dts/imx6q-pico.dts | 17 + arch/arm/dts/imx6qdl-pico.dtsi | 424 +++++++++++++++++++++++++ arch/arm/mach-imx/mx6/Kconfig | 11 + board/technexion/pico-imx6/Kconfig | 15 + board/technexion/pico-imx6/MAINTAINERS | 9 + board/technexion/pico-imx6/Makefile | 5 + board/technexion/pico-imx6/README | 73 +++++ board/technexion/pico-imx6/pico-imx6.c | 78 +++++ board/technexion/pico-imx6/spl.c | 303 ++++++++++++++++++ configs/pico-imx6_defconfig | 71 +++++ include/configs/pico-imx6.h | 130 ++++++++ 13 files changed, 1155 insertions(+) create mode 100644 arch/arm/dts/imx6dl-pico.dts create mode 100644 arch/arm/dts/imx6q-pico.dts create mode 100644 arch/arm/dts/imx6qdl-pico.dtsi create mode 100644 board/technexion/pico-imx6/Kconfig create mode 100644 board/technexion/pico-imx6/MAINTAINERS create mode 100644 board/technexion/pico-imx6/Makefile create mode 100644 board/technexion/pico-imx6/README create mode 100644 board/technexion/pico-imx6/pico-imx6.c create mode 100644 board/technexion/pico-imx6/spl.c create mode 100644 configs/pico-imx6_defconfig create mode 100644 include/configs/pico-imx6.h
arch/arm/dts/Makefile +2 -0
@@ -559,6 +559,7 @@ dtb-y += \ imx6dl-icore-rqs.dtb \ imx6dl-mamoj.dtb \ imx6dl-nitrogen6x.dtb \ + imx6dl-pico.dtb \ imx6dl-sabreauto.dtb \ imx6dl-sabresd.dtb \ imx6dl-wandboard-revb1.dtb \
@@ -577,6 +578,7 @@ dtb-y += \ imx6q-logicpd.dtb \ imx6q-nitrogen6x.dtb \ imx6q-novena.dtb \ + imx6q-pico.dtb \ imx6q-sabreauto.dtb \ imx6q-sabrelite.dtb \ imx6q-sabresd.dtb \
arch/arm/dts/imx6dl-pico.dts new file +17 -0
@@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright 2018 Technexion Ltd. +// +// Author: Wig Cheng <[email protected]> +// Richard Hu <[email protected]> +// Tapani Utriainen <[email protected]> + +/dts-v1/; + +#include "imx6dl.dtsi" +#include "imx6qdl-pico.dtsi" + +/ { + model = "TechNexion PICO-IMX6 DualLite/Solo"; + compatible = "technexion,imx6dl-pico", "fsl,imx6dl"; +};
arch/arm/dts/imx6q-pico.dts new file +17 -0
@@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright 2018 Technexion Ltd. +// +// Author: Wig Cheng <[email protected]> +// Richard Hu <[email protected]> +// Tapani Utriainen <[email protected]> + +/dts-v1/; + +#include "imx6q.dtsi" +#include "imx6qdl-pico.dtsi" + +/ { + model = "TechNexion PICO-IMX6 Quad"; + compatible = "technexion,imx6q-pico", "fsl,imx6q"; +};
arch/arm/dts/imx6qdl-pico.dtsi new file +424 -0
424 lines not on this page · raw message
arch/arm/mach-imx/mx6/Kconfig +11 -0
@@ -422,6 +422,16 @@ config TARGET_OT1200 select SUPPORT_SPL imply CMD_SATA +config TARGET_PICO_IMX6 + bool "PICO-IMX6" + select BOARD_EARLY_INIT_F + select BOARD_LATE_INIT + select DM + select DM_THERMAL + select MX6QDL + select SUPPORT_SPL + imply CMD_DM + config TARGET_PICO_IMX6UL bool "PICO-IMX6UL-EMMC" select MX6UL
@@ -609,6 +619,7 @@ source "board/logicpd/imx6/Kconfig" source "board/seco/Kconfig" source "board/sks-kinkel/sksimx6/Kconfig" source "board/solidrun/mx6cuboxi/Kconfig" +source "board/technexion/pico-imx6/Kconfig" source "board/technexion/pico-imx6ul/Kconfig" source "board/tbs/tbs2910/Kconfig" source "board/tqc/tqma6/Kconfig"
board/technexion/pico-imx6/Kconfig new file +15 -0
@@ -0,0 +1,15 @@ +if TARGET_PICO_IMX6 + +config SYS_BOARD + default "pico-imx6" + +config SYS_VENDOR + default "technexion" + +config SYS_SOC + default "mx6" + +config SYS_CONFIG_NAME + default "pico-imx6" + +endif
board/technexion/pico-imx6/MAINTAINERS new file +9 -0
@@ -0,0 +1,9 @@ +TECHNEXION PICO-IMX6 BOARD +M: Fabio Estevam <[email protected]> +S: Maintained +F: arch/arm/dts/imx6qdl-pico.dtsi +F: arch/arm/dts/imx6q-pico.dts +F: arch/arm/dts/imx6dl-pico.dts +F: board/technexion/pico-imx6/ +F: include/configs/pico-imx6.h +F: configs/pico-imx6_defconfig
board/technexion/pico-imx6/Makefile new file +5 -0
@@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# (C) Copyright 2013 Freescale Semiconductor, Inc. + +obj-y := pico-imx6.o spl.o
board/technexion/pico-imx6/README new file +73 -0
73 lines not on this page · raw message
board/technexion/pico-imx6/pico-imx6.c new file +78 -0
78 lines not on this page · raw message
board/technexion/pico-imx6/spl.c new file +303 -0
303 lines not on this page · raw message
configs/pico-imx6_defconfig new file +71 -0
71 lines not on this page · raw message
include/configs/pico-imx6.h new file +130 -0
130 lines not on this page · raw message
Signature · 1 line
2.23.0
PATCH v2 5/8 pico-imx6: Fix bootmenu handling
In reply to Otavio SalvadorWe should use a common script to allow booting the U-Boot console as fallback so we ended using a 'default_boot' and 'base_boot' environment scripts to accomplish that.
--- configs/pico-imx6_defconfig | 2 +- include/configs/pico-imx6.h | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-)
configs/pico-imx6_defconfig +1 -1
@@ -15,7 +15,7 @@ CONFIG_FIT=y CONFIG_SPL_FIT_PRINT=y CONFIG_SPL_LOAD_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" -CONFIG_BOOTCOMMAND="run findbaseboard; run findfdt; run finduuid; run distro_bootcmd" +CONFIG_BOOTCOMMAND="run default_boot" CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_DEFAULT_FDT_FILE="ask"
include/configs/pico-imx6.h +11 -9
@@ -42,13 +42,13 @@#define BOOTMENU_ENV \ "bootmenu_0=Boot using PICO-Hobbit baseboard=" \ - "setenv baseboard hobbit\0" \ + "setenv baseboard hobbit; saveenv; run base_boot\0" \ "bootmenu_1=Boot using PICO-Pi baseboard=" \ - "setenv baseboard pi\0" \ + "setenv baseboard pi; saveenv; run base_boot\0" \ "bootmenu_2=Boot using PICO-Dwarf baseboard=" \ - "setenv baseboard dwarf\0" \ + "setenv baseboard dwarf; saveenv; run base_boot\0" \ "bootmenu_3=Boot using PICO-Nymph baseboard=" \ - "setenv baseboard nymph\0" \ + "setenv baseboard nymph; saveenv; run base_boot\0" \#define CONFIG_EXTRA_ENV_SETTINGS \ "console=ttymxc0\0" \
@@ -61,11 +61,6 @@ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \CONFIG_DFU_ENV_SETTINGS \"finduuid=part uuid mmc 0:1 uuid\0" \ -"findbaseboard=" \ -"if test $baseboard = ask ; then " \ -"bootmenu -1; fi;" \ -"if test $baseboard != ask ; then " \ -"saveenv; fi;\0" \"findfdt=" \"if test $baseboard = hobbit && test $board_rev = MX6Q ; then " \"setenv fdtfile imx6q-pico-hobbit.dtb; fi; " \
@@ -85,6 +80,13 @@"setenv fdtfile imx6dl-pico-nymph.dtb; fi; " \"if test $fdtfile = ask; then " \"echo WARNING: Could not determine dtb to use; fi; \0" \ +"default_boot=" \ +"if test $baseboard = ask ; then " \ +"bootmenu -1; " \ +"else " \ +"run base_boot;" \ +"fi; \0" \ +"base_boot=run findfdt; run finduuid; run distro_bootcmd\0" \ "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \"ramdisk_addr_r=0x13000000\0" \
Signature · 1 line
2.23.0
PATCH v2 6/8 pico-imx6: Add Ethernet support
In reply to Otavio SalvadorFrom: Fabio Estevam <[email protected]>
Add Ethernet support.
--- board/technexion/pico-imx6/pico-imx6.c | 74 ++++++++++++++++++++++++++ include/configs/pico-imx6.h | 10 ++++ 2 files changed, 84 insertions(+)
board/technexion/pico-imx6/pico-imx6.c +74 -0
@@ -17,6 +17,9 @@#include <asm/io.h> #include <linux/sizes.h> #include <common.h> +#include <miiphy.h> +#include <netdev.h> +#include <phy.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -24,6 +27,11 @@ DECLARE_GLOBAL_DATA_PTR; PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | \ PAD_CTL_SRE_FAST | PAD_CTL_HYS) +#define ENET_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ + PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS) + +#define ETH_PHY_RESET IMX_GPIO_NR(1, 26) +int dram_init (void ) { gd->ram_size =imx_ddr_size ();
@@ -41,6 +49,39 @@ static void setup_iomux_uart(void)SETUP_IOMUX_PADS (uart1_pads); } +static iomux_v3_cfg_t const enet_pads[] = { +IOMUX_PADS (PAD_ENET_MDIO__ENET_MDIO |MUX_PAD_CTRL (ENET_PAD_CTRL )), +IOMUX_PADS (PAD_ENET_MDC__ENET_MDC |MUX_PAD_CTRL (ENET_PAD_CTRL )), +IOMUX_PADS (PAD_RGMII_TXC__RGMII_TXC |MUX_PAD_CTRL (ENET_PAD_CTRL )), +IOMUX_PADS (PAD_RGMII_TD0__RGMII_TD0 |MUX_PAD_CTRL (ENET_PAD_CTRL )), +IOMUX_PADS (PAD_RGMII_TD1__RGMII_TD1 |MUX_PAD_CTRL (ENET_PAD_CTRL )), +IOMUX_PADS (PAD_RGMII_TD2__RGMII_TD2 |MUX_PAD_CTRL (ENET_PAD_CTRL )), +IOMUX_PADS (PAD_RGMII_TD3__RGMII_TD3 |MUX_PAD_CTRL (ENET_PAD_CTRL )), +IOMUX_PADS (PAD_RGMII_TX_CTL__RGMII_TX_CTL | +MUX_PAD_CTRL (ENET_PAD_CTRL )), +IOMUX_PADS (PAD_ENET_REF_CLK__ENET_TX_CLK | +MUX_PAD_CTRL (ENET_PAD_CTRL )), +IOMUX_PADS (PAD_RGMII_RXC__RGMII_RXC |MUX_PAD_CTRL (ENET_PAD_CTRL )), +IOMUX_PADS (PAD_RGMII_RD0__RGMII_RD0 |MUX_PAD_CTRL (ENET_PAD_CTRL )), +IOMUX_PADS (PAD_RGMII_RD1__RGMII_RD1 |MUX_PAD_CTRL (ENET_PAD_CTRL )), +IOMUX_PADS (PAD_RGMII_RD2__RGMII_RD2 |MUX_PAD_CTRL (ENET_PAD_CTRL )), +IOMUX_PADS (PAD_RGMII_RD3__RGMII_RD3 |MUX_PAD_CTRL (ENET_PAD_CTRL )), +IOMUX_PADS (PAD_RGMII_RX_CTL__RGMII_RX_CTL |MUX_PAD_CTRL (ENET_PAD_CTRL )), +/* AR8035 PHY Reset */ +IOMUX_PADS (PAD_ENET_RXD1__GPIO1_IO26 |MUX_PAD_CTRL (NO_PAD_CTRL )), +}; + +static void setup_iomux_enet (void ) +{ +SETUP_IOMUX_PADS (enet_pads); + +/* Reset AR8031 PHY */ +gpio_request (ETH_PHY_RESET ,"enet_phy_reset" ); +gpio_direction_output (ETH_PHY_RESET ,0 ); +udelay (500 ); +gpio_set_value (ETH_PHY_RESET ,1 ); +} +int board_early_init_f (void ) {setup_iomux_uart ();
@@ -48,6 +89,39 @@ int board_early_init_f(void)return 0 ; } +int board_eth_init (bd_t *bis) +{ +setup_iomux_enet (); + +return cpu_eth_init (bis); +} + +int board_phy_config (struct phy_device *phydev) +{ +unsigned short val; + +/* To enable AR8035 ouput a 125MHz clk from CLK_25M */ +phy_write (phydev,MDIO_DEVAD_NONE ,0xd ,0x7 ); +phy_write (phydev,MDIO_DEVAD_NONE ,0xe ,0x8016 ); +phy_write (phydev,MDIO_DEVAD_NONE ,0xd ,0x4007 ); + + val =phy_read (phydev,MDIO_DEVAD_NONE ,0xe ); + val &=0xffe7 ; + val |=0x18 ; +phy_write (phydev,MDIO_DEVAD_NONE ,0xe , val); + +/* introduce tx clock delay */ +phy_write (phydev,MDIO_DEVAD_NONE ,0x1d ,0x5 ); + val =phy_read (phydev,MDIO_DEVAD_NONE ,0x1e ); + val |=0x0100 ; +phy_write (phydev,MDIO_DEVAD_NONE ,0x1e , val); + +if (phydev->drv->config) + phydev->drv->config (phydev); + +return 0 ; +} +int overwrite_console (void ) {return 1 ;
include/configs/pico-imx6.h +10 -0
@@ -129,4 +129,14 @@#define CONFIG_BOARD_SIZE_LIMIT 715776#define CONFIG_SYS_MMC_ENV_DEV 0 +/* Ethernet Configuration */ +#define CONFIG_FEC_MXC +#define CONFIG_MII +#define IMX_FEC_BASE ENET_BASE_ADDR +#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_ETHPRIME "FEC" +#define CONFIG_FEC_MXC_PHYADDR 1 +#define CONFIG_PHYLIB +#define CONFIG_PHY_ATHEROS +#endif /* __CONFIG_H * */
Signature · 1 line
2.23.0
PATCH v2 6/8 pico-imx6: Add Ethernet support
Hi Otavio,
On Fri, 20 Sep 2019 16:47:28 -0300
Otavio Salvador otavio at ossystems.com.br wrote:
...
include/configs/pico-imx6.h line 140
Quoted 9 lines
include/configs/pico-imx6.h +9
-0+/* Ethernet Configuration */ +#define CONFIG_FEC_MXC +#define CONFIG_MII +#define IMX_FEC_BASE ENET_BASE_ADDR +#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_ETHPRIME "FEC" +#define CONFIG_FEC_MXC_PHYADDR 1 +#define CONFIG_PHYLIB +#define CONFIG_PHY_ATHEROS
This adds legacy eth support, we will get CONFIG_DM_ETH conversion warning. Could you please convert it to DM_ETH? Here is an example:
http://patchwork.ozlabs.org/patch/1165443
--
Anatolij
PATCH v2 6/8 pico-imx6: Add Ethernet support
Hello Anatolij,
Quoted 15 lines · Anatolij Gustschin
On Fri, 20 Sep 2019 16:47:28 -0300
Otavio Salvador otavio at ossystems.com.br wrote:
...include/configs/pico-imx6.h line 140
Quoted 9 lines
include/configs/pico-imx6.h +9
-0+/* Ethernet Configuration */ +#define CONFIG_FEC_MXC +#define CONFIG_MII +#define IMX_FEC_BASE ENET_BASE_ADDR +#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_ETHPRIME "FEC" +#define CONFIG_FEC_MXC_PHYADDR 1 +#define CONFIG_PHYLIB +#define CONFIG_PHY_ATHEROS This adds legacy eth support, we will get
CONFIG_DM_ETHconversion warning. Could you please convert it toDM_ETH? Here is an example:
I can but I'd prefer to have the board applied first and then rework things, so people can also more easily test and contribute to it.
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750
PATCH v2 7/8 pico-imx6: Add splashscreen support
In reply to Otavio SalvadorFrom: Fabio Estevam <[email protected]>
Add splashscreen support. Tested with the parallel FT5x06-WVGA panel.
--- board/technexion/pico-imx6/pico-imx6.c | 210 +++++++++++++++++++++++++ configs/pico-imx6_defconfig | 2 + include/configs/pico-imx6.h | 10 ++ 3 files changed, 222 insertions(+)
board/technexion/pico-imx6/pico-imx6.c +210 -0
@@ -13,6 +13,8 @@#include <asm/arch/mx6-pins.h> #include <asm/arch/sys_proto.h> #include <asm/gpio.h> +#include <asm/arch/mxc_hdmi.h> +#include <asm/mach-imx/video.h> #include <asm/mach-imx/iomux-v3.h> #include <asm/io.h> #include <linux/sizes.h>
@@ -31,6 +33,8 @@ DECLARE_GLOBAL_DATA_PTR; PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS)#define ETH_PHY_RESET IMX_GPIO_NR(1, 26) +#define LVDS0_EN IMX_GPIO_NR(2, 8) +#define LVDS0_BL_EN IMX_GPIO_NR(2, 9)int dram_init (void ) {
@@ -49,6 +53,15 @@ static void setup_iomux_uart(void)SETUP_IOMUX_PADS (uart1_pads); } +static iomux_v3_cfg_t const lvds_pads[] = { +/* lvds */ +IOMUX_PADS (PAD_SD4_DAT0__GPIO2_IO08 |MUX_PAD_CTRL (NO_PAD_CTRL )), +IOMUX_PADS (PAD_SD4_DAT1__GPIO2_IO09 |MUX_PAD_CTRL (NO_PAD_CTRL )), +IOMUX_PADS (PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK |MUX_PAD_CTRL (NO_PAD_CTRL )), +IOMUX_PADS (PAD_DI0_PIN2__IPU1_DI0_PIN02 |MUX_PAD_CTRL (NO_PAD_CTRL )), +IOMUX_PADS (PAD_DI0_PIN3__IPU1_DI0_PIN03 |MUX_PAD_CTRL (NO_PAD_CTRL )), +}; +static iomux_v3_cfg_t const enet_pads[] = {IOMUX_PADS (PAD_ENET_MDIO__ENET_MDIO |MUX_PAD_CTRL (ENET_PAD_CTRL )),IOMUX_PADS (PAD_ENET_MDC__ENET_MDC |MUX_PAD_CTRL (ENET_PAD_CTRL )),
@@ -82,10 +95,207 @@ static void setup_iomux_enet(void)gpio_set_value (ETH_PHY_RESET ,1 ); } +#if defined(CONFIG_VIDEO_IPUV3 ) +static iomux_v3_cfg_t const ft5x06_wvga_pads[] = { +IOMUX_PADS (PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK ), +IOMUX_PADS (PAD_DI0_PIN2__IPU1_DI0_PIN02 ),/* HSync */ +IOMUX_PADS (PAD_DI0_PIN3__IPU1_DI0_PIN03 ),/* VSync */ +IOMUX_PADS (PAD_DI0_PIN4__IPU1_DI0_PIN04 |MUX_PAD_CTRL (PAD_CTL_DSE_120ohm)),/* Contrast */ +IOMUX_PADS (PAD_DI0_PIN15__IPU1_DI0_PIN15 ),/* DISP0_DRDY */ +IOMUX_PADS (PAD_DISP0_DAT0__IPU1_DISP0_DATA00 ), +IOMUX_PADS (PAD_DISP0_DAT1__IPU1_DISP0_DATA01 ), +IOMUX_PADS (PAD_DISP0_DAT2__IPU1_DISP0_DATA02 ), +IOMUX_PADS (PAD_DISP0_DAT3__IPU1_DISP0_DATA03 ), +IOMUX_PADS (PAD_DISP0_DAT4__IPU1_DISP0_DATA04 ), +IOMUX_PADS (PAD_DISP0_DAT5__IPU1_DISP0_DATA05 ), +IOMUX_PADS (PAD_DISP0_DAT6__IPU1_DISP0_DATA06 ), +IOMUX_PADS (PAD_DISP0_DAT7__IPU1_DISP0_DATA07 ), +IOMUX_PADS (PAD_DISP0_DAT8__IPU1_DISP0_DATA08 ), +IOMUX_PADS (PAD_DISP0_DAT9__IPU1_DISP0_DATA09 ), +IOMUX_PADS (PAD_DISP0_DAT10__IPU1_DISP0_DATA10 ), +IOMUX_PADS (PAD_DISP0_DAT11__IPU1_DISP0_DATA11 ), +IOMUX_PADS (PAD_DISP0_DAT12__IPU1_DISP0_DATA12 ), +IOMUX_PADS (PAD_DISP0_DAT13__IPU1_DISP0_DATA13 ), +IOMUX_PADS (PAD_DISP0_DAT14__IPU1_DISP0_DATA14 ), +IOMUX_PADS (PAD_DISP0_DAT15__IPU1_DISP0_DATA15 ), +IOMUX_PADS (PAD_DISP0_DAT16__IPU1_DISP0_DATA16 ), +IOMUX_PADS (PAD_DISP0_DAT17__IPU1_DISP0_DATA17 ), +IOMUX_PADS (PAD_DISP0_DAT18__IPU1_DISP0_DATA18 ), +IOMUX_PADS (PAD_DISP0_DAT19__IPU1_DISP0_DATA19 ), +IOMUX_PADS (PAD_DISP0_DAT20__IPU1_DISP0_DATA20 ), +IOMUX_PADS (PAD_DISP0_DAT21__IPU1_DISP0_DATA21 ), +IOMUX_PADS (PAD_DISP0_DAT22__IPU1_DISP0_DATA22 ), +IOMUX_PADS (PAD_DISP0_DAT23__IPU1_DISP0_DATA23 ), +IOMUX_PADS (PAD_SD4_DAT2__GPIO2_IO10 |MUX_PAD_CTRL (NO_PAD_CTRL )),/* DISP0_BKLEN */ +IOMUX_PADS (PAD_SD4_DAT3__GPIO2_IO11 |MUX_PAD_CTRL (NO_PAD_CTRL )),/* DISP0_VDDEN */ +}; + +static void do_enable_hdmi (struct display_info_t const *dev) +{ +imx_enable_hdmi_phy (); +} + +static void enable_lvds (struct display_info_t const *dev) +{ +struct iomuxc *iomux = (struct iomuxc *) +IOMUXC_BASE_ADDR ; + +/* set CH0 data width to 24bit (IOMUXC_GPR2:5 0=18bit, 1=24bit) */ +u32 reg =readl (&iomux->gpr[2 ]); + reg |=IOMUXC_GPR2_DATA_WIDTH_CH0_24BIT ; +writel (reg, &iomux->gpr[2 ]); + +/* Enable Backlight - use GPIO for Brightness adjustment */ +SETUP_IOMUX_PAD (PAD_SD4_DAT1__GPIO2_IO09 ); +gpio_request (IMX_GPIO_NR (2 ,9 ),"backlight_enable" ); +gpio_direction_output (IMX_GPIO_NR (2 ,9 ),1 ); + +gpio_request (IMX_GPIO_NR (2 ,8 ),"brightness" ); +SETUP_IOMUX_PAD (PAD_SD4_DAT0__GPIO2_IO08 ); +gpio_direction_output (IMX_GPIO_NR (2 ,8 ),1 ); +} + +static void enable_ft5x06_wvga (struct display_info_t const *dev) +{ +SETUP_IOMUX_PADS (ft5x06_wvga_pads); + +gpio_request (IMX_GPIO_NR (2 ,10 ),"parallel_enable" ); +gpio_request (IMX_GPIO_NR (2 ,11 ),"parallel_brightness" ); +gpio_direction_output (IMX_GPIO_NR (2 ,10 ),1 ); +gpio_direction_output (IMX_GPIO_NR (2 ,11 ),1 ); +} + +struct display_info_t const displays[] = {{ + .bus =1 , + .addr =0x38 , + .pixfmt =IPU_PIX_FMT_RGB24 , + .detect =NULL , + .enable = enable_ft5x06_wvga, + .mode = { + .name ="FT5x06-WVGA" , + .refresh =60 , + .xres =800 , + .yres =480 , + .pixclock =30303 , + .left_margin =45 , + .right_margin =210 , + .upper_margin =22 , + .lower_margin =22 , + .hsync_len =1 , + .vsync_len =1 , + .sync =0 , + .vmode =FB_VMODE_NONINTERLACED +} }, { + .bus =-1 , + .addr =0 , + .pixfmt =IPU_PIX_FMT_RGB24 , + .detect =NULL , + .enable = enable_lvds, + .mode = { + .name ="hj070na" , + .refresh =60 , + .xres =1024 , + .yres =600 , + .pixclock =15385 , + .left_margin =220 , + .right_margin =40 , + .upper_margin =21 , + .lower_margin =7 , + .hsync_len =60 , + .vsync_len =10 , + .sync =FB_SYNC_EXT , + .vmode =FB_VMODE_NONINTERLACED +} }, { + .bus =-1 , + .addr =0 , + .pixfmt =IPU_PIX_FMT_RGB24 , + .detect = detect_hdmi, + .enable = do_enable_hdmi, + .mode = { + .name ="HDMI" , + .refresh =60 , + .xres =1024 , + .yres =768 , + .pixclock =15385 , + .left_margin =220 , + .right_margin =40 , + .upper_margin =21 , + .lower_margin =7 , + .hsync_len =60 , + .vsync_len =10 , + .sync =FB_SYNC_EXT , + .vmode =FB_VMODE_NONINTERLACED +} } }; +size_t display_count =ARRAY_SIZE (displays); + +static void setup_display (void ) +{ +struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR ; +struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR ; +int reg; + +/* Setup HSYNC, VSYNC, DISP_CLK for debugging purposes */ +SETUP_IOMUX_PADS (lvds_pads); +gpio_request (LVDS0_EN ,"lvds0_enable" ); +gpio_request (LVDS0_BL_EN ,"lvds0_bl_enable" ); +gpio_direction_output (LVDS0_EN ,1 ); +gpio_direction_output (LVDS0_BL_EN ,1 ); + +enable_ipu_clock (); +imx_setup_hdmi (); + + reg =__raw_readl (&mxc_ccm->CCGR3); + reg |=MXC_CCM_CCGR3_LDB_DI0_MASK |MXC_CCM_CCGR3_LDB_DI1_MASK ; +writel (reg, &mxc_ccm->CCGR3); + +/* set LDB0, LDB1 clk select to 011/011 */ + reg =readl (&mxc_ccm->cs2cdr); + reg &= ~(MXC_CCM_CS2CDR_LDB_DI0_CLK_SEL_MASK + |MXC_CCM_CS2CDR_LDB_DI1_CLK_SEL_MASK ); + reg |= (3 <<MXC_CCM_CS2CDR_LDB_DI0_CLK_SEL_OFFSET ) + | (3 <<MXC_CCM_CS2CDR_LDB_DI1_CLK_SEL_OFFSET ); +writel (reg, &mxc_ccm->cs2cdr); + + reg =readl (&mxc_ccm->cscmr2); + reg |=MXC_CCM_CSCMR2_LDB_DI0_IPU_DIV |MXC_CCM_CSCMR2_LDB_DI1_IPU_DIV ; +writel (reg, &mxc_ccm->cscmr2); + + reg =readl (&mxc_ccm->chsccdr); + reg |= (CHSCCDR_CLK_SEL_LDB_DI0 + <<MXC_CCM_CHSCCDR_IPU1_DI0_CLK_SEL_OFFSET ); + reg |= (CHSCCDR_CLK_SEL_LDB_DI0 + <<MXC_CCM_CHSCCDR_IPU1_DI1_CLK_SEL_OFFSET ); +writel (reg, &mxc_ccm->chsccdr); + + reg =IOMUXC_GPR2_BGREF_RRMODE_EXTERNAL_RES + |IOMUXC_GPR2_DI1_VS_POLARITY_ACTIVE_LOW + |IOMUXC_GPR2_DI0_VS_POLARITY_ACTIVE_LOW + |IOMUXC_GPR2_BIT_MAPPING_CH1_SPWG + |IOMUXC_GPR2_DATA_WIDTH_CH1_24BIT + |IOMUXC_GPR2_BIT_MAPPING_CH0_SPWG + |IOMUXC_GPR2_DATA_WIDTH_CH0_24BIT + |IOMUXC_GPR2_LVDS_CH1_MODE_ENABLED_DI0 + |IOMUXC_GPR2_LVDS_CH0_MODE_ENABLED_DI0 ; +writel (reg, &iomux->gpr[2 ]); + reg =readl (&iomux->gpr[3 ]); + + reg = (reg & ~(IOMUXC_GPR3_LVDS0_MUX_CTL_MASK + |IOMUXC_GPR3_HDMI_MUX_CTL_MASK )) + | (IOMUXC_GPR3_MUX_SRC_IPU1_DI0 + <<IOMUXC_GPR3_LVDS0_MUX_CTL_OFFSET ); + +writel (reg, &iomux->gpr[3 ]); +} +#endif /* CONFIG_VIDEO_IPUV3 */ +int board_early_init_f (void ) {setup_iomux_uart (); +#if defined(CONFIG_VIDEO_IPUV3 ) +setup_display (); +#endif +return 0 ; }
configs/pico-imx6_defconfig +2 -0
@@ -69,3 +69,5 @@ CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y +CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y
include/configs/pico-imx6.h +10 -0
@@ -139,4 +139,14 @@#define CONFIG_PHYLIB #define CONFIG_PHY_ATHEROS +/* Framebuffer */ +#define CONFIG_VIDEO_BMP_RLE8 +#define CONFIG_SPLASH_SCREEN +#define CONFIG_SPLASH_SCREEN_ALIGN +#define CONFIG_BMP_16BPP +#define CONFIG_VIDEO_LOGO +#define CONFIG_VIDEO_BMP_LOGO +#define CONFIG_IMX_HDMI +#define CONFIG_IMX_VIDEO_SKIP +#endif /* __CONFIG_H * */
Signature · 1 line
2.23.0
PATCH v2 8/8 pico-imx6: Add Falcon mode
In reply to Otavio SalvadorFrom: Fabio Estevam <[email protected]>
Add Falcon mode support, which allows the SPL to load and jump to the Linux kernel directly, without the need of loading U-Boot proper.
CONFIG_SPL_OS_BOOT=y needs to be passed in the defconfig in order to use Falcon mode.
--- board/technexion/pico-imx6/spl.c | 11 +++++++++++ include/configs/pico-imx6.h | 12 ++++++++++++ 2 files changed, 23 insertions(+)
board/technexion/pico-imx6/spl.c +11 -0
@@ -27,6 +27,17 @@#define IMX6DQ_DRIVE_STRENGTH 0x30#define IMX6SDL_DRIVE_STRENGTH 0x28 +#ifdef CONFIG_SPL_OS_BOOT +int spl_start_uboot (void ) +{ +/* Break into full U-Boot on 'c' */ +if (serial_tstc () &&serial_getc () =='c' ) +return 1 ; + +return 0 ; +} +#endif +/* configure MX6Q/DUAL mmdc DDR io registers */ static struct mx6dq_iomux_ddr_regs mx6dq_ddr_ioregs = { .dram_sdclk_0 =IMX6DQ_DRIVE_STRENGTH ,
include/configs/pico-imx6.h +12 -0
@@ -12,6 +12,18 @@#include "imx6_spl.h" +#ifdef CONFIG_SPL_OS_BOOT +/* Falcon Mode */ +#define CONFIG_SPL_FS_LOAD_ARGS_NAME "args" +#define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage" +#define CONFIG_SYS_SPL_ARGS_ADDR 0x18000000 + +/* Falcon Mode - MMC support: args at 1MB kernel at 2MB */ +#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x800/* 1MB */ +#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512) +#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0x1000/* 2MB */ +#endif +/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (35 * SZ_1M)/* Increase due to DFU */
Signature · 1 line
2.23.0