Merge pull request #57 from brain-hackers/ci-next

Upgrade submodules etc.
brain-hackers · Feb 4, 2024 · 0c78611 · 0c78611
2 parents 68e6e10 + 4257f24
commit 0c78611
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -45,7 +45,7 @@ jobs:
         with:
           submodules: true
       - name: Workaround for apt update failure
-        run: sudo rm /etc/apt/sources.list.d/github_git-lfs.*
+        run: sudo rm -f /etc/apt/sources.list.d/github_git-lfs.*
       - name: Install deps
         run: sudo apt update && sudo apt install build-essential bison flex libncurses5-dev gcc-arm-linux-gnueabi qemu-user-static debootstrap python3-pip
       - name: Upgrade pip and setuptools
@@ -95,7 +95,7 @@ jobs:
         with:
           submodules: true
       - name: Workaround for apt update failure
-        run: sudo rm /etc/apt/sources.list.d/github_git-lfs.*
+        run: sudo rm -f /etc/apt/sources.list.d/github_git-lfs.*
       - name: Install deps
         run: sudo apt update && sudo apt install build-essential bison flex libncurses5-dev gcc-arm-linux-gnueabihf libssl-dev lzop qemu-user-static debootstrap
       - name: Configure for Linux
@@ -131,6 +131,9 @@ jobs:
           - model: a7200
             nk: edna3exe.bin
             lilo: gen2.bin
+          - model: a7400
+            nk: edna3exe.bin
+            lilo: gen2_7400.bin
           - model: sh1
             nk: edsa1exe.bin
             lilo: gen3_1.bin
@@ -158,7 +161,7 @@ jobs:
         with:
           submodules: true
       - name: Workaround for apt update failure
-        run: sudo rm /etc/apt/sources.list.d/github_git-lfs.*
+        run: sudo rm -f /etc/apt/sources.list.d/github_git-lfs.*
       - name: Install deps
         run: sudo apt update && sudo apt install build-essential bison flex libncurses5-dev gcc-arm-linux-gnueabi qemu-user-static debootstrap
       - name: Build nkbin-maker
@@ -204,7 +207,7 @@ jobs:
         with:
           submodules: true
       - name: Workaround for apt update failure
-        run: sudo rm /etc/apt/sources.list.d/github_git-lfs.*
+        run: sudo rm -f /etc/apt/sources.list.d/github_git-lfs.*
       - name: Install deps
         run: sudo apt update && sudo apt install build-essential bison flex libncurses5-dev gcc-arm-linux-gnueabihf libssl-dev lzop qemu-user-static debootstrap
       - name: Configure for U-Boot
@@ -245,7 +248,7 @@ jobs:
           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.*
+        run: sudo rm -f /etc/apt/sources.list.d/github_git-lfs.*
       - name: Install deps
         run: sudo apt update && sudo apt install kpartx build-essential bison flex libncurses5-dev gcc-arm-linux-gnueabi qemu-user-static debootstrap
       - name: Configure for Linux
@@ -281,7 +284,7 @@ jobs:
         with:
           submodules: true
       - name: Workaround for apt update failure
-        run: sudo rm /etc/apt/sources.list.d/github_git-lfs.*
+        run: sudo rm -f /etc/apt/sources.list.d/github_git-lfs.*
       - name: Install deps
         run: sudo apt update && sudo apt install kpartx build-essential bison flex libncurses5-dev gcc-arm-linux-gnueabihf libssl-dev lzop qemu-user-static debootstrap
       - name: Upgrade pip and setuptools

diff --git a/brainlilo b/brainlilo
diff --git a/image/build_image.sh b/image/build_image.sh
@@ -14,7 +14,7 @@ export CROSS_COMPILE=arm-linux-gnueabi-
 mkdir -p ${WORK}
 mkdir -p ${WORK}/lilobin
 
-for i in "a7200" "sh1" "sh2" "sh3" "sh4" "sh5" "sh6" "sh7"; do
+for i in "a7200" "a7400" "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
@@ -25,6 +25,8 @@ for i in "a7200" "sh1" "sh2" "sh3" "sh4" "sh5" "sh6" "sh7"; do
         "a7200")
             mv ${REPO}/nk.bin ${WORK}/edna3exe.bin
             mv ${REPO}/u-boot-brain/u-boot.bin ${WORK}/lilobin/gen2.bin;;
+        "a7400")
+            mv ${REPO}/u-boot-brain/u-boot.bin ${WORK}/lilobin/gen2_7400.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;;

diff --git a/linux-brain b/linux-brain
diff --git a/os-brainux/setup_brainux.sh b/os-brainux/setup_brainux.sh
@@ -80,9 +80,8 @@ apt update -y
 DEBIAN_FRONTEND=noninteractive \
     apt install -y dialog sudo \
                    libjpeg-dev libfreetype6 libfreetype6-dev zlib1g-dev \
-                   xserver-xorg xserver-xorg-video-fbdev xserver-xorg-dev xserver-xorg-input-evdev xinput-calibrator xorg-dev x11-apps xinit \
+                   xserver-xorg xserver-xorg-video-fbdev xserver-xorg-dev xserver-xorg-input-evdev xinput-calibrator xorg-dev x11-apps x11-ico-dvd xinit \
                    jwm \
-                   weston xwayland \
                    bash tmux vim htop \
                    midori pcmanfm lxterminal xterm gnome-terminal fbterm uim-fep uim-anthy fonts-noto-cjk \
                    dbus udev alsa-utils usbutils iw fake-hwclock systemd-timesyncd\

diff --git a/u-boot-brain b/u-boot-brain
+1 −0		arch/arm/boot/dts/Makefile
+6 −0		arch/arm/boot/dts/imx28-brain.dtsi
+1 −1		arch/arm/boot/dts/imx28-pwa7200.dts
+154 −0		arch/arm/boot/dts/imx28-pwa7400.dts
+9 −1		arch/arm/boot/dts/imx28.dtsi
+3 −0		arch/arm/configs/brain_defconfig
+160 −113		drivers/input/keyboard/brain-kbd-i2c.c
+1 −0		drivers/spi/spidev.c
+6 −1		arch/arm/mach-imx/mxs/Kconfig
+3 −3		board/sharp/common/Kconfig
+3 −0		board/sharp/common/Makefile
+14 −0		board/sharp/common/cpu_clkdiv.c
+3 −0		board/sharp/common/cpu_clkdiv.h
+3 −0		board/sharp/pwa7200/pwa7200.c
+17 −0		board/sharp/pwa7400/Kconfig
+6 −0		board/sharp/pwa7400/MAINTAINERS
+11 −0		board/sharp/pwa7400/Makefile
+12 −0		board/sharp/pwa7400/README
+282 −0		board/sharp/pwa7400/iomux.c
+109 −0		board/sharp/pwa7400/pwa7400.c
+3 −0		board/sharp/pwsh1/pwsh1.c
+3 −0		board/sharp/pwsh2/pwsh2.c
+3 −0		board/sharp/pwsh3/pwsh3.c
+3 −0		board/sharp/pwsh4/pwsh4.c
+3 −0		board/sharp/pwsh5/pwsh5.c
+3 −0		board/sharp/pwsh6/pwsh6.c
+3 −0		board/sharp/pwsh7/pwsh7.c
+37 −0		configs/pwa7400_defconfig
+25 −0		include/configs/pwa7400.h
+ −		tools/logos/pwa7200.bmp
+ −		tools/logos/pwa7200.bmp
+1 −0		tools/logos/pwa7400.bmp
+0 −1		tools/logos/pwg4200.bmp
+ −		tools/logos/pwg5300.bmp