Skip to contentSkip to conversation

board/octavo/osd32mp1-red: update BSP components

PATCH In review Köry Maincent via buildroot 1 participant 3 messages Oct 5, 2022 – Oct 6, 2022 Arm STM32

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 board/octavo/osd32mp1-red: update BSP components

From: Kory Maincent <[email protected]>

Update description:
TF-A to v2.4-stm32mp-r1
U-boot to version v2020.10-stm32mp-r2.1
Linux to v5.10-stm32mp-r2.1

This patch also updates U-boot to to use FIP image.

Reference:

https://octavosystems.com/octavo_products/osd32mp1-red/

The device tree blobs, and the U-boot patches come from Octavo System:

https://github.com/octavosystems/meta-octavo-osd32mp1

---
 board/octavo/osd32mp1-red/genimage.cfg        |    8 +-
 ...1-red.dts => stm32mp157c-osd32mp1-red.dts} |  591 +++--
 .../linux-dts/stm32mp157c-osd32mp1-red.dtsi   | 2077 -----------------
 .../overlay/boot/extlinux/extlinux.conf       |    2 +-
 ...Add-OSD32MP1-RED-Device-Tree-support.patch | 1180 +++++-----
 ...5_trusted_defconfig-disable-environm.patch |   47 +-
 ...1066-binG.dtsi => osd32mp1_ddr_1x4Gb.dtsi} |   12 +-
 .../stm32mp157c-osd32mp1-red-fw-config.dts    |    6 +
 ...1-red.dts => stm32mp157c-osd32mp1-red.dts} |  672 +++---
 configs/octavo_osd32mp1_red_defconfig         |   24 +-
 10 files changed, 1308 insertions(+), 3311 deletions(-)
 rename board/octavo/osd32mp1-red/linux-dts/{osd32mp1-red.dts => stm32mp157c-osd32mp1-red.dts} (84%)
 delete mode 100644 board/octavo/osd32mp1-red/linux-dts/stm32mp157c-osd32mp1-red.dtsi
 rename board/octavo/osd32mp1-red/tfa-dts/{stm32mp15-osd32mp1-ddr3-1x4Gb-1066-binG.dtsi => osd32mp1_ddr_1x4Gb.dtsi} (94%)
 create mode 100644 board/octavo/osd32mp1-red/tfa-dts/stm32mp157c-osd32mp1-red-fw-config.dts
 rename board/octavo/osd32mp1-red/tfa-dts/{osd32mp1-red.dts => stm32mp157c-osd32mp1-red.dts} (60%)
board/octavo/osd32mp1-red/genimage.cfg +4 -4
index 3f86579b98..bdad191489 100644
@@ -4,15 +4,15 @@ image sdcard.img {
 	}
 
 	partition fsbl1 {
-		image = "tf-a-osd32mp1-red.stm32"
+		image = "tf-a-stm32mp157c-osd32mp1-red.stm32"
 	}
 
 	partition fsbl2 {
-		image = "tf-a-osd32mp1-red.stm32"
+		image = "tf-a-stm32mp157c-osd32mp1-red.stm32"
 	}
 
-	partition ssbl {
-		image = "u-boot.stm32"
+	partition fip {
+		image = "fip.bin"
 		size = 2M
 	}
 
board/octavo/osd32mp1-red/linux-dts/stm32mp157c-osd32mp1-red.dts renamed from board/octavo/osd32mp1-red/linux-dts/osd32mp1-red.dts +281 -310

1,122 lines not on this page · raw message

board/octavo/osd32mp1-red/linux-dts/stm32mp157c-osd32mp1-red.dtsi deleted +0 -2077

1,859 lines not on this page · raw message

board/octavo/osd32mp1-red/overlay/boot/extlinux/extlinux.conf +1 -1
index c082c2462a..b3f16b2247 100644

Lines of this file are not shown. View the raw message.

board/octavo/osd32mp1-red/patches/uboot/0001-Add-OSD32MP1-RED-Device-Tree-support.patch +649 -531

1,180 lines not on this page · raw message

board/octavo/osd32mp1-red/patches/uboot/0002-configs-stm32mp15_trusted_defconfig-disable-environm.patch +32 -15

47 lines not on this page · raw message

board/octavo/osd32mp1-red/tfa-dts/osd32mp1_ddr_1x4Gb.dtsi renamed from board/octavo/osd32mp1-red/tfa-dts/stm32mp15-osd32mp1-ddr3-1x4Gb-1066-binG.dtsi +7 -5
similarity index 94%
rename from board/octavo/osd32mp1-red/tfa-dts/stm32mp15-osd32mp1-ddr3-1x4Gb-1066-binG.dtsi
rename to board/octavo/osd32mp1-red/tfa-dts/osd32mp1_ddr_1x4Gb.dtsi
index f33886f2b4..3cd2c3f5d1 100644

Lines of this file are not shown. View the raw message.

board/octavo/osd32mp1-red/tfa-dts/stm32mp157c-osd32mp1-red-fw-config.dts new file +6 -0
new file mode 100644
index 0000000000..256d0db935

Lines of this file are not shown. View the raw message.

board/octavo/osd32mp1-red/tfa-dts/stm32mp157c-osd32mp1-red.dts renamed from board/octavo/osd32mp1-red/tfa-dts/osd32mp1-red.dts +314 -358

672 lines not on this page · raw message

configs/octavo_osd32mp1_red_defconfig +14 -10
index ee8dbcb76d..2d0b340580 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Part of the diff is not shown here. View the raw message.

#1 lore raw

PATCH 2/2 board/octavo/osd32mp1-brk: update BSP components

From: Kory Maincent <[email protected]>

Update description:
TF-A to v2.4-stm32mp-r1
U-boot to version v2020.10-stm32mp-r2.1
Linux to v5.10-stm32mp-r2.1

This patch also updates U-boot to to use FIP image.

Reference:

https://octavosystems.com/octavo_products/osd32mp1-brk/

The device tree blobs, and the U-boot patches come from Octavo System:

https://github.com/octavosystems/meta-octavo-osd32mp1

---
 board/octavo/osd32mp1-brk/genimage.cfg        |    4 +-
 .../linux-dts/stm32mp157c-osd32mp1-brk.dts    |  809 +++---
 ...Add-OSD32MP1-BRK-device-tree-support.patch | 1509 +++++++++++
 .../uboot/0001-osd32mp1-BRK-board-added.patch | 2349 -----------------
 .../0002-Add-OSD32MP1-BRK-build-config.patch  |  881 +++++++
 ...32mp1_ddr.dtsi => osd32mp1_ddr_1x4Gb.dtsi} |    2 +
 .../stm32mp157c-osd32mp1-brk-fw-config.dts    |    6 +
 .../tfa-dts/stm32mp157c-osd32mp1-brk.dts      |  502 ++--
 configs/octavo_osd32mp1_brk_defconfig         |   20 +-
 9 files changed, 3027 insertions(+), 3055 deletions(-)
 create mode 100644 board/octavo/osd32mp1-brk/patches/uboot/0001-Add-OSD32MP1-BRK-device-tree-support.patch
 delete mode 100644 board/octavo/osd32mp1-brk/patches/uboot/0001-osd32mp1-BRK-board-added.patch
 create mode 100644 board/octavo/osd32mp1-brk/patches/uboot/0002-Add-OSD32MP1-BRK-build-config.patch
 rename board/octavo/osd32mp1-brk/tfa-dts/{osd32mp1_ddr.dtsi => osd32mp1_ddr_1x4Gb.dtsi} (99%)
 create mode 100644 board/octavo/osd32mp1-brk/tfa-dts/stm32mp157c-osd32mp1-brk-fw-config.dts
board/octavo/osd32mp1-brk/genimage.cfg +2 -2
index c632090efd..40bde81e86 100644
@@ -11,8 +11,8 @@ image sdcard.img {
 		image = "tf-a-stm32mp157c-osd32mp1-brk.stm32"
 	}
 
-	partition ssbl {
-		image = "u-boot.stm32"
+	partition fip {
+		image = "fip.bin"
 		size = 2M
 	}
 
board/octavo/osd32mp1-brk/linux-dts/stm32mp157c-osd32mp1-brk.dts +381 -428

953 lines not on this page · raw message

board/octavo/osd32mp1-brk/patches/uboot/0001-Add-OSD32MP1-BRK-device-tree-support.patch new file +1509 -0

1,509 lines not on this page · raw message

board/octavo/osd32mp1-brk/patches/uboot/0001-osd32mp1-BRK-board-added.patch deleted +0 -2349

528 lines not on this page · raw message

board/octavo/osd32mp1-brk/patches/uboot/0002-Add-OSD32MP1-BRK-build-config.patch new file +881 -0

881 lines not on this page · raw message

board/octavo/osd32mp1-brk/tfa-dts/osd32mp1_ddr_1x4Gb.dtsi renamed from board/octavo/osd32mp1-brk/tfa-dts/osd32mp1_ddr.dtsi +2 -0
similarity index 99%
rename from board/octavo/osd32mp1-brk/tfa-dts/osd32mp1_ddr.dtsi
rename to board/octavo/osd32mp1-brk/tfa-dts/osd32mp1_ddr_1x4Gb.dtsi
index e8c9eebfc6..3cd2c3f5d1 100644

Lines of this file are not shown. View the raw message.

board/octavo/osd32mp1-brk/tfa-dts/stm32mp157c-osd32mp1-brk-fw-config.dts new file +6 -0
new file mode 100644
index 0000000000..256d0db935

Lines of this file are not shown. View the raw message.

board/octavo/osd32mp1-brk/tfa-dts/stm32mp157c-osd32mp1-brk.dts +234 -268

502 lines not on this page · raw message

configs/octavo_osd32mp1_brk_defconfig +12 -8
index 5f00c2ee55..9a8ec8aa01 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Part of the diff is not shown here. View the raw message.

#2 lore raw
In reply to Köry Maincent via buildroot
Quoted 11 lines · On Wed, 5 Oct 2022 09:58:13 +0200 Köry Maincent via buildroot…

From: Kory Maincent <[email protected]>

Update description:
TF-A to v2.4-stm32mp-r1
U-boot to version v2020.10-stm32mp-r2.1
Linux to v5.10-stm32mp-r2.1

This patch also updates U-boot to to use FIP image.

Reference:

Quoted 7 lines

https://octavosystems.com/octavo_products/osd32mp1-red/

The device tree blobs, and the U-boot patches come from Octavo System:

https://github.com/octavosystems/meta-octavo-osd32mp1

I've applied both patches, but to be honest, I hate having these huge Device Tree files in Buildroot...

Thomas

Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot