From 46d7cc88db382502f5723358cf12a527416a900a Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Tue, 11 Jun 2024 15:05:23 -0600
Subject: [PATCH] WIP support for snapdragon x elite

---
 Makefile               |  3 ++-
 config/pop-os/24.04.mk | 13 ++++++++++++-
 data/grub/grub.cfg     |  1 +
 mk/iso.mk              |  4 ++++
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 9afccc9..0a7dcc8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,8 @@
 # Configuration settings
 DISTRO_CODE?=pop-os
 DISTRO_VERSION?=24.04
-DISTRO_ARCH?=$(shell dpkg --print-architecture)
+#DISTRO_ARCH?=$(shell dpkg --print-architecture)
+DISTRO_ARCH?=arm64
 
 DISTRO_EPOCH?=$(shell date +%s)
 DISTRO_DATE?=$(shell date +%Y%m%d)
diff --git a/config/pop-os/24.04.mk b/config/pop-os/24.04.mk
index 1bdc546..014bd6b 100644
--- a/config/pop-os/24.04.mk
+++ b/config/pop-os/24.04.mk
@@ -6,8 +6,19 @@ else
 DISTRO_VOLUME_LABEL=$(DISTRO_NAME) $(DISTRO_VERSION) $(DISTRO_ARCH)
 endif
 
+ifeq ($(DISTRO_ARCH),arm64)
+DISTRO_PARAMS+=\
+	arm64.nopauth \
+	clk_ignore_unused \
+	cma=128M \
+	efi=novamap \
+	fw_devlink=off \
+	pd_ignore_unused \
+	rd.driver.blacklist=msm
+else
 # Show splash screen
 DISTRO_PARAMS+=quiet splash
+endif
 
 GNOME_INITIAL_SETUP_STAMP=21.04
 
@@ -67,7 +78,7 @@ endif
 # Staging branches to use when building ISO.
 # No values is the same as building from release
 # `branch-name` is equivalent to `apt-manage add popdev:branch-name -y`
-STAGING_BRANCHES=master
+STAGING_BRANCHES=master linux-6.9.3
 
 # Packages to have in live instance
 LIVE_PKGS=\
diff --git a/data/grub/grub.cfg b/data/grub/grub.cfg
index f09420e..7abbb5a 100644
--- a/data/grub/grub.cfg
+++ b/data/grub/grub.cfg
@@ -38,6 +38,7 @@ set timeout_style=menu
 
 menuentry "Try or Install DISTRO_NAME" --class DISTRO_CODE {
 	set gfxpayload=keep
+	devicetree /dtb/qcom/x1e80100-crd.dtb
 	linux /CASPER_PATH/vmlinuz.efi boot=casper live-media-path=/CASPER_PATH hostname=DISTRO_CODE username=DISTRO_CODE noprompt DISTRO_PARAMS ---
 	initrd /CASPER_PATH/initrd.gz
 }
diff --git a/mk/iso.mk b/mk/iso.mk
index 2b30313..37d8914 100644
--- a/mk/iso.mk
+++ b/mk/iso.mk
@@ -162,6 +162,10 @@ else ifeq ($(DISTRO_ARCH),arm64)
 	mkdir -p "$(BUILD)/iso/boot/grub/arm64-efi"
 	cp "$(BUILD)/pool/usr/lib/grub/arm64-efi/"*.mod "$(BUILD)/iso/boot/grub/arm64-efi/"
 
+	# Copy devicetree files
+	rm -rf "$(BUILD)/iso/dtb"
+	cp -r "$(BUILD)/chroot/usr/lib/firmware/"*"/device-tree" "$(BUILD)/iso/dtb"
+
 endif
 
 	touch "$@"