Use ./sdcard directory

.github/workflows/build.yml

@@ -21,8 +21,8 @@ jobs:
       - uses: actions/checkout@v2
       - name: Get specific commits of git submodules
         run: sh -ex ./submod.sh
-      - name: Create kernels directory
+      - name: Create sdcard directory
-        run: mkdir -p ./kernels/
+        run: mkdir -p ./sdcard/
       - name: Put git hash in startup message
         run: |
           sed -i "s/Loading.../$(date +%Y%m%d)-$(git rev-parse --short HEAD)/g" src/userinterface.cpp
@@ -39,21 +39,21 @@ jobs:
           set -ex
           export PATH=$(readlink -f ./gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin):$PATH
           RPI=5 bash -ex build.sh
-          cp ./src/kernel*.img ./kernels/
+          cp ./src/kernel*.img ./sdcard/
 
       - name: Build for Raspberry Pi 4 (64-bit)
         run: |
           set -ex
           export PATH=$(readlink -f ./gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin):$PATH
           RPI=4 bash -ex build.sh
-          cp ./src/kernel*.img ./kernels/
+          cp ./src/kernel*.img ./sdcard/
 
       - name: Build for Raspberry Pi 3 (64-bit)
         run: |
           set -ex
           export PATH=$(readlink -f ./gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin):$PATH
           RPI=3 bash -ex build.sh
-          cp ./src/kernel*.img ./kernels/
+          cp ./src/kernel*.img ./sdcard/
 
       - name: Prepare SD card content for 64-bit
         run: |
@@ -63,15 +63,11 @@ jobs:
           make
           make armstub64
           cd -
-          mkdir -p sdcard
           cp -r ./circle-stdlib/libs/circle/boot/* sdcard
           rm -rf sdcard/config*.txt sdcard/README sdcard/Makefile sdcard/armstub sdcard/COPYING.linux
           cp ./src/config.txt ./src/minidexed.ini ./src/*img ./src/performance.ini sdcard/
           cp ./getsysex.sh sdcard/
           echo "usbspeed=full" > sdcard/cmdline.txt
-          cd sdcard
-          cp ../kernels/* . || true
-          cd -
           
       - name: Upload 64-bit artifacts
         id: upload64
@@ -89,8 +85,8 @@ jobs:
       - uses: actions/checkout@v2
       - name: Get specific commits of git submodules
         run: sh -ex ./submod.sh
-      - name: Create kernels directory
+      - name: Create sdcard directory
-        run: mkdir -p ./kernels/
+        run: mkdir -p ./sdcard/
       - name: Put git hash in startup message
         run: |
           sed -i "s/Loading.../$(date +%Y%m%d)-$(git rev-parse --short HEAD)/g" src/userinterface.cpp
@@ -107,14 +103,14 @@ jobs:
           set -ex
           export PATH=$(readlink -f ./gcc-arm-10.3-2021.07-x86_64-arm-none-eabi/bin):$PATH
           RPI=2 bash -ex build.sh
-          cp ./src/kernel*.img ./kernels/
+          cp ./src/kernel*.img ./sdcard/
 
       - name: Build for Raspberry Pi 1 (32-bit)
         run: |
           set -ex
           export PATH=$(readlink -f ./gcc-arm-10.3-2021.07-x86_64-arm-none-eabi/bin):$PATH
           RPI=1 bash -ex build.sh
-          cp ./src/kernel*.img ./kernels/
+          cp ./src/kernel*.img ./sdcard/
 
       - name: Upload 32-bit artifacts
         id: upload32