Activate all 3 mmc controllers, to ensure mmcblk2 is used

Author: timower

.github/workflows/docker-image.yml

@@ -15,6 +15,8 @@ jobs:
     permissions:
       contents: read
       packages: write
+    outputs:
+      linux-image: ${{ steps.meta.outputs.tags }}
     steps:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -35,7 +37,7 @@ jobs:
       - name: Build
         uses: docker/build-push-action@v5
         with:
-          push: ${{ github.event_name != 'pull_request' && github.ref_name == 'main' }}
+          push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           target: linux-build
           cache-from: type=gha
@@ -89,5 +91,6 @@ jobs:
           cache-to: type=gha,mode=max
           build-args: |
             fw_version=${{ matrix.os.version }}
+            linux_image=${{ needs.build-linux.outputs.linux-image }}
 
 

Dockerfile

@@ -6,10 +6,10 @@ ARG linux_release=5.8.18
 
 # By default use a cached linux kernel. To build locally pass:
 #  --build-arg linux_image=linux-build
-ARG linux_image=ghcr.io/timower/rm-docker-linux:linux-image
+ARG linux_image=ghcr.io/timower/rm-docker-linux:main
 
 # Step 1: Build Linux for the emulator
-FROM $toltec_image as linux-builder
+FROM $toltec_image AS linux-builder
 
 RUN apt-get update && \
     apt-get install -y bison bc lzop libssl-dev flex
@@ -22,9 +22,8 @@ RUN curl -o linux.tar.xz https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-$lin
 WORKDIR /opt/linux/linux-$linux_release
 
 # Add a device tree with machine name set to 'reMarkable 2.0'
-RUN cp arch/arm/boot/dts/imx7d-sbc-imx7.dts arch/arm/boot/dts/imx7d-rm.dts && \
-    sed -i 's/CompuLab SBC-iMX7/reMarkable 2.0/' arch/arm/boot/dts/imx7d-rm.dts && \
-    sed -i 's/imx7d-sbc-imx7.dtb/imx7d-sbc-imx7.dtb imx7d-rm.dtb/' arch/arm/boot/dts/Makefile
+ADD ./imx7d-rm.dts arch/arm/boot/dts/
+RUN sed -i 's/imx7d-sbc-imx7.dtb/imx7d-sbc-imx7.dtb imx7d-rm.dtb/' arch/arm/boot/dts/Makefile
 
 # Default imx7 config, enable uinput and disable all modules
 RUN make O=imx7 ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- imx_v6_v7_defconfig && \
@@ -87,7 +86,7 @@ COPY --from=rootfs /opt/rootfs.qcow2 /opt/root
 ADD bin /opt/bin
 ENV PATH=/opt/bin:$PATH
 
-FROM qemu-debug as qemu-base
+FROM qemu-debug AS qemu-base
 
 # First boot, disable xochitl and reboot service, and save state
 RUN run_vm -serial null -daemonize && \

bin/run_vm

@@ -18,7 +18,7 @@ qemu-system-arm \
     -kernel /opt/zImage \
     -dtb /opt/imx7d-rm.dtb \
     -drive if=sd,file=/opt/root/rootfs.qcow2,format=qcow2,index=2 \
-    -append "console=ttymxc0 rootfstype=ext4 root=/dev/mmcblk1p2 rw rootwait init=/sbin/init" \
+    -append "console=ttymxc0 rootfstype=ext4 root=/dev/mmcblk2p2 rw rootwait init=/sbin/init" \
     -nic user,hostfwd=tcp::22-:22,hostfwd=tcp::8888-:8888 \
     -monitor tcp::5555,server=on,wait=off \
     -parallel null -display none \

imx7d-rm.dts

@@ -0,0 +1,62 @@
+/*
+ * Edited imx7d device tree to enable all three usdhc controllers.
+ *
+ * Support for CompuLab SBC-iMX7 Single Board Computer
+ *
+ * Copyright (C) 2015 CompuLab Ltd. - http://www.compulab.co.il/
+ * Author: Ilya Ledvich <ilya@compulab.co.il>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ */
+
+#include "imx7d-cl-som-imx7.dts"
+
+/ {
+	model = "reMarkable 2.0";
+	compatible = "compulab,sbc-imx7", "compulab,cl-som-imx7", "fsl,imx7d";
+};
+
+&usdhc1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usdhc1>;
+	cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
+	wp-gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
+	wakeup-source;
+	status = "okay";
+};
+
+&usdhc2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usdhc2>;
+	status = "okay";
+};
+
+&iomuxc {
+	pinctrl_usdhc1: usdhc1grp {
+		fsl,pins = <
+			MX7D_PAD_SD1_CMD__SD1_CMD		0x59
+			MX7D_PAD_SD1_CLK__SD1_CLK		0x19
+			MX7D_PAD_SD1_DATA0__SD1_DATA0		0x59
+			MX7D_PAD_SD1_DATA1__SD1_DATA1		0x59
+			MX7D_PAD_SD1_DATA2__SD1_DATA2		0x59
+			MX7D_PAD_SD1_DATA3__SD1_DATA3		0x59
+			MX7D_PAD_SD1_CD_B__GPIO5_IO0		0x59 /* CD */
+			MX7D_PAD_SD1_WP__GPIO5_IO1		0x59 /* WP */
+		>;
+	};
+
+	pinctrl_usdhc2: usdhc2grp {
+		fsl,pins = <
+			MX7D_PAD_SD2_CMD__SD2_CMD		0x59
+			MX7D_PAD_SD2_CLK__SD2_CLK		0x19
+			MX7D_PAD_SD2_DATA0__SD2_DATA0		0x59
+			MX7D_PAD_SD2_DATA1__SD2_DATA1		0x59
+			MX7D_PAD_SD2_DATA2__SD2_DATA2		0x59
+			MX7D_PAD_SD2_DATA3__SD2_DATA3		0x59
+		>;
+	};
+
+};

make_rootfs.sh

@@ -15,11 +15,11 @@ should_skip_dhcpcd() {
     if [ -z "$FW_VERSION" ]; then
         return 1  # Don't skip if no version provided
     fi
-    
+
     version_parts=$(get_version_parts "$FW_VERSION")
     major=$(echo "$version_parts" | cut -d '.' -f 1)
     minor=$(echo "$version_parts" | cut -d '.' -f 2)
-    
+
     if [ "$major" -gt 3 ] || ([ "$major" -eq 3 ] && [ "$minor" -ge 12 ]); then
         return 0  # Skip dhcpcd modification
     else
@@ -45,10 +45,6 @@ mkfs ext4 /dev/sda4
 
 mount /dev/sda2 /
 
-download /etc/fstab /tmp/fstab
-! sed -i 's/mmcblk2/mmcblk1/' /tmp/fstab
-upload /tmp/fstab /etc/fstab
-
 mount /dev/sda4 /home
 cp-a /etc/skel /home/root