From ccdb7c2255bde555bd0d4e104f8d228e25b76572 Mon Sep 17 00:00:00 2001 From: Lokesh Vutla Date: Thu, 15 Nov 2018 11:04:50 +0530 Subject: armv7r: K3: Allow SPL to run only on core 0 Based on the MCU R5 efuse settings, R5F cores in MCU domain either work in split mode or in lock step mode. If efuse settings are in lockstep mode: ROM release R5 cores and SPL continues to run on the R5 core is lockstep mode. If efuse settings are in split mode: ROM releases both the R5 cores simultaneously and allow SPL to run on both the cores. In this case it is bootloader's responsibility to detect core 1 and park it. Else both the core will be running bootloader independently which might result in an unexpected behaviour. Signed-off-by: Lokesh Vutla Reviewed-by: Tom Rini --- include/configs/am65x_evm.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h index 484c5ef2fe1..31749c6d06f 100644 --- a/include/configs/am65x_evm.h +++ b/include/configs/am65x_evm.h @@ -29,7 +29,9 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "tispl.bin" #endif +#ifndef CONFIG_CPU_V7R #define CONFIG_SKIP_LOWLEVEL_INIT +#endif #define CONFIG_SPL_MAX_SIZE CONFIG_SYS_K3_MAX_DOWNLODABLE_IMAGE_SIZE #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SPL_TEXT_BASE + \ -- cgit v1.3.1 From 1e4fb783b32437049baed460b3b899f3f5df77a5 Mon Sep 17 00:00:00 2001 From: Sam Protsenko Date: Thu, 15 Nov 2018 22:26:17 +0200 Subject: arm: ti: boot: Fix U-Boot environment partition address Recent removal of obsolete partition led to shifting of starting address of "reserved" partition (which reflects U-Boot environment). Fix its start address to keep it in sync with ENV_OFFSET and DFU environment. This patch also provides fixed start address for "reserved" partition, so that we can track when it's shifted next time. While at it, move it before "misc" partition to keep all Android partitions together. Signed-off-by: Sam Protsenko Acked-By: Praneeth Bajjuri --- include/environment/ti/boot.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/environment/ti/boot.h b/include/environment/ti/boot.h index 3c9c87f21b1..5891009a5a2 100644 --- a/include/environment/ti/boot.h +++ b/include/environment/ti/boot.h @@ -34,9 +34,9 @@ "partitions_android=" \ "uuid_disk=${uuid_gpt_disk};" \ "name=xloader,start=128K,size=256K,uuid=${uuid_gpt_xloader};" \ - "name=bootloader,size=1792K,uuid=${uuid_gpt_bootloader};" \ + "name=bootloader,size=2048K,uuid=${uuid_gpt_bootloader};" \ + "name=reserved,start=2432K,size=256K,uuid=${uuid_gpt_reserved};" \ "name=misc,size=128K,uuid=${uuid_gpt_misc};" \ - "name=reserved,size=256K,uuid=${uuid_gpt_reserved};" \ "name=efs,size=16M,uuid=${uuid_gpt_efs};" \ "name=crypto,size=16K,uuid=${uuid_gpt_crypto};" \ "name=recovery,size=40M,uuid=${uuid_gpt_recovery};" \ -- cgit v1.3.1 From 37ff057d9446b08fcb66db02f6cb32099a4d2179 Mon Sep 17 00:00:00 2001 From: Adam Ford Date: Tue, 20 Nov 2018 08:43:13 -0600 Subject: board: da8xxevm: Fix Environmental CRC error When the spi_flash_probe_bus_cs() was previously called, it was called using 0's for two values where CONFIG_ENV_SPI_MAX_HZ and CONFIG_ENV_SPI_MODE are now used. When changed this caused the environment to fail the CRC check and the default was used. This patch defines both of these values back 0. Fixes: 25a17652c9c2 ("fix: env: Fix the SPI flash device setup for DM mode") Signed-off-by: Adam Ford --- include/configs/da850evm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index ba878eb13be..14a3046f19e 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -124,8 +124,9 @@ #ifdef CONFIG_SPL_BUILD #define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #endif +#define CONFIG_ENV_SPI_MAX_HZ 0 +#define CONFIG_ENV_SPI_MODE 0 #ifdef CONFIG_USE_SPIFLASH #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8000 -- cgit v1.3.1 From 58fcca0c00e5fbd3b3558fc4b45ebeb93bd35c71 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 20 Nov 2018 16:47:12 -0200 Subject: ARM: vexpress_*_defconfig: Enable CMD_UBI support This allow for convenient use of QEMU machine to test loading of UBI filesystem. There are a couple of changes made together of this which are required: 1) The malloc must be at least 512 KiB to allow the use of UBI filesystem. We are going to enable it in a next patch. 2) MTD_DEVICE must be enabled, otherwise we get missing symbols during the build Following configs were change: - vexpress_aemv8a_dram_defconfig - vexpress_aemv8a_juno_defconfig - vexpress_aemv8a_semi_defconfig - vexpress_ca15_tc2_defconfig - vexpress_ca5x2_defconfig - vexpress_ca9x4_defconfig Signed-off-by: Otavio Salvador Acked-by: Liviu Dudau --- configs/vexpress_aemv8a_dram_defconfig | 2 ++ configs/vexpress_aemv8a_juno_defconfig | 2 ++ configs/vexpress_aemv8a_semi_defconfig | 2 ++ configs/vexpress_ca15_tc2_defconfig | 2 ++ configs/vexpress_ca5x2_defconfig | 2 ++ configs/vexpress_ca9x4_defconfig | 2 ++ include/configs/vexpress_common.h | 2 +- 7 files changed, 13 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/configs/vexpress_aemv8a_dram_defconfig b/configs/vexpress_aemv8a_dram_defconfig index 9848f96293d..0f0f1383037 100644 --- a/configs/vexpress_aemv8a_dram_defconfig +++ b/configs/vexpress_aemv8a_dram_defconfig @@ -23,12 +23,14 @@ CONFIG_CMD_ARMFLASH=y # CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y # CONFIG_CMD_MISC is not set +CONFIG_CMD_UBI=y # CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set CONFIG_ENV_IS_IN_FLASH=y CONFIG_DM=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_PROTECTION=y diff --git a/configs/vexpress_aemv8a_juno_defconfig b/configs/vexpress_aemv8a_juno_defconfig index ef389159556..ed611fea7c3 100644 --- a/configs/vexpress_aemv8a_juno_defconfig +++ b/configs/vexpress_aemv8a_juno_defconfig @@ -23,12 +23,14 @@ CONFIG_CMD_ARMFLASH=y # CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y # CONFIG_CMD_MISC is not set +CONFIG_CMD_UBI=y # CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set CONFIG_ENV_IS_IN_FLASH=y CONFIG_DM=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_PROTECTION=y diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig index a4d1233cd50..0b3bb65ee6f 100644 --- a/configs/vexpress_aemv8a_semi_defconfig +++ b/configs/vexpress_aemv8a_semi_defconfig @@ -23,12 +23,14 @@ CONFIG_CMD_ARMFLASH=y # CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y # CONFIG_CMD_MISC is not set +CONFIG_CMD_UBI=y # CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set CONFIG_ENV_IS_IN_FLASH=y CONFIG_DM=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_PROTECTION=y diff --git a/configs/vexpress_ca15_tc2_defconfig b/configs/vexpress_ca15_tc2_defconfig index f4d555be48f..cabc0c45772 100644 --- a/configs/vexpress_ca15_tc2_defconfig +++ b/configs/vexpress_ca15_tc2_defconfig @@ -18,8 +18,10 @@ CONFIG_CMD_MMC=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set +CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_PROTECTION=y diff --git a/configs/vexpress_ca5x2_defconfig b/configs/vexpress_ca5x2_defconfig index bdacc60c2ce..dc4411d6f53 100644 --- a/configs/vexpress_ca5x2_defconfig +++ b/configs/vexpress_ca5x2_defconfig @@ -17,8 +17,10 @@ CONFIG_CMD_MMC=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set +CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_PROTECTION=y diff --git a/configs/vexpress_ca9x4_defconfig b/configs/vexpress_ca9x4_defconfig index 7a908319189..9390cf61d10 100644 --- a/configs/vexpress_ca9x4_defconfig +++ b/configs/vexpress_ca9x4_defconfig @@ -17,8 +17,10 @@ CONFIG_CMD_MMC=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set +CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_MTD_NOR_FLASH=y +CONFIG_MTD_DEVICE=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_PROTECTION=y diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index 267b230fda6..47ea89df660 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -120,7 +120,7 @@ #define CONFIG_INITRD_TAG 1 /* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 512 * 1024) /* >= 512 KiB */ #define SCTL_BASE V2M_SYSCTL #define VEXPRESS_FLASHPROG_FLVPPEN (1 << 0) -- cgit v1.3.1 From 4656ce26f02addf2f8ae030d388f59dca47ce595 Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Wed, 21 Nov 2018 20:24:51 +1300 Subject: configs: Remove CONFIG_MARVELL This option is defined by a few boards but doesn't guard any code. Remove it from the boards and config_whitelist.txt. Signed-off-by: Chris Packham Reviewed-by: Stefan Roese --- include/configs/edminiv2.h | 1 - include/configs/km/km_arm.h | 1 - include/configs/mv-common.h | 1 - scripts/config_whitelist.txt | 1 - 4 files changed, 4 deletions(-) (limited to 'include') diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index 89aa11c0ed4..645fc3ffb81 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -29,7 +29,6 @@ * High Level Configuration Options (easy to change) */ -#define CONFIG_MARVELL 1 #define CONFIG_FEROCEON 1 /* CPU Core subversion */ #define CONFIG_88F5182 1 /* SOC Name */ diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index e2585171afb..0de83f6723c 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -22,7 +22,6 @@ /* * High Level Configuration Options (easy to change) */ -#define CONFIG_MARVELL #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ #define CONFIG_KW88F6281 /* SOC Name */ diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 5eeb5a16249..a8030931635 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -19,7 +19,6 @@ /* * High Level Configuration Options (easy to change) */ -#define CONFIG_MARVELL 1 /* * Custom CONFIG_SYS_TEXT_BASE can be done in .h diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7dd9d605414..69bef5e6dad 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1199,7 +1199,6 @@ CONFIG_MALLOC_F_ADDR CONFIG_MALTA CONFIG_MARCO_MEMSET CONFIG_MARUBUN_PCCARD -CONFIG_MARVELL CONFIG_MARVELL_GPIO CONFIG_MARVELL_MFP CONFIG_MASK_AER_AO -- cgit v1.3.1