diff mbox series

defconfigs: Add a config for AM43xx High Security EVM with QSPI Boot support

Message ID 20200107225440.12082-1-afd@ti.com
State New
Headers show
Series defconfigs: Add a config for AM43xx High Security EVM with QSPI Boot support | expand

Commit Message

Andrew Davis Jan. 7, 2020, 10:54 p.m. UTC
On AM43xx HS devices, QSPI boot is XIP and we use a single stage
bootloader. Add a defconfig for this.

Signed-off-by: Andrew F. Davis <afd at ti.com>
---
 MAINTAINERS                          |  1 +
 configs/am43xx_hs_evm_qspi_defconfig | 65 ++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+)
 create mode 100644 configs/am43xx_hs_evm_qspi_defconfig

Comments

Lokesh Vutla Jan. 8, 2020, 4:13 a.m. UTC | #1
On 08/01/20 4:24 AM, Andrew F. Davis wrote:
> On AM43xx HS devices, QSPI boot is XIP and we use a single stage
> bootloader. Add a defconfig for this.
> 
> Signed-off-by: Andrew F. Davis <afd at ti.com>

Reviewed-by: Lokesh Vutla <lokeshvutla at ti.com>

Thanks and regards,
Lokesh

> ---
>  MAINTAINERS                          |  1 +
>  configs/am43xx_hs_evm_qspi_defconfig | 65 ++++++++++++++++++++++++++++
>  2 files changed, 66 insertions(+)
>  create mode 100644 configs/am43xx_hs_evm_qspi_defconfig
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 438fb225ab..1a9226d9b5 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -838,6 +838,7 @@ F:	arch/arm/mach-k3/config_secure.mk
>  F:	configs/am335x_hs_evm_defconfig
>  F:	configs/am335x_hs_evm_uart_defconfig
>  F:	configs/am43xx_hs_evm_defconfig
> +F:	configs/am43xx_hs_evm_qspi_defconfig
>  F:	configs/am57xx_hs_evm_defconfig
>  F:	configs/am57xx_hs_evm_usb_defconfig
>  F:	configs/dra7xx_hs_evm_defconfig
> diff --git a/configs/am43xx_hs_evm_qspi_defconfig b/configs/am43xx_hs_evm_qspi_defconfig
> new file mode 100644
> index 0000000000..5960950142
> --- /dev/null
> +++ b/configs/am43xx_hs_evm_qspi_defconfig
> @@ -0,0 +1,65 @@
> +CONFIG_ARM=y
> +CONFIG_ARCH_CPU_INIT=y
> +# CONFIG_SYS_THUMB_BUILD is not set
> +CONFIG_ARCH_OMAP2PLUS=y
> +CONFIG_TI_SECURE_DEVICE=y
> +CONFIG_ISW_ENTRY_ADDR=0x300018e0
> +CONFIG_TI_COMMON_CMD_OPTIONS=y
> +CONFIG_SYS_MALLOC_F_LEN=0x2000
> +CONFIG_ENV_SIZE=0x10000
> +CONFIG_DM_GPIO=y
> +CONFIG_AM43XX=y
> +CONFIG_TI_SECURE_EMIF_REGION_START=0xbdb00000
> +CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000
> +CONFIG_TI_SECURE_EMIF_PROTECTED_REGION_SIZE=0x01c00000
> +CONFIG_DISTRO_DEFAULTS=y
> +CONFIG_FIT_IMAGE_POST_PROCESS=y
> +CONFIG_OF_BOARD_SETUP=y
> +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,SERIAL1,QSPI"
> +CONFIG_QSPI_BOOT=y
> +# CONFIG_USE_BOOTCOMMAND is not set
> +CONFIG_SYS_CONSOLE_INFO_QUIET=y
> +# CONFIG_MISC_INIT_R is not set
> +CONFIG_VERSION_VARIABLE=y
> +CONFIG_BOARD_EARLY_INIT_F=y
> +# CONFIG_CMD_FLASH is not set
> +CONFIG_CMD_NAND=y
> +# CONFIG_CMD_SETEXPR is not set
> +CONFIG_CMD_MTDPARTS=y
> +CONFIG_OF_CONTROL=y
> +CONFIG_DEFAULT_DEVICE_TREE="am43x-epos-evm"
> +CONFIG_ENV_IS_IN_SPI_FLASH=y
> +CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
> +CONFIG_DM=y
> +CONFIG_DFU_MMC=y
> +CONFIG_DFU_RAM=y
> +CONFIG_DFU_SF=y
> +CONFIG_DM_MMC=y
> +CONFIG_MMC_OMAP_HS=y
> +CONFIG_SPI_FLASH=y
> +CONFIG_MTD=y
> +CONFIG_MTD_RAW_NAND=y
> +CONFIG_SF_DEFAULT_SPEED=48000000
> +CONFIG_SPI_FLASH_MACRONIX=y
> +CONFIG_PHY_GIGE=y
> +CONFIG_MII=y
> +CONFIG_DRIVER_TI_CPSW=y
> +CONFIG_DM_SERIAL=y
> +CONFIG_SPI=y
> +CONFIG_TI_QSPI=y
> +CONFIG_TIMER=y
> +CONFIG_OMAP_TIMER=y
> +CONFIG_USB=y
> +CONFIG_DM_USB=y
> +CONFIG_USB_XHCI_HCD=y
> +CONFIG_USB_XHCI_DWC3=y
> +CONFIG_USB_DWC3=y
> +CONFIG_USB_DWC3_OMAP=y
> +CONFIG_USB_DWC3_PHY_OMAP=y
> +CONFIG_OMAP_USB_PHY=y
> +CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0403
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00
> +CONFIG_USB_GADGET_DOWNLOAD=y
>
Lokesh Vutla Jan. 17, 2020, 3:41 a.m. UTC | #2
On 08/01/20 4:24 AM, Andrew F. Davis wrote:
> On AM43xx HS devices, QSPI boot is XIP and we use a single stage
> bootloader. Add a defconfig for this.
> 
> Signed-off-by: Andrew F. Davis <afd at ti.com>

This gives the following build warning. Can you fix it and re post?

In file included from arch/arm/mach-omap2/am33xx/board.c:14:
include/ns16550.h:31: warning: "CONFIG_SYS_NS16550_REG_SIZE" redefined
 #define CONFIG_SYS_NS16550_REG_SIZE (-1)

In file included from include/config.h:8,
                 from include/common.h:22,
                 from arch/arm/mach-omap2/am33xx/board.c:10:
include/configs/am43xx_evm.h:19: note: this is the location of the previous
definition
 #define CONFIG_SYS_NS16550_REG_SIZE    (-4)

In file included from drivers/serial/ns16550.c:11:
include/ns16550.h:31: warning: "CONFIG_SYS_NS16550_REG_SIZE" redefined
 #define CONFIG_SYS_NS16550_REG_SIZE (-1)

In file included from include/config.h:8,
                 from include/common.h:22,
                 from drivers/serial/ns16550.c:7:
include/configs/am43xx_evm.h:19: note: this is the location of the previous
definition
 #define CONFIG_SYS_NS16550_REG_SIZE    (-4)

In file included from drivers/serial/serial_omap.c:12:
include/ns16550.h:31: warning: "CONFIG_SYS_NS16550_REG_SIZE" redefined
 #define CONFIG_SYS_NS16550_REG_SIZE (-1)

In file included from include/config.h:8,
                 from include/common.h:22,
                 from drivers/serial/serial_omap.c:9:
include/configs/am43xx_evm.h:19: note: this is the location of the previous
definition
 #define CONFIG_SYS_NS16550_REG_SIZE    (-4)

arch/arm/mach-omap2/config_secure.mk:97: recipe for target
'u-boot_HS_XIP_X-LOADER' failed
make: *** [u-boot_HS_XIP_X-LOADER] Error 1
make: *** Deleting file 'u-boot_HS_XIP_X-LOADER'



Thanks and regards,
Lokesh
diff mbox series

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index 438fb225ab..1a9226d9b5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -838,6 +838,7 @@  F:	arch/arm/mach-k3/config_secure.mk
 F:	configs/am335x_hs_evm_defconfig
 F:	configs/am335x_hs_evm_uart_defconfig
 F:	configs/am43xx_hs_evm_defconfig
+F:	configs/am43xx_hs_evm_qspi_defconfig
 F:	configs/am57xx_hs_evm_defconfig
 F:	configs/am57xx_hs_evm_usb_defconfig
 F:	configs/dra7xx_hs_evm_defconfig
diff --git a/configs/am43xx_hs_evm_qspi_defconfig b/configs/am43xx_hs_evm_qspi_defconfig
new file mode 100644
index 0000000000..5960950142
--- /dev/null
+++ b/configs/am43xx_hs_evm_qspi_defconfig
@@ -0,0 +1,65 @@ 
+CONFIG_ARM=y
+CONFIG_ARCH_CPU_INIT=y
+# CONFIG_SYS_THUMB_BUILD is not set
+CONFIG_ARCH_OMAP2PLUS=y
+CONFIG_TI_SECURE_DEVICE=y
+CONFIG_ISW_ENTRY_ADDR=0x300018e0
+CONFIG_TI_COMMON_CMD_OPTIONS=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x10000
+CONFIG_DM_GPIO=y
+CONFIG_AM43XX=y
+CONFIG_TI_SECURE_EMIF_REGION_START=0xbdb00000
+CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000
+CONFIG_TI_SECURE_EMIF_PROTECTED_REGION_SIZE=0x01c00000
+CONFIG_DISTRO_DEFAULTS=y
+CONFIG_FIT_IMAGE_POST_PROCESS=y
+CONFIG_OF_BOARD_SETUP=y
+CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,SERIAL1,QSPI"
+CONFIG_QSPI_BOOT=y
+# CONFIG_USE_BOOTCOMMAND is not set
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
+# CONFIG_MISC_INIT_R is not set
+CONFIG_VERSION_VARIABLE=y
+CONFIG_BOARD_EARLY_INIT_F=y
+# CONFIG_CMD_FLASH is not set
+CONFIG_CMD_NAND=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_MTDPARTS=y
+CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="am43x-epos-evm"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_DM=y
+CONFIG_DFU_MMC=y
+CONFIG_DFU_RAM=y
+CONFIG_DFU_SF=y
+CONFIG_DM_MMC=y
+CONFIG_MMC_OMAP_HS=y
+CONFIG_SPI_FLASH=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
+CONFIG_SF_DEFAULT_SPEED=48000000
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_PHY_GIGE=y
+CONFIG_MII=y
+CONFIG_DRIVER_TI_CPSW=y
+CONFIG_DM_SERIAL=y
+CONFIG_SPI=y
+CONFIG_TI_QSPI=y
+CONFIG_TIMER=y
+CONFIG_OMAP_TIMER=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_OMAP=y
+CONFIG_USB_DWC3_PHY_OMAP=y
+CONFIG_OMAP_USB_PHY=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0403
+CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00
+CONFIG_USB_GADGET_DOWNLOAD=y