configs: imx8mn_beacon: Re-align memory to standard imx8mn settings
PATCH v2 1/4 configs: imx8mn_beacon: Re-align memory to standard imx8mn settings
The imx8mn_beacon board does not use the same memory map as the reference design from NXP or other imx8mn boards. As such, memory is more limited in SPL.
Moving SPL_BSS_START_ADDR and SPL_STACK to default locations increases the amount of available meory for the SPL stack. Doing this allows the board to no longer define CONFIG_MALLOC_F_ADDR.
Since SYS_LOAD_ADDR also does not align with other boards, move it too.
---
V2:
Rebase on u-boot-imx
Depends on:
https://patchwork.ozlabs.org/project/uboot/list/?series=324057
https://patchwork.ozlabs.org/project/uboot/list/?series=312020
configs/imx8mn_beacon_2g_defconfig +3 -4
@@ -16,10 +16,9 @@ CONFIG_IMX8MN_BEACON_2GB_LPDDR=y CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y -CONFIG_SPL_SYS_MALLOC_F_LEN=0x2000 CONFIG_SPL=y CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000 -CONFIG_SYS_LOAD_ADDR=0x40480000 +CONFIG_SYS_LOAD_ADDR=0x42000000 CONFIG_SYS_MEMTEST_START=0x40000000 CONFIG_SYS_MEMTEST_END=0x44000000 CONFIG_LTO=y
@@ -35,12 +34,12 @@ CONFIG_DEFAULT_FDT_FILE="imx8mn-beacon-kit.dtb" CONFIG_ARCH_MISC_INIT=y CONFIG_SPL_MAX_SIZE=0x25000 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y -CONFIG_SPL_BSS_START_ADDR=0x95e000 +CONFIG_SPL_BSS_START_ADDR=0x950000 CONFIG_SPL_BSS_MAX_SIZE=0x2000 CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_BOOTROM_SUPPORT=y # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set -CONFIG_SPL_STACK=0x187ff0 +CONFIG_SPL_STACK=0x980000 CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x42200000
configs/imx8mn_beacon_defconfig +3 -4
@@ -15,10 +15,9 @@ CONFIG_TARGET_IMX8MN_BEACON=y CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y -CONFIG_SPL_SYS_MALLOC_F_LEN=0x2000 CONFIG_SPL=y CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000 -CONFIG_SYS_LOAD_ADDR=0x40480000 +CONFIG_SYS_LOAD_ADDR=0x42000000 CONFIG_SYS_MEMTEST_START=0x40000000 CONFIG_SYS_MEMTEST_END=0x44000000 CONFIG_LTO=y
@@ -34,12 +33,12 @@ CONFIG_DEFAULT_FDT_FILE="imx8mn-beacon-kit.dtb" CONFIG_ARCH_MISC_INIT=y CONFIG_SPL_MAX_SIZE=0x25000 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y -CONFIG_SPL_BSS_START_ADDR=0x95e000 +CONFIG_SPL_BSS_START_ADDR=0x950000 CONFIG_SPL_BSS_MAX_SIZE=0x2000 CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_BOOTROM_SUPPORT=y # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set -CONFIG_SPL_STACK=0x187ff0 +CONFIG_SPL_STACK=0x980000 CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x42200000
configs/imx8mn_beacon_fspi_defconfig +3 -4
@@ -14,10 +14,9 @@ CONFIG_SPL_TEXT_BASE=0x912000 CONFIG_TARGET_IMX8MN_BEACON=y CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y -CONFIG_SPL_SYS_MALLOC_F_LEN=0x2000 CONFIG_SPL=y CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000 -CONFIG_SYS_LOAD_ADDR=0x40480000 +CONFIG_SYS_LOAD_ADDR=0x42000000 CONFIG_SYS_MEMTEST_START=0x40000000 CONFIG_SYS_MEMTEST_END=0x44000000 CONFIG_LTO=y
@@ -33,12 +32,12 @@ CONFIG_DEFAULT_FDT_FILE="imx8mn-beacon-kit.dtb" CONFIG_ARCH_MISC_INIT=y CONFIG_SPL_MAX_SIZE=0x25000 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y -CONFIG_SPL_BSS_START_ADDR=0x95e000 +CONFIG_SPL_BSS_START_ADDR=0x950000 CONFIG_SPL_BSS_MAX_SIZE=0x2000 CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_BOOTROM_SUPPORT=y # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set -CONFIG_SPL_STACK=0x187ff0 +CONFIG_SPL_STACK=0x980000 CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x42200000
include/configs/imx8mn_beacon.h +0 -8
@@ -13,14 +13,6 @@#define CONFIG_SYS_UBOOT_BASE \ (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) -#ifdef CONFIG_SPL_BUILD -/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x184000 - -/* For RAW image gives a error info not panic */ - -#endif /* CONFIG_SPL_BUILD */ -/* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \
Signature · 1 line
2.34.1
PATCH v2 2/4 regulator: bd718x7: Only bind children when PMIC_CHILDREN is enabled
If the bd718x7 is required, but PMIC_CHILDREN is disabled, this driver throws a compile error. Fix this by putting the function to bind children into an if-statement checking for PMIC_CHILDREN.
Allowing PMIC_CHILDREN to be disabled in SPL saves some space and still permits some read/write functions to access the PMIC in early startup.
drivers/power/pmic/bd71837.c +5 -4
@@ -63,10 +63,11 @@ static int bd71837_bind(struct udevice *dev)debug ("%s: '%s' - found regulators subnode\n" , __func__, dev->name); - children =pmic_bind_children (dev, regulators_node, pmic_children_info); -if (!children) -debug ("%s: %s - no child found\n" , __func__, dev->name); - +if (CONFIG_IS_ENABLED (PMIC_CHILDREN )) { + children =pmic_bind_children (dev, regulators_node, pmic_children_info); +if (!children) +debug ("%s: %s - no child found\n" , __func__, dev->name); + }/* Always return success for this device */ return 0 ; }
Signature · 1 line
2.34.1
Re: [PATCH V2 2/4] regulator: bd718x7: Only bind children when PMIC_CHILDREN is enabled
Quoted 8 lines · Adam Ford
If the bd718x7 is required, but
PMIC_CHILDRENis disabled, this driver throws a compile error. Fix this by putting the function to bind children into an if-statement checking forPMIC_CHILDREN.Allowing
PMIC_CHILDRENto be disabled in SPL saves some space and still permits some read/write functions to access the PMIC in early startup.
Cool, that's a good hint. I was not aware of it.
PATCH v2 2/4 regulator: bd718x7: Only bind children when PMIC_CHILDREN is enabled
In reply to Adam FordQuoted 19 lines
If the bd718x7 is required, but
PMIC_CHILDRENis disabled, this driver throws a compile error. Fix this by putting the function to bind children into an if-statement checking forPMIC_CHILDREN. AllowingPMIC_CHILDRENto be disabled in SPL saves some space and still permits some read/write functions to access the PMIC in early startup.Signed-off-by Adam Ford <[email protected]>Reviewed-by Simon Glass <[email protected]>Reviewed-by Fabio Estevam <[email protected]>drivers/power/pmic/bd71837.c +0
-2@@ -63,10 +63,11 @@ static int bd71837_bind(struct udevice *dev)debug ("%s: '%s' - found regulators subnode\n" , __func__, dev->name); - children =pmic_bind_children (dev, regulators_node, pmic_children_info); -if (!children)
drivers/power/pmic/bd71837.c static int bd71837_bind(struct udevice *dev) · line 73
Quoted 10 lines
drivers/power/pmic/bd71837.c +5
-2-debug ("%s: %s - no child found\n" , __func__, dev->name); - +if (CONFIG_IS_ENABLED (PMIC_CHILDREN )) { + children =pmic_bind_children (dev, regulators_node, pmic_children_info); +if (!children) +debug ("%s: %s - no child found\n" , __func__, dev->name); + }/* Always return success for this device */ return 0 ; }
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 v2 3/4 configs: imx8mn_beacon: Enable SPL_DM_PMIC_BD71837
In reply to Adam FordTo properly operate the Nano with LPDDR4 at 1.6GHz, the voltage needs to be adjusted before DDR is initialized. Enable the PMIC in SPL to do this.
configs/imx8mn_beacon_2g_defconfig +1 -0
@@ -120,6 +120,7 @@ CONFIG_PINCTRL_IMX8M=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_DM_PMIC_BD71837=y +CONFIG_SPL_DM_PMIC_BD71837=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_BD71837=y CONFIG_DM_REGULATOR_FIXED=y
configs/imx8mn_beacon_defconfig +1 -0
@@ -124,6 +124,7 @@ CONFIG_PINCTRL_IMX8M=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_DM_PMIC_BD71837=y +CONFIG_SPL_DM_PMIC_BD71837=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_BD71837=y CONFIG_DM_REGULATOR_FIXED=y
configs/imx8mn_beacon_fspi_defconfig +1 -0
@@ -125,6 +125,7 @@ CONFIG_PINCTRL_IMX8M=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_DM_PMIC_BD71837=y +CONFIG_SPL_DM_PMIC_BD71837=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_BD71837=y CONFIG_DM_REGULATOR_FIXED=y
Signature · 1 line
2.34.1
Re: [PATCH V2 3/4] configs: imx8mn_beacon: Enable SPL_DM_PMIC_BD71837
Quoted 6 lines · Adam Ford
To properly operate the Nano with LPDDR4 at 1.6GHz, the voltage needs to be adjusted before DDR is initialized. Enable the PMIC in SPL to do this.
Signed-off-by Adam Ford <[email protected]>
Re: [PATCH V2 3/4] configs: imx8mn_beacon: Enable SPL_DM_PMIC_BD71837
In reply to Adam FordQuoted 5 lines · Adam Ford
To properly operate the Nano with LPDDR4 at 1.6GHz, the voltage needs to be adjusted before DDR is initialized. Enable the PMIC in SPL to do this.
Signed-off-by Adam Ford <[email protected]>
Better enable defconfig in the end, otherwise:
Quoted 37 lines
configs/imx8mn_beacon_2g_defconfig +1
-0@@ -120,6 +120,7 @@ CONFIG_PINCTRL_IMX8M=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_DM_PMIC_BD71837=y +CONFIG_SPL_DM_PMIC_BD71837=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_BD71837=y CONFIG_DM_REGULATOR_FIXED=yconfigs/imx8mn_beacon_defconfig +1
-0@@ -124,6 +124,7 @@ CONFIG_PINCTRL_IMX8M=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_DM_PMIC_BD71837=y +CONFIG_SPL_DM_PMIC_BD71837=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_BD71837=y CONFIG_DM_REGULATOR_FIXED=yconfigs/imx8mn_beacon_fspi_defconfig +1
-0@@ -125,6 +125,7 @@ CONFIG_PINCTRL_IMX8M=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_DM_PMIC_BD71837=y +CONFIG_SPL_DM_PMIC_BD71837=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_BD71837=y CONFIG_DM_REGULATOR_FIXED=y
PATCH v2 3/4 configs: imx8mn_beacon: Enable SPL_DM_PMIC_BD71837
In reply to Adam FordQuoted 35 lines
To properly operate the Nano with LPDDR4 at 1.6GHz, the voltage needs to be adjusted before DDR is initialized. Enable the PMIC in SPL to do this.
Signed-off-by Adam Ford <[email protected]>Reviewed-by Fabio Estevam <[email protected]>Reviewed-by Peng Fan <[email protected]>configs/imx8mn_beacon_2g_defconfig +1
-0@@ -120,6 +120,7 @@ CONFIG_PINCTRL_IMX8M=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_DM_PMIC_BD71837=y +CONFIG_SPL_DM_PMIC_BD71837=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_BD71837=y CONFIG_DM_REGULATOR_FIXED=yconfigs/imx8mn_beacon_defconfig +1
-0@@ -124,6 +124,7 @@ CONFIG_PINCTRL_IMX8M=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_DM_PMIC_BD71837=y +CONFIG_SPL_DM_PMIC_BD71837=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_BD71837=y CONFIG_DM_REGULATOR_FIXED=yconfigs/imx8mn_beacon_fspi_defconfig +0
-0
configs/imx8mn_beacon_fspi_defconfig CONFIG_PINCTRL_IMX8M=y · line 131
Quoted 7 lines
configs/imx8mn_beacon_fspi_defconfig +1
-0@@ -125,6 +125,7 @@ CONFIG_PINCTRL_IMX8M=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_DM_PMIC_BD71837=y +CONFIG_SPL_DM_PMIC_BD71837=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_BD71837=y CONFIG_DM_REGULATOR_FIXED=y
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 v2 4/4 imx: imx8mn-beacon: Fix out of spec voltage
In reply to Adam FordThe DDR is configured for LPDDR4 running at 1.6GHz which requires the voltage on the PMIC to rise a bit before initializing LPDDR4 or it will be running out of spec.
board/beacon/imx8mn/spl.c +35 -0
@@ -74,6 +74,38 @@ static iomux_v3_cfg_t const pwm_pads[] = { IMX8MN_PAD_GPIO1_IO01__PWM1_OUT | MUX_PAD_CTRL(PWM1_PAD_CTRL), }; +static int power_init_board (void ) +{ +struct udevice *dev; +int ret; + + ret =pmic_get ("pmic@4b" , &dev); +if (ret == -ENODEV ) { +puts ("No pmic\n" ); +return 0 ; + } + +if (ret !=0 ) +return ret; + +/* decrease RESET key long push time from the default 10s to 10ms */ +pmic_reg_write (dev,BD718XX_PWRONCONFIG1 ,0x0 ); + +/* unlock the PMIC regs */ +pmic_reg_write (dev,BD718XX_REGLOCK ,0x1 ); + +/* increase VDD_SOC to typical value 0.85v before first DRAM access */ +pmic_reg_write (dev,BD718XX_BUCK1_VOLT_RUN ,0x0f ); + +/* increase VDD_DRAM to 0.975v for 3Ghz DDR */ +pmic_reg_write (dev,BD718XX_1ST_NODVS_BUCK_VOLT ,0x83 ); + +/* lock the PMIC regs */ +pmic_reg_write (dev,BD718XX_REGLOCK ,0x11 ); + +return 0 ; +} +int board_early_init_f (void ) {/* Claiming pwm pins prevents LCD flicker during startup*/
@@ -107,6 +139,9 @@ void board_init_f(ulong dummy)enable_tzc380 (); +/* LPDDR4 at 1.6GHz requires a voltage adjustment on the PMIC */ +power_init_board (); +/* DDR initialization */ spl_dram_init ();
Signature · 1 line
2.34.1
Re: [PATCH V2 4/4] imx: imx8mn-beacon: Fix out of spec voltage
Quoted 6 lines · Adam Ford
The DDR is configured for LPDDR4 running at 1.6GHz which requires the voltage on the PMIC to rise a bit before initializing LPDDR4 or it will be running out of spec.
Signed-off-by Adam Ford <[email protected]>
Re: [PATCH V2 4/4] imx: imx8mn-beacon: Fix out of spec voltage
In reply to Adam FordQuoted 5 lines · Adam Ford
The DDR is configured for LPDDR4 running at 1.6GHz which requires the voltage on the PMIC to rise a bit before initializing LPDDR4 or it will be running out of spec.
Signed-off-by Adam Ford <[email protected]>
I think patch 4 better be moved before patch 3. Otherwise:
Quoted 54 lines
board/beacon/imx8mn/spl.c +35
-0@@ -74,6 +74,38 @@ static iomux_v3_cfg_t const pwm_pads[] = { IMX8MN_PAD_GPIO1_IO01__PWM1_OUT | MUX_PAD_CTRL(PWM1_PAD_CTRL), }; +static int power_init_board (void ) +{ +struct udevice *dev; +int ret; + + ret =pmic_get ("pmic@4b" , &dev); +if (ret == -ENODEV ) { +puts ("No pmic\n" ); +return 0 ; + } + +if (ret !=0 ) +return ret; + +/* decrease RESET key long push time from the default 10s to 10ms */ +pmic_reg_write (dev,BD718XX_PWRONCONFIG1 ,0x0 ); + +/* unlock the PMIC regs */ +pmic_reg_write (dev,BD718XX_REGLOCK ,0x1 ); + +/* increase VDD_SOC to typical value 0.85v before first DRAM access */ +pmic_reg_write (dev,BD718XX_BUCK1_VOLT_RUN ,0x0f ); + +/* increase VDD_DRAM to 0.975v for 3Ghz DDR */ +pmic_reg_write (dev,BD718XX_1ST_NODVS_BUCK_VOLT ,0x83 ); + +/* lock the PMIC regs */ +pmic_reg_write (dev,BD718XX_REGLOCK ,0x11 ); + +return 0 ; +} +int board_early_init_f (void ) {/* Claiming pwm pins prevents LCD flicker during startup*/ @@ -107,6 +139,9 @@ void board_init_f(ulong dummy)enable_tzc380 (); +/* LPDDR4 at 1.6GHz requires a voltage adjustment on the PMIC */ +power_init_board (); +/* DDR initialization */ spl_dram_init ();
PATCH v2 4/4 imx: imx8mn-beacon: Fix out of spec voltage
In reply to Adam FordQuoted 50 lines
The DDR is configured for LPDDR4 running at 1.6GHz which requires the voltage on the PMIC to rise a bit before initializing LPDDR4 or it will be running out of spec.
Signed-off-by Adam Ford <[email protected]>Reviewed-by Fabio Estevam <[email protected]>Reviewed-by Peng Fan <[email protected]>board/beacon/imx8mn/spl.c +32
-0@@ -74,6 +74,38 @@ static iomux_v3_cfg_t const pwm_pads[] = { IMX8MN_PAD_GPIO1_IO01__PWM1_OUT | MUX_PAD_CTRL(PWM1_PAD_CTRL), }; +static int power_init_board (void ) +{ +struct udevice *dev; +int ret; + + ret =pmic_get ("pmic@4b" , &dev); +if (ret == -ENODEV ) { +puts ("No pmic\n" ); +return 0 ; + } + +if (ret !=0 ) +return ret; + +/* decrease RESET key long push time from the default 10s to 10ms */ +pmic_reg_write (dev,BD718XX_PWRONCONFIG1 ,0x0 ); + +/* unlock the PMIC regs */ +pmic_reg_write (dev,BD718XX_REGLOCK ,0x1 ); + +/* increase VDD_SOC to typical value 0.85v before first DRAM access */ +pmic_reg_write (dev,BD718XX_BUCK1_VOLT_RUN ,0x0f ); + +/* increase VDD_DRAM to 0.975v for 3Ghz DDR */ +pmic_reg_write (dev,BD718XX_1ST_NODVS_BUCK_VOLT ,0x83 ); + +/* lock the PMIC regs */ +pmic_reg_write (dev,BD718XX_REGLOCK ,0x11 ); + +return 0 ; +} +int board_early_init_f (void ) {/* Claiming pwm pins prevents LCD flicker during startup*/
board/beacon/imx8mn/spl.c void board_init_f(ulong dummy) · line 147
Quoted 9 lines
board/beacon/imx8mn/spl.c +3
-0@@ -107,6 +139,9 @@ void board_init_f(ulong dummy)enable_tzc380 (); +/* LPDDR4 at 1.6GHz requires a voltage adjustment on the PMIC */ +power_init_board (); +/* DDR initialization */ spl_dram_init ();
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] =====================================================================
Quoted 7 lines · Adam Ford
The
imx8mn_beaconboard does not use the same memory map as the reference design from NXP or other imx8mn boards. As such, memory is more limited in SPL.Moving
SPL_BSS_START_ADDRandSPL_STACKto default locations increases the amount of available meory for the SPL stack. Doing this allows
s/meory/memory
Quoted 5 lines
the board to no longer define
CONFIG_MALLOC_F_ADDR.Since
SYS_LOAD_ADDRalso does not align with other boards, move it too.Signed-off-by Adam Ford <[email protected]>
Quoted 133 lines · Adam Ford
The
imx8mn_beaconboard does not use the same memory map as the reference design from NXP or other imx8mn boards. As such, memory is more limited in SPL.Moving
SPL_BSS_START_ADDRandSPL_STACKto default locations increases the amount of available meory for the SPL stack. Doing this allows the board to no longer defineCONFIG_MALLOC_F_ADDR.Since
SYS_LOAD_ADDRalso does not align with other boards, move it too.Signed-off-by Adam Ford <[email protected]>---
V2:
Rebase on u-boot-imxDepends on:
https://patchwork.ozlabs.org/project/uboot/list/?series=324057
https://patchwork.ozlabs.org/project/uboot/list/?series=312020configs/imx8mn_beacon_2g_defconfig +3
-4@@ -16,10 +16,9 @@ CONFIG_IMX8MN_BEACON_2GB_LPDDR=y CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y -CONFIG_SPL_SYS_MALLOC_F_LEN=0x2000 CONFIG_SPL=y CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000 -CONFIG_SYS_LOAD_ADDR=0x40480000 +CONFIG_SYS_LOAD_ADDR=0x42000000 CONFIG_SYS_MEMTEST_START=0x40000000 CONFIG_SYS_MEMTEST_END=0x44000000 CONFIG_LTO=y@@ -35,12 +34,12 @@ CONFIG_DEFAULT_FDT_FILE="imx8mn-beacon-kit.dtb" CONFIG_ARCH_MISC_INIT=y CONFIG_SPL_MAX_SIZE=0x25000 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y -CONFIG_SPL_BSS_START_ADDR=0x95e000 +CONFIG_SPL_BSS_START_ADDR=0x950000 CONFIG_SPL_BSS_MAX_SIZE=0x2000 CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_BOOTROM_SUPPORT=y # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set -CONFIG_SPL_STACK=0x187ff0 +CONFIG_SPL_STACK=0x980000 CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x42200000configs/imx8mn_beacon_defconfig +3
-4@@ -15,10 +15,9 @@ CONFIG_TARGET_IMX8MN_BEACON=y CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y -CONFIG_SPL_SYS_MALLOC_F_LEN=0x2000 CONFIG_SPL=y CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000 -CONFIG_SYS_LOAD_ADDR=0x40480000 +CONFIG_SYS_LOAD_ADDR=0x42000000 CONFIG_SYS_MEMTEST_START=0x40000000 CONFIG_SYS_MEMTEST_END=0x44000000 CONFIG_LTO=y@@ -34,12 +33,12 @@ CONFIG_DEFAULT_FDT_FILE="imx8mn-beacon-kit.dtb" CONFIG_ARCH_MISC_INIT=y CONFIG_SPL_MAX_SIZE=0x25000 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y -CONFIG_SPL_BSS_START_ADDR=0x95e000 +CONFIG_SPL_BSS_START_ADDR=0x950000 CONFIG_SPL_BSS_MAX_SIZE=0x2000 CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_BOOTROM_SUPPORT=y # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set -CONFIG_SPL_STACK=0x187ff0 +CONFIG_SPL_STACK=0x980000 CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x42200000configs/imx8mn_beacon_fspi_defconfig +3
-4@@ -14,10 +14,9 @@ CONFIG_SPL_TEXT_BASE=0x912000 CONFIG_TARGET_IMX8MN_BEACON=y CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y -CONFIG_SPL_SYS_MALLOC_F_LEN=0x2000 CONFIG_SPL=y CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000 -CONFIG_SYS_LOAD_ADDR=0x40480000 +CONFIG_SYS_LOAD_ADDR=0x42000000 CONFIG_SYS_MEMTEST_START=0x40000000 CONFIG_SYS_MEMTEST_END=0x44000000 CONFIG_LTO=y@@ -33,12 +32,12 @@ CONFIG_DEFAULT_FDT_FILE="imx8mn-beacon-kit.dtb" CONFIG_ARCH_MISC_INIT=y CONFIG_SPL_MAX_SIZE=0x25000 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y -CONFIG_SPL_BSS_START_ADDR=0x95e000 +CONFIG_SPL_BSS_START_ADDR=0x950000 CONFIG_SPL_BSS_MAX_SIZE=0x2000 CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_BOOTROM_SUPPORT=y # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set -CONFIG_SPL_STACK=0x187ff0 +CONFIG_SPL_STACK=0x980000 CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x42200000include/configs/imx8mn_beacon.h +0
-9@@ -13,14 +13,6 @@#define CONFIG_SYS_UBOOT_BASE \ (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) -#ifdef CONFIG_SPL_BUILD -/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x184000 - -/* For RAW image gives a error info not panic */ - -#endif /* CONFIG_SPL_BUILD */ -/* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ --
Quoted 2 lines
2.34.1
Adam,
Have you evaluated getting rid of CONFIG_MALLOC_F_ADDR from the various imx8mm includes?
It seems like there is a lot of commonality that could be applied to the various defconfig and include/configs for the imx8mm/n/p boards.
Best Regards,
Tim
Quoted 11 lines · Adam Ford
The
imx8mn_beaconboard does not use the same memory map as the reference design from NXP or other imx8mn boards. As such, memory is more limited in SPL.Moving
SPL_BSS_START_ADDRandSPL_STACKto default locations increases the amount of available meory for the SPL stack. Doing this allows the board to no longer defineCONFIG_MALLOC_F_ADDR.Since
SYS_LOAD_ADDRalso does not align with other boards, move it too.Signed-off-by Adam Ford <[email protected]>
Quoted 120 lines
---
V2:
Rebase on u-boot-imxDepends on:
https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatchwork.ozlabs.org%2Fproject%2Fuboot%2Flist%2F%3Fseries%3D324057&data=05%7C01%7Cpeng.fan%40nxp.com%7C593fc12438854d817dc408dab4337960%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C638020430413763306%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=E%2F%2Fo5bmg6731UeEvNZ%2FiiWxZRG9%2BdypC7vo8Z6c%2B4Tc%3D&reserved=0
https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatchwork.ozlabs.org%2Fproject%2Fuboot%2Flist%2F%3Fseries%3D312020&data=05%7C01%7Cpeng.fan%40nxp.com%7C593fc12438854d817dc408dab4337960%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C638020430413763306%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=5g7Q7zw1o5QwjICog5urqD6yIb13j%2BtZt9PFcS1sFVw%3D&reserved=0configs/imx8mn_beacon_2g_defconfig +3
-4@@ -16,10 +16,9 @@ CONFIG_IMX8MN_BEACON_2GB_LPDDR=y CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y -CONFIG_SPL_SYS_MALLOC_F_LEN=0x2000 CONFIG_SPL=y CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000 -CONFIG_SYS_LOAD_ADDR=0x40480000 +CONFIG_SYS_LOAD_ADDR=0x42000000 CONFIG_SYS_MEMTEST_START=0x40000000 CONFIG_SYS_MEMTEST_END=0x44000000 CONFIG_LTO=y@@ -35,12 +34,12 @@ CONFIG_DEFAULT_FDT_FILE="imx8mn-beacon-kit.dtb" CONFIG_ARCH_MISC_INIT=y CONFIG_SPL_MAX_SIZE=0x25000 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y -CONFIG_SPL_BSS_START_ADDR=0x95e000 +CONFIG_SPL_BSS_START_ADDR=0x950000 CONFIG_SPL_BSS_MAX_SIZE=0x2000 CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_BOOTROM_SUPPORT=y # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set -CONFIG_SPL_STACK=0x187ff0 +CONFIG_SPL_STACK=0x980000 CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x42200000configs/imx8mn_beacon_defconfig +3
-4@@ -15,10 +15,9 @@ CONFIG_TARGET_IMX8MN_BEACON=y CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y -CONFIG_SPL_SYS_MALLOC_F_LEN=0x2000 CONFIG_SPL=y CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000 -CONFIG_SYS_LOAD_ADDR=0x40480000 +CONFIG_SYS_LOAD_ADDR=0x42000000 CONFIG_SYS_MEMTEST_START=0x40000000 CONFIG_SYS_MEMTEST_END=0x44000000 CONFIG_LTO=y@@ -34,12 +33,12 @@ CONFIG_DEFAULT_FDT_FILE="imx8mn-beacon-kit.dtb" CONFIG_ARCH_MISC_INIT=y CONFIG_SPL_MAX_SIZE=0x25000 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y -CONFIG_SPL_BSS_START_ADDR=0x95e000 +CONFIG_SPL_BSS_START_ADDR=0x950000 CONFIG_SPL_BSS_MAX_SIZE=0x2000 CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_BOOTROM_SUPPORT=y # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set -CONFIG_SPL_STACK=0x187ff0 +CONFIG_SPL_STACK=0x980000 CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x42200000configs/imx8mn_beacon_fspi_defconfig +3
-4@@ -14,10 +14,9 @@ CONFIG_SPL_TEXT_BASE=0x912000 CONFIG_TARGET_IMX8MN_BEACON=y CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y -CONFIG_SPL_SYS_MALLOC_F_LEN=0x2000 CONFIG_SPL=y CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000 -CONFIG_SYS_LOAD_ADDR=0x40480000 +CONFIG_SYS_LOAD_ADDR=0x42000000 CONFIG_SYS_MEMTEST_START=0x40000000 CONFIG_SYS_MEMTEST_END=0x44000000 CONFIG_LTO=y@@ -33,12 +32,12 @@ CONFIG_DEFAULT_FDT_FILE="imx8mn-beacon-kit.dtb" CONFIG_ARCH_MISC_INIT=y CONFIG_SPL_MAX_SIZE=0x25000 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y -CONFIG_SPL_BSS_START_ADDR=0x95e000 +CONFIG_SPL_BSS_START_ADDR=0x950000 CONFIG_SPL_BSS_MAX_SIZE=0x2000 CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_BOOTROM_SUPPORT=y # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set -CONFIG_SPL_STACK=0x187ff0 +CONFIG_SPL_STACK=0x980000 CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x42200000include/configs/imx8mn_beacon.h +0
-8@@ -13,14 +13,6 @@#define CONFIG_SYS_UBOOT_BASE \ (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) -#ifdef CONFIG_SPL_BUILD -/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x184000 - -/* For RAW image gives a error info not panic */ - -#endif /* CONFIG_SPL_BUILD */ -/* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \
PATCH v2 1/4 configs: imx8mn_beacon: Re-align memory to standard imx8mn settings
In reply to Adam FordQuoted 10 lines
The
imx8mn_beaconboard does not use the same memory map as the reference design from NXP or other imx8mn boards. As such, memory is more limited in SPL.
MovingSPL_BSS_START_ADDRandSPL_STACKto default locations increases the amount of available meory for the SPL stack. Doing this allows the board to no longer defineCONFIG_MALLOC_F_ADDR.
SinceSYS_LOAD_ADDRalso does not align with other boards, move it too.Signed-off-by Adam Ford <[email protected]>Reviewed-by Fabio Estevam <[email protected]>Reviewed-by Peng Fan <[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] =====================================================================