* [PATCH 1/2] configs: am65x: Merge the HS and non-HS defconfigs
@ 2023-08-03 14:54 Andrew Davis
2023-08-03 14:54 ` [PATCH 2/2] configs: Make TI_SECURE_DEVICE default for K3 Andrew Davis
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Andrew Davis @ 2023-08-03 14:54 UTC (permalink / raw)
To: Jan Kiszka, Tom Rini, Nishanth Menon, Vignesh Raghavendra,
Manorit Chawdhry
Cc: u-boot, Andrew Davis
K3 devices have runtime type board detection. Make the default defconfig
include the secure configuration. Then remove the HS specific config.
Non-HS devices will continue to boot due to runtime device type detection.
Signed-off-by: Andrew Davis <afd@ti.com>
---
MAINTAINERS | 2 -
configs/am65x_evm_a53_defconfig | 3 +-
configs/am65x_evm_r5_defconfig | 1 +
configs/am65x_evm_r5_usbdfu_defconfig | 1 +
configs/am65x_evm_r5_usbmsc_defconfig | 1 +
configs/am65x_hs_evm_a53_defconfig | 158 --------------------------
configs/am65x_hs_evm_r5_defconfig | 135 ----------------------
7 files changed, 5 insertions(+), 296 deletions(-)
delete mode 100644 configs/am65x_hs_evm_a53_defconfig
delete mode 100644 configs/am65x_hs_evm_r5_defconfig
diff --git a/MAINTAINERS b/MAINTAINERS
index 47581cf6fbb..d3b9f4cc6c4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1506,8 +1506,6 @@ F: configs/k2hk_hs_evm_defconfig
F: configs/k2e_hs_evm_defconfig
F: configs/k2g_hs_evm_defconfig
F: configs/k2l_hs_evm_defconfig
-F: configs/am65x_hs_evm_r5_defconfig
-F: configs/am65x_hs_evm_a53_defconfig
TPM DRIVERS
M: Ilias Apalodimas <ilias.apalodimas@linaro.org>
diff --git a/configs/am65x_evm_a53_defconfig b/configs/am65x_evm_a53_defconfig
index 4301553af8d..55c1b23c8db 100644
--- a/configs/am65x_evm_a53_defconfig
+++ b/configs/am65x_evm_a53_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_SKIP_LOWLEVEL_INIT=y
CONFIG_ARCH_K3=y
+CONFIG_TI_SECURE_DEVICE=y
CONFIG_SYS_MALLOC_LEN=0x2000000
CONFIG_SYS_MALLOC_F_LEN=0x8000
CONFIG_SPL_LIBCOMMON_SUPPORT=y
@@ -34,7 +35,7 @@ CONFIG_SPL_LOAD_FIT=y
CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
CONFIG_OF_SYSTEM_SETUP=y
CONFIG_DISTRO_DEFAULTS=y
-CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd; run init_${boot}; run boot_rprocs; run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern"
+CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd; run init_${boot}; run boot_rprocs; if test ${boot_fit} -eq 1; then run get_fit_${boot}; run get_overlaystring; run run_fit; else; run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern; fi;"
CONFIG_LOGLEVEL=7
CONFIG_CONSOLE_MUX=y
CONFIG_SPL_MAX_SIZE=0x58000
diff --git a/configs/am65x_evm_r5_defconfig b/configs/am65x_evm_r5_defconfig
index d5196c2024e..b9b69b921be 100644
--- a/configs/am65x_evm_r5_defconfig
+++ b/configs/am65x_evm_r5_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_ARCH_K3=y
+CONFIG_TI_SECURE_DEVICE=y
CONFIG_SYS_MALLOC_LEN=0x2000000
CONFIG_SYS_MALLOC_F_LEN=0x55000
CONFIG_SPL_GPIO=y
diff --git a/configs/am65x_evm_r5_usbdfu_defconfig b/configs/am65x_evm_r5_usbdfu_defconfig
index 88f68aa70e4..fb93024bda9 100644
--- a/configs/am65x_evm_r5_usbdfu_defconfig
+++ b/configs/am65x_evm_r5_usbdfu_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_ARCH_K3=y
+CONFIG_TI_SECURE_DEVICE=y
CONFIG_SYS_MALLOC_LEN=0x2000000
CONFIG_SYS_MALLOC_F_LEN=0x55000
CONFIG_SPL_GPIO=y
diff --git a/configs/am65x_evm_r5_usbmsc_defconfig b/configs/am65x_evm_r5_usbmsc_defconfig
index 8da49c78c82..931b756ab52 100644
--- a/configs/am65x_evm_r5_usbmsc_defconfig
+++ b/configs/am65x_evm_r5_usbmsc_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_ARCH_K3=y
+CONFIG_TI_SECURE_DEVICE=y
CONFIG_SYS_MALLOC_LEN=0x2000000
CONFIG_SYS_MALLOC_F_LEN=0x55000
CONFIG_SPL_GPIO=y
diff --git a/configs/am65x_hs_evm_a53_defconfig b/configs/am65x_hs_evm_a53_defconfig
deleted file mode 100644
index 3f9626e4550..00000000000
--- a/configs/am65x_hs_evm_a53_defconfig
+++ /dev/null
@@ -1,158 +0,0 @@
-CONFIG_ARM=y
-CONFIG_SKIP_LOWLEVEL_INIT=y
-CONFIG_ARCH_K3=y
-CONFIG_TI_SECURE_DEVICE=y
-CONFIG_SYS_MALLOC_LEN=0x2000000
-CONFIG_SYS_MALLOC_F_LEN=0x8000
-CONFIG_SPL_LIBCOMMON_SUPPORT=y
-CONFIG_SPL_LIBGENERIC_SUPPORT=y
-CONFIG_NR_DRAM_BANKS=2
-CONFIG_SOC_K3_AM654=y
-CONFIG_TARGET_AM654_A53_EVM=y
-CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
-CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80480000
-CONFIG_ENV_SIZE=0x20000
-CONFIG_ENV_OFFSET=0x680000
-CONFIG_DM_GPIO=y
-CONFIG_SPL_DM_SPI=y
-CONFIG_DEFAULT_DEVICE_TREE="k3-am654-base-board"
-CONFIG_SPL_TEXT_BASE=0x80080000
-CONFIG_OF_LIBFDT_OVERLAY=y
-CONFIG_DM_RESET=y
-CONFIG_SPL_MMC=y
-CONFIG_SPL_SERIAL=y
-CONFIG_SPL_DRIVERS_MISC=y
-CONFIG_SPL_STACK_R_ADDR=0x82000000
-CONFIG_ENV_OFFSET_REDUND=0x6A0000
-CONFIG_SPL_FS_FAT=y
-CONFIG_SPL_LIBDISK_SUPPORT=y
-CONFIG_SPL_SPI_FLASH_SUPPORT=y
-CONFIG_SPL_SPI=y
-# CONFIG_PSCI_RESET is not set
-CONFIG_PCI=y
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_DISTRO_DEFAULTS=y
-CONFIG_BOOTCOMMAND="run findfdt; run envboot; run init_${boot}; run get_fit_${boot}; run get_overlaystring; run run_fit"
-CONFIG_LOGLEVEL=7
-CONFIG_CONSOLE_MUX=y
-CONFIG_SPL_MAX_SIZE=0x58000
-CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
-CONFIG_SPL_BSS_START_ADDR=0x80a00000
-CONFIG_SPL_BSS_MAX_SIZE=0x80000
-CONFIG_SPL_SYS_MALLOC_SIMPLE=y
-CONFIG_SPL_STACK_R=y
-CONFIG_SYS_SPL_MALLOC=y
-CONFIG_SYS_SPL_MALLOC_SIZE=0x800000
-CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
-CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x1400
-CONFIG_SPL_DMA=y
-CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot.img"
-CONFIG_SPL_I2C=y
-CONFIG_SPL_DM_MAILBOX=y
-CONFIG_SPL_MTD_SUPPORT=y
-CONFIG_SPL_DM_SPI_FLASH=y
-CONFIG_SPL_DM_RESET=y
-CONFIG_SPL_POWER_DOMAIN=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=0x280000
-CONFIG_SPL_YMODEM_SUPPORT=y
-CONFIG_SYS_MAXARGS=64
-CONFIG_CMD_ASKENV=y
-CONFIG_CMD_DFU=y
-CONFIG_CMD_GPT=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_PCI=y
-CONFIG_CMD_REMOTEPROC=y
-CONFIG_CMD_USB=y
-CONFIG_CMD_TIME=y
-CONFIG_MTDIDS_DEFAULT="nor0=47040000.spi.0"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=47040000.spi.0:512k(ospi.tiboot3),2m(ospi.tispl),4m(ospi.u-boot),128k(ospi.env),128k(ospi.env.backup),1m(ospi.sysfw),-@8m(ospi.rootfs)"
-CONFIG_CMD_UBI=y
-# CONFIG_ISO_PARTITION is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_OF_CONTROL=y
-CONFIG_SPL_MULTI_DTB_FIT=y
-CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
-CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_IS_IN_MMC=y
-CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=1
-CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_SPL_DM=y
-CONFIG_SPL_DM_SEQ_ALIAS=y
-CONFIG_SPL_REGMAP=y
-CONFIG_SPL_OF_TRANSLATE=y
-CONFIG_CLK=y
-CONFIG_SPL_CLK=y
-CONFIG_CLK_TI_SCI=y
-CONFIG_DFU_MMC=y
-CONFIG_DFU_RAM=y
-CONFIG_DFU_SF=y
-CONFIG_SYS_DFU_DATA_BUF_SIZE=0x20000
-CONFIG_SYS_DFU_MAX_FILE_SIZE=0x800000
-CONFIG_DMA_CHANNELS=y
-CONFIG_TI_K3_NAVSS_UDMA=y
-CONFIG_TI_SCI_PROTOCOL=y
-CONFIG_DM_PCA953X=y
-CONFIG_DM_I2C=y
-CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
-CONFIG_SYS_I2C_OMAP24XX=y
-CONFIG_DM_MAILBOX=y
-CONFIG_K3_SEC_PROXY=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_ADMA=y
-CONFIG_SPL_MMC_SDHCI_ADMA=y
-CONFIG_MMC_SDHCI_AM654=y
-CONFIG_MTD=y
-CONFIG_DM_MTD=y
-CONFIG_DM_SPI_FLASH=y
-CONFIG_SPI_FLASH_SFDP_SUPPORT=y
-CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
-CONFIG_SPI_FLASH_MTD=y
-CONFIG_PHY_TI_DP83867=y
-CONFIG_PHY_FIXED=y
-CONFIG_E1000=y
-CONFIG_CMD_E1000=y
-CONFIG_TI_AM65_CPSW_NUSS=y
-CONFIG_PCI_KEYSTONE=y
-CONFIG_PHY=y
-CONFIG_AM654_PHY=y
-CONFIG_OMAP_USB2_PHY=y
-CONFIG_PINCTRL=y
-# CONFIG_PINCTRL_GENERIC is not set
-CONFIG_SPL_PINCTRL=y
-# CONFIG_SPL_PINCTRL_GENERIC is not set
-CONFIG_PINCTRL_SINGLE=y
-CONFIG_POWER_DOMAIN=y
-CONFIG_TI_SCI_POWER_DOMAIN=y
-CONFIG_REMOTEPROC_TI_K3_R5F=y
-CONFIG_RESET_TI_SCI=y
-CONFIG_DM_SERIAL=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_SYSRESET=y
-CONFIG_SPL_SYSRESET=y
-CONFIG_SYSRESET_TI_SCI=y
-CONFIG_USB=y
-CONFIG_DM_USB_GADGET=y
-CONFIG_USB_XHCI_HCD=y
-CONFIG_USB_XHCI_DWC3=y
-CONFIG_USB_DWC3=y
-CONFIG_USB_DWC3_GENERIC=y
-CONFIG_USB_KEYBOARD=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0451
-CONFIG_USB_GADGET_PRODUCT_NUM=0x6162
-CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/am65x_hs_evm_r5_defconfig b/configs/am65x_hs_evm_r5_defconfig
deleted file mode 100644
index 0c7b53ca2c0..00000000000
--- a/configs/am65x_hs_evm_r5_defconfig
+++ /dev/null
@@ -1,135 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_K3=y
-CONFIG_TI_SECURE_DEVICE=y
-CONFIG_SYS_MALLOC_LEN=0x2000000
-CONFIG_SYS_MALLOC_F_LEN=0x55000
-CONFIG_SPL_GPIO=y
-CONFIG_SPL_LIBCOMMON_SUPPORT=y
-CONFIG_SPL_LIBGENERIC_SUPPORT=y
-CONFIG_NR_DRAM_BANKS=2
-CONFIG_SOC_K3_AM654=y
-CONFIG_K3_EARLY_CONS=y
-CONFIG_TARGET_AM654_R5_EVM=y
-CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
-CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x41c7effc
-CONFIG_ENV_SIZE=0x20000
-CONFIG_DM_GPIO=y
-CONFIG_SPL_DM_SPI=y
-CONFIG_DEFAULT_DEVICE_TREE="k3-am654-r5-base-board"
-CONFIG_SPL_TEXT_BASE=0x41c00000
-CONFIG_DM_RESET=y
-CONFIG_SPL_MMC=y
-CONFIG_SPL_SERIAL=y
-CONFIG_SPL_DRIVERS_MISC=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_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_USE_BOOTCOMMAND=y
-# CONFIG_DISPLAY_CPUINFO is not set
-CONFIG_SPL_MAX_SIZE=0x58000
-CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
-CONFIG_SPL_BSS_START_ADDR=0x41c7effc
-CONFIG_SPL_BSS_MAX_SIZE=0xc00
-CONFIG_SPL_STACK_R=y
-CONFIG_SPL_SEPARATE_BSS=y
-CONFIG_SYS_SPL_MALLOC=y
-CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y
-CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x84000000
-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_SPL_DMA=y
-CONFIG_SPL_I2C=y
-CONFIG_SPL_DM_MAILBOX=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
-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_SYS_MAXARGS=64
-CONFIG_CMD_BOOTZ=y
-CONFIG_SYS_BOOTM_LEN=0x4000000
-CONFIG_CMD_ASKENV=y
-CONFIG_CMD_GPT=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_REMOTEPROC=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_TIME=y
-CONFIG_CMD_FAT=y
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_OF_CONTROL=y
-CONFIG_SPL_MULTI_DTB_FIT=y
-CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
-CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_IS_IN_FAT=y
-CONFIG_ENV_FAT_DEVICE_AND_PART="1:1"
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-CONFIG_SPL_DM=y
-CONFIG_SPL_DM_SEQ_ALIAS=y
-CONFIG_REGMAP=y
-CONFIG_SPL_REGMAP=y
-CONFIG_SPL_OF_TRANSLATE=y
-CONFIG_CLK=y
-CONFIG_SPL_CLK=y
-CONFIG_CLK_TI_SCI=y
-CONFIG_DMA_CHANNELS=y
-CONFIG_TI_K3_NAVSS_UDMA=y
-CONFIG_TI_SCI_PROTOCOL=y
-CONFIG_DA8XX_GPIO=y
-CONFIG_DM_I2C=y
-CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
-CONFIG_SYS_I2C_OMAP24XX=y
-CONFIG_DM_MAILBOX=y
-CONFIG_K3_SEC_PROXY=y
-CONFIG_K3_AVS0=y
-CONFIG_MMC_SDHCI=y
-CONFIG_SPL_MMC_SDHCI_ADMA=y
-CONFIG_MMC_SDHCI_AM654=y
-CONFIG_DM_SPI_FLASH=y
-CONFIG_SPI_FLASH_SFDP_SUPPORT=y
-CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
-CONFIG_PINCTRL=y
-# CONFIG_PINCTRL_GENERIC is not set
-CONFIG_SPL_PINCTRL=y
-# CONFIG_SPL_PINCTRL_GENERIC is not set
-CONFIG_PINCTRL_SINGLE=y
-CONFIG_POWER_DOMAIN=y
-CONFIG_TI_SCI_POWER_DOMAIN=y
-CONFIG_DM_REGULATOR=y
-CONFIG_SPL_DM_REGULATOR=y
-CONFIG_DM_REGULATOR_GPIO=y
-CONFIG_SPL_DM_REGULATOR_GPIO=y
-CONFIG_DM_REGULATOR_TPS62360=y
-CONFIG_RAM=y
-CONFIG_SPL_RAM=y
-CONFIG_K3_SYSTEM_CONTROLLER=y
-CONFIG_REMOTEPROC_TI_K3_ARM64=y
-CONFIG_RESET_TI_SCI=y
-CONFIG_DM_SERIAL=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_SYSRESET=y
-CONFIG_SPL_SYSRESET=y
-CONFIG_SYSRESET_TI_SCI=y
-CONFIG_TIMER=y
-CONFIG_SPL_TIMER=y
-CONFIG_OMAP_TIMER=y
-CONFIG_FS_FAT_MAX_CLUSTSIZE=16384
--
2.39.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] configs: Make TI_SECURE_DEVICE default for K3
2023-08-03 14:54 [PATCH 1/2] configs: am65x: Merge the HS and non-HS defconfigs Andrew Davis
@ 2023-08-03 14:54 ` Andrew Davis
2023-08-03 19:31 ` Tom Rini
` (2 more replies)
2023-08-03 19:31 ` [PATCH 1/2] configs: am65x: Merge the HS and non-HS defconfigs Tom Rini
` (2 subsequent siblings)
3 siblings, 3 replies; 9+ messages in thread
From: Andrew Davis @ 2023-08-03 14:54 UTC (permalink / raw)
To: Jan Kiszka, Tom Rini, Nishanth Menon, Vignesh Raghavendra,
Manorit Chawdhry
Cc: u-boot, Andrew Davis
All K3 boards now are secure by default, instead of setting this in each
defconfig, make it implied by the ARCH config.
The only exception is IOT2050, which I do not believe will have any
problems with being a TI_SECURE_DEVICE, but for now turn it off to keep
its config the same.
Signed-off-by: Andrew Davis <afd@ti.com>
---
arch/arm/Kconfig | 1 +
configs/am62ax_evm_a53_defconfig | 1 -
configs/am62ax_evm_r5_defconfig | 1 -
configs/am62x_evm_a53_defconfig | 1 -
configs/am62x_evm_r5_defconfig | 1 -
configs/am64x_evm_a53_defconfig | 1 -
configs/am64x_evm_r5_defconfig | 1 -
configs/iot2050_defconfig | 1 +
configs/j7200_evm_a72_defconfig | 1 -
configs/j7200_evm_r5_defconfig | 1 -
configs/j721e_evm_a72_defconfig | 1 -
configs/j721e_evm_r5_defconfig | 1 -
configs/j721s2_evm_a72_defconfig | 1 -
configs/j721s2_evm_r5_defconfig | 1 -
14 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 97c25b4f146..8ad6c5582ce 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -787,6 +787,7 @@ config ARCH_K3
select FIT
select REGEX
select FIT_SIGNATURE if ARM64
+ imply TI_SECURE_DEVICE
config ARCH_OMAP2PLUS
bool "TI OMAP2+"
diff --git a/configs/am62ax_evm_a53_defconfig b/configs/am62ax_evm_a53_defconfig
index 773cf3a591c..d0a34c75505 100644
--- a/configs/am62ax_evm_a53_defconfig
+++ b/configs/am62ax_evm_a53_defconfig
@@ -1,6 +1,5 @@
CONFIG_ARM=y
CONFIG_ARCH_K3=y
-CONFIG_TI_SECURE_DEVICE=y
CONFIG_SYS_MALLOC_F_LEN=0x8000
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
diff --git a/configs/am62ax_evm_r5_defconfig b/configs/am62ax_evm_r5_defconfig
index 05c30cbba19..2c1110d227f 100644
--- a/configs/am62ax_evm_r5_defconfig
+++ b/configs/am62ax_evm_r5_defconfig
@@ -1,6 +1,5 @@
CONFIG_ARM=y
CONFIG_ARCH_K3=y
-CONFIG_TI_SECURE_DEVICE=y
CONFIG_SYS_MALLOC_F_LEN=0x9000
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
diff --git a/configs/am62x_evm_a53_defconfig b/configs/am62x_evm_a53_defconfig
index d55caabe22c..1d05cecbcde 100644
--- a/configs/am62x_evm_a53_defconfig
+++ b/configs/am62x_evm_a53_defconfig
@@ -1,6 +1,5 @@
CONFIG_ARM=y
CONFIG_ARCH_K3=y
-CONFIG_TI_SECURE_DEVICE=y
CONFIG_SYS_MALLOC_F_LEN=0x8000
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
diff --git a/configs/am62x_evm_r5_defconfig b/configs/am62x_evm_r5_defconfig
index 3c5f3672984..9dd2930dc89 100644
--- a/configs/am62x_evm_r5_defconfig
+++ b/configs/am62x_evm_r5_defconfig
@@ -1,6 +1,5 @@
CONFIG_ARM=y
CONFIG_ARCH_K3=y
-CONFIG_TI_SECURE_DEVICE=y
CONFIG_SYS_MALLOC_LEN=0x08000000
CONFIG_SYS_MALLOC_F_LEN=0x9000
CONFIG_SPL_LIBCOMMON_SUPPORT=y
diff --git a/configs/am64x_evm_a53_defconfig b/configs/am64x_evm_a53_defconfig
index 9bdb767f9e6..d1d46c61075 100644
--- a/configs/am64x_evm_a53_defconfig
+++ b/configs/am64x_evm_a53_defconfig
@@ -1,7 +1,6 @@
CONFIG_ARM=y
CONFIG_SKIP_LOWLEVEL_INIT=y
CONFIG_ARCH_K3=y
-CONFIG_TI_SECURE_DEVICE=y
CONFIG_SYS_MALLOC_LEN=0x2000000
CONFIG_SYS_MALLOC_F_LEN=0x8000
CONFIG_SPL_GPIO=y
diff --git a/configs/am64x_evm_r5_defconfig b/configs/am64x_evm_r5_defconfig
index 45d32658cff..96cb437b10b 100644
--- a/configs/am64x_evm_r5_defconfig
+++ b/configs/am64x_evm_r5_defconfig
@@ -1,6 +1,5 @@
CONFIG_ARM=y
CONFIG_ARCH_K3=y
-CONFIG_TI_SECURE_DEVICE=y
CONFIG_SYS_MALLOC_LEN=0x2000000
CONFIG_SYS_MALLOC_F_LEN=0x80000
CONFIG_SPL_GPIO=y
diff --git a/configs/iot2050_defconfig b/configs/iot2050_defconfig
index bcbaa92ee89..ad9217ff86a 100644
--- a/configs/iot2050_defconfig
+++ b/configs/iot2050_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_SKIP_LOWLEVEL_INIT=y
CONFIG_ARCH_K3=y
+# CONFIG_TI_SECURE_DEVICE is not set
CONFIG_SYS_MALLOC_LEN=0x2000000
CONFIG_SYS_MALLOC_F_LEN=0x8000
CONFIG_SPL_GPIO=y
diff --git a/configs/j7200_evm_a72_defconfig b/configs/j7200_evm_a72_defconfig
index c68d52537e5..a9f5d36ffe3 100644
--- a/configs/j7200_evm_a72_defconfig
+++ b/configs/j7200_evm_a72_defconfig
@@ -1,6 +1,5 @@
CONFIG_ARM=y
CONFIG_ARCH_K3=y
-CONFIG_TI_SECURE_DEVICE=y
CONFIG_SYS_MALLOC_LEN=0x2000000
CONFIG_SYS_MALLOC_F_LEN=0x8000
CONFIG_SPL_GPIO=y
diff --git a/configs/j7200_evm_r5_defconfig b/configs/j7200_evm_r5_defconfig
index c4dd33627bd..0da16f25a23 100644
--- a/configs/j7200_evm_r5_defconfig
+++ b/configs/j7200_evm_r5_defconfig
@@ -1,6 +1,5 @@
CONFIG_ARM=y
CONFIG_ARCH_K3=y
-CONFIG_TI_SECURE_DEVICE=y
CONFIG_SYS_MALLOC_LEN=0x2000000
CONFIG_SYS_MALLOC_F_LEN=0x70000
CONFIG_SPL_GPIO=y
diff --git a/configs/j721e_evm_a72_defconfig b/configs/j721e_evm_a72_defconfig
index 525f150e91d..af784c4e005 100644
--- a/configs/j721e_evm_a72_defconfig
+++ b/configs/j721e_evm_a72_defconfig
@@ -1,6 +1,5 @@
CONFIG_ARM=y
CONFIG_ARCH_K3=y
-CONFIG_TI_SECURE_DEVICE=y
CONFIG_SYS_MALLOC_LEN=0x2000000
CONFIG_SYS_MALLOC_F_LEN=0x8000
CONFIG_SPL_GPIO=y
diff --git a/configs/j721e_evm_r5_defconfig b/configs/j721e_evm_r5_defconfig
index cf7bc872b5f..f6dba64530c 100644
--- a/configs/j721e_evm_r5_defconfig
+++ b/configs/j721e_evm_r5_defconfig
@@ -1,6 +1,5 @@
CONFIG_ARM=y
CONFIG_ARCH_K3=y
-CONFIG_TI_SECURE_DEVICE=y
CONFIG_SYS_MALLOC_LEN=0x2000000
CONFIG_SYS_MALLOC_F_LEN=0x70000
CONFIG_SPL_GPIO=y
diff --git a/configs/j721s2_evm_a72_defconfig b/configs/j721s2_evm_a72_defconfig
index d59f3156d10..7b7f3dc08e4 100644
--- a/configs/j721s2_evm_a72_defconfig
+++ b/configs/j721s2_evm_a72_defconfig
@@ -1,6 +1,5 @@
CONFIG_ARM=y
CONFIG_ARCH_K3=y
-CONFIG_TI_SECURE_DEVICE=y
CONFIG_SYS_MALLOC_LEN=0x2000000
CONFIG_SYS_MALLOC_F_LEN=0x8000
CONFIG_SPL_GPIO=y
diff --git a/configs/j721s2_evm_r5_defconfig b/configs/j721s2_evm_r5_defconfig
index 1e66ac23d05..39467e0d00e 100644
--- a/configs/j721s2_evm_r5_defconfig
+++ b/configs/j721s2_evm_r5_defconfig
@@ -1,6 +1,5 @@
CONFIG_ARM=y
CONFIG_ARCH_K3=y
-CONFIG_TI_SECURE_DEVICE=y
CONFIG_SYS_MALLOC_LEN=0x2000000
CONFIG_SYS_MALLOC_F_LEN=0x10000
CONFIG_SPL_GPIO=y
--
2.39.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] configs: am65x: Merge the HS and non-HS defconfigs
2023-08-03 14:54 [PATCH 1/2] configs: am65x: Merge the HS and non-HS defconfigs Andrew Davis
2023-08-03 14:54 ` [PATCH 2/2] configs: Make TI_SECURE_DEVICE default for K3 Andrew Davis
@ 2023-08-03 19:31 ` Tom Rini
2023-08-04 5:05 ` Manorit Chawdhry
2023-10-11 18:36 ` Tom Rini
3 siblings, 0 replies; 9+ messages in thread
From: Tom Rini @ 2023-08-03 19:31 UTC (permalink / raw)
To: Andrew Davis
Cc: Jan Kiszka, Nishanth Menon, Vignesh Raghavendra,
Manorit Chawdhry, u-boot
[-- Attachment #1: Type: text/plain, Size: 423 bytes --]
On Thu, Aug 03, 2023 at 09:54:40AM -0500, Andrew Davis wrote:
> K3 devices have runtime type board detection. Make the default defconfig
> include the secure configuration. Then remove the HS specific config.
>
> Non-HS devices will continue to boot due to runtime device type detection.
>
> Signed-off-by: Andrew Davis <afd@ti.com>
On my AM65x GP EVM:
Tested-by: Tom Rini <trini@konsulko.com>
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] configs: Make TI_SECURE_DEVICE default for K3
2023-08-03 14:54 ` [PATCH 2/2] configs: Make TI_SECURE_DEVICE default for K3 Andrew Davis
@ 2023-08-03 19:31 ` Tom Rini
2023-08-09 6:08 ` Jan Kiszka
2023-10-11 18:36 ` Tom Rini
2 siblings, 0 replies; 9+ messages in thread
From: Tom Rini @ 2023-08-03 19:31 UTC (permalink / raw)
To: Andrew Davis
Cc: Jan Kiszka, Nishanth Menon, Vignesh Raghavendra,
Manorit Chawdhry, u-boot
[-- Attachment #1: Type: text/plain, Size: 492 bytes --]
On Thu, Aug 03, 2023 at 09:54:41AM -0500, Andrew Davis wrote:
> All K3 boards now are secure by default, instead of setting this in each
> defconfig, make it implied by the ARCH config.
>
> The only exception is IOT2050, which I do not believe will have any
> problems with being a TI_SECURE_DEVICE, but for now turn it off to keep
> its config the same.
>
> Signed-off-by: Andrew Davis <afd@ti.com>
On my J721E GP EVM:
Tested-by: Tom Rini <trini@konsulko.com>
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] configs: am65x: Merge the HS and non-HS defconfigs
2023-08-03 14:54 [PATCH 1/2] configs: am65x: Merge the HS and non-HS defconfigs Andrew Davis
2023-08-03 14:54 ` [PATCH 2/2] configs: Make TI_SECURE_DEVICE default for K3 Andrew Davis
2023-08-03 19:31 ` [PATCH 1/2] configs: am65x: Merge the HS and non-HS defconfigs Tom Rini
@ 2023-08-04 5:05 ` Manorit Chawdhry
2023-09-28 7:54 ` Manorit Chawdhry
2023-10-11 18:36 ` Tom Rini
3 siblings, 1 reply; 9+ messages in thread
From: Manorit Chawdhry @ 2023-08-04 5:05 UTC (permalink / raw)
To: Andrew Davis
Cc: Jan Kiszka, Tom Rini, Nishanth Menon, Vignesh Raghavendra, u-boot
Hi Andrew,
On 09:54-20230803, Andrew Davis wrote:
> K3 devices have runtime type board detection. Make the default defconfig
> include the secure configuration. Then remove the HS specific config.
>
> Non-HS devices will continue to boot due to runtime device type detection.
>
> Signed-off-by: Andrew Davis <afd@ti.com>
> ---
> MAINTAINERS | 2 -
> configs/am65x_evm_a53_defconfig | 3 +-
> configs/am65x_evm_r5_defconfig | 1 +
> configs/am65x_evm_r5_usbdfu_defconfig | 1 +
> configs/am65x_evm_r5_usbmsc_defconfig | 1 +
> configs/am65x_hs_evm_a53_defconfig | 158 --------------------------
> configs/am65x_hs_evm_r5_defconfig | 135 ----------------------
> 7 files changed, 5 insertions(+), 296 deletions(-)
> delete mode 100644 configs/am65x_hs_evm_a53_defconfig
> delete mode 100644 configs/am65x_hs_evm_r5_defconfig
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 47581cf6fbb..d3b9f4cc6c4 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1506,8 +1506,6 @@ F: configs/k2hk_hs_evm_defconfig
> F: configs/k2e_hs_evm_defconfig
> F: configs/k2g_hs_evm_defconfig
> F: configs/k2l_hs_evm_defconfig
> -F: configs/am65x_hs_evm_r5_defconfig
> -F: configs/am65x_hs_evm_a53_defconfig
While merging these defconfigs for other boards I had faced an issue
where the multi DTB detection wasn't working for HS devices and we were
hitting a firewall exception while trying to access the EEPROM
Scratchpad before the firewalls were opened. I see that AM65x still uses
the old Scratchpad address in the Kconfig which had triggered exceptions
for other K3 devices.
config SYS_K3_MCU_SCRATCHPAD_BASE
hex
default 0x40280000 if SOC_K3_AM654
default 0x41cff9fc if SOC_K3_J721S2
default 0x41cff9fc if SOC_K3_J721E
Can you double check if this also needs a change along with the merged
defconfigs?
Regards,
Manorit
>
> TPM DRIVERS
> M: Ilias Apalodimas <ilias.apalodimas@linaro.org>
> diff --git a/configs/am65x_evm_a53_defconfig b/configs/am65x_evm_a53_defconfig
> index 4301553af8d..55c1b23c8db 100644
> --- a/configs/am65x_evm_a53_defconfig
> +++ b/configs/am65x_evm_a53_defconfig
> @@ -1,6 +1,7 @@
> CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_ARCH_K3=y
> +CONFIG_TI_SECURE_DEVICE=y
> CONFIG_SYS_MALLOC_LEN=0x2000000
> CONFIG_SYS_MALLOC_F_LEN=0x8000
> CONFIG_SPL_LIBCOMMON_SUPPORT=y
> @@ -34,7 +35,7 @@ CONFIG_SPL_LOAD_FIT=y
> CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
> CONFIG_OF_SYSTEM_SETUP=y
> CONFIG_DISTRO_DEFAULTS=y
> -CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd; run init_${boot}; run boot_rprocs; run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern"
> +CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd; run init_${boot}; run boot_rprocs; if test ${boot_fit} -eq 1; then run get_fit_${boot}; run get_overlaystring; run run_fit; else; run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern; fi;"
> CONFIG_LOGLEVEL=7
> CONFIG_CONSOLE_MUX=y
> CONFIG_SPL_MAX_SIZE=0x58000
> diff --git a/configs/am65x_evm_r5_defconfig b/configs/am65x_evm_r5_defconfig
> index d5196c2024e..b9b69b921be 100644
> --- a/configs/am65x_evm_r5_defconfig
> +++ b/configs/am65x_evm_r5_defconfig
> @@ -1,5 +1,6 @@
> CONFIG_ARM=y
> CONFIG_ARCH_K3=y
> +CONFIG_TI_SECURE_DEVICE=y
> CONFIG_SYS_MALLOC_LEN=0x2000000
> CONFIG_SYS_MALLOC_F_LEN=0x55000
> CONFIG_SPL_GPIO=y
> diff --git a/configs/am65x_evm_r5_usbdfu_defconfig b/configs/am65x_evm_r5_usbdfu_defconfig
> index 88f68aa70e4..fb93024bda9 100644
> --- a/configs/am65x_evm_r5_usbdfu_defconfig
> +++ b/configs/am65x_evm_r5_usbdfu_defconfig
> @@ -1,5 +1,6 @@
> CONFIG_ARM=y
> CONFIG_ARCH_K3=y
> +CONFIG_TI_SECURE_DEVICE=y
> CONFIG_SYS_MALLOC_LEN=0x2000000
> CONFIG_SYS_MALLOC_F_LEN=0x55000
> CONFIG_SPL_GPIO=y
> diff --git a/configs/am65x_evm_r5_usbmsc_defconfig b/configs/am65x_evm_r5_usbmsc_defconfig
> index 8da49c78c82..931b756ab52 100644
> --- a/configs/am65x_evm_r5_usbmsc_defconfig
> +++ b/configs/am65x_evm_r5_usbmsc_defconfig
> @@ -1,5 +1,6 @@
> CONFIG_ARM=y
> CONFIG_ARCH_K3=y
> +CONFIG_TI_SECURE_DEVICE=y
> CONFIG_SYS_MALLOC_LEN=0x2000000
> CONFIG_SYS_MALLOC_F_LEN=0x55000
> CONFIG_SPL_GPIO=y
> diff --git a/configs/am65x_hs_evm_a53_defconfig b/configs/am65x_hs_evm_a53_defconfig
> deleted file mode 100644
> index 3f9626e4550..00000000000
> --- a/configs/am65x_hs_evm_a53_defconfig
> +++ /dev/null
> @@ -1,158 +0,0 @@
> -CONFIG_ARM=y
> -CONFIG_SKIP_LOWLEVEL_INIT=y
> -CONFIG_ARCH_K3=y
> -CONFIG_TI_SECURE_DEVICE=y
> -CONFIG_SYS_MALLOC_LEN=0x2000000
> -CONFIG_SYS_MALLOC_F_LEN=0x8000
> -CONFIG_SPL_LIBCOMMON_SUPPORT=y
> -CONFIG_SPL_LIBGENERIC_SUPPORT=y
> -CONFIG_NR_DRAM_BANKS=2
> -CONFIG_SOC_K3_AM654=y
> -CONFIG_TARGET_AM654_A53_EVM=y
> -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
> -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80480000
> -CONFIG_ENV_SIZE=0x20000
> -CONFIG_ENV_OFFSET=0x680000
> -CONFIG_DM_GPIO=y
> -CONFIG_SPL_DM_SPI=y
> -CONFIG_DEFAULT_DEVICE_TREE="k3-am654-base-board"
> -CONFIG_SPL_TEXT_BASE=0x80080000
> -CONFIG_OF_LIBFDT_OVERLAY=y
> -CONFIG_DM_RESET=y
> -CONFIG_SPL_MMC=y
> -CONFIG_SPL_SERIAL=y
> -CONFIG_SPL_DRIVERS_MISC=y
> -CONFIG_SPL_STACK_R_ADDR=0x82000000
> -CONFIG_ENV_OFFSET_REDUND=0x6A0000
> -CONFIG_SPL_FS_FAT=y
> -CONFIG_SPL_LIBDISK_SUPPORT=y
> -CONFIG_SPL_SPI_FLASH_SUPPORT=y
> -CONFIG_SPL_SPI=y
> -# CONFIG_PSCI_RESET is not set
> -CONFIG_PCI=y
> -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SPL_LOAD_FIT=y
> -CONFIG_OF_SYSTEM_SETUP=y
> -CONFIG_DISTRO_DEFAULTS=y
> -CONFIG_BOOTCOMMAND="run findfdt; run envboot; run init_${boot}; run get_fit_${boot}; run get_overlaystring; run run_fit"
> -CONFIG_LOGLEVEL=7
> -CONFIG_CONSOLE_MUX=y
> -CONFIG_SPL_MAX_SIZE=0x58000
> -CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
> -CONFIG_SPL_BSS_START_ADDR=0x80a00000
> -CONFIG_SPL_BSS_MAX_SIZE=0x80000
> -CONFIG_SPL_SYS_MALLOC_SIMPLE=y
> -CONFIG_SPL_STACK_R=y
> -CONFIG_SYS_SPL_MALLOC=y
> -CONFIG_SYS_SPL_MALLOC_SIZE=0x800000
> -CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
> -CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x1400
> -CONFIG_SPL_DMA=y
> -CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot.img"
> -CONFIG_SPL_I2C=y
> -CONFIG_SPL_DM_MAILBOX=y
> -CONFIG_SPL_MTD_SUPPORT=y
> -CONFIG_SPL_DM_SPI_FLASH=y
> -CONFIG_SPL_DM_RESET=y
> -CONFIG_SPL_POWER_DOMAIN=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=0x280000
> -CONFIG_SPL_YMODEM_SUPPORT=y
> -CONFIG_SYS_MAXARGS=64
> -CONFIG_CMD_ASKENV=y
> -CONFIG_CMD_DFU=y
> -CONFIG_CMD_GPT=y
> -CONFIG_CMD_I2C=y
> -CONFIG_CMD_MMC=y
> -CONFIG_CMD_PCI=y
> -CONFIG_CMD_REMOTEPROC=y
> -CONFIG_CMD_USB=y
> -CONFIG_CMD_TIME=y
> -CONFIG_MTDIDS_DEFAULT="nor0=47040000.spi.0"
> -CONFIG_MTDPARTS_DEFAULT="mtdparts=47040000.spi.0:512k(ospi.tiboot3),2m(ospi.tispl),4m(ospi.u-boot),128k(ospi.env),128k(ospi.env.backup),1m(ospi.sysfw),-@8m(ospi.rootfs)"
> -CONFIG_CMD_UBI=y
> -# CONFIG_ISO_PARTITION is not set
> -CONFIG_OF_CONTROL=y
> -CONFIG_SPL_OF_CONTROL=y
> -CONFIG_SPL_MULTI_DTB_FIT=y
> -CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
> -CONFIG_ENV_OVERWRITE=y
> -CONFIG_ENV_IS_IN_MMC=y
> -CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
> -CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> -CONFIG_SYS_MMC_ENV_PART=1
> -CONFIG_NET_RANDOM_ETHADDR=y
> -CONFIG_SPL_DM=y
> -CONFIG_SPL_DM_SEQ_ALIAS=y
> -CONFIG_SPL_REGMAP=y
> -CONFIG_SPL_OF_TRANSLATE=y
> -CONFIG_CLK=y
> -CONFIG_SPL_CLK=y
> -CONFIG_CLK_TI_SCI=y
> -CONFIG_DFU_MMC=y
> -CONFIG_DFU_RAM=y
> -CONFIG_DFU_SF=y
> -CONFIG_SYS_DFU_DATA_BUF_SIZE=0x20000
> -CONFIG_SYS_DFU_MAX_FILE_SIZE=0x800000
> -CONFIG_DMA_CHANNELS=y
> -CONFIG_TI_K3_NAVSS_UDMA=y
> -CONFIG_TI_SCI_PROTOCOL=y
> -CONFIG_DM_PCA953X=y
> -CONFIG_DM_I2C=y
> -CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
> -CONFIG_SYS_I2C_OMAP24XX=y
> -CONFIG_DM_MAILBOX=y
> -CONFIG_K3_SEC_PROXY=y
> -CONFIG_MMC_SDHCI=y
> -CONFIG_MMC_SDHCI_ADMA=y
> -CONFIG_SPL_MMC_SDHCI_ADMA=y
> -CONFIG_MMC_SDHCI_AM654=y
> -CONFIG_MTD=y
> -CONFIG_DM_MTD=y
> -CONFIG_DM_SPI_FLASH=y
> -CONFIG_SPI_FLASH_SFDP_SUPPORT=y
> -CONFIG_SPI_FLASH_STMICRO=y
> -# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
> -CONFIG_SPI_FLASH_MTD=y
> -CONFIG_PHY_TI_DP83867=y
> -CONFIG_PHY_FIXED=y
> -CONFIG_E1000=y
> -CONFIG_CMD_E1000=y
> -CONFIG_TI_AM65_CPSW_NUSS=y
> -CONFIG_PCI_KEYSTONE=y
> -CONFIG_PHY=y
> -CONFIG_AM654_PHY=y
> -CONFIG_OMAP_USB2_PHY=y
> -CONFIG_PINCTRL=y
> -# CONFIG_PINCTRL_GENERIC is not set
> -CONFIG_SPL_PINCTRL=y
> -# CONFIG_SPL_PINCTRL_GENERIC is not set
> -CONFIG_PINCTRL_SINGLE=y
> -CONFIG_POWER_DOMAIN=y
> -CONFIG_TI_SCI_POWER_DOMAIN=y
> -CONFIG_REMOTEPROC_TI_K3_R5F=y
> -CONFIG_RESET_TI_SCI=y
> -CONFIG_DM_SERIAL=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_SYSRESET=y
> -CONFIG_SPL_SYSRESET=y
> -CONFIG_SYSRESET_TI_SCI=y
> -CONFIG_USB=y
> -CONFIG_DM_USB_GADGET=y
> -CONFIG_USB_XHCI_HCD=y
> -CONFIG_USB_XHCI_DWC3=y
> -CONFIG_USB_DWC3=y
> -CONFIG_USB_DWC3_GENERIC=y
> -CONFIG_USB_KEYBOARD=y
> -CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> -CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> -CONFIG_USB_GADGET_PRODUCT_NUM=0x6162
> -CONFIG_USB_GADGET_DOWNLOAD=y
> diff --git a/configs/am65x_hs_evm_r5_defconfig b/configs/am65x_hs_evm_r5_defconfig
> deleted file mode 100644
> index 0c7b53ca2c0..00000000000
> --- a/configs/am65x_hs_evm_r5_defconfig
> +++ /dev/null
> @@ -1,135 +0,0 @@
> -CONFIG_ARM=y
> -CONFIG_ARCH_K3=y
> -CONFIG_TI_SECURE_DEVICE=y
> -CONFIG_SYS_MALLOC_LEN=0x2000000
> -CONFIG_SYS_MALLOC_F_LEN=0x55000
> -CONFIG_SPL_GPIO=y
> -CONFIG_SPL_LIBCOMMON_SUPPORT=y
> -CONFIG_SPL_LIBGENERIC_SUPPORT=y
> -CONFIG_NR_DRAM_BANKS=2
> -CONFIG_SOC_K3_AM654=y
> -CONFIG_K3_EARLY_CONS=y
> -CONFIG_TARGET_AM654_R5_EVM=y
> -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
> -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x41c7effc
> -CONFIG_ENV_SIZE=0x20000
> -CONFIG_DM_GPIO=y
> -CONFIG_SPL_DM_SPI=y
> -CONFIG_DEFAULT_DEVICE_TREE="k3-am654-r5-base-board"
> -CONFIG_SPL_TEXT_BASE=0x41c00000
> -CONFIG_DM_RESET=y
> -CONFIG_SPL_MMC=y
> -CONFIG_SPL_SERIAL=y
> -CONFIG_SPL_DRIVERS_MISC=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_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SPL_LOAD_FIT=y
> -CONFIG_USE_BOOTCOMMAND=y
> -# CONFIG_DISPLAY_CPUINFO is not set
> -CONFIG_SPL_MAX_SIZE=0x58000
> -CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
> -CONFIG_SPL_BSS_START_ADDR=0x41c7effc
> -CONFIG_SPL_BSS_MAX_SIZE=0xc00
> -CONFIG_SPL_STACK_R=y
> -CONFIG_SPL_SEPARATE_BSS=y
> -CONFIG_SYS_SPL_MALLOC=y
> -CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y
> -CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x84000000
> -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_SPL_DMA=y
> -CONFIG_SPL_I2C=y
> -CONFIG_SPL_DM_MAILBOX=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
> -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_SYS_MAXARGS=64
> -CONFIG_CMD_BOOTZ=y
> -CONFIG_SYS_BOOTM_LEN=0x4000000
> -CONFIG_CMD_ASKENV=y
> -CONFIG_CMD_GPT=y
> -CONFIG_CMD_I2C=y
> -CONFIG_CMD_MMC=y
> -CONFIG_CMD_REMOTEPROC=y
> -# CONFIG_CMD_SETEXPR is not set
> -CONFIG_CMD_TIME=y
> -CONFIG_CMD_FAT=y
> -CONFIG_OF_CONTROL=y
> -CONFIG_SPL_OF_CONTROL=y
> -CONFIG_SPL_MULTI_DTB_FIT=y
> -CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
> -CONFIG_ENV_OVERWRITE=y
> -CONFIG_ENV_IS_IN_FAT=y
> -CONFIG_ENV_FAT_DEVICE_AND_PART="1:1"
> -CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> -CONFIG_SPL_DM=y
> -CONFIG_SPL_DM_SEQ_ALIAS=y
> -CONFIG_REGMAP=y
> -CONFIG_SPL_REGMAP=y
> -CONFIG_SPL_OF_TRANSLATE=y
> -CONFIG_CLK=y
> -CONFIG_SPL_CLK=y
> -CONFIG_CLK_TI_SCI=y
> -CONFIG_DMA_CHANNELS=y
> -CONFIG_TI_K3_NAVSS_UDMA=y
> -CONFIG_TI_SCI_PROTOCOL=y
> -CONFIG_DA8XX_GPIO=y
> -CONFIG_DM_I2C=y
> -CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
> -CONFIG_SYS_I2C_OMAP24XX=y
> -CONFIG_DM_MAILBOX=y
> -CONFIG_K3_SEC_PROXY=y
> -CONFIG_K3_AVS0=y
> -CONFIG_MMC_SDHCI=y
> -CONFIG_SPL_MMC_SDHCI_ADMA=y
> -CONFIG_MMC_SDHCI_AM654=y
> -CONFIG_DM_SPI_FLASH=y
> -CONFIG_SPI_FLASH_SFDP_SUPPORT=y
> -CONFIG_SPI_FLASH_STMICRO=y
> -# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
> -CONFIG_PINCTRL=y
> -# CONFIG_PINCTRL_GENERIC is not set
> -CONFIG_SPL_PINCTRL=y
> -# CONFIG_SPL_PINCTRL_GENERIC is not set
> -CONFIG_PINCTRL_SINGLE=y
> -CONFIG_POWER_DOMAIN=y
> -CONFIG_TI_SCI_POWER_DOMAIN=y
> -CONFIG_DM_REGULATOR=y
> -CONFIG_SPL_DM_REGULATOR=y
> -CONFIG_DM_REGULATOR_GPIO=y
> -CONFIG_SPL_DM_REGULATOR_GPIO=y
> -CONFIG_DM_REGULATOR_TPS62360=y
> -CONFIG_RAM=y
> -CONFIG_SPL_RAM=y
> -CONFIG_K3_SYSTEM_CONTROLLER=y
> -CONFIG_REMOTEPROC_TI_K3_ARM64=y
> -CONFIG_RESET_TI_SCI=y
> -CONFIG_DM_SERIAL=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_SYSRESET=y
> -CONFIG_SPL_SYSRESET=y
> -CONFIG_SYSRESET_TI_SCI=y
> -CONFIG_TIMER=y
> -CONFIG_SPL_TIMER=y
> -CONFIG_OMAP_TIMER=y
> -CONFIG_FS_FAT_MAX_CLUSTSIZE=16384
> --
> 2.39.2
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] configs: Make TI_SECURE_DEVICE default for K3
2023-08-03 14:54 ` [PATCH 2/2] configs: Make TI_SECURE_DEVICE default for K3 Andrew Davis
2023-08-03 19:31 ` Tom Rini
@ 2023-08-09 6:08 ` Jan Kiszka
2023-10-11 18:36 ` Tom Rini
2 siblings, 0 replies; 9+ messages in thread
From: Jan Kiszka @ 2023-08-09 6:08 UTC (permalink / raw)
To: Andrew Davis, Tom Rini, Nishanth Menon, Vignesh Raghavendra,
Manorit Chawdhry
Cc: u-boot
On 03.08.23 16:54, Andrew Davis wrote:
> All K3 boards now are secure by default, instead of setting this in each
> defconfig, make it implied by the ARCH config.
>
> The only exception is IOT2050, which I do not believe will have any
> problems with being a TI_SECURE_DEVICE, but for now turn it off to keep
> its config the same.
The IOT2050 firmware is not using TI_SECURE_DEVICE because it serves
non-HS devices by default as well. Secure boot on HS devices can be
enabled by applying an extra config fragment like [1].
So it's indeed better to keep this off for the IO2050 to avoid untested
side effects. E.g., we would probably lose legacy image booting in
non-secure mode.
Jan
[1]
https://github.com/siemens/meta-iot2050/blob/master/recipes-bsp/u-boot/files/secure-boot.cfg
>
> Signed-off-by: Andrew Davis <afd@ti.com>
> ---
> arch/arm/Kconfig | 1 +
> configs/am62ax_evm_a53_defconfig | 1 -
> configs/am62ax_evm_r5_defconfig | 1 -
> configs/am62x_evm_a53_defconfig | 1 -
> configs/am62x_evm_r5_defconfig | 1 -
> configs/am64x_evm_a53_defconfig | 1 -
> configs/am64x_evm_r5_defconfig | 1 -
> configs/iot2050_defconfig | 1 +
> configs/j7200_evm_a72_defconfig | 1 -
> configs/j7200_evm_r5_defconfig | 1 -
> configs/j721e_evm_a72_defconfig | 1 -
> configs/j721e_evm_r5_defconfig | 1 -
> configs/j721s2_evm_a72_defconfig | 1 -
> configs/j721s2_evm_r5_defconfig | 1 -
> 14 files changed, 2 insertions(+), 12 deletions(-)
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 97c25b4f146..8ad6c5582ce 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -787,6 +787,7 @@ config ARCH_K3
> select FIT
> select REGEX
> select FIT_SIGNATURE if ARM64
> + imply TI_SECURE_DEVICE
>
> config ARCH_OMAP2PLUS
> bool "TI OMAP2+"
> diff --git a/configs/am62ax_evm_a53_defconfig b/configs/am62ax_evm_a53_defconfig
> index 773cf3a591c..d0a34c75505 100644
> --- a/configs/am62ax_evm_a53_defconfig
> +++ b/configs/am62ax_evm_a53_defconfig
> @@ -1,6 +1,5 @@
> CONFIG_ARM=y
> CONFIG_ARCH_K3=y
> -CONFIG_TI_SECURE_DEVICE=y
> CONFIG_SYS_MALLOC_F_LEN=0x8000
> CONFIG_SPL_LIBCOMMON_SUPPORT=y
> CONFIG_SPL_LIBGENERIC_SUPPORT=y
> diff --git a/configs/am62ax_evm_r5_defconfig b/configs/am62ax_evm_r5_defconfig
> index 05c30cbba19..2c1110d227f 100644
> --- a/configs/am62ax_evm_r5_defconfig
> +++ b/configs/am62ax_evm_r5_defconfig
> @@ -1,6 +1,5 @@
> CONFIG_ARM=y
> CONFIG_ARCH_K3=y
> -CONFIG_TI_SECURE_DEVICE=y
> CONFIG_SYS_MALLOC_F_LEN=0x9000
> CONFIG_SPL_LIBCOMMON_SUPPORT=y
> CONFIG_SPL_LIBGENERIC_SUPPORT=y
> diff --git a/configs/am62x_evm_a53_defconfig b/configs/am62x_evm_a53_defconfig
> index d55caabe22c..1d05cecbcde 100644
> --- a/configs/am62x_evm_a53_defconfig
> +++ b/configs/am62x_evm_a53_defconfig
> @@ -1,6 +1,5 @@
> CONFIG_ARM=y
> CONFIG_ARCH_K3=y
> -CONFIG_TI_SECURE_DEVICE=y
> CONFIG_SYS_MALLOC_F_LEN=0x8000
> CONFIG_SPL_LIBCOMMON_SUPPORT=y
> CONFIG_SPL_LIBGENERIC_SUPPORT=y
> diff --git a/configs/am62x_evm_r5_defconfig b/configs/am62x_evm_r5_defconfig
> index 3c5f3672984..9dd2930dc89 100644
> --- a/configs/am62x_evm_r5_defconfig
> +++ b/configs/am62x_evm_r5_defconfig
> @@ -1,6 +1,5 @@
> CONFIG_ARM=y
> CONFIG_ARCH_K3=y
> -CONFIG_TI_SECURE_DEVICE=y
> CONFIG_SYS_MALLOC_LEN=0x08000000
> CONFIG_SYS_MALLOC_F_LEN=0x9000
> CONFIG_SPL_LIBCOMMON_SUPPORT=y
> diff --git a/configs/am64x_evm_a53_defconfig b/configs/am64x_evm_a53_defconfig
> index 9bdb767f9e6..d1d46c61075 100644
> --- a/configs/am64x_evm_a53_defconfig
> +++ b/configs/am64x_evm_a53_defconfig
> @@ -1,7 +1,6 @@
> CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_ARCH_K3=y
> -CONFIG_TI_SECURE_DEVICE=y
> CONFIG_SYS_MALLOC_LEN=0x2000000
> CONFIG_SYS_MALLOC_F_LEN=0x8000
> CONFIG_SPL_GPIO=y
> diff --git a/configs/am64x_evm_r5_defconfig b/configs/am64x_evm_r5_defconfig
> index 45d32658cff..96cb437b10b 100644
> --- a/configs/am64x_evm_r5_defconfig
> +++ b/configs/am64x_evm_r5_defconfig
> @@ -1,6 +1,5 @@
> CONFIG_ARM=y
> CONFIG_ARCH_K3=y
> -CONFIG_TI_SECURE_DEVICE=y
> CONFIG_SYS_MALLOC_LEN=0x2000000
> CONFIG_SYS_MALLOC_F_LEN=0x80000
> CONFIG_SPL_GPIO=y
> diff --git a/configs/iot2050_defconfig b/configs/iot2050_defconfig
> index bcbaa92ee89..ad9217ff86a 100644
> --- a/configs/iot2050_defconfig
> +++ b/configs/iot2050_defconfig
> @@ -1,6 +1,7 @@
> CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_ARCH_K3=y
> +# CONFIG_TI_SECURE_DEVICE is not set
> CONFIG_SYS_MALLOC_LEN=0x2000000
> CONFIG_SYS_MALLOC_F_LEN=0x8000
> CONFIG_SPL_GPIO=y
> diff --git a/configs/j7200_evm_a72_defconfig b/configs/j7200_evm_a72_defconfig
> index c68d52537e5..a9f5d36ffe3 100644
> --- a/configs/j7200_evm_a72_defconfig
> +++ b/configs/j7200_evm_a72_defconfig
> @@ -1,6 +1,5 @@
> CONFIG_ARM=y
> CONFIG_ARCH_K3=y
> -CONFIG_TI_SECURE_DEVICE=y
> CONFIG_SYS_MALLOC_LEN=0x2000000
> CONFIG_SYS_MALLOC_F_LEN=0x8000
> CONFIG_SPL_GPIO=y
> diff --git a/configs/j7200_evm_r5_defconfig b/configs/j7200_evm_r5_defconfig
> index c4dd33627bd..0da16f25a23 100644
> --- a/configs/j7200_evm_r5_defconfig
> +++ b/configs/j7200_evm_r5_defconfig
> @@ -1,6 +1,5 @@
> CONFIG_ARM=y
> CONFIG_ARCH_K3=y
> -CONFIG_TI_SECURE_DEVICE=y
> CONFIG_SYS_MALLOC_LEN=0x2000000
> CONFIG_SYS_MALLOC_F_LEN=0x70000
> CONFIG_SPL_GPIO=y
> diff --git a/configs/j721e_evm_a72_defconfig b/configs/j721e_evm_a72_defconfig
> index 525f150e91d..af784c4e005 100644
> --- a/configs/j721e_evm_a72_defconfig
> +++ b/configs/j721e_evm_a72_defconfig
> @@ -1,6 +1,5 @@
> CONFIG_ARM=y
> CONFIG_ARCH_K3=y
> -CONFIG_TI_SECURE_DEVICE=y
> CONFIG_SYS_MALLOC_LEN=0x2000000
> CONFIG_SYS_MALLOC_F_LEN=0x8000
> CONFIG_SPL_GPIO=y
> diff --git a/configs/j721e_evm_r5_defconfig b/configs/j721e_evm_r5_defconfig
> index cf7bc872b5f..f6dba64530c 100644
> --- a/configs/j721e_evm_r5_defconfig
> +++ b/configs/j721e_evm_r5_defconfig
> @@ -1,6 +1,5 @@
> CONFIG_ARM=y
> CONFIG_ARCH_K3=y
> -CONFIG_TI_SECURE_DEVICE=y
> CONFIG_SYS_MALLOC_LEN=0x2000000
> CONFIG_SYS_MALLOC_F_LEN=0x70000
> CONFIG_SPL_GPIO=y
> diff --git a/configs/j721s2_evm_a72_defconfig b/configs/j721s2_evm_a72_defconfig
> index d59f3156d10..7b7f3dc08e4 100644
> --- a/configs/j721s2_evm_a72_defconfig
> +++ b/configs/j721s2_evm_a72_defconfig
> @@ -1,6 +1,5 @@
> CONFIG_ARM=y
> CONFIG_ARCH_K3=y
> -CONFIG_TI_SECURE_DEVICE=y
> CONFIG_SYS_MALLOC_LEN=0x2000000
> CONFIG_SYS_MALLOC_F_LEN=0x8000
> CONFIG_SPL_GPIO=y
> diff --git a/configs/j721s2_evm_r5_defconfig b/configs/j721s2_evm_r5_defconfig
> index 1e66ac23d05..39467e0d00e 100644
> --- a/configs/j721s2_evm_r5_defconfig
> +++ b/configs/j721s2_evm_r5_defconfig
> @@ -1,6 +1,5 @@
> CONFIG_ARM=y
> CONFIG_ARCH_K3=y
> -CONFIG_TI_SECURE_DEVICE=y
> CONFIG_SYS_MALLOC_LEN=0x2000000
> CONFIG_SYS_MALLOC_F_LEN=0x10000
> CONFIG_SPL_GPIO=y
--
Siemens AG, Technology
Linux Expert Center
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] configs: am65x: Merge the HS and non-HS defconfigs
2023-08-04 5:05 ` Manorit Chawdhry
@ 2023-09-28 7:54 ` Manorit Chawdhry
0 siblings, 0 replies; 9+ messages in thread
From: Manorit Chawdhry @ 2023-09-28 7:54 UTC (permalink / raw)
To: Andrew Davis
Cc: Jan Kiszka, Tom Rini, Nishanth Menon, Vignesh Raghavendra, u-boot
Hi Andrew,
On 04/08/23 10:35, Manorit Chawdhry wrote:
> Hi Andrew,
>
> On 09:54-20230803, Andrew Davis wrote:
>> K3 devices have runtime type board detection. Make the default defconfig
>> include the secure configuration. Then remove the HS specific config.
>>
>> Non-HS devices will continue to boot due to runtime device type detection.
>>
>> Signed-off-by: Andrew Davis <afd@ti.com>
>> ---
>> MAINTAINERS | 2 -
>> configs/am65x_evm_a53_defconfig | 3 +-
>> configs/am65x_evm_r5_defconfig | 1 +
>> configs/am65x_evm_r5_usbdfu_defconfig | 1 +
>> configs/am65x_evm_r5_usbmsc_defconfig | 1 +
>> configs/am65x_hs_evm_a53_defconfig | 158 --------------------------
>> configs/am65x_hs_evm_r5_defconfig | 135 ----------------------
>> 7 files changed, 5 insertions(+), 296 deletions(-)
>> delete mode 100644 configs/am65x_hs_evm_a53_defconfig
>> delete mode 100644 configs/am65x_hs_evm_r5_defconfig
>>
>> diff --git a/MAINTAINERS b/MAINTAINERS
>> index 47581cf6fbb..d3b9f4cc6c4 100644
>> --- a/MAINTAINERS
>> +++ b/MAINTAINERS
>> @@ -1506,8 +1506,6 @@ F: configs/k2hk_hs_evm_defconfig
>> F: configs/k2e_hs_evm_defconfig
>> F: configs/k2g_hs_evm_defconfig
>> F: configs/k2l_hs_evm_defconfig
>> -F: configs/am65x_hs_evm_r5_defconfig
>> -F: configs/am65x_hs_evm_a53_defconfig
> While merging these defconfigs for other boards I had faced an issue
> where the multi DTB detection wasn't working for HS devices and we were
> hitting a firewall exception while trying to access the EEPROM
> Scratchpad before the firewalls were opened. I see that AM65x still uses
> the old Scratchpad address in the Kconfig which had triggered exceptions
> for other K3 devices.
>
> config SYS_K3_MCU_SCRATCHPAD_BASE
> hex
> default 0x40280000 if SOC_K3_AM654
> default 0x41cff9fc if SOC_K3_J721S2
> default 0x41cff9fc if SOC_K3_J721E
>
> Can you double check if this also needs a change along with the merged
> defconfigs?
>
> Regards,
> Manorit
I just noticed that the multi fit configs were already enabled in HS defconfig
before the merge
so ig merging the configs shouldn't bring the problem I was suspecting.
Reviewed-by: Manorit Chawdhry <m-chawdhry@ti.com>
Regards,
Manorit
>>
>> TPM DRIVERS
>> M: Ilias Apalodimas <ilias.apalodimas@linaro.org>
>> diff --git a/configs/am65x_evm_a53_defconfig b/configs/am65x_evm_a53_defconfig
>> index 4301553af8d..55c1b23c8db 100644
>> --- a/configs/am65x_evm_a53_defconfig
>> +++ b/configs/am65x_evm_a53_defconfig
>> @@ -1,6 +1,7 @@
>> CONFIG_ARM=y
>> CONFIG_SKIP_LOWLEVEL_INIT=y
>> CONFIG_ARCH_K3=y
>> +CONFIG_TI_SECURE_DEVICE=y
>> CONFIG_SYS_MALLOC_LEN=0x2000000
>> CONFIG_SYS_MALLOC_F_LEN=0x8000
>> CONFIG_SPL_LIBCOMMON_SUPPORT=y
>> @@ -34,7 +35,7 @@ CONFIG_SPL_LOAD_FIT=y
>> CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
>> CONFIG_OF_SYSTEM_SETUP=y
>> CONFIG_DISTRO_DEFAULTS=y
>> -CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd; run init_${boot}; run boot_rprocs; run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern"
>> +CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd; run init_${boot}; run boot_rprocs; if test ${boot_fit} -eq 1; then run get_fit_${boot}; run get_overlaystring; run run_fit; else; run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern; fi;"
>> CONFIG_LOGLEVEL=7
>> CONFIG_CONSOLE_MUX=y
>> CONFIG_SPL_MAX_SIZE=0x58000
>> diff --git a/configs/am65x_evm_r5_defconfig b/configs/am65x_evm_r5_defconfig
>> index d5196c2024e..b9b69b921be 100644
>> --- a/configs/am65x_evm_r5_defconfig
>> +++ b/configs/am65x_evm_r5_defconfig
>> @@ -1,5 +1,6 @@
>> CONFIG_ARM=y
>> CONFIG_ARCH_K3=y
>> +CONFIG_TI_SECURE_DEVICE=y
>> CONFIG_SYS_MALLOC_LEN=0x2000000
>> CONFIG_SYS_MALLOC_F_LEN=0x55000
>> CONFIG_SPL_GPIO=y
>> diff --git a/configs/am65x_evm_r5_usbdfu_defconfig b/configs/am65x_evm_r5_usbdfu_defconfig
>> index 88f68aa70e4..fb93024bda9 100644
>> --- a/configs/am65x_evm_r5_usbdfu_defconfig
>> +++ b/configs/am65x_evm_r5_usbdfu_defconfig
>> @@ -1,5 +1,6 @@
>> CONFIG_ARM=y
>> CONFIG_ARCH_K3=y
>> +CONFIG_TI_SECURE_DEVICE=y
>> CONFIG_SYS_MALLOC_LEN=0x2000000
>> CONFIG_SYS_MALLOC_F_LEN=0x55000
>> CONFIG_SPL_GPIO=y
>> diff --git a/configs/am65x_evm_r5_usbmsc_defconfig b/configs/am65x_evm_r5_usbmsc_defconfig
>> index 8da49c78c82..931b756ab52 100644
>> --- a/configs/am65x_evm_r5_usbmsc_defconfig
>> +++ b/configs/am65x_evm_r5_usbmsc_defconfig
>> @@ -1,5 +1,6 @@
>> CONFIG_ARM=y
>> CONFIG_ARCH_K3=y
>> +CONFIG_TI_SECURE_DEVICE=y
>> CONFIG_SYS_MALLOC_LEN=0x2000000
>> CONFIG_SYS_MALLOC_F_LEN=0x55000
>> CONFIG_SPL_GPIO=y
>> diff --git a/configs/am65x_hs_evm_a53_defconfig b/configs/am65x_hs_evm_a53_defconfig
>> deleted file mode 100644
>> index 3f9626e4550..00000000000
>> --- a/configs/am65x_hs_evm_a53_defconfig
>> +++ /dev/null
>> @@ -1,158 +0,0 @@
>> -CONFIG_ARM=y
>> -CONFIG_SKIP_LOWLEVEL_INIT=y
>> -CONFIG_ARCH_K3=y
>> -CONFIG_TI_SECURE_DEVICE=y
>> -CONFIG_SYS_MALLOC_LEN=0x2000000
>> -CONFIG_SYS_MALLOC_F_LEN=0x8000
>> -CONFIG_SPL_LIBCOMMON_SUPPORT=y
>> -CONFIG_SPL_LIBGENERIC_SUPPORT=y
>> -CONFIG_NR_DRAM_BANKS=2
>> -CONFIG_SOC_K3_AM654=y
>> -CONFIG_TARGET_AM654_A53_EVM=y
>> -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
>> -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80480000
>> -CONFIG_ENV_SIZE=0x20000
>> -CONFIG_ENV_OFFSET=0x680000
>> -CONFIG_DM_GPIO=y
>> -CONFIG_SPL_DM_SPI=y
>> -CONFIG_DEFAULT_DEVICE_TREE="k3-am654-base-board"
>> -CONFIG_SPL_TEXT_BASE=0x80080000
>> -CONFIG_OF_LIBFDT_OVERLAY=y
>> -CONFIG_DM_RESET=y
>> -CONFIG_SPL_MMC=y
>> -CONFIG_SPL_SERIAL=y
>> -CONFIG_SPL_DRIVERS_MISC=y
>> -CONFIG_SPL_STACK_R_ADDR=0x82000000
>> -CONFIG_ENV_OFFSET_REDUND=0x6A0000
>> -CONFIG_SPL_FS_FAT=y
>> -CONFIG_SPL_LIBDISK_SUPPORT=y
>> -CONFIG_SPL_SPI_FLASH_SUPPORT=y
>> -CONFIG_SPL_SPI=y
>> -# CONFIG_PSCI_RESET is not set
>> -CONFIG_PCI=y
>> -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>> -CONFIG_SPL_LOAD_FIT=y
>> -CONFIG_OF_SYSTEM_SETUP=y
>> -CONFIG_DISTRO_DEFAULTS=y
>> -CONFIG_BOOTCOMMAND="run findfdt; run envboot; run init_${boot}; run get_fit_${boot}; run get_overlaystring; run run_fit"
>> -CONFIG_LOGLEVEL=7
>> -CONFIG_CONSOLE_MUX=y
>> -CONFIG_SPL_MAX_SIZE=0x58000
>> -CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
>> -CONFIG_SPL_BSS_START_ADDR=0x80a00000
>> -CONFIG_SPL_BSS_MAX_SIZE=0x80000
>> -CONFIG_SPL_SYS_MALLOC_SIMPLE=y
>> -CONFIG_SPL_STACK_R=y
>> -CONFIG_SYS_SPL_MALLOC=y
>> -CONFIG_SYS_SPL_MALLOC_SIZE=0x800000
>> -CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
>> -CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x1400
>> -CONFIG_SPL_DMA=y
>> -CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot.img"
>> -CONFIG_SPL_I2C=y
>> -CONFIG_SPL_DM_MAILBOX=y
>> -CONFIG_SPL_MTD_SUPPORT=y
>> -CONFIG_SPL_DM_SPI_FLASH=y
>> -CONFIG_SPL_DM_RESET=y
>> -CONFIG_SPL_POWER_DOMAIN=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=0x280000
>> -CONFIG_SPL_YMODEM_SUPPORT=y
>> -CONFIG_SYS_MAXARGS=64
>> -CONFIG_CMD_ASKENV=y
>> -CONFIG_CMD_DFU=y
>> -CONFIG_CMD_GPT=y
>> -CONFIG_CMD_I2C=y
>> -CONFIG_CMD_MMC=y
>> -CONFIG_CMD_PCI=y
>> -CONFIG_CMD_REMOTEPROC=y
>> -CONFIG_CMD_USB=y
>> -CONFIG_CMD_TIME=y
>> -CONFIG_MTDIDS_DEFAULT="nor0=47040000.spi.0"
>> -CONFIG_MTDPARTS_DEFAULT="mtdparts=47040000.spi.0:512k(ospi.tiboot3),2m(ospi.tispl),4m(ospi.u-boot),128k(ospi.env),128k(ospi.env.backup),1m(ospi.sysfw),-@8m(ospi.rootfs)"
>> -CONFIG_CMD_UBI=y
>> -# CONFIG_ISO_PARTITION is not set
>> -CONFIG_OF_CONTROL=y
>> -CONFIG_SPL_OF_CONTROL=y
>> -CONFIG_SPL_MULTI_DTB_FIT=y
>> -CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
>> -CONFIG_ENV_OVERWRITE=y
>> -CONFIG_ENV_IS_IN_MMC=y
>> -CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
>> -CONFIG_SYS_RELOC_GD_ENV_ADDR=y
>> -CONFIG_SYS_MMC_ENV_PART=1
>> -CONFIG_NET_RANDOM_ETHADDR=y
>> -CONFIG_SPL_DM=y
>> -CONFIG_SPL_DM_SEQ_ALIAS=y
>> -CONFIG_SPL_REGMAP=y
>> -CONFIG_SPL_OF_TRANSLATE=y
>> -CONFIG_CLK=y
>> -CONFIG_SPL_CLK=y
>> -CONFIG_CLK_TI_SCI=y
>> -CONFIG_DFU_MMC=y
>> -CONFIG_DFU_RAM=y
>> -CONFIG_DFU_SF=y
>> -CONFIG_SYS_DFU_DATA_BUF_SIZE=0x20000
>> -CONFIG_SYS_DFU_MAX_FILE_SIZE=0x800000
>> -CONFIG_DMA_CHANNELS=y
>> -CONFIG_TI_K3_NAVSS_UDMA=y
>> -CONFIG_TI_SCI_PROTOCOL=y
>> -CONFIG_DM_PCA953X=y
>> -CONFIG_DM_I2C=y
>> -CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
>> -CONFIG_SYS_I2C_OMAP24XX=y
>> -CONFIG_DM_MAILBOX=y
>> -CONFIG_K3_SEC_PROXY=y
>> -CONFIG_MMC_SDHCI=y
>> -CONFIG_MMC_SDHCI_ADMA=y
>> -CONFIG_SPL_MMC_SDHCI_ADMA=y
>> -CONFIG_MMC_SDHCI_AM654=y
>> -CONFIG_MTD=y
>> -CONFIG_DM_MTD=y
>> -CONFIG_DM_SPI_FLASH=y
>> -CONFIG_SPI_FLASH_SFDP_SUPPORT=y
>> -CONFIG_SPI_FLASH_STMICRO=y
>> -# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
>> -CONFIG_SPI_FLASH_MTD=y
>> -CONFIG_PHY_TI_DP83867=y
>> -CONFIG_PHY_FIXED=y
>> -CONFIG_E1000=y
>> -CONFIG_CMD_E1000=y
>> -CONFIG_TI_AM65_CPSW_NUSS=y
>> -CONFIG_PCI_KEYSTONE=y
>> -CONFIG_PHY=y
>> -CONFIG_AM654_PHY=y
>> -CONFIG_OMAP_USB2_PHY=y
>> -CONFIG_PINCTRL=y
>> -# CONFIG_PINCTRL_GENERIC is not set
>> -CONFIG_SPL_PINCTRL=y
>> -# CONFIG_SPL_PINCTRL_GENERIC is not set
>> -CONFIG_PINCTRL_SINGLE=y
>> -CONFIG_POWER_DOMAIN=y
>> -CONFIG_TI_SCI_POWER_DOMAIN=y
>> -CONFIG_REMOTEPROC_TI_K3_R5F=y
>> -CONFIG_RESET_TI_SCI=y
>> -CONFIG_DM_SERIAL=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_SYSRESET=y
>> -CONFIG_SPL_SYSRESET=y
>> -CONFIG_SYSRESET_TI_SCI=y
>> -CONFIG_USB=y
>> -CONFIG_DM_USB_GADGET=y
>> -CONFIG_USB_XHCI_HCD=y
>> -CONFIG_USB_XHCI_DWC3=y
>> -CONFIG_USB_DWC3=y
>> -CONFIG_USB_DWC3_GENERIC=y
>> -CONFIG_USB_KEYBOARD=y
>> -CONFIG_USB_GADGET=y
>> -CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
>> -CONFIG_USB_GADGET_VENDOR_NUM=0x0451
>> -CONFIG_USB_GADGET_PRODUCT_NUM=0x6162
>> -CONFIG_USB_GADGET_DOWNLOAD=y
>> diff --git a/configs/am65x_hs_evm_r5_defconfig b/configs/am65x_hs_evm_r5_defconfig
>> deleted file mode 100644
>> index 0c7b53ca2c0..00000000000
>> --- a/configs/am65x_hs_evm_r5_defconfig
>> +++ /dev/null
>> @@ -1,135 +0,0 @@
>> -CONFIG_ARM=y
>> -CONFIG_ARCH_K3=y
>> -CONFIG_TI_SECURE_DEVICE=y
>> -CONFIG_SYS_MALLOC_LEN=0x2000000
>> -CONFIG_SYS_MALLOC_F_LEN=0x55000
>> -CONFIG_SPL_GPIO=y
>> -CONFIG_SPL_LIBCOMMON_SUPPORT=y
>> -CONFIG_SPL_LIBGENERIC_SUPPORT=y
>> -CONFIG_NR_DRAM_BANKS=2
>> -CONFIG_SOC_K3_AM654=y
>> -CONFIG_K3_EARLY_CONS=y
>> -CONFIG_TARGET_AM654_R5_EVM=y
>> -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
>> -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x41c7effc
>> -CONFIG_ENV_SIZE=0x20000
>> -CONFIG_DM_GPIO=y
>> -CONFIG_SPL_DM_SPI=y
>> -CONFIG_DEFAULT_DEVICE_TREE="k3-am654-r5-base-board"
>> -CONFIG_SPL_TEXT_BASE=0x41c00000
>> -CONFIG_DM_RESET=y
>> -CONFIG_SPL_MMC=y
>> -CONFIG_SPL_SERIAL=y
>> -CONFIG_SPL_DRIVERS_MISC=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_SYS_MALLOC_CLEAR_ON_INIT is not set
>> -CONFIG_SPL_LOAD_FIT=y
>> -CONFIG_USE_BOOTCOMMAND=y
>> -# CONFIG_DISPLAY_CPUINFO is not set
>> -CONFIG_SPL_MAX_SIZE=0x58000
>> -CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
>> -CONFIG_SPL_BSS_START_ADDR=0x41c7effc
>> -CONFIG_SPL_BSS_MAX_SIZE=0xc00
>> -CONFIG_SPL_STACK_R=y
>> -CONFIG_SPL_SEPARATE_BSS=y
>> -CONFIG_SYS_SPL_MALLOC=y
>> -CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y
>> -CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x84000000
>> -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_SPL_DMA=y
>> -CONFIG_SPL_I2C=y
>> -CONFIG_SPL_DM_MAILBOX=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
>> -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_SYS_MAXARGS=64
>> -CONFIG_CMD_BOOTZ=y
>> -CONFIG_SYS_BOOTM_LEN=0x4000000
>> -CONFIG_CMD_ASKENV=y
>> -CONFIG_CMD_GPT=y
>> -CONFIG_CMD_I2C=y
>> -CONFIG_CMD_MMC=y
>> -CONFIG_CMD_REMOTEPROC=y
>> -# CONFIG_CMD_SETEXPR is not set
>> -CONFIG_CMD_TIME=y
>> -CONFIG_CMD_FAT=y
>> -CONFIG_OF_CONTROL=y
>> -CONFIG_SPL_OF_CONTROL=y
>> -CONFIG_SPL_MULTI_DTB_FIT=y
>> -CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
>> -CONFIG_ENV_OVERWRITE=y
>> -CONFIG_ENV_IS_IN_FAT=y
>> -CONFIG_ENV_FAT_DEVICE_AND_PART="1:1"
>> -CONFIG_SYS_RELOC_GD_ENV_ADDR=y
>> -CONFIG_SPL_DM=y
>> -CONFIG_SPL_DM_SEQ_ALIAS=y
>> -CONFIG_REGMAP=y
>> -CONFIG_SPL_REGMAP=y
>> -CONFIG_SPL_OF_TRANSLATE=y
>> -CONFIG_CLK=y
>> -CONFIG_SPL_CLK=y
>> -CONFIG_CLK_TI_SCI=y
>> -CONFIG_DMA_CHANNELS=y
>> -CONFIG_TI_K3_NAVSS_UDMA=y
>> -CONFIG_TI_SCI_PROTOCOL=y
>> -CONFIG_DA8XX_GPIO=y
>> -CONFIG_DM_I2C=y
>> -CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
>> -CONFIG_SYS_I2C_OMAP24XX=y
>> -CONFIG_DM_MAILBOX=y
>> -CONFIG_K3_SEC_PROXY=y
>> -CONFIG_K3_AVS0=y
>> -CONFIG_MMC_SDHCI=y
>> -CONFIG_SPL_MMC_SDHCI_ADMA=y
>> -CONFIG_MMC_SDHCI_AM654=y
>> -CONFIG_DM_SPI_FLASH=y
>> -CONFIG_SPI_FLASH_SFDP_SUPPORT=y
>> -CONFIG_SPI_FLASH_STMICRO=y
>> -# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
>> -CONFIG_PINCTRL=y
>> -# CONFIG_PINCTRL_GENERIC is not set
>> -CONFIG_SPL_PINCTRL=y
>> -# CONFIG_SPL_PINCTRL_GENERIC is not set
>> -CONFIG_PINCTRL_SINGLE=y
>> -CONFIG_POWER_DOMAIN=y
>> -CONFIG_TI_SCI_POWER_DOMAIN=y
>> -CONFIG_DM_REGULATOR=y
>> -CONFIG_SPL_DM_REGULATOR=y
>> -CONFIG_DM_REGULATOR_GPIO=y
>> -CONFIG_SPL_DM_REGULATOR_GPIO=y
>> -CONFIG_DM_REGULATOR_TPS62360=y
>> -CONFIG_RAM=y
>> -CONFIG_SPL_RAM=y
>> -CONFIG_K3_SYSTEM_CONTROLLER=y
>> -CONFIG_REMOTEPROC_TI_K3_ARM64=y
>> -CONFIG_RESET_TI_SCI=y
>> -CONFIG_DM_SERIAL=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_SYSRESET=y
>> -CONFIG_SPL_SYSRESET=y
>> -CONFIG_SYSRESET_TI_SCI=y
>> -CONFIG_TIMER=y
>> -CONFIG_SPL_TIMER=y
>> -CONFIG_OMAP_TIMER=y
>> -CONFIG_FS_FAT_MAX_CLUSTSIZE=16384
>> --
>> 2.39.2
>>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] configs: am65x: Merge the HS and non-HS defconfigs
2023-08-03 14:54 [PATCH 1/2] configs: am65x: Merge the HS and non-HS defconfigs Andrew Davis
` (2 preceding siblings ...)
2023-08-04 5:05 ` Manorit Chawdhry
@ 2023-10-11 18:36 ` Tom Rini
3 siblings, 0 replies; 9+ messages in thread
From: Tom Rini @ 2023-10-11 18:36 UTC (permalink / raw)
To: Andrew Davis
Cc: Jan Kiszka, Nishanth Menon, Vignesh Raghavendra,
Manorit Chawdhry, u-boot
[-- Attachment #1: Type: text/plain, Size: 490 bytes --]
On Thu, Aug 03, 2023 at 09:54:40AM -0500, Andrew Davis wrote:
> K3 devices have runtime type board detection. Make the default defconfig
> include the secure configuration. Then remove the HS specific config.
>
> Non-HS devices will continue to boot due to runtime device type detection.
>
> Signed-off-by: Andrew Davis <afd@ti.com>
> Tested-by: Tom Rini <trini@konsulko.com>
> Reviewed-by: Manorit Chawdhry <m-chawdhry@ti.com>
Applied to u-boot/master, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] configs: Make TI_SECURE_DEVICE default for K3
2023-08-03 14:54 ` [PATCH 2/2] configs: Make TI_SECURE_DEVICE default for K3 Andrew Davis
2023-08-03 19:31 ` Tom Rini
2023-08-09 6:08 ` Jan Kiszka
@ 2023-10-11 18:36 ` Tom Rini
2 siblings, 0 replies; 9+ messages in thread
From: Tom Rini @ 2023-10-11 18:36 UTC (permalink / raw)
To: Andrew Davis
Cc: Jan Kiszka, Nishanth Menon, Vignesh Raghavendra,
Manorit Chawdhry, u-boot
[-- Attachment #1: Type: text/plain, Size: 506 bytes --]
On Thu, Aug 03, 2023 at 09:54:41AM -0500, Andrew Davis wrote:
> All K3 boards now are secure by default, instead of setting this in each
> defconfig, make it implied by the ARCH config.
>
> The only exception is IOT2050, which I do not believe will have any
> problems with being a TI_SECURE_DEVICE, but for now turn it off to keep
> its config the same.
>
> Signed-off-by: Andrew Davis <afd@ti.com>
> Tested-by: Tom Rini <trini@konsulko.com>
Applied to u-boot/master, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-10-11 18:59 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-03 14:54 [PATCH 1/2] configs: am65x: Merge the HS and non-HS defconfigs Andrew Davis
2023-08-03 14:54 ` [PATCH 2/2] configs: Make TI_SECURE_DEVICE default for K3 Andrew Davis
2023-08-03 19:31 ` Tom Rini
2023-08-09 6:08 ` Jan Kiszka
2023-10-11 18:36 ` Tom Rini
2023-08-03 19:31 ` [PATCH 1/2] configs: am65x: Merge the HS and non-HS defconfigs Tom Rini
2023-08-04 5:05 ` Manorit Chawdhry
2023-09-28 7:54 ` Manorit Chawdhry
2023-10-11 18:36 ` Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.