mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-08-08 08:30:47 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/am33x-cm3: Switch to TI repo and bump to v0x192

Browse Source 
Switch from the RobertCNelson GitHub mirror to the official TI git
repository and update to version 0x192 (latest release).

The previous installation method used sysfs to load the firmware,
which was specific to old downstream Beaglebone or TI kernels. The
mainline wkup_m3_ipc driver now expects am335x-pm-firmware.elf and
*-scale-data.bin files to be installed in /lib/firmware, making the
sysfs init script obsolete.

Changes:
 - Switch repository from github.com/RobertCNelson to git.ti.com
 - Update version from 11107db (v05.00.00.02) to fb484c5 (v0x192)
 - Refresh all patches to apply cleanly on new version
 - Install .elf and scale-data files instead of .bin
 - Remove obsolete S93-am335x-pm-firmware-load init script
 - Update .checkpackageignore to reflect changes

Signed-off-by: Kory Maincent (TI.com) <kory.maincent@bootlin.com>
[Julien: update .checkpackageignore to fix check-package errors]
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Kory Maincent (TI.com)
2026-01-05 10:55:53 +00:00
committed by Julien Olivain
parent 3bec3d67d8
commit 072f01878b
9 changed files with 76 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.checkpackageignore
View File

@@ -185,11 +185,6 @@ package/alchemy/0001-toolchains-remove-hash-style-management.patch lib_patch.Ups
package/alsamixergui/0001-misc-fixes.patch lib_patch.Sob lib_patch.Upstream
package/alsamixergui/0002-configure-fix-detection-of-fltk-libs.patch lib_patch.Upstream
package/am335x-pru-package/0001-install-does-not-build.patch lib_patch.Upstream
package/am33x-cm3/0001-fix-makefile.patch lib_patch.Upstream
package/am33x-cm3/0002-Makefile-unconditionally-disable-SSP.patch lib_patch.Upstream
package/am33x-cm3/0003-Makefile-unconditionally-disable-PIE.patch lib_patch.Upstream
package/am33x-cm3/0004-Makefile-add-fno-builtin.patch lib_patch.Upstream
package/am33x-cm3/S93-am335x-pm-firmware-load lib_sysv.Variables
package/android-tools/0001-Fix-makefiles-for-out-of-tree-build.patch lib_patch.Upstream
package/android-tools/0002-Fix-adbd-for-non-Ubuntu-systems.patch lib_patch.Upstream
package/android-tools/0004-Fix-build-issue-with-musl.patch lib_patch.Upstream

38
package/am33x-cm3/0001-Enforce-correct-march-option.patch Normal file
View File

@@ -0,0 +1,38 @@
From 4e2c99b1197633704ce249413d86da28d21e1d8b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Date: Tue, 16 Dec 2025 14:58:28 +0100
Subject: [PATCH] Enforce correct -march option
Buildroot uses a normal ARM compiler to build the AM33X CM3 firmware
(which runs on a Cortex-M3 processor), but Buildroot will have a
default -march value that doesn't necessarily match the one needed for
Cortex-M3, leading to build failures (gcc complains that the
-mcpu=cortex-m3 option being passed is not compatible with the
selected -march).
Fix this by explicitly indicating -march=armv7-m.
Upstream: N/A Buildroot specific
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 3fd9f23d4969..3f27be4dff4f 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ SRCDIR = src
BINDIR = bin
INCLUDES = $(SRCDIR)/include
-CFLAGS =-mcpu=cortex-m3 -mthumb -nostdlib -ffreestanding -Wall -Wundef \
+CFLAGS =-march=armv7-m -mcpu=cortex-m3 -mthumb -nostdlib -ffreestanding -Wall -Wundef \
-Werror-implicit-function-declaration -Wstrict-prototypes \
-Wdeclaration-after-statement -fno-delete-null-pointer-checks \
-Wempty-body -fno-strict-overflow -g -I$(INCLUDES) -O2 -MD
--
2.43.0

30
package/am33x-cm3/0001-fix-makefile.patch
View File

@@ -1,30 +0,0 @@
Enforce correct -march option
Buildroot uses a normal ARM compiler to build the AM33X CM3 firmware
(which runs on a Cortex-M3 processor), but Buildroot will have a
default -march value that doesn't necessarily match the one needed for
Cortex-M3, leading to build failures (gcc complains that the
-mcpu=cortex-m3 option being passed is not compatible with the
selected -march).
Fix this by explicitly indicating -march=armv7-m.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Updated the patch to the latest version of the Makefile
Signed-off-by: Anders Darander <anders@chargestorm.se>
Index: b/Makefile
===================================================================
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ SRCDIR = src
BINDIR = bin
INCLUDES = $(SRCDIR)/include
-CFLAGS =-mcpu=cortex-m3 -mthumb -nostdlib -Wall -Wundef \
+CFLAGS =-march=armv7-m -mcpu=cortex-m3 -mthumb -nostdlib -Wall -Wundef \
-Werror-implicit-function-declaration -Wstrict-prototypes \
-Wdeclaration-after-statement -fno-delete-null-pointer-checks \
-Wempty-body -fno-strict-overflow -g -I$(INCLUDES) -O2

17
package/am33x-cm3/0002-Makefile-unconditionally-disable-SSP.patch
View File

@@ -1,6 +1,6 @@
From 6c3b05b74ccd49d8ba246bfef0c2e549b9f2bf7b Mon Sep 17 00:00:00 2001
From ba71b50bef042ed404759a8d48bef1f779cec6d6 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Tue, 29 Oct 2019 16:14:18 +0100
Date: Tue, 16 Dec 2025 15:02:28 +0100
Subject: [PATCH] Makefile: unconditionally disable SSP
Though -nostdlib is passed in $(CFLAGS), -fno-stack-protector must also be
@@ -11,25 +11,28 @@ passed to avoid linking errors related to undefined references to
Fixes:
- http://autobuild.buildroot.net/results/3a3a21f3c35ea025e9b93e09c2454aed0ad31034
Upstream: N/A Buildroot specific
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---
Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index c3ec071..5226006 100644
index 3f27be4dff4f..52423507f50b 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,8 @@ INCLUDES = $(SRCDIR)/include
CFLAGS =-march=armv7-m -mcpu=cortex-m3 -mthumb -nostdlib -Wall -Wundef \
CFLAGS =-march=armv7-m -mcpu=cortex-m3 -mthumb -nostdlib -ffreestanding -Wall -Wundef \
-Werror-implicit-function-declaration -Wstrict-prototypes \
-Wdeclaration-after-statement -fno-delete-null-pointer-checks \
- -Wempty-body -fno-strict-overflow -g -I$(INCLUDES) -O2
- -Wempty-body -fno-strict-overflow -g -I$(INCLUDES) -O2 -MD
+ -Wempty-body -fno-strict-overflow -fno-stack-protector \
+ -g -I$(INCLUDES) -O2
+ -g -I$(INCLUDES) -O2 -MD
LDFLAGS =-nostartfiles -fno-exceptions -Tfirmware.ld
EXECUTABLE=am335x-pm-firmware.elf
--
2.23.0
2.43.0

17
package/am33x-cm3/0003-Makefile-unconditionally-disable-PIE.patch
View File

@@ -1,6 +1,6 @@
From 0e8c3c4851ce64268a8ae1810ef72594251d917d Mon Sep 17 00:00:00 2001
From 8d86dd4b141da8d4d4dc0002b5588389b4412df8 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sun, 10 Nov 2019 21:57:12 +0100
Date: Tue, 16 Dec 2025 15:03:55 +0100
Subject: [PATCH] Makefile: unconditionally disable PIE
Though -nostdlib is passed in $(CFLAGS), -fno-pie must also be passed to
@@ -10,24 +10,27 @@ enforces PIE.
Fixes:
- http://autobuild.buildroot.org/results/418a40b995e91bc66e692dfbc4b0521db3fa5fbb
Upstream: N/A Buildroot specific
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 5226006..fe3d844 100644
index 52423507f50b..9146a8b6a7da 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ CFLAGS =-march=armv7-m -mcpu=cortex-m3 -mthumb -nostdlib -Wall -Wundef \
@@ -17,7 +17,7 @@ CFLAGS =-march=armv7-m -mcpu=cortex-m3 -mthumb -nostdlib -ffreestanding -Wall -W
-Werror-implicit-function-declaration -Wstrict-prototypes \
-Wdeclaration-after-statement -fno-delete-null-pointer-checks \
-Wempty-body -fno-strict-overflow -fno-stack-protector \
- -g -I$(INCLUDES) -O2
+ -fno-pie -g -I$(INCLUDES) -O2
- -g -I$(INCLUDES) -O2 -MD
+ -fno-pie -g -I$(INCLUDES) -O2 -MD
LDFLAGS =-nostartfiles -fno-exceptions -Tfirmware.ld
EXECUTABLE=am335x-pm-firmware.elf
--
2.23.0
2.43.0

17
package/am33x-cm3/0004-Makefile-add-fno-builtin.patch
View File

@@ -1,6 +1,6 @@
From 25fc567ba8a0cd199e48bfa82863247d953784ea Mon Sep 17 00:00:00 2001
From bce00a9036fb0fc4d7735cd2c386b4932b915d97 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sun, 30 Aug 2020 20:59:29 +0200
Date: Tue, 16 Dec 2025 15:09:15 +0100
Subject: [PATCH] Makefile: add -fno-builtin
Build with gcc 10 fails on:
@@ -18,24 +18,27 @@ To fix this build failure, add -fno-builtin
Fixes:
- http://autobuild.buildroot.org/results/a991e6efa012df518ff1bb35017ad2c96c8feedc
Upstream: N/A Buildroot specific
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index fe3d844..fa24d4b 100644
index 9146a8b6a7da..b4869c494593 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ CFLAGS =-march=armv7-m -mcpu=cortex-m3 -mthumb -nostdlib -Wall -Wundef \
@@ -17,7 +17,7 @@ CFLAGS =-march=armv7-m -mcpu=cortex-m3 -mthumb -nostdlib -ffreestanding -Wall -W
-Werror-implicit-function-declaration -Wstrict-prototypes \
-Wdeclaration-after-statement -fno-delete-null-pointer-checks \
-Wempty-body -fno-strict-overflow -fno-stack-protector \
- -fno-pie -g -I$(INCLUDES) -O2
+ -fno-pie -fno-builtin -g -I$(INCLUDES) -O2
- -fno-pie -g -I$(INCLUDES) -O2 -MD
+ -fno-pie -fno-builtin -g -I$(INCLUDES) -O2 -MD
LDFLAGS =-nostartfiles -fno-exceptions -Tfirmware.ld
EXECUTABLE=am335x-pm-firmware.elf
--
2.28.0
2.43.0

6
package/am33x-cm3/S93-am335x-pm-firmware-load
View File

@@ -1,6 +0,0 @@
#!/bin/sh
# Load the PM CM3 firmware
echo 1 > /sys/devices/ocp.2/44d00000.wkup_m3/firmware/am335x-pm-firmware.bin/loading
cat /lib/firmware/am335x-pm-firmware.bin > /sys/devices/ocp.2/44d00000.wkup_m3/firmware/am335x-pm-firmware.bin/data
echo 0 > /sys/devices/ocp.2/44d00000.wkup_m3/firmware/am335x-pm-firmware.bin/loading

2
package/am33x-cm3/am33x-cm3.hash
View File

@@ -1,3 +1,3 @@
# Locally computed
sha256 79b05eda90498390778001caf18435617d5983c075b5b4a6b339bee40551e946 am33x-cm3-11107db2f1e9e58ee75d4fe9cc38423c9a6e4365-git4.tar.gz
sha256 b6020ce5fee52e8df6cf8e045c75064021760dd04e2923ad0e4bdd6e18ebaa49 am33x-cm3-fb484c5e54f2e31cf0a338d2927a06a2870bcc2c-git4.tar.gz
sha256 e136e6949a1d3ca144374375af8b9387faa11d2eee7debff8cf22ca8fe7bf7e9 License.txt

18
package/am33x-cm3/am33x-cm3.mk
View File

@@ -4,9 +4,9 @@
#
################################################################################
# This should correpsond to v05.00.00.02
AM33X_CM3_VERSION = 11107db2f1e9e58ee75d4fe9cc38423c9a6e4365
AM33X_CM3_SITE = https://github.com/RobertCNelson/am33x-cm3
# This should correspond to version 0x192
AM33X_CM3_VERSION = fb484c5e54f2e31cf0a338d2927a06a2870bcc2c
AM33X_CM3_SITE = https://git.ti.com/git/processor-firmware/ti-amx3-cm3-pm-firmware.git
AM33X_CM3_SITE_METHOD = git
AM33X_CM3_LICENSE = TI Publicly Available Software License
AM33X_CM3_LICENSE_FILES = License.txt
@@ -17,15 +17,11 @@ define AM33X_CM3_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) all
endef
# Not all of the firmware files are used
define AM33X_CM3_INSTALL_TARGET_CMDS
$(INSTALL) -m 0644 -D $(@D)/bin/am335x-pm-firmware.bin \
$(TARGET_DIR)/lib/firmware/am335x-pm-firmware.bin
endef
define AM33X_CM3_INSTALL_INIT_SYSV
$(INSTALL) -m 0755 -D package/am33x-cm3/S93-am335x-pm-firmware-load \
$(TARGET_DIR)/etc/init.d/S93-am335x-pm-firmware-load
$(INSTALL) -m 0644 -D $(@D)/bin/am335x-pm-firmware.elf \
$(TARGET_DIR)/lib/firmware/am335x-pm-firmware.elf
$(INSTALL) -m 0644 -D $(@D)/bin/*-scale-data.bin \
$(TARGET_DIR)/lib/firmware/
endef
$(eval $(generic-package))