* [Buildroot] [PATCH v9 02/11] package/binutils-bare-metal: new package
2024-01-31 11:22 [Buildroot] [PATCH v9 01/11] toolchain/toolchain-bare-metal-buildroot: new toolchain Neal Frager via buildroot
@ 2024-01-31 11:22 ` Neal Frager via buildroot
2024-02-06 17:52 ` Thomas Petazzoni via buildroot
2024-01-31 11:22 ` [Buildroot] [PATCH v9 03/11] package/gcc-bare-metal: " Neal Frager via buildroot
` (9 subsequent siblings)
10 siblings, 1 reply; 22+ messages in thread
From: Neal Frager via buildroot @ 2024-01-31 11:22 UTC (permalink / raw)
To: buildroot
Cc: ibai.erkiaga-elorza, luca.ceresoli, thomas.petazzoni, Neal Frager,
michal.simek
This patch adds a new package for building binutils for a bare-metal toolchain.
The cpu architecture is defined by a toolchain-bare-metal virtual package.
While any cpu architecture could be used, the default configuration will be a
Xilinx microblaze little endian architecture, so that buildroot will be able
to build the microblaze firmware applications for zynqmp and versal.
In order to build the zynqmp pmufw and versal plm applications without error,
binutils version 2.41 or higher is required.
Signed-off-by: Neal Frager <neal.frager@amd.com>
Signed-off-by: Ibai Erkiaga <ibai.erkiaga-elorza@amd.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
V1->V2:
- removed default enable to be replaced with toolchain select config
V2->V3:
- no changes
V3->V4:
- split tar instruction into multiple lines
- replaced unnecessary =? with = for assignments
- changed xlnx-rel-v2023.1.tar.gz hash to sha256
- improved menuconfig help comment
V4->V5:
- moved to upstream version 2.41 with needed patches
- reduced all lines to <80 chars
V5->V6:
- migrated to toolchain-bare-metal-buildroot
V6->V7:
- removed Config.in and hard-coded version
V7->V8:
- no changes
V8->V9:
- bumped to binutils 2.42
- removed patches since they are included with binutils 2.42
---
DEVELOPERS | 2 ++
.../binutils-bare-metal.hash | 1 +
.../binutils-bare-metal.mk | 33 +++++++++++++++++++
package/binutils/binutils.hash | 1 +
4 files changed, 37 insertions(+)
create mode 120000 package/binutils-bare-metal/binutils-bare-metal.hash
create mode 100644 package/binutils-bare-metal/binutils-bare-metal.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index 4b97dcfbd5..e78bd4dc02 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1386,6 +1386,7 @@ N: Ian Haylock <haylocki@yahoo.co.uk>
F: package/python-rpi-gpio/
N: Ibai Erkiaga <ibai.erkiaga-elorza@amd.com>
+F: package/binutils-bare-metal/
F: toolchain/toolchain-bare-metal-buildroot/
N: Ignacy Gawędzki <ignacy.gawedzki@green-communications.fr>
@@ -2240,6 +2241,7 @@ F: configs/zynqmp_kria_kv260_defconfig
F: configs/zynqmp_zcu102_defconfig
F: configs/zynqmp_zcu104_defconfig
F: configs/zynqmp_zcu106_defconfig
+F: package/binutils-bare-metal/
F: package/bootgen/
F: package/versal-firmware/
F: toolchain/toolchain-bare-metal-buildroot/
diff --git a/package/binutils-bare-metal/binutils-bare-metal.hash b/package/binutils-bare-metal/binutils-bare-metal.hash
new file mode 120000
index 0000000000..e0655d3af3
--- /dev/null
+++ b/package/binutils-bare-metal/binutils-bare-metal.hash
@@ -0,0 +1 @@
+../binutils/binutils.hash
\ No newline at end of file
diff --git a/package/binutils-bare-metal/binutils-bare-metal.mk b/package/binutils-bare-metal/binutils-bare-metal.mk
new file mode 100644
index 0000000000..d55c2d081e
--- /dev/null
+++ b/package/binutils-bare-metal/binutils-bare-metal.mk
@@ -0,0 +1,33 @@
+################################################################################
+#
+# binutils-bare-metal
+#
+################################################################################
+
+HOST_BINUTILS_BARE_METAL_VERSION = 2.42
+HOST_BINUTILS_BARE_METAL_SITE = $(BR2_GNU_MIRROR)/binutils
+HOST_BINUTILS_BARE_METAL_SOURCE = binutils-$(HOST_BINUTILS_BARE_METAL_VERSION).tar.xz
+
+HOST_BINUTILS_BARE_METAL_LICENSE = GPL-3.0+, libiberty LGPL-2.1+
+HOST_BINUTILS_BARE_METAL_LICENSE_FILES = COPYING3 COPYING.LIB
+HOST_BINUTILS_BARE_METAL_CPE_ID_VENDOR = gnu
+
+HOST_BINUTILS_BARE_METAL_DEPENDENCIES = host-zlib
+
+# Don't build documentation. It takes up extra space / build time,
+# and sometimes needs specific makeinfo versions to work
+HOST_BINUTILS_BARE_METAL_CONF_ENV += MAKEINFO=true
+HOST_BINUTILS_BARE_METAL_MAKE_OPTS += MAKEINFO=true
+HOST_BINUTILS_BARE_METAL_INSTALL_OPTS += MAKEINFO=true install
+
+HOST_BINUTILS_BARE_METAL_CONF_OPTS = \
+ --target=$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE) \
+ --disable-gprof \
+ --disable-shared \
+ --enable-lto \
+ --enable-static \
+ --disable-initfini-array \
+ --disable-multilib \
+ --disable-werror
+
+$(eval $(host-autotools-package))
diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash
index 519a0ca887..e4c6a0b0b6 100644
--- a/package/binutils/binutils.hash
+++ b/package/binutils/binutils.hash
@@ -2,6 +2,7 @@
sha512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3 binutils-2.39.tar.xz
sha512 a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925 binutils-2.40.tar.xz
sha512 5df45d0bd6ddabdce4f35878c041e46a92deef01e7dea5facc97fd65cc06b59abc6fba0eb454b68e571c7e14038dc823fe7f2263843e6e627b7444eaf0fe9374 binutils-2.41.tar.xz
+sha512 155f3ba14cd220102f4f29a4f1e5cfee3c48aa03b74603460d05afb73c70d6657a9d87eee6eb88bf13203fe6f31177a5c9addc04384e956e7da8069c8ecd20a6 binutils-2.42.tar.xz
# Locally calculated (fetched from Github)
sha512 3518b47d5c11d1fb478ee152bde1719363f9391db73f3b9f5491217c17742bef8ebca6a51a40302dfaa9476c5a32a8b8f70a4bf64289422dea5f750ae53ab88d binutils-gdb-arc-2023.09-release.tar.gz
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [Buildroot] [PATCH v9 02/11] package/binutils-bare-metal: new package
2024-01-31 11:22 ` [Buildroot] [PATCH v9 02/11] package/binutils-bare-metal: new package Neal Frager via buildroot
@ 2024-02-06 17:52 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 22+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-02-06 17:52 UTC (permalink / raw)
To: Neal Frager via buildroot
Cc: michal.simek, ibai.erkiaga-elorza, luca.ceresoli, Neal Frager
On Wed, 31 Jan 2024 11:22:14 +0000
Neal Frager via buildroot <buildroot@buildroot.org> wrote:
> This patch adds a new package for building binutils for a bare-metal toolchain.
> The cpu architecture is defined by a toolchain-bare-metal virtual package.
> While any cpu architecture could be used, the default configuration will be a
> Xilinx microblaze little endian architecture, so that buildroot will be able
> to build the microblaze firmware applications for zynqmp and versal.
>
> In order to build the zynqmp pmufw and versal plm applications without error,
> binutils version 2.41 or higher is required.
>
> Signed-off-by: Neal Frager <neal.frager@amd.com>
> Signed-off-by: Ibai Erkiaga <ibai.erkiaga-elorza@amd.com>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
> V1->V2:
> - removed default enable to be replaced with toolchain select config
> V2->V3:
> - no changes
> V3->V4:
> - split tar instruction into multiple lines
> - replaced unnecessary =? with = for assignments
> - changed xlnx-rel-v2023.1.tar.gz hash to sha256
> - improved menuconfig help comment
> V4->V5:
> - moved to upstream version 2.41 with needed patches
> - reduced all lines to <80 chars
> V5->V6:
> - migrated to toolchain-bare-metal-buildroot
> V6->V7:
> - removed Config.in and hard-coded version
> V7->V8:
> - no changes
> V8->V9:
> - bumped to binutils 2.42
> - removed patches since they are included with binutils 2.42
> ---
> DEVELOPERS | 2 ++
> .../binutils-bare-metal.hash | 1 +
> .../binutils-bare-metal.mk | 33 +++++++++++++++++++
> package/binutils/binutils.hash | 1 +
> 4 files changed, 37 insertions(+)
> create mode 120000 package/binutils-bare-metal/binutils-bare-metal.hash
> create mode 100644 package/binutils-bare-metal/binutils-bare-metal.mk
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH v9 03/11] package/gcc-bare-metal: new package
2024-01-31 11:22 [Buildroot] [PATCH v9 01/11] toolchain/toolchain-bare-metal-buildroot: new toolchain Neal Frager via buildroot
2024-01-31 11:22 ` [Buildroot] [PATCH v9 02/11] package/binutils-bare-metal: new package Neal Frager via buildroot
@ 2024-01-31 11:22 ` Neal Frager via buildroot
2024-02-06 17:52 ` Thomas Petazzoni via buildroot
2024-01-31 11:22 ` [Buildroot] [PATCH v9 04/11] package/newlib-bare-metal: " Neal Frager via buildroot
` (8 subsequent siblings)
10 siblings, 1 reply; 22+ messages in thread
From: Neal Frager via buildroot @ 2024-01-31 11:22 UTC (permalink / raw)
To: buildroot
Cc: ibai.erkiaga-elorza, luca.ceresoli, thomas.petazzoni, Neal Frager,
michal.simek
This patch adds a new package for building gcc for a bare-metal toolchain.
The cpu architecture is defined by a toolchain-bare-metal virtual package.
While any cpu architecture could be used, the default configuration will be a
Xilinx microblaze little endian architecture, so that buildroot will be able
to build the microblaze firmware applications for zynqmp and versal.
Signed-off-by: Neal Frager <neal.frager@amd.com>
Signed-off-by: Ibai Erkiaga <ibai.erkiaga-elorza@amd.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
V1->V2:
- removed default enable to be replaced with toolchain select config
V2->V3:
- no changes
V3->V4:
- split tar instruction into multiple lines
- replaced unnecessary =? with = for assignments
- changed xlnx-rel-v2023.1.tar.gz hash to sha256
- improved menuconfig help comment
V4->V5:
- moved to upstream gcc without any xilinx patches
- reduced all lines to <80 chars
- added license files
V5->V6:
- migrated to toolchain-bare-metal-buildroot
V6->V7:
- removed Config.in and hard-coded version
- added sysroot for newlib install
V7->V8:
- no changes
V8->V9:
- integrated changes from Thomas
---
DEVELOPERS | 2 +
package/gcc-bare-metal/13.2.0 | 1 +
package/gcc-bare-metal/gcc-bare-metal.hash | 1 +
package/gcc-bare-metal/gcc-bare-metal.mk | 61 ++++++++++++++++++++++
4 files changed, 65 insertions(+)
create mode 120000 package/gcc-bare-metal/13.2.0
create mode 120000 package/gcc-bare-metal/gcc-bare-metal.hash
create mode 100644 package/gcc-bare-metal/gcc-bare-metal.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index e78bd4dc02..af6c01c72f 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1387,6 +1387,7 @@ F: package/python-rpi-gpio/
N: Ibai Erkiaga <ibai.erkiaga-elorza@amd.com>
F: package/binutils-bare-metal/
+F: package/gcc-bare-metal/
F: toolchain/toolchain-bare-metal-buildroot/
N: Ignacy Gawędzki <ignacy.gawedzki@green-communications.fr>
@@ -2243,6 +2244,7 @@ F: configs/zynqmp_zcu104_defconfig
F: configs/zynqmp_zcu106_defconfig
F: package/binutils-bare-metal/
F: package/bootgen/
+F: package/gcc-bare-metal/
F: package/versal-firmware/
F: toolchain/toolchain-bare-metal-buildroot/
diff --git a/package/gcc-bare-metal/13.2.0 b/package/gcc-bare-metal/13.2.0
new file mode 120000
index 0000000000..b7a75dc7dd
--- /dev/null
+++ b/package/gcc-bare-metal/13.2.0
@@ -0,0 +1 @@
+../gcc/13.2.0/
\ No newline at end of file
diff --git a/package/gcc-bare-metal/gcc-bare-metal.hash b/package/gcc-bare-metal/gcc-bare-metal.hash
new file mode 120000
index 0000000000..d417b0dc77
--- /dev/null
+++ b/package/gcc-bare-metal/gcc-bare-metal.hash
@@ -0,0 +1 @@
+../gcc/gcc.hash
\ No newline at end of file
diff --git a/package/gcc-bare-metal/gcc-bare-metal.mk b/package/gcc-bare-metal/gcc-bare-metal.mk
new file mode 100644
index 0000000000..f391f094fe
--- /dev/null
+++ b/package/gcc-bare-metal/gcc-bare-metal.mk
@@ -0,0 +1,61 @@
+################################################################################
+#
+# gcc-bare-metal
+#
+################################################################################
+
+HOST_GCC_BARE_METAL_VERSION = 13.2.0
+HOST_GCC_BARE_METAL_SITE = \
+ https://ftp.gnu.org/gnu/gcc/gcc-$(HOST_GCC_BARE_METAL_VERSION)
+HOST_GCC_BARE_METAL_SOURCE = gcc-$(HOST_GCC_BARE_METAL_VERSION).tar.xz
+
+HOST_GCC_BARE_METAL_LICENSE = GPL-2.0, GPL-3.0, LGPL-2.1, LGPL-3.0
+HOST_GCC_BARE_METAL_LICENSE_FILES = COPYING COPYING3 COPYING.LIB COPYING3.LIB
+
+HOST_GCC_BARE_METAL_DEPENDENCIES = \
+ host-binutils-bare-metal \
+ host-gmp \
+ host-mpc \
+ host-mpfr \
+ host-isl
+
+# gcc doesn't support in-tree build, so we create a 'build'
+# subdirectory in the gcc sources, and build from there.
+define GCC_BARE_METAL_CONFIGURE_SYMLINK
+ mkdir -p $(@D)/build
+ ln -sf ../configure $(@D)/build/configure
+endef
+
+HOST_GCC_BARE_METAL_PRE_CONFIGURE_HOOKS += GCC_BARE_METAL_CONFIGURE_SYMLINK
+HOST_GCC_BARE_METAL_SUBDIR = build
+
+HOST_GCC_BARE_METAL_MAKE_OPTS = \
+ $(HOST_GCC_COMMON_MAKE_OPTS) \
+ all-gcc \
+ all-target-libgcc
+
+HOST_GCC_BARE_METAL_INSTALL_OPTS = install-gcc install-target-libgcc
+
+HOST_GCC_BARE_METAL_CONF_OPTS = \
+ --target=$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE) \
+ --disable-initfini_array \
+ --disable-__cxa_atexit \
+ --disable-libstdcxx-pch \
+ --with-newlib \
+ --disable-threads \
+ --enable-plugins \
+ --with-gnu-as \
+ --disable-libitm \
+ --without-long-double-128 \
+ --without-headers \
+ --enable-languages=c \
+ --disable-multilib \
+ --with-gmp=$(HOST_DIR) \
+ --with-mpc=$(HOST_DIR) \
+ --with-mpfr=$(HOST_DIR) \
+ --with-isl=$(HOST_DIR) \
+ --with-sysroot=$(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT) \
+ AR_FOR_TARGET=$(HOST_DIR)/bin/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)-ar \
+ RANLIB_FOR_TARGET=$(HOST_DIR)/bin/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)-ranlib
+
+$(eval $(host-autotools-package))
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [Buildroot] [PATCH v9 03/11] package/gcc-bare-metal: new package
2024-01-31 11:22 ` [Buildroot] [PATCH v9 03/11] package/gcc-bare-metal: " Neal Frager via buildroot
@ 2024-02-06 17:52 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 22+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-02-06 17:52 UTC (permalink / raw)
To: Neal Frager via buildroot
Cc: michal.simek, ibai.erkiaga-elorza, luca.ceresoli, Neal Frager
On Wed, 31 Jan 2024 11:22:15 +0000
Neal Frager via buildroot <buildroot@buildroot.org> wrote:
> This patch adds a new package for building gcc for a bare-metal toolchain.
> The cpu architecture is defined by a toolchain-bare-metal virtual package.
> While any cpu architecture could be used, the default configuration will be a
> Xilinx microblaze little endian architecture, so that buildroot will be able
> to build the microblaze firmware applications for zynqmp and versal.
>
> Signed-off-by: Neal Frager <neal.frager@amd.com>
> Signed-off-by: Ibai Erkiaga <ibai.erkiaga-elorza@amd.com>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
> V1->V2:
> - removed default enable to be replaced with toolchain select config
> V2->V3:
> - no changes
> V3->V4:
> - split tar instruction into multiple lines
> - replaced unnecessary =? with = for assignments
> - changed xlnx-rel-v2023.1.tar.gz hash to sha256
> - improved menuconfig help comment
> V4->V5:
> - moved to upstream gcc without any xilinx patches
> - reduced all lines to <80 chars
> - added license files
> V5->V6:
> - migrated to toolchain-bare-metal-buildroot
> V6->V7:
> - removed Config.in and hard-coded version
> - added sysroot for newlib install
> V7->V8:
> - no changes
> V8->V9:
> - integrated changes from Thomas
> ---
> DEVELOPERS | 2 +
> package/gcc-bare-metal/13.2.0 | 1 +
> package/gcc-bare-metal/gcc-bare-metal.hash | 1 +
> package/gcc-bare-metal/gcc-bare-metal.mk | 61 ++++++++++++++++++++++
> 4 files changed, 65 insertions(+)
> create mode 120000 package/gcc-bare-metal/13.2.0
> create mode 120000 package/gcc-bare-metal/gcc-bare-metal.hash
> create mode 100644 package/gcc-bare-metal/gcc-bare-metal.mk
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH v9 04/11] package/newlib-bare-metal: new package
2024-01-31 11:22 [Buildroot] [PATCH v9 01/11] toolchain/toolchain-bare-metal-buildroot: new toolchain Neal Frager via buildroot
2024-01-31 11:22 ` [Buildroot] [PATCH v9 02/11] package/binutils-bare-metal: new package Neal Frager via buildroot
2024-01-31 11:22 ` [Buildroot] [PATCH v9 03/11] package/gcc-bare-metal: " Neal Frager via buildroot
@ 2024-01-31 11:22 ` Neal Frager via buildroot
2024-02-02 12:11 ` Frager, Neal via buildroot
2024-02-06 17:52 ` Thomas Petazzoni via buildroot
2024-01-31 11:22 ` [Buildroot] [PATCH v9 05/11] toolchain/toolchain-bare-metal-buildroot: wire up newlib-bare-metal Neal Frager via buildroot
` (7 subsequent siblings)
10 siblings, 2 replies; 22+ messages in thread
From: Neal Frager via buildroot @ 2024-01-31 11:22 UTC (permalink / raw)
To: buildroot
Cc: ibai.erkiaga-elorza, luca.ceresoli, thomas.petazzoni, Neal Frager,
michal.simek
This patch adds a new package for building newlib for a bare-metal toolchain.
The cpu architecture is defined by a toolchain-bare-metal virtual package.
While any cpu architecture could be used, the default configuration will be a
Xilinx microblaze little endian architecture, so that buildroot will be able
to build the microblaze firmware applications for zynqmp and versal.
Signed-off-by: Neal Frager <neal.frager@amd.com>
Signed-off-by: Ibai Erkiaga <ibai.erkiaga-elorza@amd.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
V1->V2:
- removed default enable to be replaced with toolchain select config
V2->V3:
- no changes
V3->V4:
- replaced unnecessary =? with = for assignments
- improved menuconfig help comment
V4->V5:
- added license files
- reduced all lines to <80 chars
V5->V6:
- migrated to toolchain-bare-metal-buildroot
V6->V7:
- hard-coded version
- converted to target package with gcc-bare-metal sysroot install
V7->V8:
- no changes
V8->V9:
- bumped to version 4.4.0
---
DEVELOPERS | 2 +
package/newlib-bare-metal/Config.in | 2 +
.../newlib-bare-metal/newlib-bare-metal.hash | 8 +++
.../newlib-bare-metal/newlib-bare-metal.mk | 52 +++++++++++++++++++
4 files changed, 64 insertions(+)
create mode 100644 package/newlib-bare-metal/Config.in
create mode 100644 package/newlib-bare-metal/newlib-bare-metal.hash
create mode 100644 package/newlib-bare-metal/newlib-bare-metal.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index af6c01c72f..057eac7845 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1388,6 +1388,7 @@ F: package/python-rpi-gpio/
N: Ibai Erkiaga <ibai.erkiaga-elorza@amd.com>
F: package/binutils-bare-metal/
F: package/gcc-bare-metal/
+F: package/newlib-bare-metal/
F: toolchain/toolchain-bare-metal-buildroot/
N: Ignacy Gawędzki <ignacy.gawedzki@green-communications.fr>
@@ -2245,6 +2246,7 @@ F: configs/zynqmp_zcu106_defconfig
F: package/binutils-bare-metal/
F: package/bootgen/
F: package/gcc-bare-metal/
+F: package/newlib-bare-metal/
F: package/versal-firmware/
F: toolchain/toolchain-bare-metal-buildroot/
diff --git a/package/newlib-bare-metal/Config.in b/package/newlib-bare-metal/Config.in
new file mode 100644
index 0000000000..1ff3d5d8ec
--- /dev/null
+++ b/package/newlib-bare-metal/Config.in
@@ -0,0 +1,2 @@
+config BR2_PACKAGE_NEWLIB_BARE_METAL
+ bool
diff --git a/package/newlib-bare-metal/newlib-bare-metal.hash b/package/newlib-bare-metal/newlib-bare-metal.hash
new file mode 100644
index 0000000000..f8c553cf86
--- /dev/null
+++ b/package/newlib-bare-metal/newlib-bare-metal.hash
@@ -0,0 +1,8 @@
+# Locally calculated
+sha256 0c166a39e1bf0951dfafcd68949fe0e4b6d3658081d6282f39aeefc6310f2f13 newlib-4.4.0.20231231.tar.gz
+
+# Hashes for license files locally calculated
+sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING
+sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB
+sha256 f3b7f3e4426b1fa6f60198dae7adfedd94b77b28db2d108adc0253575011e0ff COPYING.LIBGLOSS
+sha256 422aa40293093fb54fc66e692a0d68fd0b24ed5602e5d1d33ad05ba3909057e9 COPYING.NEWLIB
diff --git a/package/newlib-bare-metal/newlib-bare-metal.mk b/package/newlib-bare-metal/newlib-bare-metal.mk
new file mode 100644
index 0000000000..452bc4da25
--- /dev/null
+++ b/package/newlib-bare-metal/newlib-bare-metal.mk
@@ -0,0 +1,52 @@
+################################################################################
+#
+# newlib-bare-metal
+#
+################################################################################
+
+NEWLIB_BARE_METAL_VERSION = 4.4.0
+NEWLIB_BARE_METAL_SITE = ftp://sourceware.org/pub/newlib
+NEWLIB_BARE_METAL_SOURCE = newlib-$(NEWLIB_BARE_METAL_VERSION).20231231.tar.gz
+NEWLIB_BARE_METAL_DEPENDENCIES = host-gcc-bare-metal
+NEWLIB_BARE_METAL_ADD_TOOLCHAIN_DEPENDENCY = NO
+NEWLIB_BARE_METAL_LICENSE = GPL-2.0, GPL-3.0, LGPL-2.1, LGPL-3.0
+NEWLIB_BARE_METAL_LICENSE_FILES = \
+ COPYING \
+ COPYING.LIB \
+ COPYING.LIBGLOSS \
+ COPYING.NEWLIB
+
+NEWLIB_BARE_METAL_INSTALL_STAGING = YES
+NEWLIB_BARE_METAL_INSTALL_TARGET = NO
+
+define NEWLIB_BARE_METAL_CONFIGURE_CMDS
+ (cd $(@D) && \
+ PATH=$(BR_PATH) \
+ ./configure \
+ --target=$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE) \
+ --prefix=/usr \
+ --enable-newlib-io-c99-formats \
+ --enable-newlib-io-long-long \
+ --enable-newlib-io-float \
+ --enable-newlib-io-long-double \
+ --disable-multilib \
+ )
+endef
+
+define NEWLIB_BARE_METAL_BUILD_CMDS
+ PATH=$(BR_PATH) $(MAKE1) -C $(@D)
+endef
+
+define NEWLIB_BARE_METAL_INSTALL_STAGING_CMDS
+ PATH=$(BR_PATH) $(MAKE1) -C $(@D) DESTDIR=$(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT) install
+endef
+
+define NEWLIB_BARE_METAL_FIXUP
+ mv $(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT)/usr/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)/include \
+ $(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT)/usr/include
+ mv $(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT)/usr/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)/lib \
+ $(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT)/usr/lib
+endef
+NEWLIB_BARE_METAL_POST_INSTALL_STAGING_HOOKS += NEWLIB_BARE_METAL_FIXUP
+
+$(eval $(generic-package))
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [Buildroot] [PATCH v9 04/11] package/newlib-bare-metal: new package
2024-01-31 11:22 ` [Buildroot] [PATCH v9 04/11] package/newlib-bare-metal: " Neal Frager via buildroot
@ 2024-02-02 12:11 ` Frager, Neal via buildroot
2024-02-06 17:53 ` Thomas Petazzoni via buildroot
2024-02-06 17:52 ` Thomas Petazzoni via buildroot
1 sibling, 1 reply; 22+ messages in thread
From: Frager, Neal via buildroot @ 2024-02-02 12:11 UTC (permalink / raw)
To: thomas.petazzoni@bootlin.com
Cc: Simek, Michal, buildroot@buildroot.org, luca.ceresoli@bootlin.com,
Erkiaga Elorza, Ibai
Hi Thomas,
Have you had a chance to look at v9 of the bare-metal patch set?
> +
> +define NEWLIB_BARE_METAL_FIXUP
> + mv $(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT)/usr/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)/include \
> + $(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT)/usr/include
> + mv $(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT)/usr/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)/lib \
> + $(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT)/usr/lib
> +endef
> +NEWLIB_BARE_METAL_POST_INSTALL_STAGING_HOOKS += NEWLIB_BARE_METAL_FIXUP
> +
> +$(eval $(generic-package))
There are two things I wish to highlight.
1. Thanks to the binutils 2.42 release, we do not need microblaze patches
anymore.
2. I chose to keep the newlib fixup. Even though the --with-tooldir patch was
accepted upstream, newlib requires autoconf 2.69 for this patch to be applied.
So rather than including a version of the patch that works on the output
configure script directly, I thought it would be better to just keep the fixup
for now. We can remove the fixup with the next newlib release which will have
a configurable --with-tooldir option.
What are your thoughts? Do you think any more changes are needed before
applying this bare-metal toolchain patch set?
Thank you for your support.
Best regards,
Neal Frager
AMD
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Buildroot] [PATCH v9 04/11] package/newlib-bare-metal: new package
2024-02-02 12:11 ` Frager, Neal via buildroot
@ 2024-02-06 17:53 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 22+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-02-06 17:53 UTC (permalink / raw)
To: Frager, Neal via buildroot
Cc: luca.ceresoli@bootlin.com, Erkiaga Elorza, Ibai, Simek, Michal,
Frager, Neal
On Fri, 2 Feb 2024 12:11:29 +0000
"Frager, Neal via buildroot" <buildroot@buildroot.org> wrote:
> 1. Thanks to the binutils 2.42 release, we do not need microblaze patches
> anymore.
Excellent!
> 2. I chose to keep the newlib fixup. Even though the --with-tooldir patch was
> accepted upstream, newlib requires autoconf 2.69 for this patch to be applied.
> So rather than including a version of the patch that works on the output
> configure script directly, I thought it would be better to just keep the fixup
> for now. We can remove the fixup with the next newlib release which will have
> a configurable --with-tooldir option.
I think it's a reasonable trade-off indeed.
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Buildroot] [PATCH v9 04/11] package/newlib-bare-metal: new package
2024-01-31 11:22 ` [Buildroot] [PATCH v9 04/11] package/newlib-bare-metal: " Neal Frager via buildroot
2024-02-02 12:11 ` Frager, Neal via buildroot
@ 2024-02-06 17:52 ` Thomas Petazzoni via buildroot
1 sibling, 0 replies; 22+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-02-06 17:52 UTC (permalink / raw)
To: Neal Frager via buildroot
Cc: michal.simek, ibai.erkiaga-elorza, luca.ceresoli, Neal Frager
On Wed, 31 Jan 2024 11:22:16 +0000
Neal Frager via buildroot <buildroot@buildroot.org> wrote:
> This patch adds a new package for building newlib for a bare-metal toolchain.
> The cpu architecture is defined by a toolchain-bare-metal virtual package.
> While any cpu architecture could be used, the default configuration will be a
> Xilinx microblaze little endian architecture, so that buildroot will be able
> to build the microblaze firmware applications for zynqmp and versal.
>
> Signed-off-by: Neal Frager <neal.frager@amd.com>
> Signed-off-by: Ibai Erkiaga <ibai.erkiaga-elorza@amd.com>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
> V1->V2:
> - removed default enable to be replaced with toolchain select config
> V2->V3:
> - no changes
> V3->V4:
> - replaced unnecessary =? with = for assignments
> - improved menuconfig help comment
> V4->V5:
> - added license files
> - reduced all lines to <80 chars
> V5->V6:
> - migrated to toolchain-bare-metal-buildroot
> V6->V7:
> - hard-coded version
> - converted to target package with gcc-bare-metal sysroot install
> V7->V8:
> - no changes
> V8->V9:
> - bumped to version 4.4.0
> ---
> DEVELOPERS | 2 +
> package/newlib-bare-metal/Config.in | 2 +
> .../newlib-bare-metal/newlib-bare-metal.hash | 8 +++
> .../newlib-bare-metal/newlib-bare-metal.mk | 52 +++++++++++++++++++
> 4 files changed, 64 insertions(+)
> create mode 100644 package/newlib-bare-metal/Config.in
> create mode 100644 package/newlib-bare-metal/newlib-bare-metal.hash
> create mode 100644 package/newlib-bare-metal/newlib-bare-metal.mk
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH v9 05/11] toolchain/toolchain-bare-metal-buildroot: wire up newlib-bare-metal
2024-01-31 11:22 [Buildroot] [PATCH v9 01/11] toolchain/toolchain-bare-metal-buildroot: new toolchain Neal Frager via buildroot
` (2 preceding siblings ...)
2024-01-31 11:22 ` [Buildroot] [PATCH v9 04/11] package/newlib-bare-metal: " Neal Frager via buildroot
@ 2024-01-31 11:22 ` Neal Frager via buildroot
2024-02-06 17:53 ` Thomas Petazzoni via buildroot
2024-01-31 11:22 ` [Buildroot] [PATCH v9 06/11] boot/zynqmp-firmware: new boot firmware Neal Frager via buildroot
` (6 subsequent siblings)
10 siblings, 1 reply; 22+ messages in thread
From: Neal Frager via buildroot @ 2024-01-31 11:22 UTC (permalink / raw)
To: buildroot
Cc: ibai.erkiaga-elorza, luca.ceresoli, thomas.petazzoni, Neal Frager,
michal.simek
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Neal Frager <neal.frager@amd.com>
---
toolchain/Config.in | 1 +
toolchain/toolchain-bare-metal-buildroot/Config.in | 2 ++
.../toolchain-bare-metal-buildroot.mk | 2 +-
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 64a07f91dc..407a03c42e 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -927,6 +927,7 @@ comment "Bare metal toolchain"
config BR2_TOOLCHAIN_BARE_METAL_BUILDROOT
bool "Build a bare metal toolchain"
+ select BR2_PACKAGE_NEWLIB_BARE_METAL
help
Select if you need a bare-metal toolchain for building
platform specific firmware images.
diff --git a/toolchain/toolchain-bare-metal-buildroot/Config.in b/toolchain/toolchain-bare-metal-buildroot/Config.in
index 3c99c7e1b5..6fe969357f 100644
--- a/toolchain/toolchain-bare-metal-buildroot/Config.in
+++ b/toolchain/toolchain-bare-metal-buildroot/Config.in
@@ -6,4 +6,6 @@ config BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH
This option allows to define the architecture tuple for the
bare-metal toolchain.
+source "package/newlib-bare-metal/Config.in"
+
endif # BR2_TOOLCHAIN_BARE_METAL_BUILDROOT
diff --git a/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk b/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk
index 4dc36ef3f3..dbfe30a910 100644
--- a/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk
+++ b/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk
@@ -4,7 +4,7 @@
#
################################################################################
-TOOLCHAIN_BARE_METAL_BUILDROOT_DEPENDENCIES =
+TOOLCHAIN_BARE_METAL_BUILDROOT_DEPENDENCIES = newlib-bare-metal
TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE = $(call qstrip,$(BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH))
TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT = $(HOST_DIR)/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)/sysroot
TOOLCHAIN_BARE_METAL_BUILDROOT_ADD_TOOLCHAIN_DEPENDENCY = NO
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [Buildroot] [PATCH v9 05/11] toolchain/toolchain-bare-metal-buildroot: wire up newlib-bare-metal
2024-01-31 11:22 ` [Buildroot] [PATCH v9 05/11] toolchain/toolchain-bare-metal-buildroot: wire up newlib-bare-metal Neal Frager via buildroot
@ 2024-02-06 17:53 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 22+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-02-06 17:53 UTC (permalink / raw)
To: Neal Frager via buildroot
Cc: michal.simek, ibai.erkiaga-elorza, luca.ceresoli, Neal Frager
On Wed, 31 Jan 2024 11:22:17 +0000
Neal Frager via buildroot <buildroot@buildroot.org> wrote:
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> Signed-off-by: Neal Frager <neal.frager@amd.com>
> ---
> toolchain/Config.in | 1 +
> toolchain/toolchain-bare-metal-buildroot/Config.in | 2 ++
> .../toolchain-bare-metal-buildroot.mk | 2 +-
> 3 files changed, 4 insertions(+), 1 deletion(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH v9 06/11] boot/zynqmp-firmware: new boot firmware
2024-01-31 11:22 [Buildroot] [PATCH v9 01/11] toolchain/toolchain-bare-metal-buildroot: new toolchain Neal Frager via buildroot
` (3 preceding siblings ...)
2024-01-31 11:22 ` [Buildroot] [PATCH v9 05/11] toolchain/toolchain-bare-metal-buildroot: wire up newlib-bare-metal Neal Frager via buildroot
@ 2024-01-31 11:22 ` Neal Frager via buildroot
2024-02-07 9:00 ` Frager, Neal via buildroot
2024-01-31 11:22 ` [Buildroot] [PATCH v9 07/11] boot/uboot.mk: new zynqmp pmufw build option Neal Frager via buildroot
` (5 subsequent siblings)
10 siblings, 1 reply; 22+ messages in thread
From: Neal Frager via buildroot @ 2024-01-31 11:22 UTC (permalink / raw)
To: buildroot
Cc: ibai.erkiaga-elorza, luca.ceresoli, thomas.petazzoni, Neal Frager,
michal.simek
This patch adds a new boot firmware to buildroot for building the zynqmp pmufw.
It requires the toolchain-bare-metal package that includes a bare-metal
binutils, gcc and newlib which can be built for the microblaze architecture.
A patch is required to enable parallel building of the pmufw. This patch has
been submitted upstream internally at AMD / Xilinx and is included with the
2023.2 release of the embeddedsw repository.
Signed-off-by: Neal Frager <neal.frager@amd.com>
---
V1->V2:
- builds a bare-metal gcc toolchain instead of requiring an external
microblaze toolchain
V2->V3:
- corrected custom cflags option
- added support for xilinx_v2022.2 version
- added zynqmp-firmware.hash
V3->V4:
- no changes
V4->V5:
- reduced all lines to <80 chars
V5->V6:
- migrated to toolchain-bare-metal-buildroot
V6->V7:
- removed patch numbers
- changed dependency to toolchain-bare-metal-buildroot
- removed hash since version is configurable
V7->V9:
- no changes
---
DEVELOPERS | 1 +
boot/Config.in | 1 +
boot/zynqmp-firmware/Config.in | 22 ++++
...akefile-specify-sequential-Makefiles.patch | 1 +
...akefile-specify-sequential-Makefiles.patch | 115 ++++++++++++++++++
boot/zynqmp-firmware/zynqmp-firmware.mk | 33 +++++
6 files changed, 173 insertions(+)
create mode 100644 boot/zynqmp-firmware/Config.in
create mode 120000 boot/zynqmp-firmware/xilinx_v2022.2/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch
create mode 100644 boot/zynqmp-firmware/xilinx_v2023.1/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch
create mode 100644 boot/zynqmp-firmware/zynqmp-firmware.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index 057eac7845..fcb3734229 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2234,6 +2234,7 @@ N: Neal Frager <neal.frager@amd.com>
F: board/versal/
F: board/zynq/
F: board/zynqmp/
+F: boot/zynqmp-firmware/
F: configs/versal_vck190_defconfig
F: configs/zynq_zc702_defconfig
F: configs/zynq_zc706_defconfig
diff --git a/boot/Config.in b/boot/Config.in
index e5fdf7ad43..c7478fef2e 100644
--- a/boot/Config.in
+++ b/boot/Config.in
@@ -24,5 +24,6 @@ source "boot/ti-k3-image-gen/Config.in"
source "boot/ti-k3-r5-loader/Config.in"
source "boot/uboot/Config.in"
source "boot/vexpress-firmware/Config.in"
+source "boot/zynqmp-firmware/Config.in"
endmenu
diff --git a/boot/zynqmp-firmware/Config.in b/boot/zynqmp-firmware/Config.in
new file mode 100644
index 0000000000..b567efe634
--- /dev/null
+++ b/boot/zynqmp-firmware/Config.in
@@ -0,0 +1,22 @@
+config BR2_TARGET_ZYNQMP_FIRMWARE
+ bool "zynqmp-firmware"
+ select BR2_TOOLCHAIN_BARE_METAL_BUILDROOT
+ help
+ This package builds the PMU Firmware application required
+ to run U-Boot and Linux in the Zynq MPSoC devices.
+
+if BR2_TARGET_ZYNQMP_FIRMWARE
+
+config BR2_TARGET_ZYNQMP_FIRMWARE_VERSION
+ string "firmware version"
+ default "xilinx_v2023.2"
+ help
+ Release version of zynqmp firmware.
+ Only versions xilinx_v2022.2 and newer are supported.
+
+config BR2_TARGET_ZYNQMP_FIRMWARE_CUSTOM_CFLAGS
+ string "custom cflags"
+ help
+ Adds additional CFLAGS for building zynqmp firmware.
+
+endif # BR2_TARGET_ZYNQMP_FIRMWARE
diff --git a/boot/zynqmp-firmware/xilinx_v2022.2/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch b/boot/zynqmp-firmware/xilinx_v2022.2/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch
new file mode 120000
index 0000000000..51cb8a6ae0
--- /dev/null
+++ b/boot/zynqmp-firmware/xilinx_v2022.2/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch
@@ -0,0 +1 @@
+../xilinx_v2023.1/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch
\ No newline at end of file
diff --git a/boot/zynqmp-firmware/xilinx_v2023.1/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch b/boot/zynqmp-firmware/xilinx_v2023.1/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch
new file mode 100644
index 0000000000..92dedc7e81
--- /dev/null
+++ b/boot/zynqmp-firmware/xilinx_v2023.1/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch
@@ -0,0 +1,115 @@
+From 23002defd462845db376425a7b7d975f3deba83d Mon Sep 17 00:00:00 2001
+From: Neal Frager <neal.frager@amd.com>
+Date: Mon, 24 Apr 2023 12:53:25 +0100
+Subject: [PATCH] pmufw: misc/Makefile: specify sequential Makefiles
+
+The BSP_SEQUENTIAL_MAKEFILES variable is not properly assigned and exported
+from copy_bsp.sh.
+
+Because of this, no library is built sequentially even if it was desired to
+build them sequentially by assigning to BSP_SEQUENTIAL_MAKEFILES. All the
+libraries are built in parallel.
+
+This patch resolves this issue, so that libraries that must be built
+sequentially are indeed built sequentially.
+
+Signed-off-by: Neal Frager <neal.frager@amd.com>
+---
+ lib/sw_apps/zynqmp_pmufw/misc/Makefile | 10 +++++++++-
+ lib/sw_apps/zynqmp_pmufw/misc/copy_bsp.sh | 7 -------
+ lib/sw_apps/zynqmp_pmufw/src/Makefile | 2 ++
+ 3 files changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/lib/sw_apps/zynqmp_pmufw/misc/Makefile b/lib/sw_apps/zynqmp_pmufw/misc/Makefile
+index a773498512..fe2d23c965 100644
+--- a/lib/sw_apps/zynqmp_pmufw/misc/Makefile
++++ b/lib/sw_apps/zynqmp_pmufw/misc/Makefile
+@@ -7,6 +7,14 @@ PROCESSOR = psu_pmu_0
+ LIBRARIES = ${PROCESSOR}/lib/libxil.a
+ BSP_MAKEFILES := $(wildcard $(PROCESSOR)/libsrc/*/src/Makefile)
+ SUBDIRS := $(patsubst %/Makefile, %, $(BSP_MAKEFILES))
++DRIVERS_LIST=../drivers.txt
++SEQUENTIAL_MAKEFILES := $(shell cat ${DRIVERS_LIST})
++BSP_SEQUENTIAL_MAKEFILES = $(patsubst %, ${PROCESSOR}/libsrc/%/src/Makefile, $(SEQUENTIAL_MAKEFILES))
++BSP_SEQUENTIAL_MAKEFILES += ${PROCESSOR}/libsrc/xilskey/src/Makefile
++BSP_SEQUENTIAL_MAKEFILES += ${PROCESSOR}/libsrc/xilfpga/src/Makefile
++BSP_SEQUENTIAL_MAKEFILES += ${PROCESSOR}/libsrc/xilsecure/src/Makefile
++BSP_SEQUENTIAL_MAKEFILES += ${PROCESSOR}/libsrc/dppsu/src/Makefile
++BSP_SEQUENTIAL_MAKEFILES += ${PROCESSOR}/libsrc/dpdma/src/Makefile
+ BSP_PARALLEL_MAKEFILES := $(filter-out $(BSP_SEQUENTIAL_MAKEFILES),$(BSP_MAKEFILES))
+ SEQ_SUBDIRS := $(patsubst %/Makefile, %, $(BSP_SEQUENTIAL_MAKEFILES))
+ PAR_SUBDIRS := $(patsubst %/Makefile, %, $(BSP_PARALLEL_MAKEFILES))
+@@ -16,7 +24,7 @@ ifneq (,$(findstring win,$(RDI_PLATFORM)))
+ endif
+
+ all:
+- $(MAKE) --no-print-directory seq_libs
++ $(MAKE) -j1 --no-print-directory seq_libs
+ $(MAKE) -j --no-print-directory par_libs
+ $(MAKE) --no-print-directory archive
+ @echo 'Finished building libraries'
+diff --git a/lib/sw_apps/zynqmp_pmufw/misc/copy_bsp.sh b/lib/sw_apps/zynqmp_pmufw/misc/copy_bsp.sh
+index 197f7af844..ac8dd8249e 100755
+--- a/lib/sw_apps/zynqmp_pmufw/misc/copy_bsp.sh
++++ b/lib/sw_apps/zynqmp_pmufw/misc/copy_bsp.sh
+@@ -29,8 +29,6 @@ STANDALONE_DIR=$EMBEDDED_SW_DIR/lib/bsp/standalone/src
+ # libraries dir
+ SERVICES_DIR=$EMBEDDED_SW_DIR/lib/sw_services
+
+-BSP_SEQUENTIAL_MAKEFILES=
+-
+ # creation of BSP folders required
+ if [ -d $BSP_DIR ]; then
+ echo "BSP directory already exists"
+@@ -55,14 +53,12 @@ cp -r $SERVICES_DIR/xilfpga/src/interface/zynqmp/xilfpga_pcap.c $BSP_DIR/libsrc/
+ cp -r $SERVICES_DIR/xilfpga/src/*.h $BSP_DIR/include/
+ cp -r $SERVICES_DIR/xilfpga/src/interface/zynqmp/*.h $BSP_DIR/include/
+ rm -r $BSP_DIR/libsrc/xilfpga/src/interface/
+-BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilfpga/src/Makefile"
+ mkdir -p $BSP_DIR/libsrc/xilsecure/src/
+ cp -r $SERVICES_DIR/xilsecure/src/Makefile $BSP_DIR/libsrc/xilsecure/src/
+ cp -r $SERVICES_DIR/xilsecure/src/common/all/* $BSP_DIR/libsrc/xilsecure/src/
+ cp -r $SERVICES_DIR/xilsecure/src/zynqmp/* $BSP_DIR/libsrc/xilsecure/src/
+ cp -r $SERVICES_DIR/xilsecure/src/common/all/*.h $BSP_DIR/include/
+ cp -r $SERVICES_DIR/xilsecure/src/zynqmp/*.h $BSP_DIR/include/
+-BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilsecure/src/Makefile"
+ cp -r $SERVICES_DIR/xilskey/ $BSP_DIR/libsrc/
+
+ # remove the xilskey library files which are not required for PMU
+@@ -84,7 +80,6 @@ rm -r $BSP_DIR/libsrc/xilskey/src/include/xilskey_bbram.h
+ # copy the xilskey library header files to include directory
+ cp -r $BSP_DIR/libsrc/xilskey/src/*.h $BSP_DIR/include/
+ cp -r $BSP_DIR/libsrc/xilskey/src/include/*.h $BSP_DIR/include/
+-BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilskey/src/Makefile"
+
+ # copy bsp standalone code
+ cp -r $STANDALONE_DIR/common/* $BSP_DIR/libsrc/standalone/src/
+@@ -113,7 +108,6 @@ do
+ if [ $line != "avbuf" ] && [ $line != "video_common" ]; then
+ cp $WORKING_DIR/x"$line"_g.c $BSP_DIR/libsrc/$line/src/
+ fi
+- BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/$line/src/Makefile"
+
+ done < $DRIVERS_LIST
+
+@@ -136,4 +130,3 @@ cp $STANDALONE_DIR/profile/*.h $BSP_DIR/include/
+
+ # no inbyte and outbyte present in standalone
+ cp $WORKING_DIR/inbyte.c $WORKING_DIR/outbyte.c $BSP_DIR/libsrc/standalone/src/
+-export BSP_SEQUENTIAL_MAKEFILES
+diff --git a/lib/sw_apps/zynqmp_pmufw/src/Makefile b/lib/sw_apps/zynqmp_pmufw/src/Makefile
+index 1750c0a329..8747db5cdf 100644
+--- a/lib/sw_apps/zynqmp_pmufw/src/Makefile
++++ b/lib/sw_apps/zynqmp_pmufw/src/Makefile
+@@ -27,6 +27,8 @@ all: $(EXEC)
+ $(EXEC): $(LIBS) $(OBJS) $(INCLUDES)
+ $(CC) -o $@ $(OBJS) $(CC_FLAGS) $(CFLAGS) $(LN_FLAGS) $(LIBPATH) $(LSCRIPT)
+
++$(OBJS): $(LIBS)
++
+ $(LIBS):
+ echo "Copying BSP files"
+ ../misc/copy_bsp.sh
+--
+2.17.1
+
diff --git a/boot/zynqmp-firmware/zynqmp-firmware.mk b/boot/zynqmp-firmware/zynqmp-firmware.mk
new file mode 100644
index 0000000000..383d888fba
--- /dev/null
+++ b/boot/zynqmp-firmware/zynqmp-firmware.mk
@@ -0,0 +1,33 @@
+################################################################################
+#
+# zynqmp-firmware
+#
+################################################################################
+
+ZYNQMP_FIRMWARE_VERSION = $(call qstrip,$(BR2_TARGET_ZYNQMP_FIRMWARE_VERSION))
+ZYNQMP_FIRMWARE_SITE = \
+ $(call github,Xilinx,embeddedsw,$(ZYNQMP_FIRMWARE_VERSION))
+ZYNQMP_FIRMWARE_LICENSE = MIT
+ZYNQMP_FIRMWARE_LICENSE_FILES = license.txt
+ZYNQMP_FIRMWARE_INSTALL_IMAGES = YES
+ZYNQMP_FIRMWARE_INSTALL_TARGET = NO
+ZYNQMP_FIRMWARE_DEPENDENCIES = toolchain-bare-metal-buildroot
+
+CUSTOM_CFLAGS = $(call qstrip,$(BR2_TARGET_ZYNQMP_FIRMWARE_CUSTOM_CFLAGS))
+ZYNQMP_FIRMWARE_CFLAGS = "-Os -flto -ffat-lto-objects $(CUSTOM_CFLAGS)"
+
+define ZYNQMP_FIRMWARE_BUILD_CMDS
+ $(MAKE) -C $(@D)/lib/sw_apps/zynqmp_pmufw/src \
+ COMPILER=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc \
+ ARCHIVER=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc-ar \
+ CC=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc \
+ CFLAGS=$(ZYNQMP_FIRMWARE_CFLAGS)
+endef
+
+ZYNQMP_PMUFW = $(@D)/lib/sw_apps/zynqmp_pmufw/src/executable.elf
+
+define ZYNQMP_FIRMWARE_INSTALL_IMAGES_CMDS
+ $(INSTALL) -D -m 0755 $(ZYNQMP_PMUFW) $(BINARIES_DIR)/pmufw.elf
+endef
+
+$(eval $(generic-package))
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [Buildroot] [PATCH v9 06/11] boot/zynqmp-firmware: new boot firmware
2024-01-31 11:22 ` [Buildroot] [PATCH v9 06/11] boot/zynqmp-firmware: new boot firmware Neal Frager via buildroot
@ 2024-02-07 9:00 ` Frager, Neal via buildroot
2024-02-22 16:35 ` Frager, Neal via buildroot
0 siblings, 1 reply; 22+ messages in thread
From: Frager, Neal via buildroot @ 2024-02-07 9:00 UTC (permalink / raw)
To: buildroot@buildroot.org, luca.ceresoli@bootlin.com,
thomas.petazzoni@bootlin.com, peter@korsgaard.com
Cc: Simek, Michal, Erkiaga Elorza, Ibai
Hello everyone,
Now that the toolchain-bare-metal-buildroot has been applied, do you have any
feedback regarding the remainder of the patch set?
One open question I have is regarding the patches for zynqmp-firmware and
versal-firmware. These patches are no longer neeeded since being applied to
release version xilinx_v2023.2. I kept them with the idea that users may
still be using older versions of software, so the patches enable users to
work with versions as old as 2022.2 for zynqmp and 2023.1 for versal.
Do you agree with keeping the patches or do you think it is better not to
include them and to say that support begins starting with version
xilinx_v2023.2?
What are your thoughts?
> create mode 120000 boot/zynqmp-firmware/xilinx_v2022.2/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch
> create mode 100644 boot/zynqmp-firmware/xilinx_v2023.1/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch
Best regards,
Neal Frager
AMD
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Buildroot] [PATCH v9 06/11] boot/zynqmp-firmware: new boot firmware
2024-02-07 9:00 ` Frager, Neal via buildroot
@ 2024-02-22 16:35 ` Frager, Neal via buildroot
2024-02-29 9:29 ` Luca Ceresoli via buildroot
0 siblings, 1 reply; 22+ messages in thread
From: Frager, Neal via buildroot @ 2024-02-22 16:35 UTC (permalink / raw)
To: buildroot@buildroot.org, luca.ceresoli@bootlin.com,
thomas.petazzoni@bootlin.com, peter@korsgaard.com
Cc: Simek, Michal, Erkiaga Elorza, Ibai
Hello everyone,
Just a friendly reminder. Any updates?
> Now that the toolchain-bare-metal-buildroot has been applied, do you have any
> feedback regarding the remainder of the patch set?
> One open question I have is regarding the patches for zynqmp-firmware and
> versal-firmware. These patches are no longer neeeded since being applied to
> release version xilinx_v2023.2. I kept them with the idea that users may
> still be using older versions of software, so the patches enable users to
> work with versions as old as 2022.2 for zynqmp and 2023.1 for versal.
> Do you agree with keeping the patches or do you think it is better not to
> include them and to say that support begins starting with version
> xilinx_v2023.2?
What are your thoughts?
> create mode 120000 boot/zynqmp-firmware/xilinx_v2022.2/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch
> create mode 100644 boot/zynqmp-firmware/xilinx_v2023.1/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch
Best regards,
Neal Frager
AMD
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Buildroot] [PATCH v9 06/11] boot/zynqmp-firmware: new boot firmware
2024-02-22 16:35 ` Frager, Neal via buildroot
@ 2024-02-29 9:29 ` Luca Ceresoli via buildroot
2024-03-03 8:23 ` Frager, Neal via buildroot
0 siblings, 1 reply; 22+ messages in thread
From: Luca Ceresoli via buildroot @ 2024-02-29 9:29 UTC (permalink / raw)
To: Frager, Neal
Cc: Erkiaga Elorza, Ibai, Simek, Michal, thomas.petazzoni@bootlin.com,
buildroot@buildroot.org
Hello Neal,
On Thu, 22 Feb 2024 16:35:21 +0000
"Frager, Neal" <neal.frager@amd.com> wrote:
> Hello everyone,
>
> Just a friendly reminder. Any updates?
>
> > Now that the toolchain-bare-metal-buildroot has been applied, do you have any
> > feedback regarding the remainder of the patch set?
>
> > One open question I have is regarding the patches for zynqmp-firmware and
> > versal-firmware. These patches are no longer neeeded since being applied to
> > release version xilinx_v2023.2. I kept them with the idea that users may
> > still be using older versions of software, so the patches enable users to
> > work with versions as old as 2022.2 for zynqmp and 2023.1 for versal.
>
> > Do you agree with keeping the patches or do you think it is better not to
> > include them and to say that support begins starting with version
> > xilinx_v2023.2?
>
> What are your thoughts?
>
> > create mode 120000 boot/zynqmp-firmware/xilinx_v2022.2/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch
> > create mode 100644 boot/zynqmp-firmware/xilinx_v2023.1/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch
Apologies for the late reply...
I think we should not put any effort in encouraging the practice of
using old and perhaps not-maintained-anymore software that some
proprietary tools tend to enforce.
We do have a mainline pmufw that works without needing any patches
thank to your (very appreciated!) effort, so let's just support the
latest and greatest pmufw version and be happy.
Your patches are there in this series anyway, and will be, so whoever
wants to use an old version can do some research and find them.
So, I vote to not have these patches in Buildroot.
Luca
--
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Buildroot] [PATCH v9 06/11] boot/zynqmp-firmware: new boot firmware
2024-02-29 9:29 ` Luca Ceresoli via buildroot
@ 2024-03-03 8:23 ` Frager, Neal via buildroot
0 siblings, 0 replies; 22+ messages in thread
From: Frager, Neal via buildroot @ 2024-03-03 8:23 UTC (permalink / raw)
To: Luca Ceresoli
Cc: Erkiaga Elorza, Ibai, Simek, Michal, thomas.petazzoni@bootlin.com,
buildroot@buildroot.org
Hello Luca,
> Hello everyone,
>
> Just a friendly reminder. Any updates?
>
> > Now that the toolchain-bare-metal-buildroot has been applied, do you have any
> > feedback regarding the remainder of the patch set?
>
> > One open question I have is regarding the patches for zynqmp-firmware and
> > versal-firmware. These patches are no longer neeeded since being applied to
> > release version xilinx_v2023.2. I kept them with the idea that users may
> > still be using older versions of software, so the patches enable users to
> > work with versions as old as 2022.2 for zynqmp and 2023.1 for versal.
>
> > Do you agree with keeping the patches or do you think it is better not to
> > include them and to say that support begins starting with version
> > xilinx_v2023.2?
>
> What are your thoughts?
>
> > create mode 120000 boot/zynqmp-firmware/xilinx_v2022.2/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch
> > create mode 100644 boot/zynqmp-firmware/xilinx_v2023.1/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch
> Apologies for the late reply...
> I think we should not put any effort in encouraging the practice of
> using old and perhaps not-maintained-anymore software that some
> proprietary tools tend to enforce.
> We do have a mainline pmufw that works without needing any patches
> thank to your (very appreciated!) effort, so let's just support the
> latest and greatest pmufw version and be happy.
> Your patches are there in this series anyway, and will be, so whoever
> wants to use an old version can do some research and find them.
> So, I vote to not have these patches in Buildroot.
> Luca
I agree with your reasoning. I will remove the patches for the old versions.
Best regards,
Neal Frager
AMD
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH v9 07/11] boot/uboot.mk: new zynqmp pmufw build option
2024-01-31 11:22 [Buildroot] [PATCH v9 01/11] toolchain/toolchain-bare-metal-buildroot: new toolchain Neal Frager via buildroot
` (4 preceding siblings ...)
2024-01-31 11:22 ` [Buildroot] [PATCH v9 06/11] boot/zynqmp-firmware: new boot firmware Neal Frager via buildroot
@ 2024-01-31 11:22 ` Neal Frager via buildroot
2024-01-31 11:22 ` [Buildroot] [PATCH v9 08/11] configs/zynqmp*: build pmufw source Neal Frager via buildroot
` (4 subsequent siblings)
10 siblings, 0 replies; 22+ messages in thread
From: Neal Frager via buildroot @ 2024-01-31 11:22 UTC (permalink / raw)
To: buildroot
Cc: ibai.erkiaga-elorza, luca.ceresoli, thomas.petazzoni, Neal Frager,
michal.simek
The new BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE option will enable u-boot to
use the zynqmp-firmware package for building a pmufw.elf that gets included in
the generated boot.bin.
If the BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE option is enabled, then the
BR2_TARGET_UBOOT_ZYNQMP_PMUFW config for downloading a prebuilt pmufw will
be ignored.
Signed-off-by: Neal Frager <neal.frager@amd.com>
---
V1->V2:
- patch is now backwards compatible for users already using the
BR2_TARGET_UBOOT_ZYNQMP_PMUFW config for downloading a prebuilt pmufw
V2->V3:
- no changes
V3->V4:
- BR2_TARGET_UBOOT_ZYNQMP_PMUFW removed when
BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE selected
V4->V9:
- no changes
---
boot/uboot/Config.in | 19 +++++++++++++++++--
boot/uboot/uboot.mk | 5 +++++
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index beafb38930..c5e33944d5 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -514,11 +514,26 @@ config BR2_TARGET_UBOOT_ZYNQMP
if BR2_TARGET_UBOOT_ZYNQMP
+config BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE
+ bool "Build zynqmp PMU firmware from source"
+ select BR2_TARGET_ZYNQMP_FIRMWARE
+ depends on BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG
+ help
+ This option instructs u-boot to build the zynqmp pmufw using
+ the zynqmp-firmware package. u-boot will then include this
+ pmufw.elf in the generated boot.bin.
+
+ If this option is selected, the BR2_TARGET_UBOOT_ZYNQMP_PMUFW
+ prebuilt option will be ignored.
+
+ This feature requires U-Boot >= 2018.07.
+
config BR2_TARGET_UBOOT_ZYNQMP_PMUFW
- string "PMU firmware location"
+ string "Pre-built zynqmp PMU firmware location"
depends on BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG
+ depends on !BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE
help
- Location of a PMU firmware binary.
+ Location of a pre-built PMU firmware binary.
If not empty, instructs the U-Boot build process to generate
a boot.bin (to be loaded by the ZynqMP boot ROM) containing
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index dda606a880..c11e3d89f7 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -416,7 +416,12 @@ endef
ifeq ($(BR2_TARGET_UBOOT_ZYNQMP),y)
+ifeq ($(BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE),y)
+UBOOT_DEPENDENCIES += zynqmp-firmware
+UBOOT_ZYNQMP_PMUFW = $(BINARIES_DIR)/pmufw.elf
+else
UBOOT_ZYNQMP_PMUFW = $(call qstrip,$(BR2_TARGET_UBOOT_ZYNQMP_PMUFW))
+endif #BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE
ifneq ($(findstring ://,$(UBOOT_ZYNQMP_PMUFW)),)
UBOOT_EXTRA_DOWNLOADS += $(UBOOT_ZYNQMP_PMUFW)
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH v9 08/11] configs/zynqmp*: build pmufw source
2024-01-31 11:22 [Buildroot] [PATCH v9 01/11] toolchain/toolchain-bare-metal-buildroot: new toolchain Neal Frager via buildroot
` (5 preceding siblings ...)
2024-01-31 11:22 ` [Buildroot] [PATCH v9 07/11] boot/uboot.mk: new zynqmp pmufw build option Neal Frager via buildroot
@ 2024-01-31 11:22 ` Neal Frager via buildroot
2024-01-31 11:22 ` [Buildroot] [PATCH v9 09/11] boot/versal-firmware: new boot firmware Neal Frager via buildroot
` (3 subsequent siblings)
10 siblings, 0 replies; 22+ messages in thread
From: Neal Frager via buildroot @ 2024-01-31 11:22 UTC (permalink / raw)
To: buildroot
Cc: ibai.erkiaga-elorza, luca.ceresoli, thomas.petazzoni, Neal Frager,
michal.simek
This patch migrates the zynqmp config files to use the new
zynqmp-firmware package for building the zynqmp pmufw from source.
Signed-off-by: Neal Frager <neal.frager@amd.com>
---
V4->V7:
- no changes
V7->V8:
- bump to xilinx_v2023.2
V8->V9:
- add the new zynqmp defconfigs
- add BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH definition
---
configs/zynqmp_kria_kd240_defconfig | 5 ++++-
configs/zynqmp_kria_kr260_defconfig | 5 ++++-
configs/zynqmp_kria_kv260_defconfig | 5 ++++-
configs/zynqmp_zcu102_defconfig | 4 +++-
configs/zynqmp_zcu104_defconfig | 4 +++-
configs/zynqmp_zcu106_defconfig | 4 +++-
6 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/configs/zynqmp_kria_kd240_defconfig b/configs/zynqmp_kria_kd240_defconfig
index 78302a48c0..1c82585feb 100644
--- a/configs/zynqmp_kria_kd240_defconfig
+++ b/configs/zynqmp_kria_kd240_defconfig
@@ -32,7 +32,10 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
BR2_TARGET_UBOOT_ZYNQMP=y
-BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/kd240-kria/pmufw.elf"
+BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE=y
+BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf"
+BR2_TARGET_ZYNQMP_FIRMWARE_VERSION="xilinx_v2023.2"
+BR2_TARGET_ZYNQMP_FIRMWARE_CUSTOM_CFLAGS="-DBOARD_SHUTDOWN_PIN=2 -DBOARD_SHUTDOWN_PIN_STATE=0 -DENABLE_EM -DENABLE_MOD_OVERTEMP -DENABLE_DYNAMIC_MIO_CONFIG -DENABLE_IOCTL -DCONNECT_PMU_GPO_2_VAL=0"
BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kd240/pm_cfg_obj.c"
BR2_TARGET_UBOOT_FORMAT_ITB=y
BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
diff --git a/configs/zynqmp_kria_kr260_defconfig b/configs/zynqmp_kria_kr260_defconfig
index 2089c3f355..8a2d9db87e 100644
--- a/configs/zynqmp_kria_kr260_defconfig
+++ b/configs/zynqmp_kria_kr260_defconfig
@@ -32,7 +32,10 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
BR2_TARGET_UBOOT_ZYNQMP=y
-BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/kr260-kria/pmufw.elf"
+BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE=y
+BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf"
+BR2_TARGET_ZYNQMP_FIRMWARE_VERSION="xilinx_v2023.2"
+BR2_TARGET_ZYNQMP_FIRMWARE_CUSTOM_CFLAGS="-DBOARD_SHUTDOWN_PIN=2 -DBOARD_SHUTDOWN_PIN_STATE=0 -DENABLE_EM -DENABLE_MOD_OVERTEMP -DENABLE_DYNAMIC_MIO_CONFIG -DENABLE_IOCTL -DCONNECT_PMU_GPO_2_VAL=0"
BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kr260/pm_cfg_obj.c"
BR2_TARGET_UBOOT_FORMAT_ITB=y
BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig
index a3a157267c..2d39818599 100644
--- a/configs/zynqmp_kria_kv260_defconfig
+++ b/configs/zynqmp_kria_kv260_defconfig
@@ -32,7 +32,10 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
BR2_TARGET_UBOOT_ZYNQMP=y
-BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/kv260-kria/pmufw.elf"
+BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE=y
+BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf"
+BR2_TARGET_ZYNQMP_FIRMWARE_VERSION="xilinx_v2023.2"
+BR2_TARGET_ZYNQMP_FIRMWARE_CUSTOM_CFLAGS="-DBOARD_SHUTDOWN_PIN=2 -DBOARD_SHUTDOWN_PIN_STATE=0 -DENABLE_EM -DENABLE_MOD_OVERTEMP -DENABLE_DYNAMIC_MIO_CONFIG -DENABLE_IOCTL -DCONNECT_PMU_GPO_2_VAL=0"
BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kv260/pm_cfg_obj.c"
BR2_TARGET_UBOOT_FORMAT_ITB=y
BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig
index c920093d8d..9ae4ce7995 100644
--- a/configs/zynqmp_zcu102_defconfig
+++ b/configs/zynqmp_zcu102_defconfig
@@ -30,7 +30,9 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
BR2_TARGET_UBOOT_ZYNQMP=y
-BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/zcu102-zynqmp/pmufw.elf"
+BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE=y
+BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf"
+BR2_TARGET_ZYNQMP_FIRMWARE_VERSION="xilinx_v2023.2"
BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu102/pm_cfg_obj.c"
BR2_TARGET_UBOOT_FORMAT_ITB=y
BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
diff --git a/configs/zynqmp_zcu104_defconfig b/configs/zynqmp_zcu104_defconfig
index 452f2343c8..d86f17e384 100644
--- a/configs/zynqmp_zcu104_defconfig
+++ b/configs/zynqmp_zcu104_defconfig
@@ -30,7 +30,9 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
BR2_TARGET_UBOOT_ZYNQMP=y
-BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/zcu104-zynqmp/pmufw.elf"
+BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE=y
+BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf"
+BR2_TARGET_ZYNQMP_FIRMWARE_VERSION="xilinx_v2023.2"
BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu104/pm_cfg_obj.c"
BR2_TARGET_UBOOT_FORMAT_ITB=y
BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig
index 011c7f0fae..03c04dff39 100644
--- a/configs/zynqmp_zcu106_defconfig
+++ b/configs/zynqmp_zcu106_defconfig
@@ -30,7 +30,9 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
BR2_TARGET_UBOOT_ZYNQMP=y
-BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/zcu106-zynqmp/pmufw.elf"
+BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE=y
+BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf"
+BR2_TARGET_ZYNQMP_FIRMWARE_VERSION="xilinx_v2023.2"
BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu106/pm_cfg_obj.c"
BR2_TARGET_UBOOT_FORMAT_ITB=y
BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH v9 09/11] boot/versal-firmware: new boot firmware
2024-01-31 11:22 [Buildroot] [PATCH v9 01/11] toolchain/toolchain-bare-metal-buildroot: new toolchain Neal Frager via buildroot
` (6 preceding siblings ...)
2024-01-31 11:22 ` [Buildroot] [PATCH v9 08/11] configs/zynqmp*: build pmufw source Neal Frager via buildroot
@ 2024-01-31 11:22 ` Neal Frager via buildroot
2024-01-31 11:22 ` [Buildroot] [PATCH v9 10/11] configs/versal_vck190_defconfig: build plm and psmfw source Neal Frager via buildroot
` (2 subsequent siblings)
10 siblings, 0 replies; 22+ messages in thread
From: Neal Frager via buildroot @ 2024-01-31 11:22 UTC (permalink / raw)
To: buildroot
Cc: ibai.erkiaga-elorza, luca.ceresoli, thomas.petazzoni, Neal Frager,
michal.simek
This patch adds a new boot firmware to buildroot for building the versal plm
and psmfw. It requires the toolchain-bare-metal package that includes a
bare-metal binutils, gcc and newlib which can be built for the microblaze
architecture.
Patches are required to enable parallel building of the versal plm and psmfw
applications. These two patches have been submitted upstream internally at
AMD / Xilinx and will be included with the 2023.2 release of the embeddedsw
repository.
Signed-off-by: Neal Frager <neal.frager@amd.com>
---
V4->V5:
- automatically select bootgen as a needed tool
- reduce all lines to <80 chars
- add help for PDI file location which could be URL or local
V5->V6:
- migrated to toolchain-bare-metal-buildroot
V6->V7:
- removed patch numbers
- changed dependency to toolchain-bare-metal-buildroot
- removed hash since version is configurable
V7->V9:
- no changes
---
DEVELOPERS | 1 +
boot/Config.in | 1 +
boot/versal-firmware/Config.in | 38 +++++
boot/versal-firmware/versal-firmware.mk | 52 ++++++
...al_plm-add-support-of-parallel-build.patch | 157 ++++++++++++++++++
..._psmfw-add-support-of-parallel-build.patch | 48 ++++++
6 files changed, 297 insertions(+)
create mode 100644 boot/versal-firmware/Config.in
create mode 100644 boot/versal-firmware/versal-firmware.mk
create mode 100644 boot/versal-firmware/xilinx_v2023.1/0001-sw_apps-versal_plm-add-support-of-parallel-build.patch
create mode 100644 boot/versal-firmware/xilinx_v2023.1/0002-sw_apps-versal_psmfw-add-support-of-parallel-build.patch
diff --git a/DEVELOPERS b/DEVELOPERS
index fcb3734229..e2c8fb6198 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2234,6 +2234,7 @@ N: Neal Frager <neal.frager@amd.com>
F: board/versal/
F: board/zynq/
F: board/zynqmp/
+F: boot/versal-firmware/
F: boot/zynqmp-firmware/
F: configs/versal_vck190_defconfig
F: configs/zynq_zc702_defconfig
diff --git a/boot/Config.in b/boot/Config.in
index c7478fef2e..da5ccb6b9c 100644
--- a/boot/Config.in
+++ b/boot/Config.in
@@ -23,6 +23,7 @@ source "boot/ti-k3-boot-firmware/Config.in"
source "boot/ti-k3-image-gen/Config.in"
source "boot/ti-k3-r5-loader/Config.in"
source "boot/uboot/Config.in"
+source "boot/versal-firmware/Config.in"
source "boot/vexpress-firmware/Config.in"
source "boot/zynqmp-firmware/Config.in"
diff --git a/boot/versal-firmware/Config.in b/boot/versal-firmware/Config.in
new file mode 100644
index 0000000000..b931461a4a
--- /dev/null
+++ b/boot/versal-firmware/Config.in
@@ -0,0 +1,38 @@
+config BR2_TARGET_VERSAL_FIRMWARE
+ bool "versal-firmware"
+ select BR2_PACKAGE_HOST_BOOTGEN
+ select BR2_TOOLCHAIN_BARE_METAL_BUILDROOT
+ help
+ This package builds the boot firmware apps for Xilinx versal
+ boards, so that they can boot u-boot and Linux.
+
+if BR2_TARGET_VERSAL_FIRMWARE
+
+config BR2_TARGET_VERSAL_FIRMWARE_VERSION
+ string "firmware version"
+ default "xilinx_v2023.2"
+ help
+ Release version of versal firmware.
+ Only versions xilinx_v2023.1 and newer are supported.
+
+config BR2_TARGET_VERSAL_FIRMWARE_CUSTOM_CFLAGS
+ string "custom cflags"
+ help
+ Adds additional CFLAGS for building versal firmware.
+
+config BR2_TARGET_VERSAL_FIRMWARE_PDI
+ string "pdi file location"
+ default "https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/vck190-versal/vpl_gen_fixed.pdi"
+ help
+ The PDI file defines everything which is board specific for versal.
+ It gets parsed by the plm.elf during boot. To boot a custom target
+ based on versal, this should be configured to point to your Vivado
+ generated PDI file.
+
+ The location of the PDI can be either a URL for download or a file
+ in the local repository.
+
+ This config should never be undefined, so default configuration is
+ for the vck190 evaluation board.
+
+endif # BR2_TARGET_VERSAL_FIRMWARE
diff --git a/boot/versal-firmware/versal-firmware.mk b/boot/versal-firmware/versal-firmware.mk
new file mode 100644
index 0000000000..fa932510a1
--- /dev/null
+++ b/boot/versal-firmware/versal-firmware.mk
@@ -0,0 +1,52 @@
+################################################################################
+#
+# versal-firmware
+#
+################################################################################
+
+VERSAL_FIRMWARE_VERSION = $(call qstrip,$(BR2_TARGET_VERSAL_FIRMWARE_VERSION))
+VERSAL_FIRMWARE_SITE = \
+ $(call github,Xilinx,embeddedsw,$(VERSAL_FIRMWARE_VERSION))
+VERSAL_FIRMWARE_LICENSE = MIT
+VERSAL_FIRMWARE_LICENSE_FILES = license.txt
+VERSAL_FIRMWARE_INSTALL_IMAGES = YES
+VERSAL_FIRMWARE_INSTALL_TARGET = NO
+VERSAL_FIRMWARE_DEPENDENCIES = toolchain-bare-metal-buildroot
+
+CUSTOM_CFLAGS = $(call qstrip,$(BR2_TARGET_VERSAL_FIRMWARE_CUSTOM_CFLAGS))
+VERSAL_FIRMWARE_CFLAGS = "-Os -flto -ffat-lto-objects $(CUSTOM_CFLAGS)"
+
+VERSAL_FIRMWARE_PDI = $(call qstrip,$(BR2_TARGET_VERSAL_FIRMWARE_PDI))
+
+ifneq ($(findstring ://,$(VERSAL_FIRMWARE_PDI)),)
+VERSAL_FIRMWARE_EXTRA_DOWNLOADS = $(VERSAL_FIRMWARE_PDI)
+BR_NO_CHECK_HASH_FOR += $(notdir $(VERSAL_FIRMWARE_PDI))
+VERSAL_PDI = $(VERSAL_FIRMWARE_DL_DIR)/$(notdir $(VERSAL_FIRMWARE_PDI))
+else ifneq ($(VERSAL_FIRMWARE_PDI),)
+VERSAL_PDI = $(shell readlink -f $(VERSAL_FIRMWARE_PDI))
+endif #VERSAL_FIRMWARE_PDI
+
+define VERSAL_FIRMWARE_BUILD_CMDS
+ $(MAKE) -C $(@D)/lib/sw_apps/versal_plm/src/versal \
+ COMPILER=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc \
+ ARCHIVER=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc-ar \
+ CC=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc \
+ CFLAGS=$(VERSAL_FIRMWARE_CFLAGS)
+
+ $(MAKE) -C $(@D)/lib/sw_apps/versal_psmfw/src/versal \
+ COMPILER=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc \
+ ARCHIVER=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc-ar \
+ CC=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc \
+ CFLAGS=$(VERSAL_FIRMWARE_CFLAGS)
+endef
+
+VERSAL_PLM = $(@D)/lib/sw_apps/versal_plm/src/versal/plm.elf
+VERSAL_PSMFW = $(@D)/lib/sw_apps/versal_psmfw/src/versal/psmfw.elf
+
+define VERSAL_FIRMWARE_INSTALL_IMAGES_CMDS
+ $(INSTALL) -D -m 0755 $(VERSAL_PLM) $(BINARIES_DIR)/plm.elf
+ $(INSTALL) -D -m 0755 $(VERSAL_PSMFW) $(BINARIES_DIR)/psmfw.elf
+ $(INSTALL) -D -m 0755 $(VERSAL_PDI) $(BINARIES_DIR)/vpl_gen_fixed.pdi
+endef
+
+$(eval $(generic-package))
diff --git a/boot/versal-firmware/xilinx_v2023.1/0001-sw_apps-versal_plm-add-support-of-parallel-build.patch b/boot/versal-firmware/xilinx_v2023.1/0001-sw_apps-versal_plm-add-support-of-parallel-build.patch
new file mode 100644
index 0000000000..d4e08f435c
--- /dev/null
+++ b/boot/versal-firmware/xilinx_v2023.1/0001-sw_apps-versal_plm-add-support-of-parallel-build.patch
@@ -0,0 +1,157 @@
+From 245509f87776c7727973480f08ead6f293a2f3b2 Mon Sep 17 00:00:00 2001
+From: Neal Frager <neal.frager@amd.com>
+Date: Mon, 4 Sep 2023 07:08:02 +0100
+Subject: [PATCH] sw_apps:versal_plm: add support of parallel build
+
+The build fails when make command is invoked with -j option.
+The root cause is, BSP_SEQUENTIAL_MAKEFILES variable is not assigned
+and exported properly in copy_bsp.sh file. Also, the 'all' target in
+src/Makefile tries to compile the source code before bsp copy was
+finished when -j option is enabled during build.
+
+Added BSP_SEQUENTIAL_MAKEFILES in the misc/Makefile to resolve the
+export issue and corrected dependency in the src/Makefile to let the bsp
+copy finished before compiling the source.
+
+Signed-off-by: Duvvi Divya <Duvvi.Divya@xilinx.com>
+Acked-by: Sreedhar Kundella <sreedhar.k@xilinx.com>
+---
+ lib/sw_apps/versal_plm/misc/versal/Makefile | 12 +++++++++++-
+ lib/sw_apps/versal_plm/misc/versal/copy_bsp.sh | 11 -----------
+ lib/sw_apps/versal_plm/src/versal/Makefile | 2 ++
+ 3 files changed, 13 insertions(+), 12 deletions(-)
+
+diff --git a/lib/sw_apps/versal_plm/misc/versal/Makefile b/lib/sw_apps/versal_plm/misc/versal/Makefile
+index 5c8e719e9c..d735f64530 100644
+--- a/lib/sw_apps/versal_plm/misc/versal/Makefile
++++ b/lib/sw_apps/versal_plm/misc/versal/Makefile
+@@ -7,6 +7,16 @@ PROCESSOR = psv_pmc_0
+ LIBRARIES = ${PROCESSOR}/lib/libxil.a
+ BSP_MAKEFILES := $(wildcard $(PROCESSOR)/libsrc/*/src/Makefile)
+ SUBDIRS := $(patsubst %/Makefile, %, $(BSP_MAKEFILES))
++DRIVERS_LIST=../drivers.txt
++SEQUENTIAL_MAKEFILES := $(shell cat ${DRIVERS_LIST})
++BSP_SEQUENTIAL_MAKEFILES = $(patsubst %, ${PROCESSOR}/libsrc/%/src/Makefile, $(SEQUENTIAL_MAKEFILES))
++BSP_SEQUENTIAL_MAKEFILES += ${PROCESSOR}/libsrc/xilffs/src/Makefile
++BSP_SEQUENTIAL_MAKEFILES += ${PROCESSOR}/libsrc/xilpdi/src/Makefile
++BSP_SEQUENTIAL_MAKEFILES += ${PROCESSOR}/libsrc/xilplmi/src/Makefile
++BSP_SEQUENTIAL_MAKEFILES += ${PROCESSOR}/libsrc/xilpuf/src/Makefile
++BSP_SEQUENTIAL_MAKEFILES += ${PROCESSOR}/libsrc/xilloader/src/Makefile
++BSP_SEQUENTIAL_MAKEFILES += ${PROCESSOR}/libsrc/xilnvm/src/Makefile
++BSP_SEQUENTIAL_MAKEFILES += ${PROCESSOR}/libsrc/xilsecure/src/Makefile
+ BSP_PARALLEL_MAKEFILES := $(filter-out $(BSP_SEQUENTIAL_MAKEFILES),$(BSP_MAKEFILES))
+ SEQ_SUBDIRS := $(patsubst %/Makefile, %, $(BSP_SEQUENTIAL_MAKEFILES))
+ PAR_SUBDIRS := $(patsubst %/Makefile, %, $(BSP_PARALLEL_MAKEFILES))
+@@ -16,7 +26,7 @@ ifneq (,$(findstring win,$(RDI_PLATFORM)))
+ endif
+
+ all:
+- $(MAKE) --no-print-directory seq_libs
++ $(MAKE) -j1 --no-print-directory seq_libs
+ $(MAKE) -j --no-print-directory par_libs
+ $(MAKE) --no-print-directory archive
+ @echo 'Finished building libraries'
+diff --git a/lib/sw_apps/versal_plm/misc/versal/copy_bsp.sh b/lib/sw_apps/versal_plm/misc/versal/copy_bsp.sh
+index 404e588ae2..244d36e2ee 100755
+--- a/lib/sw_apps/versal_plm/misc/versal/copy_bsp.sh
++++ b/lib/sw_apps/versal_plm/misc/versal/copy_bsp.sh
+@@ -29,7 +29,6 @@ STANDALONE_DIR=$EMBEDDED_SW_DIR/lib/bsp/standalone/src
+
+ # libraries dir
+ SERVICES_DIR=$EMBEDDED_SW_DIR/lib/sw_services
+-BSP_SEQUENTIAL_MAKEFILES=
+
+ # creation of BSP folders required
+ if [ -d $BSP_DIR ]; then
+@@ -52,7 +51,6 @@ fi
+ mkdir -p $BSP_DIR/libsrc/xilffs
+ cp -r $SERVICES_DIR/xilffs/src $BSP_DIR/libsrc/xilffs/
+ cp -r $SERVICES_DIR/xilffs/src/include/* $BSP_DIR/include/
+-BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilffs/src/Makefile"
+
+ mkdir -p $BSP_DIR/libsrc/xilpdi/src
+ cp -r $SERVICES_DIR/xilpdi/src/Makefile $BSP_DIR/libsrc/xilpdi/src
+@@ -60,7 +58,6 @@ cp -r $SERVICES_DIR/xilpdi/src/versal/* $BSP_DIR/libsrc/xilpdi/src/
+ cp -r $SERVICES_DIR/xilpdi/src/versal/*.h $BSP_DIR/include/
+ cp -r $SERVICES_DIR/xilpdi/src/common/* $BSP_DIR/libsrc/xilpdi/src/
+ cp -r $SERVICES_DIR/xilpdi/src/common/*.h $BSP_DIR/include/
+-BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilpdi/src/Makefile"
+
+ mkdir -p $BSP_DIR/libsrc/xilplmi/src
+ cp -r $SERVICES_DIR/xilplmi/src/Makefile $BSP_DIR/libsrc/xilplmi/src
+@@ -68,14 +65,12 @@ cp -r $SERVICES_DIR/xilplmi/src/versal/* $BSP_DIR/libsrc/xilplmi/src/
+ cp -r $SERVICES_DIR/xilplmi/src/versal/*.h $BSP_DIR/include/
+ cp -r $SERVICES_DIR/xilplmi/src/common/* $BSP_DIR/libsrc/xilplmi/src/
+ cp -r $SERVICES_DIR/xilplmi/src/common/*.h $BSP_DIR/include/
+-BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilplmi/src/Makefile"
+
+ mkdir -p $BSP_DIR/libsrc/xilpuf/src
+ cp -r $SERVICES_DIR/xilpuf/src/Makefile $BSP_DIR/libsrc/xilpuf/src
+ cp -r $SERVICES_DIR/xilpuf/src/common/* $BSP_DIR/libsrc/xilpuf/src
+ cp -r $SERVICES_DIR/xilpuf/src/server/* $BSP_DIR/libsrc/xilpuf/src
+ cp -r $BSP_DIR/libsrc/xilpuf/src/*.h $BSP_DIR/include/
+-BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilpuf/src/Makefile"
+
+ mkdir -p $BSP_DIR/libsrc/xilloader/src
+ cp -r $SERVICES_DIR/xilloader/src/Makefile $BSP_DIR/libsrc/xilloader/src
+@@ -83,7 +78,6 @@ cp -r $SERVICES_DIR/xilloader/src/versal/* $BSP_DIR/libsrc/xilloader/src/
+ cp -r $SERVICES_DIR/xilloader/src/versal/*.h $BSP_DIR/include/
+ cp -r $SERVICES_DIR/xilloader/src/common/* $BSP_DIR/libsrc/xilloader/src/
+ cp -r $SERVICES_DIR/xilloader/src/common/*.h $BSP_DIR/include/
+-BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilloader/src/Makefile"
+
+ mkdir -p $BSP_DIR/libsrc/xilpm/src/
+ cp -r $SERVICES_DIR/xilpm/src/versal/common/* $BSP_DIR/libsrc/xilpm/src/
+@@ -94,7 +88,6 @@ cp -r $SERVICES_DIR/xilpm/src/versal_common/server/* $BSP_DIR/libsrc/xilpm/src/
+ cp -r $SERVICES_DIR/xilpm/src/versal_common/server/*.h $BSP_DIR/include/
+ cp -r $SERVICES_DIR/xilpm/src/versal_common/common/*.h $BSP_DIR/include/
+ cp -r $SERVICES_DIR/xilpm/src/versal_common/common/* $BSP_DIR/libsrc/xilpm/src/
+-BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilpm/src/versal/common/Makefile"
+
+ mkdir -p $BSP_DIR/libsrc/xilnvm/src
+ cp -r $SERVICES_DIR/xilnvm/src/Makefile $BSP_DIR/libsrc/xilnvm/src
+@@ -103,7 +96,6 @@ cp -r $SERVICES_DIR/xilnvm/src/versal/server/* $BSP_DIR/libsrc/xilnvm/src/
+ cp -r $SERVICES_DIR/xilnvm/src/common/server/* $BSP_DIR/libsrc/xilnvm/src/
+ cp -r $SERVICES_DIR/xilnvm/src/common/* $BSP_DIR/libsrc/xilnvm/src/
+ cp $BSP_DIR/libsrc/xilnvm/src/*.h $BSP_DIR/include/
+-BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilnvm/src/Makefile"
+
+ mkdir -p $BSP_DIR/libsrc/xilsecure/src
+ cp -r $SERVICES_DIR/xilsecure/src/Makefile $BSP_DIR/libsrc/xilsecure/src
+@@ -115,7 +107,6 @@ cp -r $SERVICES_DIR/xilsecure/src/versal/common/* $BSP_DIR/libsrc/xilsecure/src/
+ cp $BSP_DIR/libsrc/xilsecure/src/*.h $BSP_DIR/include/
+ mv $BSP_DIR/libsrc/xilsecure/src/libxilsecure_pmc.a $BSP_DIR/libsrc/xilsecure/src/libxilsecure.a
+ rm -f $BSP_DIR/libsrc/xilsecure/src/libxilsecure_*.a
+-BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilsecure/src/Makefile"
+
+ # copy bsp standalone code
+ cp -r $STANDALONE_DIR/common/* $BSP_DIR/libsrc/standalone/src/
+@@ -144,7 +135,6 @@ do
+ cp -r $DRIVERS_DIR/$line/src/*.h $BSP_DIR/include/
+ # copy all the HSM generated driver files DRIVER_g.c
+ cp $WORKING_DIR/x"$line"_g.c $BSP_DIR/libsrc/$line/src/
+- BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/$line/src/Makefile"
+ done < $DRIVERS_LIST
+
+ #copy the processor code.
+@@ -176,4 +166,3 @@ cp $STANDALONE_DIR/microblaze/*.h $BSP_DIR/include/
+
+ # no inbyte and outbyte present in standalone
+ cp $WORKING_DIR/inbyte.c $WORKING_DIR/outbyte.c $BSP_DIR/libsrc/standalone/src/
+-export BSP_SEQUENTIAL_MAKEFILES
+diff --git a/lib/sw_apps/versal_plm/src/versal/Makefile b/lib/sw_apps/versal_plm/src/versal/Makefile
+index 15956c8a14..a944225845 100644
+--- a/lib/sw_apps/versal_plm/src/versal/Makefile
++++ b/lib/sw_apps/versal_plm/src/versal/Makefile
+@@ -32,6 +32,8 @@ all: $(EXEC)
+ $(EXEC): $(LIBS) $(OBJS) $(INCLUDES)
+ $(CC) -o $@ $(OBJS) $(CC_FLAGS) $(CFLAGS) $(LN_FLAGS) $(LIBPATH) $(LSCRIPT)
+
++$(OBJS): $(LIBS)
++
+ $(LIBS):
+ echo "Copying BSP files"
+ ../../misc/versal/copy_bsp.sh
+--
+2.25.1
+
diff --git a/boot/versal-firmware/xilinx_v2023.1/0002-sw_apps-versal_psmfw-add-support-of-parallel-build.patch b/boot/versal-firmware/xilinx_v2023.1/0002-sw_apps-versal_psmfw-add-support-of-parallel-build.patch
new file mode 100644
index 0000000000..68866223ad
--- /dev/null
+++ b/boot/versal-firmware/xilinx_v2023.1/0002-sw_apps-versal_psmfw-add-support-of-parallel-build.patch
@@ -0,0 +1,48 @@
+From 2ed864ef5965b7466fb145f479ce0747123f2ce0 Mon Sep 17 00:00:00 2001
+From: Neal Frager <neal.frager@amd.com>
+Date: Mon, 4 Sep 2023 07:14:38 +0100
+Subject: [PATCH] sw_apps:versal_psmfw: add support of parallel build
+
+The PSMFW build fails when make command is invoked with -j option.
+The root cause is, the 'all' target in src/Makefile tries to compile
+the source code before bsp copy was finished when -j option is
+enabled during build.
+
+Corrected dependency in the src/Makefile to let the bsp copy
+finished before compiling the source.
+
+Signed-off-by: Naman Trivedi Manojbhai <naman.trivedimanojbhai@amd.com>
+---
+ lib/sw_apps/versal_psmfw/misc/Makefile | 2 +-
+ lib/sw_apps/versal_psmfw/src/versal/Makefile | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/sw_apps/versal_psmfw/misc/Makefile b/lib/sw_apps/versal_psmfw/misc/Makefile
+index 02d85e492e..92d95d0896 100644
+--- a/lib/sw_apps/versal_psmfw/misc/Makefile
++++ b/lib/sw_apps/versal_psmfw/misc/Makefile
+@@ -17,7 +17,7 @@ ifneq (,$(findstring win,$(RDI_PLATFORM)))
+ endif
+
+ all:
+- $(MAKE) --no-print-directory seq_libs
++ $(MAKE) -j1 --no-print-directory seq_libs
+ $(MAKE) -j --no-print-directory par_libs
+ $(MAKE) --no-print-directory archive
+ @echo 'Finished building libraries'
+diff --git a/lib/sw_apps/versal_psmfw/src/versal/Makefile b/lib/sw_apps/versal_psmfw/src/versal/Makefile
+index 1572bbbca9..3f1589283b 100644
+--- a/lib/sw_apps/versal_psmfw/src/versal/Makefile
++++ b/lib/sw_apps/versal_psmfw/src/versal/Makefile
+@@ -33,6 +33,8 @@ all: $(EXEC)
+ $(EXEC): $(LIBS) $(OBJS) $(INCLUDES)
+ $(CC) -o $@ $(OBJS) $(CC_FLAGS) $(CFLAGS) $(LN_FLAGS) $(LIBPATH) $(LSCRIPT)
+
++$(OBJS): $(LIBS)
++
+ $(LIBS):
+ echo "Copying BSP files"
+ ../../misc/copy_bsp.sh
+--
+2.25.1
+
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH v9 10/11] configs/versal_vck190_defconfig: build plm and psmfw source
2024-01-31 11:22 [Buildroot] [PATCH v9 01/11] toolchain/toolchain-bare-metal-buildroot: new toolchain Neal Frager via buildroot
` (7 preceding siblings ...)
2024-01-31 11:22 ` [Buildroot] [PATCH v9 09/11] boot/versal-firmware: new boot firmware Neal Frager via buildroot
@ 2024-01-31 11:22 ` Neal Frager via buildroot
2024-01-31 11:22 ` [Buildroot] [PATCH v9 11/11] package/versal-firmware: remove package Neal Frager via buildroot
2024-02-06 17:52 ` [Buildroot] [PATCH v9 01/11] toolchain/toolchain-bare-metal-buildroot: new toolchain Thomas Petazzoni via buildroot
10 siblings, 0 replies; 22+ messages in thread
From: Neal Frager via buildroot @ 2024-01-31 11:22 UTC (permalink / raw)
To: buildroot
Cc: ibai.erkiaga-elorza, luca.ceresoli, thomas.petazzoni, Neal Frager,
michal.simek
This patch migrates the versal_vck190_defconfig to use the new
versal-firmware package for building the versal plm and psmfw from source.
Signed-off-by: Neal Frager <neal.frager@amd.com>
---
V4->V5:
- bootgen is selected automatically now
V5->V7:
- no changes
V7->V8:
- bump to xilinx_v2023.2
V8->V9:
- add BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH definition
---
configs/versal_vck190_defconfig | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig
index 8561b6641a..5a0dddc070 100644
--- a/configs/versal_vck190_defconfig
+++ b/configs/versal_vck190_defconfig
@@ -32,11 +32,11 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
BR2_TARGET_UBOOT_NEEDS_GNUTLS=y
BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y
BR2_TARGET_UBOOT_FORMAT_DTB=y
-BR2_PACKAGE_VERSAL_FIRMWARE=y
-BR2_PACKAGE_VERSAL_FIRMWARE_VERSION="xilinx_v2023.2"
-BR2_PACKAGE_VERSAL_FIRMWARE_BOARD="vck190"
+BR2_TARGET_VERSAL_FIRMWARE=y
+BR2_TARGET_VERSAL_FIRMWARE_VERSION="xilinx_v2023.2"
+BR2_TARGET_VERSAL_FIRMWARE_PDI="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/vck190-versal/vpl_gen_fixed.pdi"
+BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf"
BR2_PACKAGE_HOST_DOSFSTOOLS=y
BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_MTOOLS=y
-BR2_PACKAGE_HOST_BOOTGEN=y
BR2_GLOBAL_PATCH_DIR="board/versal/patches"
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH v9 11/11] package/versal-firmware: remove package
2024-01-31 11:22 [Buildroot] [PATCH v9 01/11] toolchain/toolchain-bare-metal-buildroot: new toolchain Neal Frager via buildroot
` (8 preceding siblings ...)
2024-01-31 11:22 ` [Buildroot] [PATCH v9 10/11] configs/versal_vck190_defconfig: build plm and psmfw source Neal Frager via buildroot
@ 2024-01-31 11:22 ` Neal Frager via buildroot
2024-02-06 17:52 ` [Buildroot] [PATCH v9 01/11] toolchain/toolchain-bare-metal-buildroot: new toolchain Thomas Petazzoni via buildroot
10 siblings, 0 replies; 22+ messages in thread
From: Neal Frager via buildroot @ 2024-01-31 11:22 UTC (permalink / raw)
To: buildroot
Cc: ibai.erkiaga-elorza, luca.ceresoli, thomas.petazzoni, Neal Frager,
michal.simek
This patch removes the package/versal-firmware as this package is replaced
by the boot/versal-firmware target boot firmware package for versal.
Signed-off-by: Neal Frager <neal.frager@amd.com>
---
V4->V9:
- no changes
---
DEVELOPERS | 1 -
package/Config.in | 1 -
package/versal-firmware/Config.in | 24 ----------------------
package/versal-firmware/versal-firmware.mk | 21 -------------------
4 files changed, 47 deletions(-)
delete mode 100644 package/versal-firmware/Config.in
delete mode 100644 package/versal-firmware/versal-firmware.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index e2c8fb6198..8d40a9b5f7 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2249,7 +2249,6 @@ F: package/binutils-bare-metal/
F: package/bootgen/
F: package/gcc-bare-metal/
F: package/newlib-bare-metal/
-F: package/versal-firmware/
F: toolchain/toolchain-bare-metal-buildroot/
N: Nicola Di Lieto <nicola.dilieto@gmail.com>
diff --git a/package/Config.in b/package/Config.in
index 426bd7d090..8381c19cfd 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -458,7 +458,6 @@ menu "Firmware"
source "package/sunxi-boards/Config.in"
source "package/ts4900-fpga/Config.in"
source "package/ux500-firmware/Config.in"
- source "package/versal-firmware/Config.in"
source "package/wilc-firmware/Config.in"
source "package/wilink-bt-firmware/Config.in"
source "package/zd1211-firmware/Config.in"
diff --git a/package/versal-firmware/Config.in b/package/versal-firmware/Config.in
deleted file mode 100644
index 01daefd204..0000000000
--- a/package/versal-firmware/Config.in
+++ /dev/null
@@ -1,24 +0,0 @@
-config BR2_PACKAGE_VERSAL_FIRMWARE
- bool "versal-firmware"
- depends on BR2_aarch64
- help
- Pre-built firmware files for Xilinx Versal boards.
-
- https://github.com/Xilinx/soc-prebuilt-firmware
-
-if BR2_PACKAGE_VERSAL_FIRMWARE
-
-config BR2_PACKAGE_VERSAL_FIRMWARE_VERSION
- string "firmware version"
- default "xilinx_v2023.1"
- help
- Release version of Versal firmware.
-
-config BR2_PACKAGE_VERSAL_FIRMWARE_BOARD
- string "board name"
- default "vck190"
- help
- Name of Versal target board.
- Used for installing the appropriate firmware.
-
-endif # BR2_PACKAGE_VERSAL_FIRMWARE
diff --git a/package/versal-firmware/versal-firmware.mk b/package/versal-firmware/versal-firmware.mk
deleted file mode 100644
index 1ced259be1..0000000000
--- a/package/versal-firmware/versal-firmware.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-################################################################################
-#
-# versal-firmware
-#
-################################################################################
-
-VERSAL_FIRMWARE_VERSION = $(call qstrip,$(BR2_PACKAGE_VERSAL_FIRMWARE_VERSION))
-VERSAL_FIRMWARE_SITE = $(call github,Xilinx,soc-prebuilt-firmware,$(VERSAL_FIRMWARE_VERSION))
-VERSAL_FIRMWARE_LICENSE = MIT
-VERSAL_FIRMWARE_LICENSE_FILES = LICENSE
-VERSAL_FIRMWARE_INSTALL_TARGET = NO
-VERSAL_FIRMWARE_INSTALL_IMAGES = YES
-
-define VERSAL_FIRMWARE_INSTALL_IMAGES_CMDS
- $(foreach f,plm.elf psmfw.elf vpl_gen_fixed.pdi,\
- $(INSTALL) -D -m 0755 $(@D)/$(BR2_PACKAGE_VERSAL_FIRMWARE_BOARD)-versal/$(f) \
- $(BINARIES_DIR)/$(f)
- )
-endef
-
-$(eval $(generic-package))
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [Buildroot] [PATCH v9 01/11] toolchain/toolchain-bare-metal-buildroot: new toolchain
2024-01-31 11:22 [Buildroot] [PATCH v9 01/11] toolchain/toolchain-bare-metal-buildroot: new toolchain Neal Frager via buildroot
` (9 preceding siblings ...)
2024-01-31 11:22 ` [Buildroot] [PATCH v9 11/11] package/versal-firmware: remove package Neal Frager via buildroot
@ 2024-02-06 17:52 ` Thomas Petazzoni via buildroot
10 siblings, 0 replies; 22+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-02-06 17:52 UTC (permalink / raw)
To: Neal Frager via buildroot
Cc: michal.simek, ibai.erkiaga-elorza, luca.ceresoli, Neal Frager
On Wed, 31 Jan 2024 11:22:13 +0000
Neal Frager via buildroot <buildroot@buildroot.org> wrote:
> This patch adds a new virtual package for adding a bare-metal
> toolchain to Buildroot. For now, it depends on nothing, so it will not
> actually build anything, but it defines some options that will be
> needed by the various packages that will be part of this toolchain
> build process.
>
> Signed-off-by: Neal Frager <neal.frager@amd.com>
> Signed-off-by: Ibai Erkiaga <ibai.erkiaga-elorza@amd.com>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
> DEVELOPERS | 4 ++++
> toolchain/Config.in | 10 ++++++++++
> toolchain/toolchain-bare-metal-buildroot/Config.in | 9 +++++++++
> .../toolchain-bare-metal-buildroot.mk | 12 ++++++++++++
> utils/checksymbolslib/br.py | 3 +++
> 5 files changed, 38 insertions(+)
> create mode 100644 toolchain/toolchain-bare-metal-buildroot/Config.in
> create mode 100644 toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 22+ messages in thread