Skip to content

librem5: workaround atf bug on some compilers #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Danct12 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

librem5: workaround atf bug on some compilers #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ src/u-boot-librem5:
@mkdir src/u-boot-librem5
@wget https://source.puri.sm/Librem5/u-boot-builder/-/archive/3b1c7d957f46c87c6cdd71cd8dab7c84aca26570/u-boot-builder-3b1c7d957f46c87c6cdd71cd8dab7c84aca26570.tar.gz
@tar -xf u-boot-builder-3b1c7d957f46c87c6cdd71cd8dab7c84aca26570.tar.gz --strip-components 1 -C src/u-boot-librem5
@cd src/u-boot-librem5 && patch -p1 < ../librem5-atf-bug.patch

src/u-boot-pocketpc:
@echo "WGET u-boot-pocketpc"
Expand Down
18 changes: 18 additions & 0 deletions src/librem5-atf-bug.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
diff --git a/build_uboot.sh b/build_uboot.sh
index d9fb650..9a4b428 100755
--- a/build_uboot.sh
+++ b/build_uboot.sh
@@ -101,8 +101,13 @@ function build_atf()
git clone "${ATF_REPO}"
fi
cd "${ATF_DIR}"
+ git reset --hard
+ git clean -f -d
git checkout "${ATF_BRANCH}"

+ # Remove -Werror to workaround a compiler bug
+ sed -i 's/-Werror//g' Makefile
+
make PLAT="${ATF_PLAT}" CROSS_COMPILE="${CROSS_COMPILER}" bl31

cd "${CWD}"