219 lines
6.5 KiB
Diff
219 lines
6.5 KiB
Diff
From 4407a960368fbc08654cc08ea18856565ec562fb Mon Sep 17 00:00:00 2001
|
|
From: Romuald JEANNE <romuald.jeanne@st.com>
|
|
Date: Tue, 17 Sep 2019 13:55:59 +0200
|
|
Subject: [PATCH 12/13] ARM v2018.11 stm32mp r3 CONFIG
|
|
|
|
---
|
|
configs/stm32mp15_basic_defconfig | 17 ++++++++++++++---
|
|
configs/stm32mp15_optee_defconfig | 16 +++++++++++++---
|
|
configs/stm32mp15_trusted_defconfig | 16 +++++++++++++---
|
|
3 files changed, 40 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig
|
|
index ad3424e..3eff6b5 100644
|
|
--- a/configs/stm32mp15_basic_defconfig
|
|
+++ b/configs/stm32mp15_basic_defconfig
|
|
@@ -9,6 +9,7 @@ CONFIG_SPL_SPI_SUPPORT=y
|
|
# CONFIG_ARMV7_VIRT is not set
|
|
CONFIG_DISTRO_DEFAULTS=y
|
|
CONFIG_FIT=y
|
|
+CONFIG_BOOTCOMMAND="run bootcmd_stm32mp"
|
|
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y
|
|
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=3
|
|
CONFIG_SPL_I2C_SUPPORT=y
|
|
@@ -16,6 +17,7 @@ CONFIG_SPL_MTD_SUPPORT=y
|
|
CONFIG_SPL_POWER_SUPPORT=y
|
|
CONFIG_SYS_PROMPT="STM32MP> "
|
|
# CONFIG_CMD_BOOTD is not set
|
|
+CONFIG_CMD_DTIMG=y
|
|
# CONFIG_CMD_ELF is not set
|
|
# CONFIG_CMD_IMI is not set
|
|
# CONFIG_CMD_XIMG is not set
|
|
@@ -32,6 +34,7 @@ CONFIG_CMD_I2C=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_REMOTEPROC=y
|
|
CONFIG_CMD_SF=y
|
|
+CONFIG_CMD_SPI=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_USB_MASS_STORAGE=y
|
|
CONFIG_CMD_BMP=y
|
|
@@ -45,6 +48,14 @@ CONFIG_CMD_MTDPARTS=y
|
|
CONFIG_CMD_UBI=y
|
|
# CONFIG_SPL_DOS_PARTITION is not set
|
|
CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1"
|
|
+CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-names interrupts-extended interrupt-controller \\\#interrupt-cells interrupt-parent dmas dma-names assigned-clocks assigned-clock-rates assigned-clock-parents hwlocks"
|
|
+CONFIG_ENV_IS_NOWHERE=y
|
|
+CONFIG_ENV_IS_IN_EXT4=y
|
|
+CONFIG_ENV_IS_IN_SPI_FLASH=y
|
|
+CONFIG_ENV_IS_IN_UBI=y
|
|
+CONFIG_ENV_EXT4_INTERFACE="mmc"
|
|
+CONFIG_ENV_EXT4_DEVICE_AND_PART="0:auto"
|
|
+CONFIG_ENV_EXT4_FILE="/uboot.env"
|
|
CONFIG_STM32_ADC=y
|
|
CONFIG_USB_FUNCTION_FASTBOOT=y
|
|
CONFIG_FASTBOOT_BUF_ADDR=0xC0000000
|
|
@@ -74,7 +85,6 @@ 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
|
|
@@ -91,10 +101,13 @@ CONFIG_DM_REGULATOR_STM32_VREFBUF=y
|
|
CONFIG_DM_REGULATOR_STPMIC1=y
|
|
CONFIG_STM32MP1_DDR_INTERACTIVE=y
|
|
CONFIG_REMOTEPROC_STM32_COPRO=y
|
|
+CONFIG_DM_RTC=y
|
|
+CONFIG_RTC_STM32=y
|
|
CONFIG_SERIAL_RX_BUFFER=y
|
|
CONFIG_SPI=y
|
|
CONFIG_DM_SPI=y
|
|
CONFIG_STM32_QSPI=y
|
|
+CONFIG_STM32_SPI=y
|
|
CONFIG_USB=y
|
|
CONFIG_DM_USB=y
|
|
CONFIG_USB_EHCI_HCD=y
|
|
@@ -113,6 +126,4 @@ 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
|
|
index a24727c..9ef8f62 100644
|
|
--- a/configs/stm32mp15_optee_defconfig
|
|
+++ b/configs/stm32mp15_optee_defconfig
|
|
@@ -5,8 +5,10 @@ CONFIG_TARGET_STM32MP1=y
|
|
CONFIG_STM32MP1_OPTEE=y
|
|
CONFIG_DISTRO_DEFAULTS=y
|
|
CONFIG_FIT=y
|
|
+CONFIG_BOOTCOMMAND="run bootcmd_stm32mp"
|
|
CONFIG_SYS_PROMPT="STM32MP> "
|
|
# CONFIG_CMD_BOOTD is not set
|
|
+CONFIG_CMD_DTIMG=y
|
|
# CONFIG_CMD_ELF is not set
|
|
# CONFIG_CMD_IMI is not set
|
|
# CONFIG_CMD_XIMG is not set
|
|
@@ -23,6 +25,7 @@ CONFIG_CMD_I2C=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_REMOTEPROC=y
|
|
CONFIG_CMD_SF=y
|
|
+CONFIG_CMD_SPI=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_USB_MASS_STORAGE=y
|
|
CONFIG_CMD_BMP=y
|
|
@@ -35,6 +38,13 @@ CONFIG_CMD_EXT4_WRITE=y
|
|
CONFIG_CMD_MTDPARTS=y
|
|
CONFIG_CMD_UBI=y
|
|
CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1"
|
|
+CONFIG_ENV_IS_NOWHERE=y
|
|
+CONFIG_ENV_IS_IN_EXT4=y
|
|
+CONFIG_ENV_IS_IN_SPI_FLASH=y
|
|
+CONFIG_ENV_IS_IN_UBI=y
|
|
+CONFIG_ENV_EXT4_INTERFACE="mmc"
|
|
+CONFIG_ENV_EXT4_DEVICE_AND_PART="0:auto"
|
|
+CONFIG_ENV_EXT4_FILE="/uboot.env"
|
|
CONFIG_STM32_ADC=y
|
|
CONFIG_USB_FUNCTION_FASTBOOT=y
|
|
CONFIG_FASTBOOT_BUF_ADDR=0xC0000000
|
|
@@ -64,7 +74,6 @@ 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
|
|
@@ -78,10 +87,13 @@ CONFIG_DM_REGULATOR_GPIO=y
|
|
CONFIG_DM_REGULATOR_STM32_VREFBUF=y
|
|
CONFIG_DM_REGULATOR_STPMIC1=y
|
|
CONFIG_REMOTEPROC_STM32_COPRO=y
|
|
+CONFIG_DM_RTC=y
|
|
+CONFIG_RTC_STM32=y
|
|
CONFIG_SERIAL_RX_BUFFER=y
|
|
CONFIG_SPI=y
|
|
CONFIG_DM_SPI=y
|
|
CONFIG_STM32_QSPI=y
|
|
+CONFIG_STM32_SPI=y
|
|
CONFIG_USB=y
|
|
CONFIG_DM_USB=y
|
|
CONFIG_USB_EHCI_HCD=y
|
|
@@ -100,6 +112,4 @@ 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
|
|
index e41506b..7635d7f 100644
|
|
--- a/configs/stm32mp15_trusted_defconfig
|
|
+++ b/configs/stm32mp15_trusted_defconfig
|
|
@@ -4,8 +4,10 @@ CONFIG_SYS_MALLOC_F_LEN=0x3000
|
|
CONFIG_TARGET_STM32MP1=y
|
|
CONFIG_DISTRO_DEFAULTS=y
|
|
CONFIG_FIT=y
|
|
+CONFIG_BOOTCOMMAND="run bootcmd_stm32mp"
|
|
CONFIG_SYS_PROMPT="STM32MP> "
|
|
# CONFIG_CMD_BOOTD is not set
|
|
+CONFIG_CMD_DTIMG=y
|
|
# CONFIG_CMD_ELF is not set
|
|
# CONFIG_CMD_IMI is not set
|
|
# CONFIG_CMD_XIMG is not set
|
|
@@ -22,6 +24,7 @@ CONFIG_CMD_I2C=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_REMOTEPROC=y
|
|
CONFIG_CMD_SF=y
|
|
+CONFIG_CMD_SPI=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_USB_MASS_STORAGE=y
|
|
CONFIG_CMD_BMP=y
|
|
@@ -34,6 +37,13 @@ CONFIG_CMD_EXT4_WRITE=y
|
|
CONFIG_CMD_MTDPARTS=y
|
|
CONFIG_CMD_UBI=y
|
|
CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1"
|
|
+CONFIG_ENV_IS_NOWHERE=y
|
|
+CONFIG_ENV_IS_IN_EXT4=y
|
|
+CONFIG_ENV_IS_IN_SPI_FLASH=y
|
|
+CONFIG_ENV_IS_IN_UBI=y
|
|
+CONFIG_ENV_EXT4_INTERFACE="mmc"
|
|
+CONFIG_ENV_EXT4_DEVICE_AND_PART="0:auto"
|
|
+CONFIG_ENV_EXT4_FILE="/uboot.env"
|
|
CONFIG_STM32_ADC=y
|
|
CONFIG_USB_FUNCTION_FASTBOOT=y
|
|
CONFIG_FASTBOOT_BUF_ADDR=0xC0000000
|
|
@@ -63,7 +73,6 @@ 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
|
|
@@ -77,10 +86,13 @@ CONFIG_DM_REGULATOR_GPIO=y
|
|
CONFIG_DM_REGULATOR_STM32_VREFBUF=y
|
|
CONFIG_DM_REGULATOR_STPMIC1=y
|
|
CONFIG_REMOTEPROC_STM32_COPRO=y
|
|
+CONFIG_DM_RTC=y
|
|
+CONFIG_RTC_STM32=y
|
|
CONFIG_SERIAL_RX_BUFFER=y
|
|
CONFIG_SPI=y
|
|
CONFIG_DM_SPI=y
|
|
CONFIG_STM32_QSPI=y
|
|
+CONFIG_STM32_SPI=y
|
|
CONFIG_USB=y
|
|
CONFIG_DM_USB=y
|
|
CONFIG_USB_EHCI_HCD=y
|
|
@@ -99,6 +111,4 @@ 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
|
|
|