379 lines
9.8 KiB
Diff
379 lines
9.8 KiB
Diff
From b8317d14837ab109d5063c84a8cde6c6de474970 Mon Sep 17 00:00:00 2001
|
|
From: christophe montaud <christophe.montaud@st.com>
|
|
Date: Fri, 4 Jan 2019 15:08:43 +0100
|
|
Subject: [PATCH 4/5] ARM v2018.11 stm32mp r1 CONFIG
|
|
|
|
---
|
|
configs/sandbox_defconfig | 2 +
|
|
configs/stm32mp15_basic_defconfig | 71 ++++++++++++++++++++----
|
|
configs/stm32mp15_optee_defconfig | 105 ++++++++++++++++++++++++++++++++++++
|
|
configs/stm32mp15_trusted_defconfig | 104 +++++++++++++++++++++++++++++++++++
|
|
4 files changed, 273 insertions(+), 9 deletions(-)
|
|
create mode 100644 configs/stm32mp15_optee_defconfig
|
|
create mode 100644 configs/stm32mp15_trusted_defconfig
|
|
|
|
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
|
|
index 5a744f4..587e2aa 100644
|
|
--- a/configs/sandbox_defconfig
|
|
+++ b/configs/sandbox_defconfig
|
|
@@ -215,3 +215,5 @@ CONFIG_UT_TIME=y
|
|
CONFIG_UT_DM=y
|
|
CONFIG_UT_ENV=y
|
|
CONFIG_UT_OVERLAY=y
|
|
+CONFIG_DM_HWSPINLOCK=y
|
|
+CONFIG_HWSPINLOCK_SANDBOX=y
|
|
diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig
|
|
index 3bf7538..ad3424e 100644
|
|
--- a/configs/stm32mp15_basic_defconfig
|
|
+++ b/configs/stm32mp15_basic_defconfig
|
|
@@ -1,14 +1,18 @@
|
|
CONFIG_ARM=y
|
|
CONFIG_ARCH_STM32MP=y
|
|
-CONFIG_SYS_MALLOC_F_LEN=0x2000
|
|
+CONFIG_SYS_MALLOC_F_LEN=0x3000
|
|
CONFIG_SPL_MMC_SUPPORT=y
|
|
CONFIG_SPL=y
|
|
CONFIG_TARGET_STM32MP1=y
|
|
+CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
|
+CONFIG_SPL_SPI_SUPPORT=y
|
|
+# CONFIG_ARMV7_VIRT is not set
|
|
CONFIG_DISTRO_DEFAULTS=y
|
|
-CONFIG_NR_DRAM_BANKS=1
|
|
+CONFIG_FIT=y
|
|
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y
|
|
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=3
|
|
CONFIG_SPL_I2C_SUPPORT=y
|
|
+CONFIG_SPL_MTD_SUPPORT=y
|
|
CONFIG_SPL_POWER_SUPPORT=y
|
|
CONFIG_SYS_PROMPT="STM32MP> "
|
|
# CONFIG_CMD_BOOTD is not set
|
|
@@ -18,48 +22,97 @@ CONFIG_SYS_PROMPT="STM32MP> "
|
|
# CONFIG_CMD_EXPORTENV is not set
|
|
# CONFIG_CMD_IMPORTENV is not set
|
|
CONFIG_CMD_MEMINFO=y
|
|
+CONFIG_CMD_MEMTEST=y
|
|
CONFIG_CMD_ADC=y
|
|
+CONFIG_CMD_CLK=y
|
|
+CONFIG_CMD_DFU=y
|
|
CONFIG_CMD_FUSE=y
|
|
CONFIG_CMD_GPIO=y
|
|
-CONFIG_CMD_GPT=y
|
|
CONFIG_CMD_I2C=y
|
|
CONFIG_CMD_MMC=y
|
|
+CONFIG_CMD_REMOTEPROC=y
|
|
+CONFIG_CMD_SF=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_USB_MASS_STORAGE=y
|
|
+CONFIG_CMD_BMP=y
|
|
+CONFIG_CMD_CACHE=y
|
|
+CONFIG_CMD_TIME=y
|
|
+CONFIG_CMD_TIMER=y
|
|
CONFIG_CMD_PMIC=y
|
|
CONFIG_CMD_REGULATOR=y
|
|
CONFIG_CMD_EXT4_WRITE=y
|
|
+CONFIG_CMD_MTDPARTS=y
|
|
+CONFIG_CMD_UBI=y
|
|
# CONFIG_SPL_DOS_PARTITION is not set
|
|
CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1"
|
|
CONFIG_STM32_ADC=y
|
|
+CONFIG_USB_FUNCTION_FASTBOOT=y
|
|
+CONFIG_FASTBOOT_BUF_ADDR=0xC0000000
|
|
+CONFIG_FASTBOOT_BUF_SIZE=0x02000000
|
|
+CONFIG_FASTBOOT_USB_DEV=1
|
|
+CONFIG_FASTBOOT_FLASH=y
|
|
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1
|
|
+CONFIG_DM_HWSPINLOCK=y
|
|
+CONFIG_HWSPINLOCK_STM32=y
|
|
CONFIG_DM_I2C=y
|
|
CONFIG_SYS_I2C_STM32F7=y
|
|
CONFIG_LED=y
|
|
CONFIG_LED_GPIO=y
|
|
+CONFIG_DM_MAILBOX=y
|
|
+CONFIG_STM32_IPCC=y
|
|
CONFIG_DM_MMC=y
|
|
CONFIG_STM32_SDMMC2=y
|
|
+CONFIG_MTD=y
|
|
+CONFIG_NAND=y
|
|
+CONFIG_NAND_STM32_FMC2=y
|
|
+CONFIG_DM_SPI_FLASH=y
|
|
+CONFIG_SPI_FLASH=y
|
|
+CONFIG_SPI_FLASH_BAR=y
|
|
+CONFIG_SPI_FLASH_MACRONIX=y
|
|
+CONFIG_SPI_FLASH_SPANSION=y
|
|
+CONFIG_SPI_FLASH_STMICRO=y
|
|
+CONFIG_SPI_FLASH_WINBOND=y
|
|
+# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
|
|
+CONFIG_SPI_FLASH_MTD=y
|
|
+CONFIG_PHY_FIXED=y
|
|
+CONFIG_DM_ETH=y
|
|
+CONFIG_DWC_ETH_QOS=y
|
|
CONFIG_PHY=y
|
|
CONFIG_PHY_STM32_USBPHYC=y
|
|
-# CONFIG_PINCTRL_FULL is not set
|
|
+CONFIG_PINCONF=y
|
|
# CONFIG_SPL_PINCTRL_FULL is not set
|
|
+CONFIG_PINCTRL_STMFX=y
|
|
CONFIG_DM_PMIC=y
|
|
# CONFIG_SPL_PMIC_CHILDREN is not set
|
|
-CONFIG_PMIC_STPMU1=y
|
|
+CONFIG_PMIC_STPMIC1=y
|
|
CONFIG_DM_REGULATOR_FIXED=y
|
|
CONFIG_DM_REGULATOR_GPIO=y
|
|
CONFIG_DM_REGULATOR_STM32_VREFBUF=y
|
|
-CONFIG_DM_REGULATOR_STPMU1=y
|
|
+CONFIG_DM_REGULATOR_STPMIC1=y
|
|
+CONFIG_STM32MP1_DDR_INTERACTIVE=y
|
|
+CONFIG_REMOTEPROC_STM32_COPRO=y
|
|
CONFIG_SERIAL_RX_BUFFER=y
|
|
-CONFIG_STM32_SERIAL=y
|
|
+CONFIG_SPI=y
|
|
+CONFIG_DM_SPI=y
|
|
+CONFIG_STM32_QSPI=y
|
|
CONFIG_USB=y
|
|
CONFIG_DM_USB=y
|
|
CONFIG_USB_EHCI_HCD=y
|
|
CONFIG_USB_EHCI_GENERIC=y
|
|
-CONFIG_USB_DWC2=y
|
|
CONFIG_USB_STORAGE=y
|
|
CONFIG_USB_GADGET=y
|
|
CONFIG_USB_GADGET_MANUFACTURER="STMicroelectronics"
|
|
CONFIG_USB_GADGET_VENDOR_NUM=0x0483
|
|
CONFIG_USB_GADGET_PRODUCT_NUM=0x5720
|
|
CONFIG_USB_GADGET_DWC2_OTG=y
|
|
-CONFIG_USB_GADGET_DOWNLOAD=y
|
|
+CONFIG_DM_VIDEO=y
|
|
+CONFIG_BACKLIGHT_GPIO=y
|
|
+CONFIG_VIDEO_LCD_ORISETECH_OTM8009A=y
|
|
+CONFIG_VIDEO_LCD_RAYDIUM_RM68200=y
|
|
+CONFIG_VIDEO_STM32=y
|
|
+CONFIG_VIDEO_STM32_DSI=y
|
|
+CONFIG_VIDEO_STM32_MAX_XRES=1280
|
|
+CONFIG_VIDEO_STM32_MAX_YRES=800
|
|
+CONFIG_STM32MP_WATCHDOG=y
|
|
+CONFIG_FDT_FIXUP_PARTITIONS=y
|
|
+# CONFIG_EFI_LOADER is not set
|
|
diff --git a/configs/stm32mp15_optee_defconfig b/configs/stm32mp15_optee_defconfig
|
|
new file mode 100644
|
|
index 0000000..a24727c
|
|
--- /dev/null
|
|
+++ b/configs/stm32mp15_optee_defconfig
|
|
@@ -0,0 +1,105 @@
|
|
+CONFIG_ARM=y
|
|
+CONFIG_ARCH_STM32MP=y
|
|
+CONFIG_SYS_MALLOC_F_LEN=0x3000
|
|
+CONFIG_TARGET_STM32MP1=y
|
|
+CONFIG_STM32MP1_OPTEE=y
|
|
+CONFIG_DISTRO_DEFAULTS=y
|
|
+CONFIG_FIT=y
|
|
+CONFIG_SYS_PROMPT="STM32MP> "
|
|
+# CONFIG_CMD_BOOTD is not set
|
|
+# CONFIG_CMD_ELF is not set
|
|
+# CONFIG_CMD_IMI is not set
|
|
+# CONFIG_CMD_XIMG is not set
|
|
+# CONFIG_CMD_EXPORTENV is not set
|
|
+# CONFIG_CMD_IMPORTENV is not set
|
|
+CONFIG_CMD_MEMINFO=y
|
|
+CONFIG_CMD_MEMTEST=y
|
|
+CONFIG_CMD_ADC=y
|
|
+CONFIG_CMD_CLK=y
|
|
+CONFIG_CMD_DFU=y
|
|
+CONFIG_CMD_FUSE=y
|
|
+CONFIG_CMD_GPIO=y
|
|
+CONFIG_CMD_I2C=y
|
|
+CONFIG_CMD_MMC=y
|
|
+CONFIG_CMD_REMOTEPROC=y
|
|
+CONFIG_CMD_SF=y
|
|
+CONFIG_CMD_USB=y
|
|
+CONFIG_CMD_USB_MASS_STORAGE=y
|
|
+CONFIG_CMD_BMP=y
|
|
+CONFIG_CMD_CACHE=y
|
|
+CONFIG_CMD_TIME=y
|
|
+CONFIG_CMD_TIMER=y
|
|
+CONFIG_CMD_PMIC=y
|
|
+CONFIG_CMD_REGULATOR=y
|
|
+CONFIG_CMD_EXT4_WRITE=y
|
|
+CONFIG_CMD_MTDPARTS=y
|
|
+CONFIG_CMD_UBI=y
|
|
+CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1"
|
|
+CONFIG_STM32_ADC=y
|
|
+CONFIG_USB_FUNCTION_FASTBOOT=y
|
|
+CONFIG_FASTBOOT_BUF_ADDR=0xC0000000
|
|
+CONFIG_FASTBOOT_BUF_SIZE=0x02000000
|
|
+CONFIG_FASTBOOT_USB_DEV=1
|
|
+CONFIG_FASTBOOT_FLASH=y
|
|
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1
|
|
+CONFIG_DM_HWSPINLOCK=y
|
|
+CONFIG_HWSPINLOCK_STM32=y
|
|
+CONFIG_DM_I2C=y
|
|
+CONFIG_SYS_I2C_STM32F7=y
|
|
+CONFIG_LED=y
|
|
+CONFIG_LED_GPIO=y
|
|
+CONFIG_DM_MAILBOX=y
|
|
+CONFIG_STM32_IPCC=y
|
|
+CONFIG_DM_MMC=y
|
|
+CONFIG_STM32_SDMMC2=y
|
|
+CONFIG_MTD=y
|
|
+CONFIG_NAND=y
|
|
+CONFIG_NAND_STM32_FMC2=y
|
|
+CONFIG_DM_SPI_FLASH=y
|
|
+CONFIG_SPI_FLASH=y
|
|
+CONFIG_SPI_FLASH_BAR=y
|
|
+CONFIG_SPI_FLASH_MACRONIX=y
|
|
+CONFIG_SPI_FLASH_SPANSION=y
|
|
+CONFIG_SPI_FLASH_STMICRO=y
|
|
+CONFIG_SPI_FLASH_WINBOND=y
|
|
+# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
|
|
+CONFIG_SPI_FLASH_MTD=y
|
|
+CONFIG_PHY_FIXED=y
|
|
+CONFIG_DM_ETH=y
|
|
+CONFIG_DWC_ETH_QOS=y
|
|
+CONFIG_PHY=y
|
|
+CONFIG_PHY_STM32_USBPHYC=y
|
|
+CONFIG_PINCONF=y
|
|
+CONFIG_PINCTRL_STMFX=y
|
|
+CONFIG_DM_PMIC=y
|
|
+CONFIG_PMIC_STPMIC1=y
|
|
+CONFIG_DM_REGULATOR_FIXED=y
|
|
+CONFIG_DM_REGULATOR_GPIO=y
|
|
+CONFIG_DM_REGULATOR_STM32_VREFBUF=y
|
|
+CONFIG_DM_REGULATOR_STPMIC1=y
|
|
+CONFIG_REMOTEPROC_STM32_COPRO=y
|
|
+CONFIG_SERIAL_RX_BUFFER=y
|
|
+CONFIG_SPI=y
|
|
+CONFIG_DM_SPI=y
|
|
+CONFIG_STM32_QSPI=y
|
|
+CONFIG_USB=y
|
|
+CONFIG_DM_USB=y
|
|
+CONFIG_USB_EHCI_HCD=y
|
|
+CONFIG_USB_EHCI_GENERIC=y
|
|
+CONFIG_USB_STORAGE=y
|
|
+CONFIG_USB_GADGET=y
|
|
+CONFIG_USB_GADGET_MANUFACTURER="STMicroelectronics"
|
|
+CONFIG_USB_GADGET_VENDOR_NUM=0x0483
|
|
+CONFIG_USB_GADGET_PRODUCT_NUM=0x5720
|
|
+CONFIG_USB_GADGET_DWC2_OTG=y
|
|
+CONFIG_DM_VIDEO=y
|
|
+CONFIG_BACKLIGHT_GPIO=y
|
|
+CONFIG_VIDEO_LCD_ORISETECH_OTM8009A=y
|
|
+CONFIG_VIDEO_LCD_RAYDIUM_RM68200=y
|
|
+CONFIG_VIDEO_STM32=y
|
|
+CONFIG_VIDEO_STM32_DSI=y
|
|
+CONFIG_VIDEO_STM32_MAX_XRES=1280
|
|
+CONFIG_VIDEO_STM32_MAX_YRES=800
|
|
+CONFIG_STM32MP_WATCHDOG=y
|
|
+CONFIG_FDT_FIXUP_PARTITIONS=y
|
|
+# CONFIG_EFI_LOADER is not set
|
|
diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig
|
|
new file mode 100644
|
|
index 0000000..e41506b
|
|
--- /dev/null
|
|
+++ b/configs/stm32mp15_trusted_defconfig
|
|
@@ -0,0 +1,104 @@
|
|
+CONFIG_ARM=y
|
|
+CONFIG_ARCH_STM32MP=y
|
|
+CONFIG_SYS_MALLOC_F_LEN=0x3000
|
|
+CONFIG_TARGET_STM32MP1=y
|
|
+CONFIG_DISTRO_DEFAULTS=y
|
|
+CONFIG_FIT=y
|
|
+CONFIG_SYS_PROMPT="STM32MP> "
|
|
+# CONFIG_CMD_BOOTD is not set
|
|
+# CONFIG_CMD_ELF is not set
|
|
+# CONFIG_CMD_IMI is not set
|
|
+# CONFIG_CMD_XIMG is not set
|
|
+# CONFIG_CMD_EXPORTENV is not set
|
|
+# CONFIG_CMD_IMPORTENV is not set
|
|
+CONFIG_CMD_MEMINFO=y
|
|
+CONFIG_CMD_MEMTEST=y
|
|
+CONFIG_CMD_ADC=y
|
|
+CONFIG_CMD_CLK=y
|
|
+CONFIG_CMD_DFU=y
|
|
+CONFIG_CMD_FUSE=y
|
|
+CONFIG_CMD_GPIO=y
|
|
+CONFIG_CMD_I2C=y
|
|
+CONFIG_CMD_MMC=y
|
|
+CONFIG_CMD_REMOTEPROC=y
|
|
+CONFIG_CMD_SF=y
|
|
+CONFIG_CMD_USB=y
|
|
+CONFIG_CMD_USB_MASS_STORAGE=y
|
|
+CONFIG_CMD_BMP=y
|
|
+CONFIG_CMD_CACHE=y
|
|
+CONFIG_CMD_TIME=y
|
|
+CONFIG_CMD_TIMER=y
|
|
+CONFIG_CMD_PMIC=y
|
|
+CONFIG_CMD_REGULATOR=y
|
|
+CONFIG_CMD_EXT4_WRITE=y
|
|
+CONFIG_CMD_MTDPARTS=y
|
|
+CONFIG_CMD_UBI=y
|
|
+CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1"
|
|
+CONFIG_STM32_ADC=y
|
|
+CONFIG_USB_FUNCTION_FASTBOOT=y
|
|
+CONFIG_FASTBOOT_BUF_ADDR=0xC0000000
|
|
+CONFIG_FASTBOOT_BUF_SIZE=0x02000000
|
|
+CONFIG_FASTBOOT_USB_DEV=1
|
|
+CONFIG_FASTBOOT_FLASH=y
|
|
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1
|
|
+CONFIG_DM_HWSPINLOCK=y
|
|
+CONFIG_HWSPINLOCK_STM32=y
|
|
+CONFIG_DM_I2C=y
|
|
+CONFIG_SYS_I2C_STM32F7=y
|
|
+CONFIG_LED=y
|
|
+CONFIG_LED_GPIO=y
|
|
+CONFIG_DM_MAILBOX=y
|
|
+CONFIG_STM32_IPCC=y
|
|
+CONFIG_DM_MMC=y
|
|
+CONFIG_STM32_SDMMC2=y
|
|
+CONFIG_MTD=y
|
|
+CONFIG_NAND=y
|
|
+CONFIG_NAND_STM32_FMC2=y
|
|
+CONFIG_DM_SPI_FLASH=y
|
|
+CONFIG_SPI_FLASH=y
|
|
+CONFIG_SPI_FLASH_BAR=y
|
|
+CONFIG_SPI_FLASH_MACRONIX=y
|
|
+CONFIG_SPI_FLASH_SPANSION=y
|
|
+CONFIG_SPI_FLASH_STMICRO=y
|
|
+CONFIG_SPI_FLASH_WINBOND=y
|
|
+# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
|
|
+CONFIG_SPI_FLASH_MTD=y
|
|
+CONFIG_PHY_FIXED=y
|
|
+CONFIG_DM_ETH=y
|
|
+CONFIG_DWC_ETH_QOS=y
|
|
+CONFIG_PHY=y
|
|
+CONFIG_PHY_STM32_USBPHYC=y
|
|
+CONFIG_PINCONF=y
|
|
+CONFIG_PINCTRL_STMFX=y
|
|
+CONFIG_DM_PMIC=y
|
|
+CONFIG_PMIC_STPMIC1=y
|
|
+CONFIG_DM_REGULATOR_FIXED=y
|
|
+CONFIG_DM_REGULATOR_GPIO=y
|
|
+CONFIG_DM_REGULATOR_STM32_VREFBUF=y
|
|
+CONFIG_DM_REGULATOR_STPMIC1=y
|
|
+CONFIG_REMOTEPROC_STM32_COPRO=y
|
|
+CONFIG_SERIAL_RX_BUFFER=y
|
|
+CONFIG_SPI=y
|
|
+CONFIG_DM_SPI=y
|
|
+CONFIG_STM32_QSPI=y
|
|
+CONFIG_USB=y
|
|
+CONFIG_DM_USB=y
|
|
+CONFIG_USB_EHCI_HCD=y
|
|
+CONFIG_USB_EHCI_GENERIC=y
|
|
+CONFIG_USB_STORAGE=y
|
|
+CONFIG_USB_GADGET=y
|
|
+CONFIG_USB_GADGET_MANUFACTURER="STMicroelectronics"
|
|
+CONFIG_USB_GADGET_VENDOR_NUM=0x0483
|
|
+CONFIG_USB_GADGET_PRODUCT_NUM=0x5720
|
|
+CONFIG_USB_GADGET_DWC2_OTG=y
|
|
+CONFIG_DM_VIDEO=y
|
|
+CONFIG_BACKLIGHT_GPIO=y
|
|
+CONFIG_VIDEO_LCD_ORISETECH_OTM8009A=y
|
|
+CONFIG_VIDEO_LCD_RAYDIUM_RM68200=y
|
|
+CONFIG_VIDEO_STM32=y
|
|
+CONFIG_VIDEO_STM32_DSI=y
|
|
+CONFIG_VIDEO_STM32_MAX_XRES=1280
|
|
+CONFIG_VIDEO_STM32_MAX_YRES=800
|
|
+CONFIG_STM32MP_WATCHDOG=y
|
|
+CONFIG_FDT_FIXUP_PARTITIONS=y
|
|
+# CONFIG_EFI_LOADER is not set
|
|
--
|
|
2.7.4
|
|
|