apalis-imx8: boot issue fix and support refresh
Subsystems (2)
v3 cover apalis-imx8: boot issue fix and support refresh
From: Francesco Dolcini <[email protected]>
This series fixes a boot issue and refreshes Apalis iMX8 support as follows:
- implement PCB version and SoC variant handling
- turn off LCD backlight before OS handover
- display build info
- provide proper prompt
- set bootdelay
- add overlays support
- remove global environment variable script
- enable environment bootcount limit
- remove obsolete SDHC related config defines
- remove obsolete net usb start
- introduce setup setting setupargs
- drop obsolete environment variables
- update update_uboot confirmation message
- update env memory layout
- use correct type for sc_pm_setup_uart() return value
- remove board_phy_config() from board file
- initialize svns
- add aux cores helpers
- add emmc/mmc card pinctrl's for different speeds
Changes in v3:
- added Reviewed-by: Fabio Estevam <[email protected]>
- dropped SPDX and copyright year update patch
- dropped DM_EVENT defconfig update patch
Changes in v2:
- fixed issue in pcb version and soc variant handling for 8GB SKU
- remove another spurious variable from the environment, boot_file
- new commit: use correct type for sc_pm_setup_uart() return value
- new commit: remove useless board_phy_config() from board file
- new commit: initialize svns
- new commit: add aux core helpers
- new commit: add emmc/mmc card pinctrl's for different speeds
Andrejs Cainikovs (5):
board: apalis-imx8: remove board_phy_config duplicate
board: apalis-imx8: initialize snvs
apalis-imx8: set bootaux memory base and size
apalis-imx8: add M4 boot environment helpers
apalis-imx8: add emmc/mmc card pinctrl's for different speeds
Igor Opaniuk (1):
apalis-imx8: provide proper config_sys_prompt
Marcel Ziswiler (11):
apalis-imx8: implement pcb version and soc variant handling
apalis-imx8: turn off lcd backlight before os handover
apalis-imx8: display build info
apalis-imx8: set bootdelay
apalis-imx8: enable environment bootcount limit
apalis-imx8: remove obsolete sdhc related config defines
apalis-imx8: remove obsolete net usb start
apalis-imx8: introduce setup setting setupargs
apalis-imx8: drop obsolete environment variables
apalis-imx8: update update_uboot confirmation message
apalis-imx8: update env memory layout
Oleksandr Suvorov (2):
apalis/colibri-imx8/8x: add overlay support for i.mx 8/8x-based soms apalis/colibri-imx8/8x: remove global variable script
Philippe Schenker (1):
board: apalis-imx8: get rid of sc_err_t type
arch/arm/dts/fsl-imx8qm-apalis.dts | 8 +- board/toradex/apalis-imx8/apalis-imx8.c | 148 +++++++++++++++++++++--- configs/apalis-imx8_defconfig | 11 +- configs/colibri-imx8x_defconfig | 1 + include/configs/apalis-imx8.h | 50 ++++---- include/configs/colibri-imx8x.h | 1 - 6 files changed, 172 insertions(+), 47 deletions(-)
Signature · 1 line
2.25.1
PATCH v3 1/20 apalis-imx8: implement pcb version and soc variant handling
From: Marcel Ziswiler <[email protected]>
Implement PCB version and SoC variant handling which automatically loads the correct device tree for the Linux kernel.
---
v3: added Reviewed-by: Fabio
v2: added missing 8GB SKU
--- board/toradex/apalis-imx8/apalis-imx8.c | 105 +++++++++++++++++++++++- configs/apalis-imx8_defconfig | 2 + include/configs/apalis-imx8.h | 3 +- 3 files changed, 107 insertions(+), 3 deletions(-)
board/toradex/apalis-imx8/apalis-imx8.c +104 -1
@@ -15,10 +15,12 @@#include <asm/arch/sys_proto.h> #include <asm/gpio.h> #include <asm/io.h> +#include <command.h> #include <env.h> #include <errno.h> -#include <linux/libfdt.h> #include <linux/bitops.h> +#include <linux/delay.h> +#include <linux/libfdt.h> #include "../common/tdx-cfg-block.h"
@@ -29,11 +31,41 @@ DECLARE_GLOBAL_DATA_PTR; (SC_PAD_28FDSOI_DSE_DV_HIGH << PADRING_DSE_SHIFT) | \ (SC_PAD_28FDSOI_PS_PU << PADRING_PULL_SHIFT)) +#define PCB_VERS_DETECT ((SC_PAD_CONFIG_NORMAL << PADRING_CONFIG_SHIFT) | \ + (SC_PAD_ISO_OFF << PADRING_LPCONFIG_SHIFT) | \ + (SC_PAD_28FDSOI_DSE_DV_HIGH << PADRING_DSE_SHIFT) | \ + (SC_PAD_28FDSOI_PS_PU << PADRING_PULL_SHIFT)) + +#define GPIO_PAD_CTRL ((SC_PAD_CONFIG_NORMAL << PADRING_CONFIG_SHIFT) | \ + (SC_PAD_ISO_OFF << PADRING_LPCONFIG_SHIFT) | \ + (SC_PAD_28FDSOI_DSE_DV_HIGH << PADRING_DSE_SHIFT) | \ + (SC_PAD_28FDSOI_PS_PU << PADRING_PULL_SHIFT)) + +#define PCB_VERS_DEFAULT ((SC_PAD_CONFIG_NORMAL << PADRING_CONFIG_SHIFT) | \ + (SC_PAD_ISO_OFF << PADRING_LPCONFIG_SHIFT) | \ + (SC_PAD_28FDSOI_PS_PD << PADRING_PULL_SHIFT) | \ + (SC_PAD_28FDSOI_DSE_DV_HIGH << PADRING_DSE_SHIFT)) +#define TDX_USER_FUSE_BLOCK1_A 276#define TDX_USER_FUSE_BLOCK1_B 277#define TDX_USER_FUSE_BLOCK2_A 278#define TDX_USER_FUSE_BLOCK2_B 279 +enum pcb_rev_t { +PCB_VERSION_1_0 , +PCB_VERSION_1_1 +}; + +static iomux_cfg_t pcb_vers_detect[] = { +SC_P_MIPI_DSI0_GPIO0_00 |MUX_MODE_ALT (3 ) |MUX_PAD_CTRL (PCB_VERS_DETECT ), +SC_P_MIPI_DSI0_GPIO0_01 |MUX_MODE_ALT (3 ) |MUX_PAD_CTRL (PCB_VERS_DETECT ), +}; + +static iomux_cfg_t pcb_vers_default[] = { +SC_P_MIPI_DSI0_GPIO0_00 |MUX_MODE_ALT (3 ) |MUX_PAD_CTRL (PCB_VERS_DEFAULT ), +SC_P_MIPI_DSI0_GPIO0_01 |MUX_MODE_ALT (3 ) |MUX_PAD_CTRL (PCB_VERS_DEFAULT ), +}; +static iomux_cfg_t uart1_pads[] = {SC_P_UART1_RX |MUX_PAD_CTRL (UART_PAD_CTRL ),SC_P_UART1_TX |MUX_PAD_CTRL (UART_PAD_CTRL ),
@@ -180,6 +212,75 @@ int checkboard(void)return 0 ; } +static enum pcb_rev_t get_pcb_revision (void ) +{ +unsigned int pcb_vers =0 ; + +imx8_iomux_setup_multiple_pads (pcb_vers_detect, +ARRAY_SIZE (pcb_vers_detect)); + +gpio_request (IMX_GPIO_NR (1 ,18 ), +"PCB version detection on PAD SC_P_MIPI_DSI0_GPIO0_00" ); +gpio_request (IMX_GPIO_NR (1 ,19 ), +"PCB version detection on PAD SC_P_MIPI_DSI0_GPIO0_01" ); +gpio_direction_input (IMX_GPIO_NR (1 ,18 )); +gpio_direction_input (IMX_GPIO_NR (1 ,19 )); + +udelay (1000 ); + + pcb_vers =gpio_get_value (IMX_GPIO_NR (1 ,18 )); + pcb_vers |=gpio_get_value (IMX_GPIO_NR (1 ,19 )) <<1 ; + +/* Set muxing back to default values for saving energy */ +imx8_iomux_setup_multiple_pads (pcb_vers_default, +ARRAY_SIZE (pcb_vers_default)); + +switch (pcb_vers) { +case 0b11 : +return PCB_VERSION_1_0 ; +case 0b10 : +return PCB_VERSION_1_1 ; +default : +printf ("Unknown PCB version=0x%x, default to V1.1\n" , pcb_vers); +return PCB_VERSION_1_1 ; + } +} + +static void select_dt_from_module_version (void ) +{ +env_set ("soc" ,"imx8qm" ); +env_set ("variant" ,"-v1.1" ); + +switch (tdx_hw_tag.prodid) { +/* Select Apalis iMX8QM device trees */ +case APALIS_IMX8QM_IT : +case APALIS_IMX8QM_WIFI_BT_IT : +case APALIS_IMX8QM_8GB_WIFI_BT_IT : +if (get_pcb_revision () ==PCB_VERSION_1_0 ) +env_set ("variant" ,"" ); +break ; +/* Select Apalis iMX8QP device trees */ +case APALIS_IMX8QP_WIFI_BT : +case APALIS_IMX8QP : +env_set ("soc" ,"imx8qp" ); +break ; +default : +printf ("Unknown Apalis iMX8 module\n" ); +return ; + } +} + +static int do_select_dt_from_module_version (struct cmd_tbl *cmdtp,int flag, +int argc,char *const argv[]) +{ +select_dt_from_module_version (); +return 0 ; +} + +U_BOOT_CMD (select_dt_from_module_version,CONFIG_SYS_MAXARGS ,1 , do_select_dt_from_module_version, +"\n" ," - select devicetree from module version" +); +int board_init (void ) {board_gpio_init ();
@@ -215,5 +316,7 @@ int board_late_init(void)env_set ("board_rev" ,"v1.0" );#endif +select_dt_from_module_version (); +return 0 ; }
configs/apalis-imx8_defconfig +2 -0
@@ -19,6 +19,8 @@ CONFIG_REMAKE_ELF=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_SYSTEM_SETUP=y +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile ${soc}-apalis${variant}-${fdt_board}.dtb" CONFIG_LOG=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y
include/configs/apalis-imx8.h +1 -2
@@ -41,8 +41,7 @@"boot_script_dhcp=boot.scr\0" \"console=ttyLP1 earlycon\0" \"fdt_addr=0x83000000\0" \ -"fdt_file=fsl-imx8qm-apalis-eval.dtb\0" \ -"fdtfile=fsl-imx8qm-apalis-eval.dtb\0" \ +"fdt_board=eval\0" \"finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \"initrd_addr=0x83800000\0" \"initrd_high=0xffffffffffffffff\0" \
Signature · 1 line
2.25.1
PATCH v3 1/20 apalis-imx8: implement pcb version and soc variant handling
Quoted 7 lines
From: Marcel Ziswiler <[email protected]> Implement PCB version and SoC variant handling which automatically loads the correct device tree for the Linux kernel.
Signed-off-by Marcel Ziswiler <[email protected]>Signed-off-by Andrejs Cainikovs <[email protected]>Signed-off-by Francesco Dolcini <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v3 2/20 apalis-imx8: turn off lcd backlight before os handover
In reply to Francesco DolciniFrom: Marcel Ziswiler <[email protected]>
U-Boot typically tears down the display controller before handing control over to Linux. On LCD displays disabling pixel clock leads to a fading out effect with vertical/horizontal lines. Make sure to disable back light GPIO Apalis BKL1 before booting Linux.
---
v3: added Reviewed-by: Fabio
v2: no changes
--- board/toradex/apalis-imx8/apalis-imx8.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
board/toradex/apalis-imx8/apalis-imx8.c +18 -1
@@ -182,9 +182,18 @@ int board_early_init_f(void) }#if CONFIG_IS_ENABLED (DM_GPIO ) + +#define BKL1_GPIO IMX_GPIO_NR(1, 10) + +static iomux_cfg_t board_gpios[] = { +SC_P_LVDS1_GPIO00 |MUX_MODE_ALT (3 ) |MUX_PAD_CTRL (GPIO_PAD_CTRL ), +}; +static void board_gpio_init (void ) { -/* TODO */ +imx8_iomux_setup_multiple_pads (board_gpios,ARRAY_SIZE (board_gpios)); + +gpio_request (BKL1_GPIO ,"BKL1_GPIO" ); }#else static inline void board_gpio_init (void ) {}
@@ -202,6 +211,14 @@ int board_phy_config(struct phy_device *phydev) }#endif +/* +* Backlight off before OS handover +*/ +void board_preboot_os (void ) +{ +gpio_direction_output (BKL1_GPIO ,0 ); +} +int checkboard (void ) {puts ("Model: Toradex Apalis iMX8\n" );
Signature · 1 line
2.25.1
PATCH v3 2/20 apalis-imx8: turn off lcd backlight before os handover
Quoted 8 lines
From: Marcel Ziswiler <[email protected]>
U-Boot typically tears down the display controller before handing control over to Linux. On LCD displays disabling pixel clock leads to a fading out effect with vertical/horizontal lines. Make sure to disable back light GPIO Apalis BKL1 before booting Linux.Signed-off-by Marcel Ziswiler <[email protected]>Signed-off-by Francesco Dolcini <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v3 3/20 apalis-imx8: display build info
In reply to Francesco DolciniFrom: Marcel Ziswiler <[email protected]>
Display build info with information about the version of SCFW, SECO and TF-A (ATF).
---
v3: added Reviewed-by: Fabio
v2: no changes
--- board/toradex/apalis-imx8/apalis-imx8.c | 2 ++ 1 file changed, 2 insertions(+)
board/toradex/apalis-imx8/apalis-imx8.c +2 -0
@@ -333,6 +333,8 @@ int board_late_init(void)env_set ("board_rev" ,"v1.0" );#endif +build_info (); +select_dt_from_module_version ();return 0 ;
Signature · 1 line
2.25.1
PATCH v3 3/20 apalis-imx8: display build info
Quoted 6 lines
From: Marcel Ziswiler <[email protected]>
Display build info with information about the version of SCFW, SECO and TF-A (ATF).Signed-off-by Marcel Ziswiler <[email protected]>Signed-off-by Francesco Dolcini <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v3 4/20 apalis-imx8: provide proper config_sys_prompt
In reply to Francesco DolciniFrom: Igor Opaniuk <[email protected]>
This provides correct system prompt for U-Boot console.
---
v3: added Reviewed-by: Fabio
v2: no changes
--- configs/apalis-imx8_defconfig | 1 + 1 file changed, 1 insertion(+)
configs/apalis-imx8_defconfig +1 -0
@@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0xFFFFDE00 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-apalis" CONFIG_TARGET_APALIS_IMX8=y +CONFIG_SYS_PROMPT="Apalis iMX8 # " CONFIG_SYS_LOAD_ADDR=0x80280000 CONFIG_SYS_MEMTEST_START=0x88000000 CONFIG_SYS_MEMTEST_END=0x89000000
Signature · 1 line
2.25.1
PATCH v3 4/20 apalis-imx8: provide proper config_sys_prompt
Quoted 6 lines
From: Igor Opaniuk <[email protected]> This provides correct system prompt for U-Boot console.
Signed-off-by Igor Opaniuk <[email protected]>Signed-off-by Marcel Ziswiler <[email protected]>Signed-off-by Francesco Dolcini <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v3 5/20 apalis-imx8: set bootdelay
In reply to Francesco DolciniFrom: Marcel Ziswiler <[email protected]>
Set the boot delay to one second.
---
v3: added Reviewed-by: Fabio
v2: no changes
--- configs/apalis-imx8_defconfig | 1 + 1 file changed, 1 insertion(+)
configs/apalis-imx8_defconfig +1 -0
@@ -20,6 +20,7 @@ CONFIG_REMAKE_ELF=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_SYSTEM_SETUP=y +CONFIG_BOOTDELAY=1 CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile ${soc}-apalis${variant}-${fdt_board}.dtb" CONFIG_LOG=y
Signature · 1 line
2.25.1
PATCH v3 5/20 apalis-imx8: set bootdelay
Quoted 5 lines
From: Marcel Ziswiler <[email protected]> Set the boot delay to one second.
Signed-off-by Marcel Ziswiler <[email protected]>Signed-off-by Francesco Dolcini <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v3 6/20 apalis/colibri-imx8/8x: add overlay support for i.mx 8/8x-based soms
In reply to Francesco DolciniFrom: Oleksandr Suvorov <[email protected]>
There is no "apply" command enabled for "fdt". Enable "apply" command to allow overlays to be applied.
---
v3: added Reviewed-by: Fabio
v2: no changes
--- configs/apalis-imx8_defconfig | 1 + configs/colibri-imx8x_defconfig | 1 + 2 files changed, 2 insertions(+)
configs/apalis-imx8_defconfig +1 -0
@@ -79,4 +79,5 @@ CONFIG_DM_SERIAL=y CONFIG_FSL_LPUART=y CONFIG_DM_THERMAL=y CONFIG_IMX_SCU_THERMAL=y +CONFIG_OF_LIBFDT_OVERLAY=y # CONFIG_EFI_LOADER is not set
configs/colibri-imx8x_defconfig +1 -0
@@ -74,4 +74,5 @@ CONFIG_DM_SERIAL=y CONFIG_FSL_LPUART=y CONFIG_DM_THERMAL=y CONFIG_IMX_SCU_THERMAL=y +CONFIG_OF_LIBFDT_OVERLAY=y # CONFIG_EFI_LOADER is not set
Signature · 1 line
2.25.1
PATCH v3 6/20 apalis/colibri-imx8/8x: add overlay support for i.mx 8/8x-based soms
Quoted 7 lines
From: Oleksandr Suvorov <[email protected]> There is no "apply" command enabled for "fdt". Enable "apply" command to allow overlays to be applied.
Signed-off-by Oleksandr Suvorov <[email protected]>Signed-off-by Marcel Ziswiler <[email protected]>Signed-off-by Francesco Dolcini <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v3 7/20 apalis/colibri-imx8/8x: remove global variable script
In reply to Francesco DolciniFrom: Oleksandr Suvorov <[email protected]>
The distroboot script system scans boot_scripts variable and try to find and use to boot each script name mentioned there. Setting global variable "script" breaks this general mechanism of searching and running a distro boot script. Remove global variables "script" to fix working the general distro boot script mechanism.
---
v3: added Reviewed-by: Fabio
v2: no changes
--- include/configs/apalis-imx8.h | 1 - include/configs/colibri-imx8x.h | 1 - 2 files changed, 2 deletions(-)
include/configs/apalis-imx8.h +0 -1
@@ -50,7 +50,6 @@ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \"mmcpart=1\0" \"panel=NULL\0" \ -"script=boot.scr\0" \"update_uboot=askenv confirm Did you load u-boot-dtb.imx (y/N)?; " \"if test \"$confirm\" = \"y\"; then " \"setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt " \
include/configs/colibri-imx8x.h +0 -1
@@ -81,7 +81,6 @@ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \"mmcpart=1\0" \"panel=NULL\0" \ -"script=boot.scr\0" \"update_uboot=askenv confirm Did you load u-boot-dtb.imx (y/N)?; " \"if test \"$confirm\" = \"y\"; then " \"setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt " \
Signature · 1 line
2.25.1
PATCH v3 7/20 apalis/colibri-imx8/8x: remove global variable script
Quoted 11 lines
From: Oleksandr Suvorov <[email protected]> The distroboot script system scans
boot_scriptsvariable and try to find and use to boot each script name mentioned there. Setting global variable "script" breaks this general mechanism of searching and running a distro boot script. Remove global variables "script" to fix working the general distro boot script mechanism.Signed-off-by Oleksandr Suvorov <[email protected]>Signed-off-by Marcel Ziswiler <[email protected]>Signed-off-by Francesco Dolcini <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v3 8/20 apalis-imx8: enable environment bootcount limit
In reply to Francesco DolciniFrom: Marcel Ziswiler <[email protected]>
Enable optional environment bootcount limit functionality.
---
v3: added Reviewed-by: Fabio
v2: no changes
--- configs/apalis-imx8_defconfig | 2 ++ 1 file changed, 2 insertions(+)
configs/apalis-imx8_defconfig +2 -0
@@ -52,6 +52,8 @@ CONFIG_VERSION_VARIABLE=y CONFIG_IP_DEFRAG=y CONFIG_TFTP_BLOCKSIZE=4096 CONFIG_TFTP_TSIZE=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_ENV=y CONFIG_CLK_IMX8=y CONFIG_CPU=y CONFIG_MXC_GPIO=y
Signature · 1 line
2.25.1
PATCH v3 8/20 apalis-imx8: enable environment bootcount limit
Quoted 5 lines
From: Marcel Ziswiler <[email protected]> Enable optional environment bootcount limit functionality.
Signed-off-by Marcel Ziswiler <[email protected]>Signed-off-by Francesco Dolcini <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v3 9/20 apalis-imx8: remove obsolete sdhc related config defines
In reply to Francesco DolciniFrom: Marcel Ziswiler <[email protected]>
Remove obsolete SDHC related config defines. Nowadays, all SDHC related hardware configuration comes from the device tree.
---
v3: added Reviewed-by: Fabio
v2: no changes
--- include/configs/apalis-imx8.h | 9 --------- 1 file changed, 9 deletions(-)
include/configs/apalis-imx8.h +0 -9
@@ -9,10 +9,6 @@#include <asm/arch/imx-regs.h> #include <linux/sizes.h> -#define CFG_SYS_FSL_ESDHC_ADDR 0 -#define USDHC1_BASE_ADDR 0x5b010000 -#define USDHC2_BASE_ADDR 0x5b020000 -/* Networking */ #define CONFIG_IPADDR 192.168.10.2#define CONFIG_NETMASK 255.255.255.0
@@ -56,11 +52,6 @@"${blkcnt} / 0x200; mmc dev 0 1; mmc write ${loadaddr} 0x0 " \ "${blkcnt}; fi\0" -/* Link Definitions */ - -/* On Apalis iMX8 USDHC1 is eMMC, USDHC2 is 8-bit and USDHC3 is 4-bit MMC/SD */ -#define CFG_SYS_FSL_USDHC_NUM 3 -#define CONFIG_SYS_SDRAM_BASE 0x80000000#define PHYS_SDRAM_1 0x80000000#define PHYS_SDRAM_2 0x880000000
Signature · 1 line
2.25.1
PATCH v3 9/20 apalis-imx8: remove obsolete sdhc related config defines
Quoted 6 lines
From: Marcel Ziswiler <[email protected]>
Remove obsolete SDHC related config defines. Nowadays, all SDHC related hardware configuration comes from the device tree.Signed-off-by Marcel Ziswiler <[email protected]>Signed-off-by Francesco Dolcini <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v3 10/20 apalis-imx8: remove obsolete net usb start
In reply to Francesco DolciniFrom: Marcel Ziswiler <[email protected]>
Remove obsolete net USB start.
While at it also add a comment about enabling distro-boot.
---
v3: added Reviewed-by: Fabio
v2: no changes
--- include/configs/apalis-imx8.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
include/configs/apalis-imx8.h +1 -2
@@ -20,14 +20,13 @@"ramdisk_addr_r=0x94400000\0" \"scriptaddr=0x87000000\0" +/* Enable Distro Boot */#define BOOT_TARGET_DEVICES (func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 2) \ func(MMC, mmc, 0) \ func(DHCP, dhcp, na)#include <config_distro_bootcmd.h> -#undef BOOTENV_RUN_NET_USB_START -#define BOOTENV_RUN_NET_USB_START ""/* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \
Signature · 1 line
2.25.1
PATCH v3 10/20 apalis-imx8: remove obsolete net usb start
Quoted 6 lines
From: Marcel Ziswiler <[email protected]> Remove obsolete net USB start.
While at it also add a comment about enabling distro-boot.Signed-off-by Marcel Ziswiler <[email protected]>Signed-off-by Francesco Dolcini <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v3 11/20 apalis-imx8: introduce setup setting setupargs
In reply to Francesco DolciniFrom: Marcel Ziswiler <[email protected]>
Introduce setup setting setupargs and move earlycon there.
---
v3: added Reviewed-by: Fabio
v2: no changes
--- include/configs/apalis-imx8.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
include/configs/apalis-imx8.h +3 -1
@@ -34,7 +34,7 @@MEM_LAYOUT_ENV_SETTINGS \"boot_file=Image\0" \"boot_script_dhcp=boot.scr\0" \ -"console=ttyLP1 earlycon\0" \ +"console=ttyLP1\0" \"fdt_addr=0x83000000\0" \"fdt_board=eval\0" \"finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \
@@ -45,6 +45,8 @@ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \"mmcpart=1\0" \"panel=NULL\0" \ +"setup=setenv setupargs console=tty1 console=${console},${baudrate} " \ +"consoleblank=0 earlycon\0" \"update_uboot=askenv confirm Did you load u-boot-dtb.imx (y/N)?; " \"if test \"$confirm\" = \"y\"; then " \"setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt " \
Signature · 1 line
2.25.1
PATCH v3 11/20 apalis-imx8: introduce setup setting setupargs
Quoted 5 lines
From: Marcel Ziswiler <[email protected]> Introduce setup setting setupargs and move earlycon there.
Signed-off-by Marcel Ziswiler <[email protected]>Signed-off-by Francesco Dolcini <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v3 12/20 apalis-imx8: drop obsolete environment variables
In reply to Francesco DolciniFrom: Marcel Ziswiler <[email protected]>
Drop obsolete environment variables fdt_addr, finduuid, boot_file, mmcargs, mmcdev, mmcpart and panel.
---
v3: added Reviewed-by: Fabio
v2: remove additional boot_file variable
--- include/configs/apalis-imx8.h | 8 -------- 1 file changed, 8 deletions(-)
include/configs/apalis-imx8.h +0 -8
@@ -32,19 +32,11 @@#define CONFIG_EXTRA_ENV_SETTINGS \ BOOTENV \ MEM_LAYOUT_ENV_SETTINGS \ - "boot_file=Image\0" \ "boot_script_dhcp=boot.scr\0" \ "console=ttyLP1\0" \ - "fdt_addr=0x83000000\0" \ "fdt_board=eval\0" \ - "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \ "initrd_addr=0x83800000\0" \ "initrd_high=0xffffffffffffffff\0" \ - "mmcargs=setenv bootargs console=${console},${baudrate} " \ - "root=PARTUUID=${uuid} rootwait " \ - "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ - "mmcpart=1\0" \ - "panel=NULL\0" \ "setup=setenv setupargs console=tty1 console=${console},${baudrate} " \ "consoleblank=0 earlycon\0" \ "update_uboot=askenv confirm Did you load u-boot-dtb.imx (y/N)?; " \
Signature · 1 line
2.25.1
PATCH v3 12/20 apalis-imx8: drop obsolete environment variables
Quoted 7 lines
From: Marcel Ziswiler <[email protected]> Drop obsolete environment variables
fdt_addr, finduuid,boot_file, mmcargs, mmcdev, mmcpart and panel.Signed-off-by Marcel Ziswiler <[email protected]>Signed-off-by Andrejs Cainikovs <[email protected]>Signed-off-by Francesco Dolcini <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v3 13/20 apalis-imx8: update update_uboot confirmation message
In reply to Francesco DolciniFrom: Marcel Ziswiler <[email protected]>
Update update_uboot confirmation message.
---
v3: added Reviewed-by: Fabio
v2: no changes
--- include/configs/apalis-imx8.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/apalis-imx8.h +1 -1
@@ -39,7 +39,7 @@"initrd_high=0xffffffffffffffff\0" \"setup=setenv setupargs console=tty1 console=${console},${baudrate} " \"consoleblank=0 earlycon\0" \ -"update_uboot=askenv confirm Did you load u-boot-dtb.imx (y/N)?; " \ +"update_uboot=askenv confirm Did you load flash.bin resp. u-boot-dtb.imx (y/N)?; " \"if test \"$confirm\" = \"y\"; then " \"setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt " \"${blkcnt} / 0x200; mmc dev 0 1; mmc write ${loadaddr} 0x0 " \
Signature · 1 line
2.25.1
PATCH v3 13/20 apalis-imx8: update update_uboot confirmation message
Quoted 5 lines
From: Marcel Ziswiler <[email protected]> Update
update_ubootconfirmation message.Signed-off-by Marcel Ziswiler <[email protected]>Signed-off-by Francesco Dolcini <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v3 14/20 apalis-imx8: update env memory layout
In reply to Francesco DolciniFrom: Marcel Ziswiler <[email protected]>
Update the distro config env memory layout for the Apalis iMX8 aka QuadMax:
- kernel_comp_addr_r=0xf0000000 temporary area for uncompressing (ie FIT images or Image.gz booted using booti)
- kernel_comp_size=0x08000000
- loadaddr=0x95400000 avoiding any reserved areas located before that
- fdt_addr_r = loadaddr + 128MB - allows for 128MB kernel
- scriptaddr = fdt_addr_r + 512KB - allows for 512KB fdt
- ramdisk_addr_r = scriptaddr + 512KB - allows for 512KB script
Basic idea of memory layout taken from commit fd5c7173ade4 ("imx8m{m,n}_venice: update env memory layout"). However, moved past any reserved areas to avoid any kind of conflicts.
Note that for our regular BSP Layers and Reference Images for Yocto Project an updated distro boot script is required (see meta-toradex-bsp-common/recipes-bsp/u-boot/u-boot-distro-boot).
---
v3: added Reviewed-by: Fabio
v2: no changes
--- configs/apalis-imx8_defconfig | 2 +- include/configs/apalis-imx8.h | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-)
configs/apalis-imx8_defconfig +1 -1
@@ -10,7 +10,7 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-apalis" CONFIG_TARGET_APALIS_IMX8=y CONFIG_SYS_PROMPT="Apalis iMX8 # " -CONFIG_SYS_LOAD_ADDR=0x80280000 +CONFIG_SYS_LOAD_ADDR=0x95400000 CONFIG_SYS_MEMTEST_START=0x88000000 CONFIG_SYS_MEMTEST_END=0x89000000 CONFIG_DISTRO_DEFAULTS=y
include/configs/apalis-imx8.h +6 -4
@@ -15,10 +15,12 @@#define CONFIG_SERVERIP 192.168.10.1#define MEM_LAYOUT_ENV_SETTINGS \ - "fdt_addr_r=0x84000000\0" \ - "kernel_addr_r=0x82000000\0" \ - "ramdisk_addr_r=0x94400000\0" \ - "scriptaddr=0x87000000\0" + "fdt_addr_r=0x9d400000\0" \ + "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "kernel_comp_addr_r=0xf0000000\0" \ + "kernel_comp_size=0x08000000\0" \ + "ramdisk_addr_r=0x9d500000\0" \ + "scriptaddr=0x9d480000\0"/* Enable Distro Boot */ #define BOOT_TARGET_DEVICES (func) \
Signature · 1 line
2.25.1
PATCH v3 14/20 apalis-imx8: update env memory layout
Quoted 16 lines
From: Marcel Ziswiler <[email protected]>
Update the distro config env memory layout for the Apalis iMX8 aka QuadMax:
- kernel_comp_addr_r=0xf0000000 temporary area for uncompressing (ie FIT images or Image.gz booted using booti)
- kernel_comp_size=0x08000000
- loadaddr=0x95400000 avoiding any reserved areas located before that
-fdt_addr_r= loadaddr + 128MB - allows for 128MB kernel
- scriptaddr =fdt_addr_r+ 512KB - allows for 512KB fdt
-ramdisk_addr_r= scriptaddr + 512KB - allows for 512KB script Basic idea of memory layout taken from commitfd5c7173ade4("imx8m{m,n}_venice: update env memory layout"). However, moved past any reserved areas to avoid any kind of conflicts.
Note that for our regular BSP Layers and Reference Images for Yocto Project an updated distro boot script is required (see meta-toradex-bsp-common/recipes-bsp/u-boot/u-boot-distro-boot).
Quoted 3 lines
Signed-off-by Marcel Ziswiler <[email protected]>Signed-off-by Francesco Dolcini <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v3 15/20 board: apalis-imx8: get rid of sc_err_t type
In reply to Francesco DolciniFrom: Philippe Schenker <[email protected]>
sc_pm_setup_uart() returns int, not sc_err_t.
---
v3: added Reviewed-by: Fabio
v2: new patch
--- board/toradex/apalis-imx8/apalis-imx8.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
board/toradex/apalis-imx8/apalis-imx8.c +4 -4
@@ -169,12 +169,12 @@ void board_mem_get_layout(u64 *phys_sdram_1_start,int board_early_init_f (void ) {sc_pm_clock_rate_t rate =SC_80MHZ ; -sc_err_t err =0 ; +int ret;/* Set UART1 clock root to 80 MHz and enable it */ - err =sc_pm_setup_uart (SC_R_UART_1 , rate); -if (err !=SC_ERR_NONE ) -return 0 ; + ret =sc_pm_setup_uart (SC_R_UART_1 , rate); +if (ret) +return ret;setup_iomux_uart ();
Signature · 1 line
2.25.1
PATCH v3 15/20 board: apalis-imx8: get rid of sc_err_t type
Quoted 5 lines
From: Philippe Schenker <[email protected]>
sc_pm_setup_uart()returns int, notsc_err_t.Signed-off-by Philippe Schenker <[email protected]>Signed-off-by Francesco Dolcini <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v3 16/20 board: apalis-imx8: remove board_phy_config duplicate
In reply to Francesco DolciniFrom: Andrejs Cainikovs <[email protected]>
Remove a duplicate of weak board_phy_config() implementation in drivers/net/phy/phy.c.
---
v3: added Reviewed-by: Fabio
v2: new patch
--- board/toradex/apalis-imx8/apalis-imx8.c | 12 ------------ 1 file changed, 12 deletions(-)
board/toradex/apalis-imx8/apalis-imx8.c +0 -12
@@ -199,18 +199,6 @@ static void board_gpio_init(void)static inline void board_gpio_init (void ) {}#endif -#if IS_ENABLED (CONFIG_FEC_MXC ) -#include <miiphy.h> - -int board_phy_config (struct phy_device *phydev) -{ -if (phydev->drv->config) - phydev->drv->config (phydev); - -return 0 ; -} -#endif -/* * Backlight off before OS handover */
Signature · 1 line
2.25.1
PATCH v3 16/20 board: apalis-imx8: remove board_phy_config duplicate
Quoted 6 lines
From: Andrejs Cainikovs <[email protected]> Remove a duplicate of weak
board_phy_config()implementation indrivers/net/phy/phy.c.Signed-off-by Andrejs Cainikovs <[email protected]>Signed-off-by Francesco Dolcini <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v3 17/20 board: apalis-imx8: initialize snvs
In reply to Francesco DolciniFrom: Andrejs Cainikovs <[email protected]>
Initialize Secure Non-Volatile Storage, aka SNVS.
---
v3: added Reviewed-by: Fabio
v2: new patch
--- board/toradex/apalis-imx8/apalis-imx8.c | 8 ++++++++ 1 file changed, 8 insertions(+)
board/toradex/apalis-imx8/apalis-imx8.c +8 -0
@@ -12,6 +12,7 @@#include <asm/arch/imx8-pins.h> #include <asm/arch/iomux.h> #include <asm/arch/sci/sci.h> +#include <asm/arch/snvs_security_sc.h> #include <asm/arch/sys_proto.h> #include <asm/gpio.h> #include <asm/io.h>
@@ -290,6 +291,13 @@ int board_init(void) {board_gpio_init (); +if (IS_ENABLED (CONFIG_IMX_SNVS_SEC_SC_AUTO )) { +int ret =snvs_security_sc_init (); + +if (ret) +return ret; + } +return 0 ; }
Signature · 1 line
2.25.1
PATCH v3 17/20 board: apalis-imx8: initialize snvs
Quoted 5 lines
From: Andrejs Cainikovs <[email protected]> Initialize Secure Non-Volatile Storage, aka SNVS.
Signed-off-by Andrejs Cainikovs <[email protected]>Signed-off-by Francesco Dolcini <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v3 18/20 apalis-imx8: set bootaux memory base and size
In reply to Francesco DolciniFrom: Andrejs Cainikovs <[email protected]>
Set i.MX auxiliary core memory base and size.
---
v3: added Reviewed-by: Fabio
v2: new patch
--- configs/apalis-imx8_defconfig | 2 ++ 1 file changed, 2 insertions(+)
configs/apalis-imx8_defconfig +2 -0
@@ -8,6 +8,8 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFDE00 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-apalis" +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 CONFIG_TARGET_APALIS_IMX8=y CONFIG_SYS_PROMPT="Apalis iMX8 # " CONFIG_SYS_LOAD_ADDR=0x95400000
Signature · 1 line
2.25.1
PATCH v3 18/20 apalis-imx8: set bootaux memory base and size
Quoted 5 lines
From: Andrejs Cainikovs <[email protected]> Set i.MX auxiliary core memory base and size.
Signed-off-by Andrejs Cainikovs <[email protected]>Signed-off-by Francesco Dolcini <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v3 19/20 apalis-imx8: add M4 boot environment helpers
In reply to Francesco DolciniFrom: Andrejs Cainikovs <[email protected]>
Add M4 boot environment functions for reference.
---
v3: added Reviewed-by: Fabio
v2: new patch
--- include/configs/apalis-imx8.h | 10 ++++++++++ 1 file changed, 10 insertions(+)
include/configs/apalis-imx8.h +10 -0
@@ -22,6 +22,15 @@"ramdisk_addr_r=0x9d500000\0" \"scriptaddr=0x9d480000\0" +/* Boot M4 */ +#define M4_BOOT_ENV \ + "m4_0_image=m4_0.bin\0" \ + "m4_1_image=m4_1.bin\0" \ + "loadm4image_0=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${m4_0_image}\0" \ + "loadm4image_1=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${m4_1_image}\0" \ + "m4boot_0=run loadm4image_0; dcache flush; bootaux ${loadaddr} 0\0" \ + "m4boot_1=run loadm4image_1; dcache flush; bootaux ${loadaddr} 1\0" \ +/* Enable Distro Boot */ #define BOOT_TARGET_DEVICES (func) \ func(MMC, mmc, 1) \
@@ -33,6 +42,7 @@/* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ BOOTENV \ + M4_BOOT_ENV \ MEM_LAYOUT_ENV_SETTINGS \ "boot_script_dhcp=boot.scr\0" \ "console=ttyLP1\0" \
Signature · 1 line
2.25.1
PATCH v3 19/20 apalis-imx8: add M4 boot environment helpers
Quoted 5 lines
From: Andrejs Cainikovs <[email protected]> Add M4 boot environment functions for reference.
Signed-off-by Andrejs Cainikovs <[email protected]>Signed-off-by Francesco Dolcini <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v3 20/20 apalis-imx8: add emmc/mmc card pinctrl's for different speeds
In reply to Francesco DolciniFrom: Andrejs Cainikovs <[email protected]>
Add pinctrl's for high speed eMMC and MMC cards.
---
v3: added Reviewed-by: Fabio
v2: new patch
--- arch/arm/dts/fsl-imx8qm-apalis.dts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/arm/dts/fsl-imx8qm-apalis.dts +6 -2
@@ -589,8 +589,10 @@ /* eMMC */ &usdhc1 { - pinctrl-names = "default"; + pinctrl-names = "default", "state_100mhz", "state_200mhz"; pinctrl-0 = <&pinctrl_usdhc1>; + pinctrl-1 = <&pinctrl_usdhc1>; + pinctrl-2 = <&pinctrl_usdhc1>; bus-width = <8>; non-removable; status = "okay";
@@ -598,8 +600,10 @@ /* Apalis MMC1 */ &usdhc2 { - pinctrl-names = "default"; + pinctrl-names = "default", "state_100mhz", "state_200mhz"; pinctrl-0 = <&pinctrl_usdhc2>, <&pinctrl_mmc1_cd>; + pinctrl-1 = <&pinctrl_usdhc2>, <&pinctrl_mmc1_cd>; + pinctrl-2 = <&pinctrl_usdhc2>, <&pinctrl_mmc1_cd>; bus-width = <8>; cd-gpios = <&gpio2 9 GPIO_ACTIVE_LOW>; /* Apalis MMC1_CD# */ status = "okay";
Signature · 1 line
2.25.1
PATCH v3 20/20 apalis-imx8: add emmc/mmc card pinctrl's for different speeds
Quoted 6 lines
From: Andrejs Cainikovs <[email protected]> Add pinctrl's for high speed eMMC and MMC cards.
Signed-off-by Andrejs Cainikovs <[email protected]>Signed-off-by Philippe Schenker <[email protected]>Signed-off-by Francesco Dolcini <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================