manual merge

diff --git a/README.md b/README.md
index 44de2532b56e3096e6c3d8f33b9682225c068718..46e84914080e3b1531ed25d158eb64e8c24c23bb 100644 (file)
--- a/README.md
+++ b/README.md
@@ -120,7 +120,7 @@ Than open a terminal, and run the following commands:
 
 # FAQ
 
-* If I install Debian, will it be easy to update the Asahi work as it develops?
+## If I install Debian, will it be easy to update the Asahi work as it develops?
 
 Yes, long answer below.
 
@@ -144,7 +144,7 @@ instructions and a video in order to do so, but short version is:
 So, you never need to reinstall Debian. Kernel updates are easy, stub
 updates are a little bit more cumbersome but also seldom.
 
-* How do I compile zfs on apple silicon debian?
+## How do I compile zfs on apple silicon debian?
 
 - In order to build zfs you need the rust environment. So from the m1-debian
   repository you have to run these scripts:
@@ -152,12 +152,6 @@ updates are a little bit more cumbersome but also seldom.
         ./dependencies.sh
         ./prepare_rust.sh
 
-- Build a kernel that is not cross compiled. Because the cross compiled header
-  package does contain the fixtool for the wrong architecture at the moment and
-  install the resulting kernel deb and headers and boot into it:
-
-        ./m1n1_uboot_kernel.sh
-
 - Prepare your zfs build environment. You need to replace
   /home/sithglan/work/m1-debian with your path to
   your m1-debian checkout:

diff --git a/m1n1_uboot_kernel.sh b/m1n1_uboot_kernel.sh
index 772df40d50a2f23858cf109ecfc921412298138e..e32bcde98b59a478013e03839cb260c1f6bd4e97 100644 (file)
--- a/m1n1_uboot_kernel.sh
+++ b/m1n1_uboot_kernel.sh
@@ -16,19 +16,9 @@ source "$(pwd)/build/cargo/env"
 unset LC_CTYPE
 unset LANG
 
-handle_crosscompile()
-{
-        if [ "`uname -m`" != 'aarch64' ]; then
-                export ARCH=arm64
-                export CROSS_COMPILE=aarch64-linux-gnu-
-                sudo apt install -y libc6-dev-arm64-cross
-        fi
-}
-
 build_linux()
 {
 (
-        handle_crosscompile
         test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
         git fetch -a -t
@@ -54,7 +44,6 @@ build_m1n1()
 build_uboot()
 {
 (
-        handle_crosscompile
         test -d u-boot || git clone https://github.com/AsahiLinux/u-boot
         cd u-boot
         git fetch -a -t