alice.mosphere.at / TIC-80
this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

update to latest circle-stdlib (#2697)

authored by

Miguel and committed by
GitHub 3125d4a4 9724aed3

+20 -22
+12 -9
.github/workflows/build.yml
··· 193 193 # === Raspberry PI 1-4 Bare Metal === 194 194 rpi-baremetal: 195 195 runs-on: ubuntu-latest 196 - container: nesbox/baremetalpi-tic80:latest 196 + container: miguelhrvs/baremetalapi-tic80:latest 197 197 198 198 steps: 199 - - uses: actions/checkout@v3 199 + - uses: actions/checkout@v4 200 200 with: 201 201 submodules: recursive 202 202 fetch-depth: 0 ··· 211 211 cd vendor 212 212 git clone --recursive https://github.com/smuehlst/circle-stdlib 213 213 cd circle-stdlib 214 - git checkout fdb3c4a948421d47fddab8042a92f980cba43915 214 + git checkout db053a32c165c1b22423a47ed6cb5bddc72b51f2 215 215 git submodule update --recursive 216 216 ./configure -r 3 217 217 make -j$(nproc) ··· 239 239 cp build/baremetalpi/boot/config.txt vendor/circle-stdlib/libs/circle/boot/config.txt 240 240 241 241 - name: Deploy 242 - uses: actions/upload-artifact@v3 242 + uses: actions/upload-artifact@v4 243 243 with: 244 244 name: "tic80-rpi-baremetal" 245 245 path: | 246 + vendor/circle-stdlib/libs/circle/boot/bcm2710-rpi-zero-2-w.dtb 246 247 vendor/circle-stdlib/libs/circle/boot/config.txt 247 248 vendor/circle-stdlib/libs/circle/boot/kernel.img 248 249 vendor/circle-stdlib/libs/circle/boot/bootcode.bin ··· 250 251 vendor/circle-stdlib/libs/circle/boot/fixup.dat 251 252 vendor/circle-stdlib/libs/circle/boot/LICENCE.broadcom 252 253 253 - # === Raspberry PI 4 Bare Metal === 254 + # === Raspberry PI 4-5 Bare Metal === 254 255 rpi4-baremetal: 255 256 runs-on: ubuntu-latest 256 - container: nesbox/baremetalpi-tic80:latest 257 + container: miguelhrvs/baremetalapi-tic80:latest 257 258 258 259 steps: 259 - - uses: actions/checkout@v3 260 + - uses: actions/checkout@v4 260 261 with: 261 262 submodules: recursive 262 263 fetch-depth: 0 ··· 271 272 cd vendor 272 273 git clone --recursive https://github.com/smuehlst/circle-stdlib 273 274 cd circle-stdlib 274 - git checkout fdb3c4a948421d47fddab8042a92f980cba43915 275 + git checkout db053a32c165c1b22423a47ed6cb5bddc72b51f2 275 276 git submodule update --recursive 276 277 ./configure -r 4 277 278 make -j$(nproc) ··· 299 300 cp build/baremetalpi/boot/config.txt vendor/circle-stdlib/libs/circle/boot/config.txt 300 301 301 302 - name: Deploy 302 - uses: actions/upload-artifact@v3 303 + uses: actions/upload-artifact@v4 303 304 with: 304 305 name: "tic80-rpi4-baremetal" 305 306 path: | 306 307 vendor/circle-stdlib/libs/circle/boot/bcm2711-rpi-4-b.dtb 307 308 vendor/circle-stdlib/libs/circle/boot/bcm2711-rpi-cm4.dtb 309 + vendor/circle-stdlib/libs/circle/boot/bcm2711-rpi-400.dtb 310 + vendor/circle-stdlib/libs/circle/boot/bcm2711-rpi-5-b.dtb 308 311 vendor/circle-stdlib/libs/circle/boot/bootcode.bin 309 312 vendor/circle-stdlib/libs/circle/boot/config.txt 310 313 vendor/circle-stdlib/libs/circle/boot/COPYING.linux
+6 -6
build/baremetalpi/Dockerfile
··· 1 - FROM ubuntu:18.04 1 + FROM ubuntu:24.04 2 2 RUN apt-get update 3 3 RUN apt-get install software-properties-common -y 4 4 RUN add-apt-repository ppa:git-core/ppa -y 5 5 RUN apt-get install wget git build-essential -y 6 - RUN wget -q https://cmake.org/files/v3.13/cmake-3.13.0-Linux-x86_64.sh 7 - RUN sh cmake-3.13.0-Linux-x86_64.sh --skip-license --prefix=/usr 8 - 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 9 - RUN cd /opt && tar xjf gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2 10 - ENV PATH=/opt/gcc-arm-none-eabi-9-2020-q2-update/bin/:$PATH 6 + RUN wget -q https://cmake.org/files/v3.30/cmake-3.30.3-linux-x86_64.sh 7 + RUN sh cmake-3.30.3-linux-x86_64.sh --skip-license --prefix=/usr 8 + 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 9 + RUN cd /opt && tar -xf arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi.tar.xz 10 + ENV PATH=/opt/arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi/bin/:$PATH 11 11 RUN mkdir /src 12 12 WORKDIR /src
+1
build/baremetalpi/Makefile
··· 55 55 $(CIRCLEHOME)/addon/linux/liblinuxemu.a \ 56 56 $(CIRCLEHOME)/addon/SDCard/libsdcard.a \ 57 57 $(CIRCLEHOME)/addon/fatfs/libfatfs.a \ 58 + $(CIRCLEHOME)/lib/sound/libsound.a \ 58 59 $(CIRCLEHOME)/lib/usb/libusb.a \ 59 60 $(CIRCLEHOME)/lib/input/libinput.a \ 60 61 $(CIRCLEHOME)/lib/fs/fat/libfatfs.a \
+1 -1
src/system/baremetalpi/syscore.h
··· 22 22 #include <vc4/vchiq/vchiqdevice.h> 23 23 #include <vc4/sound/vchiqsoundbasedevice.h> 24 24 #else 25 - #include <circle/pwmsoundbasedevice.h> 25 + #include <circle/sound/pwmsoundbasedevice.h> 26 26 #endif 27 27 28 28 #include <circle/input/mouse.h>
-6
src/system/baremetalpi/utils.cpp
··· 18 18 return -1; 19 19 } 20 20 21 - int ftruncate(int fd, off_t length) 22 - { 23 - dbg("called ftruncate\n"); 24 - return -1; 25 - } 26 - 27 21 int symlink(const char *target, const char *linkpath) 28 22 { 29 23 dbg("called symlink\n");