Skip to contentSkip to conversation

stm32mp1: remove the imply BOOTSTAGE

PATCH New Patrick Delaunay 1 participant 4 messages Dec 18, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 stm32mp1: remove the imply BOOTSTAGE

This patch is only a temporarily workaround for crash introduced by commit ac9cd4805c8b ("bootstage: Correct relocation algorithm").

The crash occurs because the bootstage struct is not correctly aligned when BOOTSTAGE feature is activated.

---
Hi,

For issue analysis and patch proposal, see the patch

[U-Boot,v3] board_f.c: Insure gd->new_bootstage alignment
http://patchwork.ozlabs.org/patch/1201452/

Patrick

 arch/arm/mach-stm32mp/Kconfig | 2 --
 1 file changed, 2 deletions(-)
arch/arm/mach-stm32mp/Kconfig +0 -2
index c9bc084194..a110522095 100644
@@ -46,9 +46,7 @@ config TARGET_STM32MP1
 	select STM32_SERIAL
 	select SYS_ARCH_TIMER
 	imply BOOTCOUNT_LIMIT
-	imply BOOTSTAGE
 	imply CMD_BOOTCOUNT
-	imply CMD_BOOTSTAGE
 	imply DISABLE_CONSOLE
 	imply PRE_CONSOLE_BUFFER
 	imply SILENT_CONSOLE
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/2 stm32mp1: remove the imply BOOTSTAGE

Hi,

Quoted 10 lines

From: Patrick DELAUNAY <[email protected]>
Sent: mercredi 18 décembre 2019 10:13

This patch is only a temporarily workaround for crash introduced by commit ac9cd4805c8b ("bootstage: Correct relocation algorithm").

The crash occurs because the bootstage struct is not correctly aligned when BOOTSTAGE feature is activated.

Applied to u-boot-stm32/master, thanks!

Quoted 29 lines

---
Hi,

For issue analysis and patch proposal, see the patch

[U-Boot,v3] board_f.c: Insure gd->new_bootstage alignment
http://patchwork.ozlabs.org/patch/1201452/

Patrick

 arch/arm/mach-stm32mp/Kconfig | 2 --
 1 file changed, 2 deletions(-)
arch/arm/mach-stm32mp/Kconfig +0 -3
index c9bc084194..a110522095 100644
@@ -46,9 +46,7 @@ config TARGET_STM32MP1
 	select STM32_SERIAL
 	select SYS_ARCH_TIMER
 	imply BOOTCOUNT_LIMIT
-	imply BOOTSTAGE
 	imply CMD_BOOTCOUNT
-	imply CMD_BOOTSTAGE
 	imply DISABLE_CONSOLE
 	imply PRE_CONSOLE_BUFFER
 	imply SILENT_CONSOLE
--
Quoted 1 line

2.17.1

Regards
Patrick

#2 lore raw

PATCH 2/2 stm32mp1: configs: Resync with savedefconfig

In reply to Patrick Delaunay

Rsync all defconfig files using moveconfig.py

---

 configs/stm32mp15_basic_defconfig   | 2 +-
 configs/stm32mp15_optee_defconfig   | 2 +-
 configs/stm32mp15_trusted_defconfig | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
configs/stm32mp15_basic_defconfig +1 -1
index 358c2cd079..713a7e6c57 100644
@@ -132,10 +132,10 @@ 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_BPP8=y
 CONFIG_VIDEO_BPP16=y
 CONFIG_VIDEO_BPP32=y
-CONFIG_BACKLIGHT_GPIO=y
 CONFIG_VIDEO_LCD_ORISETECH_OTM8009A=y
 CONFIG_VIDEO_LCD_RAYDIUM_RM68200=y
 CONFIG_VIDEO_STM32=y
configs/stm32mp15_optee_defconfig +1 -1
index a065d3e088..f9161fd7d1 100644
@@ -116,10 +116,10 @@ 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_BPP8=y
 CONFIG_VIDEO_BPP16=y
 CONFIG_VIDEO_BPP32=y
-CONFIG_BACKLIGHT_GPIO=y
 CONFIG_VIDEO_LCD_ORISETECH_OTM8009A=y
 CONFIG_VIDEO_LCD_RAYDIUM_RM68200=y
 CONFIG_VIDEO_STM32=y
configs/stm32mp15_trusted_defconfig +1 -1
index 632f11f59b..a5ea528ae3 100644
@@ -115,10 +115,10 @@ 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_BPP8=y
 CONFIG_VIDEO_BPP16=y
 CONFIG_VIDEO_BPP32=y
-CONFIG_BACKLIGHT_GPIO=y
 CONFIG_VIDEO_LCD_ORISETECH_OTM8009A=y
 CONFIG_VIDEO_LCD_RAYDIUM_RM68200=y
 CONFIG_VIDEO_STM32=y
Signature · 1 line
2.17.1
#3 lore raw

PATCH 2/2 stm32mp1: configs: Resync with savedefconfig

Hi,

Quoted 6 lines

From: Patrick DELAUNAY <[email protected]>
Sent: mercredi 18 décembre 2019 10:13

Rsync all defconfig files using moveconfig.py

Applied to u-boot-stm32/master, thanks!

Quoted 59 lines

---

 configs/stm32mp15_basic_defconfig   | 2 +-
 configs/stm32mp15_optee_defconfig   | 2 +-
 configs/stm32mp15_trusted_defconfig | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
configs/stm32mp15_basic_defconfig +1 -1
index 358c2cd079..713a7e6c57 100644
@@ -132,10 +132,10 @@ 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_BPP8=y
 CONFIG_VIDEO_BPP16=y
 CONFIG_VIDEO_BPP32=y
-CONFIG_BACKLIGHT_GPIO=y
 CONFIG_VIDEO_LCD_ORISETECH_OTM8009A=y
 CONFIG_VIDEO_LCD_RAYDIUM_RM68200=y
 CONFIG_VIDEO_STM32=y
configs/stm32mp15_optee_defconfig +1 -1
index a065d3e088..f9161fd7d1 100644
@@ -116,10 +116,10 @@ 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_BPP8=y
 CONFIG_VIDEO_BPP16=y
 CONFIG_VIDEO_BPP32=y
-CONFIG_BACKLIGHT_GPIO=y
 CONFIG_VIDEO_LCD_ORISETECH_OTM8009A=y
 CONFIG_VIDEO_LCD_RAYDIUM_RM68200=y
 CONFIG_VIDEO_STM32=y
configs/stm32mp15_trusted_defconfig +1 -2
index 632f11f59b..a5ea528ae3 100644
@@ -115,10 +115,10 @@ 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_BPP8=y
 CONFIG_VIDEO_BPP16=y
 CONFIG_VIDEO_BPP32=y
-CONFIG_BACKLIGHT_GPIO=y
 CONFIG_VIDEO_LCD_ORISETECH_OTM8009A=y
 CONFIG_VIDEO_LCD_RAYDIUM_RM68200=y
 CONFIG_VIDEO_STM32=y
--
Quoted 1 line

2.17.1

Regards

Patrick