update to latest circle-stdlib (#2697)

nesbox · Oct 16, 2024 · 3125d4a · 3125d4a
1 parent 9724aed
commit 3125d4a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 22 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -193,10 +193,10 @@ jobs:
   # === Raspberry PI 1-4 Bare Metal ===
   rpi-baremetal:
     runs-on: ubuntu-latest
-    container: nesbox/baremetalpi-tic80:latest
+    container: miguelhrvs/baremetalapi-tic80:latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
           fetch-depth: 0
@@ -211,7 +211,7 @@ jobs:
           cd vendor
           git clone --recursive https://github.com/smuehlst/circle-stdlib
           cd circle-stdlib
-          git checkout fdb3c4a948421d47fddab8042a92f980cba43915
+          git checkout db053a32c165c1b22423a47ed6cb5bddc72b51f2
           git submodule update --recursive
           ./configure -r 3
           make -j$(nproc)
@@ -239,24 +239,25 @@ jobs:
           cp build/baremetalpi/boot/config.txt vendor/circle-stdlib/libs/circle/boot/config.txt
 
       - name: Deploy
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "tic80-rpi-baremetal"
           path: |
+            vendor/circle-stdlib/libs/circle/boot/bcm2710-rpi-zero-2-w.dtb
             vendor/circle-stdlib/libs/circle/boot/config.txt
             vendor/circle-stdlib/libs/circle/boot/kernel.img
             vendor/circle-stdlib/libs/circle/boot/bootcode.bin
             vendor/circle-stdlib/libs/circle/boot/start.elf
             vendor/circle-stdlib/libs/circle/boot/fixup.dat
             vendor/circle-stdlib/libs/circle/boot/LICENCE.broadcom
 
-  # === Raspberry PI 4 Bare Metal ===
+  # === Raspberry PI 4-5 Bare Metal ===
   rpi4-baremetal:
     runs-on: ubuntu-latest
-    container: nesbox/baremetalpi-tic80:latest
+    container: miguelhrvs/baremetalapi-tic80:latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
           fetch-depth: 0
@@ -271,7 +272,7 @@ jobs:
           cd vendor
           git clone --recursive https://github.com/smuehlst/circle-stdlib
           cd circle-stdlib
-          git checkout fdb3c4a948421d47fddab8042a92f980cba43915
+          git checkout db053a32c165c1b22423a47ed6cb5bddc72b51f2
           git submodule update --recursive
           ./configure -r 4
           make -j$(nproc)
@@ -299,12 +300,14 @@ jobs:
           cp build/baremetalpi/boot/config.txt vendor/circle-stdlib/libs/circle/boot/config.txt
 
       - name: Deploy
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "tic80-rpi4-baremetal"
           path: |
             vendor/circle-stdlib/libs/circle/boot/bcm2711-rpi-4-b.dtb
             vendor/circle-stdlib/libs/circle/boot/bcm2711-rpi-cm4.dtb
+            vendor/circle-stdlib/libs/circle/boot/bcm2711-rpi-400.dtb
+            vendor/circle-stdlib/libs/circle/boot/bcm2711-rpi-5-b.dtb
             vendor/circle-stdlib/libs/circle/boot/bootcode.bin
             vendor/circle-stdlib/libs/circle/boot/config.txt
             vendor/circle-stdlib/libs/circle/boot/COPYING.linux

diff --git a/build/baremetalpi/Dockerfile b/build/baremetalpi/Dockerfile
@@ -1,12 +1,12 @@
-FROM ubuntu:18.04
+FROM ubuntu:24.04
 RUN apt-get update
 RUN apt-get install software-properties-common -y
 RUN add-apt-repository ppa:git-core/ppa -y
 RUN apt-get install wget git build-essential -y
-RUN wget -q https://cmake.org/files/v3.13/cmake-3.13.0-Linux-x86_64.sh
-RUN sh cmake-3.13.0-Linux-x86_64.sh --skip-license --prefix=/usr
-RUN cd /opt && wget -q https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2
-RUN cd /opt && tar xjf gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2
-ENV PATH=/opt/gcc-arm-none-eabi-9-2020-q2-update/bin/:$PATH
+RUN wget -q https://cmake.org/files/v3.30/cmake-3.30.3-linux-x86_64.sh
+RUN sh cmake-3.30.3-linux-x86_64.sh --skip-license --prefix=/usr
+RUN cd /opt && wget -q https://developer.arm.com/-/media/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi.tar.xz
+RUN cd /opt && tar -xf arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi.tar.xz
+ENV PATH=/opt/arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi/bin/:$PATH
 RUN mkdir /src
 WORKDIR /src
diff --git a/build/baremetalpi/Makefile b/build/baremetalpi/Makefile
@@ -55,6 +55,7 @@ LIBS :=  \
     $(CIRCLEHOME)/addon/linux/liblinuxemu.a \
     $(CIRCLEHOME)/addon/SDCard/libsdcard.a \
     $(CIRCLEHOME)/addon/fatfs/libfatfs.a \
+    $(CIRCLEHOME)/lib/sound/libsound.a \
     $(CIRCLEHOME)/lib/usb/libusb.a \
     $(CIRCLEHOME)/lib/input/libinput.a \
     $(CIRCLEHOME)/lib/fs/fat/libfatfs.a \

diff --git a/src/system/baremetalpi/syscore.h b/src/system/baremetalpi/syscore.h
@@ -22,7 +22,7 @@
   #include <vc4/vchiq/vchiqdevice.h>
   #include <vc4/sound/vchiqsoundbasedevice.h>
 #else
-  #include <circle/pwmsoundbasedevice.h>
+  #include <circle/sound/pwmsoundbasedevice.h>
 #endif
 
 #include <circle/input/mouse.h>

diff --git a/src/system/baremetalpi/utils.cpp b/src/system/baremetalpi/utils.cpp
@@ -18,12 +18,6 @@ dbg("called chmod\n");
 	return -1;
 }
 
-int ftruncate(int fd, off_t length)
-{
-dbg("called ftruncate\n");
-	return -1;
-}
-
 int symlink(const char *target, const char *linkpath)
 {
 dbg("called symlink\n");