Merge pull request #34 from brain-hackers/ci-newlilo

2022-05-10
This commit is contained in:
Takumi Sueda 2022-05-10 02:03:19 +09:00 committed by GitHub
commit 1a4d1cd39a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 56 additions and 9 deletions

View File

@ -128,20 +128,30 @@ jobs:
strategy:
matrix:
include:
- model: g5300
nk: edna3exe.bin
lilo: gen2.bin
- model: sh1
nk: edsa1exe.bin
lilo: gen3_1.bin
- model: sh2
nk: edsa2exe.bin
lilo: gen3_2.bin
- model: sh3
nk: edsa3exe.bin
lilo: gen3_3.bin
- model: sh4
nk: edsh4exe.bin
lilo: gen3_4.bin
- model: sh5
nk: edsh5exe.bin
lilo: gen3_5.bin
- model: sh6
nk: edsh6exe.bin
lilo: gen3_6.bin
- model: sh7
nk: edsh7exe.bin
lilo: gen3_7.bin
steps:
- uses: actions/checkout@v2
@ -164,6 +174,7 @@ jobs:
run: |
mkdir release
cp ./u-boot-brain/u-boot.bin release/u-boot.bin
cp ./u-boot-brain/u-boot.bin release/${{ matrix.lilo }}
cp ./u-boot-brain/u-boot.sb release/u-boot.sb
cp ./nk.bin release/${{ matrix.nk }}
zip -r release.zip release/
@ -226,6 +237,13 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: true
- name: Make /opt writable
run: sudo chown "$(whoami):$(whoami)" /opt
- name: Install cegcc
run: |
wget -O cegcc.zip https://github.com/brain-hackers/cegcc-build/releases/download/2022-04-11-133546/cegcc-2022-04-11-133546.zip
unzip -q cegcc.zip
cp -r cegcc /opt/
- name: Workaround for apt update failure
run: sudo rm /etc/apt/sources.list.d/github_git-lfs.*
- name: Install deps

View File

@ -127,6 +127,15 @@ boot4ubuild:
boot4uclean:
make -C ./boot4u clean
.PHONY:
lilobuild:
make -C ./brainlilo
.PHONY:
liloclean:
make -C ./brainlilo clean
brainux:
@if [ "$(shell uname)" != "Linux" ]; then \
echo "Debootstrap is only available in Linux!"; \

View File

@ -9,17 +9,25 @@ IMG=${REPO}/image/sd.img
export CROSS_COMPILE=arm-linux-gnueabi-
mkdir -p ${WORK}
mkdir -p ${WORK}/lilobin
for i in $(seq 1 7); do
make -C ${REPO}/u-boot-brain pwsh${i}_defconfig
for i in "g5300" "sh1" "sh2" "sh3" "sh4" "sh5" "sh6" "sh7"; do
NUM=$(echo $i | sed -E 's/sh//g')
make -C ${REPO}/u-boot-brain distclean pw${i}_defconfig
make -j${JOBS} -C ${REPO}/u-boot-brain u-boot.bin
${REPO}/nkbin_maker/bsd-ce ${REPO}/u-boot-brain/u-boot.bin
case $i in
1|2|3)
mv ${REPO}/nk.bin ${WORK}/edsa${i}exe.bin;;
4|5|6|7)
mv ${REPO}/nk.bin ${WORK}/edsh${i}exe.bin;;
"g5300")
mv ${REPO}/nk.bin ${WORK}/edna3exe.bin
mv ${REPO}/u-boot-brain/u-boot.bin ${WORK}/lilobin/gen2.bin;;
"sh1" | "sh2" | "sh3")
mv ${REPO}/nk.bin ${WORK}/edsa${NUM}exe.bin
mv ${REPO}/u-boot-brain/u-boot.bin ${WORK}/lilobin/gen3_${NUM}.bin;;
"sh4" | "sh5" | "sh6" | "sh7")
mv ${REPO}/nk.bin ${WORK}/edsh${NUM}exe.bin
mv ${REPO}/u-boot-brain/u-boot.bin ${WORK}/lilobin/gen3_${NUM}.bin;;
*)
echo "WTF: $i"
exit 1;;
@ -47,13 +55,25 @@ sudo mkfs.fat -F32 -v -I /dev/mapper/${LOOPDEV}p1
sudo mkfs.ext4 /dev/mapper/${LOOPDEV}p2
mkdir -p ${WORK}/p1 ${WORK}/p2
sudo mount /dev/mapper/${LOOPDEV}p1 ${WORK}/p1
sudo mount -o utf8=true /dev/mapper/${LOOPDEV}p1 ${WORK}/p1
sudo mount /dev/mapper/${LOOPDEV}p2 ${WORK}/p2
sudo cp ${LINUX}/arch/arm/boot/zImage ${WORK}/p1/
sudo cp ${LINUX}/arch/arm/boot/dts/imx28-pwsh*.dtb ${WORK}/p1/
sudo cp ${LINUX}/arch/arm/boot/dts/imx28-pw*.dtb ${WORK}/p1/
sudo cp ${WORK}/*.bin ${WORK}/p1/
make -C ${REPO}/brainlilo
LILO="${WORK}/p1/アプリ/Launch Linux"
sudo mkdir -p "${LILO}"
sudo touch "${LILO}/index.din"
sudo touch "${LILO}/AppMain.cfg"
sudo cp ${REPO}/brainlilo/*.dll "${LILO}/"
sudo cp ${REPO}/brainlilo/BrainLILO.exe "${LILO}/AppMain.exe"
sudo mkdir -p ${WORK}/p1/loader
sudo cp ${WORK}/lilobin/*.bin ${WORK}/p1/loader/
sudo cp -ra ${REPO}/brainux/* ${WORK}/p2/
sudo umount ${WORK}/p1 ${WORK}/p2

@ -1 +1 @@
Subproject commit 90e75bc2c45a7d09a643f58818eedcecc7e83db9
Subproject commit e342c1c00092283097a51f236dfcccd503c44925