From fd3c26f3f921ad7addf95857cdb99a883c6e497a Mon Sep 17 00:00:00 2001 From: Adam Ford Date: Wed, 17 Apr 2019 11:21:56 -0500 Subject: ARM: da850evm: Fix broken SPI Flash A previous patch converted a bunch of settings for CONFIG_SF_DEFAULT but it broke the SPI Flash which now prevents booting. This patch now correctly sets CONFIG_SF_DEFAULT_SPEED=30000000 to match what it was before the conversion. Fixes: 14453fbfadc2 ("Convert CONFIG_SF_DEFAULT_* to Kconfig") Signed-off-by: Adam Ford --- configs/da850evm_defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'configs/da850evm_defconfig') diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig index 4b09ba10a6..745ae2b4b1 100644 --- a/configs/da850evm_defconfig +++ b/configs/da850evm_defconfig @@ -55,6 +55,7 @@ CONFIG_DM_MMC=y CONFIG_MTD_DEVICE=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y +CONFIG_SF_DEFAULT_SPEED=30000000 CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_SPI_FLASH_MTD=y -- cgit From cd2d8245ac364b15becbf117dec4cfa677f21cee Mon Sep 17 00:00:00 2001 From: Adam Ford Date: Wed, 17 Apr 2019 13:24:33 -0500 Subject: ARM: da850evm: Fix TI boot scripts for MMC The da850evm include environment/ti/mmc.h and places DEFAULT_MMC_TI_ARGS, defined int that file, in CONFIG_EXTRA_ENV_SETTINGS. This has been broken for some time since neither CMD_PART nor CMD_UUID are available, so manually changing the environmental variables was always required before booting from MMC. With this patch, these scripts should work again, and by default they point to mmc 0, partition 2, and the dtb file exists in a /boot directory on partition 2. Signed-off-by: Adam Ford --- configs/da850evm_defconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'configs/da850evm_defconfig') diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig index 745ae2b4b1..ee39b0b1bc 100644 --- a/configs/da850evm_defconfig +++ b/configs/da850evm_defconfig @@ -9,9 +9,9 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x800 CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y +CONFIG_NR_DRAM_BANKS=1 CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y -CONFIG_NR_DRAM_BANKS=1 CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH" CONFIG_BOOTDELAY=3 CONFIG_DEFAULT_FDT_FILE="da850-evm.dtb" @@ -30,11 +30,10 @@ CONFIG_CRC32_VERIFY=y CONFIG_CMD_DM=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_GPT is not set -# CONFIG_CMD_PART is not set # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_TIME is not set # CONFIG_CMD_EXT4 is not set -# CONFIG_CMD_FS_GENERIC is not set +CONFIG_CMD_FS_UUID=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nor0=spi0.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:512k(u-boot.ais),64k(u-boot-env),7552k(kernel-spare),64k(MAC-Address)" -- cgit