[PATCH V2 1/4] configs: imx8mn_beacon: Re-align memory to standard imx8mn settings

[Peng Fan]

On 10/22/2022 9:43 PM, Adam Ford wrote:
> 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.
> 
> Signed-off-by: Adam Ford <aford173 at gmail.com>

Reviewed-by: Peng Fan <peng.fan at nxp.com>
> ---
> V2:
> Rebase on u-boot-imx
> 
> Depends 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=0
> 
> diff --git a/configs/imx8mn_beacon_2g_defconfig b/configs/imx8mn_beacon_2g_defconfig
> index 613945a9ec..5708ba5c69 100644
> --- a/configs/imx8mn_beacon_2g_defconfig
> +++ b/configs/imx8mn_beacon_2g_defconfig
> @@ -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
> diff --git a/configs/imx8mn_beacon_defconfig b/configs/imx8mn_beacon_defconfig
> index cc1583524b..0793db0bd6 100644
> --- a/configs/imx8mn_beacon_defconfig
> +++ b/configs/imx8mn_beacon_defconfig
> @@ -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
> diff --git a/configs/imx8mn_beacon_fspi_defconfig b/configs/imx8mn_beacon_fspi_defconfig
> index ecaefd8930..6da2182eb3 100644
> --- a/configs/imx8mn_beacon_fspi_defconfig
> +++ b/configs/imx8mn_beacon_fspi_defconfig
> @@ -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
> diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h
> index 6faecbde77..930b11b75e 100644
> --- a/include/configs/imx8mn_beacon.h
> +++ b/include/configs/imx8mn_beacon.h
> @@ -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" \