Skip to content

Commit c15870f

Browse files
committed
st bsp update to stm32mp-r2
1 parent 56540b1 commit c15870f

File tree

9 files changed

+80
-57
lines changed

9 files changed

+80
-57
lines changed

recipes-bsp/trusted-firmware-a/tf-a-stm32mp-common.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
55

66
SRC_URI = "git://github.com/STMicroelectronics/arm-trusted-firmware;protocol=https;branch=${SRCBRANCH}"
77
SRCBRANCH = "v2.8-stm32mp"
8-
SRCREV = "61924c04caa485af6d4be4663b4977f6ac226ca0"
8+
SRCREV = "648de4789e0456eb9f874d6dd2151baaa85032d3"
99

1010
DEPENDS += "dtc-native openssl-native"
1111

recipes-bsp/u-boot/u-boot-stm32/0001-add-signature-nodes-to-dts-files.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 912ba711f3d740c0797edc1de9d1ee2d9b907f6e Mon Sep 17 00:00:00 2001
1+
From 1616438ea56412aa7948701ebd8516d1438b8d13 Mon Sep 17 00:00:00 2001
22
From: Ayoub Zaki <[email protected]>
33
Date: Wed, 27 Dec 2023 15:05:24 +0700
44
Subject: [PATCH 1/4] add signature nodes to dts files
@@ -10,7 +10,7 @@ Signed-off-by: Ayoub Zaki <[email protected]>
1010
2 files changed, 16 insertions(+)
1111

1212
diff --git a/arch/arm/dts/stm32mp157c-dk2.dts b/arch/arm/dts/stm32mp157c-dk2.dts
13-
index 41d01a769c2..21c450a7719 100644
13+
index 55126617bf..ae2bbeb130 100644
1414
--- a/arch/arm/dts/stm32mp157c-dk2.dts
1515
+++ b/arch/arm/dts/stm32mp157c-dk2.dts
1616
@@ -18,6 +18,14 @@
@@ -29,7 +29,7 @@ index 41d01a769c2..21c450a7719 100644
2929
ethernet0 = &ethernet0;
3030
serial3 = &usart2;
3131
diff --git a/arch/arm/dts/stm32mp157f-dk2.dts b/arch/arm/dts/stm32mp157f-dk2.dts
32-
index c07a360f687..552f4edb6ee 100644
32+
index f18aa8c35f..cd93eed192 100644
3333
--- a/arch/arm/dts/stm32mp157f-dk2.dts
3434
+++ b/arch/arm/dts/stm32mp157f-dk2.dts
3535
@@ -18,6 +18,14 @@
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From 0c4a60782d0863240e0ed579e107c5ffd1e5aac5 Mon Sep 17 00:00:00 2001
1+
From a92099b60b60d201f6a419de0a61968967718d1e Mon Sep 17 00:00:00 2001
22
From: Ayoub Zaki <[email protected]>
3-
Date: Wed, 27 Dec 2023 15:06:02 +0700
3+
Date: Wed, 31 Jul 2024 17:49:33 +0200
44
Subject: [PATCH 2/4] shift kernel load address
55

66
Signed-off-by: Ayoub Zaki <[email protected]>
@@ -9,18 +9,18 @@ Signed-off-by: Ayoub Zaki <[email protected]>
99
1 file changed, 1 insertion(+), 1 deletion(-)
1010

1111
diff --git a/include/configs/stm32mp15_common.h b/include/configs/stm32mp15_common.h
12-
index bd8e16bc1b9..ecd00327c29 100644
12+
index 50a989332d..55ad90c54d 100644
1313
--- a/include/configs/stm32mp15_common.h
1414
+++ b/include/configs/stm32mp15_common.h
15-
@@ -123,7 +123,7 @@
15+
@@ -114,7 +114,7 @@
1616
* 1M fdt, 1M script, 1M pxe and 1M for overlay
1717
* and the ramdisk at the end.
1818
*/
1919
-#define __KERNEL_ADDR_R __stringify(0xc2000000)
2020
+#define __KERNEL_ADDR_R __stringify(0xc8000000)
21-
#define __FDT_ADDR_R __stringify(0xc4000000)
22-
#define __SCRIPT_ADDR_R __stringify(0xc4100000)
23-
#define __PXEFILE_ADDR_R __stringify(0xc4200000)
21+
#define __FDT_ADDR_R __stringify(0xc6000000)
22+
#define __SCRIPT_ADDR_R __stringify(0xc6100000)
23+
#define __PXEFILE_ADDR_R __stringify(0xc6200000)
2424
--
2525
2.34.1
2626

recipes-bsp/u-boot/u-boot-stm32/0003-rework-CONFIG_EXTRA_ENV_SETTINGS.patch

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From 100981de9788ee6a854685ce39c6043963076d18 Mon Sep 17 00:00:00 2001
1+
From d63dbde80546af992b6dfde0eadc3f3cf7e80187 Mon Sep 17 00:00:00 2001
22
From: Ayoub Zaki <[email protected]>
3-
Date: Wed, 27 Dec 2023 15:07:18 +0700
3+
Date: Wed, 31 Jul 2024 17:50:34 +0200
44
Subject: [PATCH 3/4] rework CONFIG_EXTRA_ENV_SETTINGS
55

66
Signed-off-by: Ayoub Zaki <[email protected]>
@@ -9,10 +9,10 @@ Signed-off-by: Ayoub Zaki <[email protected]>
99
1 file changed, 29 insertions(+), 13 deletions(-)
1010

1111
diff --git a/include/configs/stm32mp15_st_common.h b/include/configs/stm32mp15_st_common.h
12-
index e9bfbc482ef..3218118d8df 100644
12+
index 7b0ed0a121..39c97b13e0 100644
1313
--- a/include/configs/stm32mp15_st_common.h
1414
+++ b/include/configs/stm32mp15_st_common.h
15-
@@ -28,21 +28,24 @@
15+
@@ -28,28 +28,44 @@
1616
* for nor boot, distro boot on SD card = mmc0 ONLY !
1717
*/
1818
#define ST_STM32MP1_BOOTCMD "bootcmd_stm32mp=" \
@@ -49,8 +49,7 @@ index e9bfbc482ef..3218118d8df 100644
4949
#undef CONFIG_EXTRA_ENV_SETTINGS
5050
#define CONFIG_EXTRA_ENV_SETTINGS \
5151
STM32MP_MEM_LAYOUT \
52-
@@ -50,7 +53,20 @@
53-
STM32MP_PARTS_DEFAULT \
52+
ST_STM32MP1_BOOTCMD \
5453
BOOTENV \
5554
STM32MP_EXTRA \
5655
- STM32MP_BOARD_EXTRA_ENV
Lines changed: 12 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,26 @@
1-
From 52a49165ed1c44a42fee1d9ba393044ada5e8e8b Mon Sep 17 00:00:00 2001
1+
From 93c29bdf97040789b477575dbbbfdeefd239d50a Mon Sep 17 00:00:00 2001
22
From: Ayoub Zaki <[email protected]>
3-
Date: Wed, 27 Dec 2023 15:07:36 +0700
4-
Subject: [PATCH 4/4] rework stm32mp15x defconfig
3+
Date: Wed, 31 Jul 2024 17:55:07 +0200
4+
Subject: [PATCH] rework stm32mp15x defconfig
55

66
Signed-off-by: Ayoub Zaki <[email protected]>
77
---
88
configs/stm32mp15_defconfig | 26 ++++++++++++++++----------
99
1 file changed, 16 insertions(+), 10 deletions(-)
1010

1111
diff --git a/configs/stm32mp15_defconfig b/configs/stm32mp15_defconfig
12-
index be25aaa7885..5908a573b2d 100644
12+
index 5f3fbac002..03c1e59040 100644
1313
--- a/configs/stm32mp15_defconfig
1414
+++ b/configs/stm32mp15_defconfig
15-
@@ -2,14 +2,15 @@ CONFIG_ARM=y
15+
@@ -2,14 +2,14 @@ CONFIG_ARM=y
1616
CONFIG_ARCH_STM32MP=y
1717
CONFIG_TFABOOT=y
1818
CONFIG_SYS_MALLOC_F_LEN=0x80000
1919
-CONFIG_ENV_OFFSET=0x900000
20-
CONFIG_ENV_SECT_SIZE=0x40000
2120
+CONFIG_ENV_OFFSET=0x280000
21+
CONFIG_ENV_SECT_SIZE=0x40000
2222
CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1"
2323
CONFIG_SYS_PROMPT="STM32MP> "
24-
+CONFIG_BOOTCOUNT_BOOTLIMIT=3
2524
CONFIG_DDR_CACHEABLE_SIZE=0x8000000
2625
CONFIG_CMD_STM32KEY=y
2726
CONFIG_TARGET_ST_STM32MP15X=y
@@ -30,15 +29,7 @@ index be25aaa7885..5908a573b2d 100644
3029
CONFIG_CMD_STM32PROG=y
3130
# CONFIG_ARMV7_NONSEC is not set
3231
CONFIG_SYS_LOAD_ADDR=0xc2000000
33-
@@ -43,6 +44,7 @@ CONFIG_CMD_USB=y
34-
CONFIG_CMD_USB_MASS_STORAGE=y
35-
CONFIG_SYS_DISABLE_AUTOLOAD=y
36-
CONFIG_CMD_BMP=y
37-
+CONFIG_CMD_BOOTCOUNT=y
38-
CONFIG_CMD_CACHE=y
39-
CONFIG_CMD_EFIDEBUG=y
40-
CONFIG_CMD_TIME=y
41-
@@ -54,19 +56,14 @@ CONFIG_CMD_EXT4_WRITE=y
32+
@@ -60,17 +60,10 @@ CONFIG_CMD_EXT4_WRITE=y
4233
CONFIG_CMD_LOG=y
4334
CONFIG_CMD_UBI=y
4435
CONFIG_OF_LIVE=y
@@ -54,25 +45,15 @@ index be25aaa7885..5908a573b2d 100644
5445
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
5546
-CONFIG_SYS_MMC_ENV_DEV=-1
5647
-CONFIG_ENV_MMC_USE_DT=y
57-
+# CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG is not set
5848
CONFIG_TFTP_TSIZE=y
5949
CONFIG_STM32_ADC=y
60-
+CONFIG_BOOTCOUNT_LIMIT=y
6150
CONFIG_CLK_SCMI=y
62-
CONFIG_SET_DFU_ALT_INFO=y
63-
CONFIG_USB_FUNCTION_FASTBOOT=y
64-
@@ -164,6 +161,7 @@ CONFIG_BMP_16BPP=y
65-
CONFIG_BMP_24BPP=y
66-
CONFIG_BMP_32BPP=y
67-
CONFIG_WDT=y
51+
@@ -187,3 +180,16 @@ CONFIG_FWU_MULTI_BANK_UPDATE=y
52+
CONFIG_FWU_MDATA_V2=y
53+
# CONFIG_TOOLS_MKEFICAPSULE is not set
54+
# CONFIG_TOOLS_MKFWUMDATA is not set
55+
+CONFIG_BOOTCOUNT_LIMIT=y
6856
+CONFIG_WDT_STM32MP=y
69-
CONFIG_WDT_ARM_SMC=y
70-
CONFIG_WDT_STM32MP=y
71-
# CONFIG_BINMAN_FDT is not set
72-
@@ -174,3 +169,11 @@ CONFIG_ERRNO_STR=y
73-
# CONFIG_LMB_USE_MAX_REGIONS is not set
74-
CONFIG_LMB_MEMORY_REGIONS=2
75-
CONFIG_LMB_RESERVED_REGIONS=16
7657
+CONFIG_VIDEO_LOGO=y
7758
+CONFIG_SPLASH_SCREEN=y
7859
+CONFIG_SPLASH_SCREEN_ALIGN=y
@@ -84,7 +65,5 @@ index be25aaa7885..5908a573b2d 100644
8465
+CONFIG_ENV_WRITEABLE_LIST=y
8566
+CONFIG_ENV_FLAGS_LIST_DEFAULT="active_system:dw"
8667
+CONFIG_ENV_FLAGS_LIST_STATIC="active_system:dw"
87-
8868
--
8969
2.34.1
90-

recipes-bsp/u-boot/u-boot-stm32_2022.10.bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ DEPENDS += "bc-native dtc-native u-boot-tools-native"
88
DEPENDS += "python3-setuptools-native"
99

1010
SRCBRANCH = "v2022.10-stm32mp"
11-
SRCREV = "2c7a6accfa78d34c402fa262bb53f0b952198882"
11+
SRCREV = "262bcb6906d46aa2265be284b0b625eb2e0b674e"
1212

1313
SRC_URI = "git://github.com/STMicroelectronics/u-boot.git;protocol=https;branch=${SRCBRANCH} \
1414
file://0001-add-signature-nodes-to-dts-files.patch \

recipes-kernel/linux/linux-stm32/defconfig

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,16 +211,60 @@ CONFIG_REGULATOR_STM32_PWR=y
211211
CONFIG_REGULATOR_STPMIC1=y
212212
CONFIG_REGULATOR_VCTRL=y
213213
CONFIG_DRM=y
214+
CONFIG_DRM_MIPI_DSI=y
215+
CONFIG_DRM_KMS_HELPER=y
216+
CONFIG_DRM_FBDEV_EMULATION=y
217+
CONFIG_DRM_DP_AUX_BUS=y
218+
CONFIG_DRM_DISPLAY_HELPER=y
219+
CONFIG_DRM_DISPLAY_DP_HELPER=y
220+
CONFIG_DRM_DISPLAY_HDMI_HELPER=y
221+
CONFIG_DRM_GEM_DMA_HELPER=y
222+
CONFIG_DRM_GEM_SHMEM_HELPER=y
223+
CONFIG_DRM_EXYNOS_FIMD=y
224+
CONFIG_DRM_EXYNOS_MIXER=y
225+
CONFIG_DRM_EXYNOS_DPI=y
226+
CONFIG_DRM_EXYNOS_DSI=y
227+
CONFIG_DRM_EXYNOS_DP=y
228+
CONFIG_DRM_EXYNOS_HDMI=y
229+
CONFIG_DRM_RCAR_USE_LVDS=y
230+
CONFIG_DRM_RCAR_USE_MIPI_DSI=y
214231
CONFIG_DRM_STM=y
215232
CONFIG_DRM_STM_DSI=y
233+
CONFIG_DRM_PANEL=y
234+
CONFIG_DRM_PANEL_SIMPLE=y
235+
CONFIG_DRM_PANEL_EDP=y
216236
CONFIG_DRM_PANEL_ORISETECH_OTM8009A=y
237+
CONFIG_DRM_BRIDGE=y
238+
CONFIG_DRM_PANEL_BRIDGE=y
239+
CONFIG_DRM_DISPLAY_CONNECTOR=y
217240
CONFIG_DRM_SII902X=y
241+
CONFIG_DRM_I2C_ADV7511=y
242+
CONFIG_DRM_I2C_ADV7511_AUDIO=y
243+
CONFIG_DRM_I2C_ADV7511_CEC=y
244+
CONFIG_DRM_DW_MIPI_DSI=y
245+
CONFIG_DRM_ETNAVIV_THERMAL=y
246+
CONFIG_DRM_SIMPLEDRM=y
247+
CONFIG_DRM_LEGACY=y
248+
CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
249+
CONFIG_DRM_NOMODESET=y
218250
CONFIG_FB=y
219-
CONFIG_FB_SIMPLE=y
251+
CONFIG_FB_CMDLINE=y
252+
CONFIG_FB_NOTIFY=y
253+
CONFIG_FB_CFB_FILLRECT=y
254+
CONFIG_FB_CFB_COPYAREA=y
255+
CONFIG_FB_CFB_IMAGEBLIT=y
256+
CONFIG_FB_SYS_FILLRECT=y
257+
CONFIG_FB_SYS_COPYAREA=y
258+
CONFIG_FB_SYS_IMAGEBLIT=y
259+
CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA=y
260+
CONFIG_FB_SYS_FOPS=y
261+
CONFIG_FB_DEFERRED_IO=y
262+
CONFIG_FB_MODE_HELPERS=y
220263
CONFIG_BACKLIGHT_CLASS_DEVICE=y
221264
CONFIG_BACKLIGHT_PWM=y
222265
CONFIG_BACKLIGHT_GPIO=y
223266
CONFIG_FRAMEBUFFER_CONSOLE=y
267+
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
224268
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
225269
CONFIG_LOGO=y
226270
CONFIG_USB_CONN_GPIO=y
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
require linux-stm32.inc
22

3-
LINUX_VERSION = "6.1.28"
3+
LINUX_VERSION = "6.1.82"
44
SRCBRANCH = "v6.1-stm32mp"
5-
SRCREV = "7928f69738d2e57ee2a0dba6e9e680a3bf75ded9"
5+
SRCREV = "4c4175804a542f40c50d091cc694bb0b186728a0"
66

77
LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
88

99
SRC_URI += "file://defconfig"
10-
SRC_URI += "https://cdn.kernel.org/pub/linux/kernel/projects/rt/6.1/older/patch-6.1.28-rt10.patch.gz;sha256sum=e3686855cd31a6856d40ea3601422e5ebb073d4733263c1f1e7d506a84dcd6c6"
10+
SRC_URI += "https://cdn.kernel.org/pub/linux/kernel/projects/rt/6.1/older/patch-6.1.82-rt27.patch.gz;sha256sum=5381b4f6da5f13aa285bd980c8af695366bc3e330aa377ea0e01699270c8696f"
1111
SRC_URI += "${@bb.utils.contains('MACHINE_FEATURES', 'rt', 'file://rt-preempt.cfg', '', d)}"

recipes-security/optee/optee-os-stm32mp_3.19.0.bb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SRC_URI = "git://github.com/STMicroelectronics/optee_os.git;protocol=ssh;branch=
66
SRC_URI += "file://0001-ta-pkcs11-fix-ecc-generation-and-ecc-import.patch"
77
SRC_URI += "file://0002-ta-pkcs11-rsa-public-key-import-calculate-CKA_MODULUS_BITS.patch"
88
SRCBRANCH = "3.19.0-stm32mp"
9-
SRCREV = "d0159bbfa266dcb0e12c01712e258b86e4d67f51"
9+
SRCREV = "43089782f25c57968bea4e2794fb82101d31227c"
1010

1111
S = "${WORKDIR}/git"
1212

@@ -36,7 +36,8 @@ EXTRA_OEMAKE += "CROSS_COMPILE_core=${HOST_PREFIX}"
3636
EXTRA_OEMAKE += "CROSS_COMPILE_ta_arm64=${HOST_PREFIX}"
3737
EXTRA_OEMAKE += "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', 'CFG_ARM64_core=y ta-targets=ta_arm64', 'CFG_ARM32_core=y CROSS_COMPILE_ta_arm32=${HOST_PREFIX}', d)}"
3838
EXTRA_OEMAKE += "NOWERROR=1"
39-
EXTRA_OEMAKE += "CFG_WITH_PAGER=y CFG_STM32MP1_OPTEE_IN_SYSRAM=1"
39+
EXTRA_OEMAKE += "CFG_STM32MP_PROFILE=secure_and_system_services"
40+
EXTRA_OEMAKE += "CFG_WITH_PAGER=y CFG_STM32MP1_OPTEE_IN_SYSRAM=y"
4041
EXTRA_OEMAKE += "CFG_WITH_USER_TA=y"
4142
EXTRA_OEMAKE += "CFG_IN_TREE_EARLY_TAS+=trusted_keys/f04a0fe7-1f5d-4b9b-abf7-619b85b4ce8c"
4243
EXTRA_OEMAKE += "CFG_IN_TREE_EARLY_TAS+=pkcs11/fd02c9da-306c-48c7-a49c-bbd827ae86ee"

0 commit comments

Comments
 (0)