[PATCH v2 2/4] configs: am62x_evm_*: Run savedefconfig

[Dhruva Gole]

On 20/12/22 20:51, Sjoerd Simons wrote:
> Clean configuration for am62x_evm using savedefconfig
> 
> Signed-off-by: Sjoerd Simons <sjoerd at collabora.com>
> ---
> 
> (no changes since v1)
> 
>   configs/am62x_evm_a53_defconfig |  4 ++--
>   configs/am62x_evm_r5_defconfig  | 32 +++++++++++++++-----------------
>   2 files changed, 17 insertions(+), 19 deletions(-)
> 
> diff --git a/configs/am62x_evm_a53_defconfig b/configs/am62x_evm_a53_defconfig
> index 94de1ea4586..cd06e362f09 100644
> --- a/configs/am62x_evm_a53_defconfig
> +++ b/configs/am62x_evm_a53_defconfig
> @@ -7,6 +7,7 @@ CONFIG_NR_DRAM_BANKS=2
>   CONFIG_SOC_K3_AM625=y
>   CONFIG_K3_ATF_LOAD_ADDR=0x9e780000
>   CONFIG_TARGET_AM625_A53_EVM=y
> +CONFIG_SPL_DM_SPI=y
>   CONFIG_DEFAULT_DEVICE_TREE="k3-am625-sk"
>   CONFIG_SPL_TEXT_BASE=0x80080000
>   CONFIG_SPL_MMC=y
> @@ -14,6 +15,7 @@ CONFIG_SPL_SERIAL=y
>   CONFIG_SPL_STACK_R_ADDR=0x82000000
>   CONFIG_SPL_FS_FAT=y
>   CONFIG_SPL_LIBDISK_SUPPORT=y
> +CONFIG_SPL_SPI_FLASH_SUPPORT=y
>   CONFIG_SPL_SPI=y
>   CONFIG_DISTRO_DEFAULTS=y
>   CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
> @@ -32,12 +34,10 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
>   CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x1400
>   CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot.img"
>   CONFIG_SPL_DM_MAILBOX=y
> -CONFIG_SPL_DM_SPI=y
>   CONFIG_SPL_DM_SPI_FLASH=y
>   CONFIG_SPL_POWER_DOMAIN=y
>   # CONFIG_SPL_SPI_FLASH_TINY is not set
>   CONFIG_SPL_SPI_FLASH_SFDP_SUPPORT=y
> -CONFIG_SPL_SPI_FLASH_SUPPORT=y
>   CONFIG_SPL_SPI_LOAD=y
>   CONFIG_SYS_SPI_U_BOOT_OFFS=0x280000
>   CONFIG_SPL_YMODEM_SUPPORT=y
> diff --git a/configs/am62x_evm_r5_defconfig b/configs/am62x_evm_r5_defconfig
> index 40f933ca749..7350882a36f 100644
> --- a/configs/am62x_evm_r5_defconfig
> +++ b/configs/am62x_evm_r5_defconfig
> @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
>   CONFIG_NR_DRAM_BANKS=2
>   CONFIG_SOC_K3_AM625=y
>   CONFIG_TARGET_AM625_R5_EVM=y
> +CONFIG_ENV_SIZE=0x20000
>   CONFIG_DM_GPIO=y
>   CONFIG_SPL_DM_SPI=y
>   CONFIG_DEFAULT_DEVICE_TREE="k3-am625-r5-sk"
> @@ -18,10 +19,8 @@ CONFIG_SPL_STACK_R_ADDR=0x82000000
>   CONFIG_SPL_SIZE_LIMIT=0x40000
>   CONFIG_SPL_FS_FAT=y
>   CONFIG_SPL_LIBDISK_SUPPORT=y
> -CONFIG_SPL_SPI=y
>   CONFIG_SPL_SPI_FLASH_SUPPORT=y
> -CONFIG_SPL_SPI_SUPPORT=y
> -CONFIG_SF_DEFAULT_SPEED=25000000
> +CONFIG_SPL_SPI=y
>   CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
>   CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7000ffff
>   CONFIG_SPL_LOAD_FIT=y
> @@ -42,10 +41,9 @@ CONFIG_SYS_SPL_MALLOC_SIZE=0x1000000
>   CONFIG_SPL_EARLY_BSS=y
>   CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
>   CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x400
> -CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
>   CONFIG_SPL_DM_MAILBOX=y
> -CONFIG_SPL_DM_RESET=y
>   CONFIG_SPL_DM_SPI_FLASH=y
> +CONFIG_SPL_DM_RESET=y
>   CONFIG_SPL_POWER_DOMAIN=y
>   CONFIG_SPL_RAM_SUPPORT=y
>   CONFIG_SPL_RAM_DEVICE=y
> @@ -53,6 +51,7 @@ CONFIG_SPL_REMOTEPROC=y
>   # CONFIG_SPL_SPI_FLASH_TINY is not set
>   CONFIG_SPL_SPI_FLASH_SFDP_SUPPORT=y
>   CONFIG_SPL_SPI_LOAD=y
> +CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
>   CONFIG_SPL_YMODEM_SUPPORT=y
>   CONFIG_HUSH_PARSER=y
>   CONFIG_CMD_ASKENV=y
> @@ -88,6 +87,14 @@ CONFIG_MMC_SDHCI=y
>   CONFIG_MMC_SDHCI_ADMA=y
>   CONFIG_SPL_MMC_SDHCI_ADMA=y
>   CONFIG_MMC_SDHCI_AM654=y
> +CONFIG_DM_SPI_FLASH=y
> +CONFIG_SF_DEFAULT_MODE=0
> +CONFIG_SF_DEFAULT_SPEED=25000000
> +CONFIG_SPI_FLASH_SFDP_SUPPORT=y
> +CONFIG_SPI_FLASH_SOFT_RESET=y
> +CONFIG_SPI_FLASH_SOFT_RESET_ON_BOOT=y
> +CONFIG_SPI_FLASH_SPANSION=y
> +CONFIG_SPI_FLASH_S28HX_T=y
>   CONFIG_PINCTRL=y
>   # CONFIG_PINCTRL_GENERIC is not set
>   CONFIG_SPL_PINCTRL=y
> @@ -101,23 +108,14 @@ CONFIG_DM_RESET=y
>   CONFIG_RESET_TI_SCI=y
>   CONFIG_SPECIFY_CONSOLE_INDEX=y
>   CONFIG_DM_SERIAL=y
> -CONFIG_DM_SPI=y
> -CONFIG_CADENCE_QSPI=y
> -CONFIG_DM_SPI_FLASH=y
> -CONFIG_SF_DEFAULT_MODE=0
> -CONFIG_SPI=y
> -CONFIG_SPI_FLASH_SFDP_SUPPORT=y
> -CONFIG_SPI_FLASH_SOFT_RESET=y
> -CONFIG_SPI_FLASH_SOFT_RESET_ON_BOOT=y
> -CONFIG_SPI_FLASH_SPANSION=y
> -CONFIG_SPI_FLASH_S28HX_T=y
>   CONFIG_SOC_DEVICE=y
>   CONFIG_SOC_DEVICE_TI_K3=y
>   CONFIG_SOC_TI=y
> +CONFIG_SPI=y
> +CONFIG_DM_SPI=y
> +CONFIG_CADENCE_QSPI=y
>   CONFIG_TIMER=y
>   CONFIG_SPL_TIMER=y
>   CONFIG_OMAP_TIMER=y
>   CONFIG_LIB_RATIONAL=y
>   CONFIG_SPL_LIB_RATIONAL=y
> -CONFIG_ENV_SIZE=0x20000
> -CONFIG_ENV_OFFSET=0x680000

Tested QSPI Flash on my AM62x, tried probe, read and update ops and they
seems to be working fine.

Hence, for flash related config changes,

Tested-by: Dhruva Gole <d-gole at ti.com>

-- 
Thanks and Regards,
Dhruva Gole