Merge branch 'master' of 88.198.237.222:/git/m1-debian

diff --git a/bootstrap.sh b/bootstrap.sh
index bd3af5af8135490dd539d9017b54a93f216e3257..c188a14d2d299c520f7ff699baab3629eb8446e3 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -69,7 +69,6 @@ build_rootfs()
         sudo cp ../../files/fstab etc/fstab
         sudo cp ../../files/quickstart.txt root/
         sudo cp ../../files/interfaces etc/network/interfaces
-        sudo cp ../../files/wlp1s0f0 etc/network/interfaces.d/
         sudo cp ../../files/wpa.conf etc/wpa_supplicant/wpa_supplicant.conf
 
         sudo bash -c 'chroot . apt update'
@@ -155,9 +154,9 @@ upload_artefacts()
 mkdir -p build
 cd build
 
+build_linux
 build_m1n1
 build_uboot
-build_linux
 build_rootfs
 build_live_stick
 build_di_stick

diff --git a/doc/OpenBSD.txt b/doc/OpenBSD.txt
new file mode 100644 (file)
index 0000000..dcbd173
--- /dev/null
+++ b/doc/OpenBSD.txt
@@ -0,0 +1,30 @@
+https://cdn.openbsd.org/pub/OpenBSD/snapshots/arm64/install70.img
+18:56 < kettenis> the mini works fine
+18:57 < kettenis> just remember that with the current DTB all machines default to serial console
+18:57 < kettenis> so you'll have to type "set tty fb0" at the boot> prompt
+19:13 < kettenis> but if you already have u-boot running, the standard instructions from INSTALL.arm64 are all you need
+
+set tty fb0
+boot
+
+Choose whole disk, but it will wipe any linux partitions
+
+Interface is bge0
+
+Hostname: ftp.eu.openbsd.org
+
+Firmware needs to go in /etc/firmware
+
+pkg_add -i bash gnupg vim sudo fvwm2 chromium mtr mpv
+
+halt -p
+
+echo 'set tty fb0' > /etc/boot.conf
+
+systat sensors
+
+# Login Manager X
+xenodm
+
+20:37 < kettenis> the files need to be renamed; it prints the name if wants at the end
+20:37 < kettenis> this will all change once the naming scheme that marcan came up with gets blessed by the Linux maintainers

diff --git a/doc/asahi.txt b/doc/asahi.txt
index c29c3ea1839c564b651ae37042058123be7d0858..24f9025787cd2d45e9ae997d5095c961a48d9d25 100644 (file)
--- a/doc/asahi.txt
+++ b/doc/asahi.txt
@@ -11,19 +11,19 @@
 
 curl -sL tg.st/u/fwx.sh | sh
 
-# Make space the last number is the size that MacOS instatllation should
+# Make space. The last number is the size that MacOS instatllation should
 # consume. The minimum recommended is 100 GB to be able to apply updates later
 # on easily.
 
-diskutil apfs resizeContainer disk0s2 200GB
+diskutil apfs resizeContainer disk0s2 100GB
 
-# Run the installer, select as stub OS 12.1, in the boot picker you're supposed
-# to click Restart than return to the shell and wait until the installer is
-# finished and press Return to shutdown your system.
+# Run the installer, select MacOS 12.1 as stub OS version, in the boot picker
+# you're supposed to click Restart than return to the shell and wait until the
+# installer is finished and press Return to shutdown your system.
 
 curl -L https://mrcn.st/alxsh | sh
 
-# Wait for the system to shutdown and the LEDs turn off. Than wait another 5
+# Wait for the system to shutdown and the LEDs turn off. Than wait another 10
 # seconds. Now press and do _not_ let go of the power button for 15 seconds.
 # If you screw up the power button holding, turn the System off by pressing the
 # power button until it is off and start from the beginning of this paragraph.
@@ -42,9 +42,10 @@ diskutil addPartition <identifier before free space> %EFI% LB 512MB
 diskutil list
 diskutil addPartition <identifier before free space> %Linux% %noformat% <size>
 
-# dd a Debian Testing rootfs on it (minimum size 1 GB)
+# dd a Debian Testing rootfs on it (minimum size 1GB)
 # Find the scripts to create that rootfs here: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian
 
+diskutil list
 curl -L https://tg.st/u/m1.tgz | tar -xOz | dd of=/dev/<identifier of Linux Filesystem> bs=8m
 
 # Build dependencies

diff --git a/doc/rtc.txt b/doc/rtc.txt
new file mode 100644 (file)
index 0000000..f7abfec
--- /dev/null
+++ b/doc/rtc.txt
@@ -0,0 +1,12 @@
+curl -s https://tg.st/u/114e7b2c8bcbbdd2aade6711169d65fc1cbaafb5.patch | git am -
+curl -s https://tg.st/u/1e286fea8f626d571aed6e620f4e166a694317c2.patch | git am -
+curl -s https://tg.st/u/888add910ab5dd1b7500fd2583d8ba5aa73538f3.patch | git am -
+curl -s https://tg.st/u/d0801e9a20532025b82c06342da068da9aa12967.patch | git am -
+
+CONFIG_SPMI_APPLE=y
+CONFIG_MFD_APPLE_SPMI_SERA_PMU=y
+CONFIG_RTC_DRV_APPLE_PMU_SERA=y
+
+01:52 < jeffmiw> Glanzmann: rtc support over spmi is here : https://github.com/jfbortolotti/linux/tree/spmi_rtc  , you need the following flags in your kernel config: CONFIG_SPMI_APPLE=y CONFIG_MFD_APPLE_SPMI_SERA_PMU=y CONFIG_RTC_DRV_APPLE_PMU_SERA=y
+01:53 < jeffmiw> tested on mba for now, branch only have the changes for t8103
+01:58 < jeffmiw> this enables to boot with current time set in rtc, and rtc is updated is system date/time is changed