lk2nd: Allow hardcoding a DTB using LK1ST_DTB

Usage e.g. LK1ST_DTB=apq8016-sbc

Author: stephan-gh

lk2nd/lk2nd-device.c

@@ -313,12 +313,25 @@ static void lk2nd_parse_device_node(const void *fdt)
 #endif
 }
 
+#ifdef LK1ST_DTB
+INCFILE(lk1st_dtb, lk1st_dtb_size, LK1ST_DTB);
+#endif
+
+static void *lk2nd_get_fdt(void)
+{
+#ifdef LK1ST_DTB
+	return lk1st_dtb;
+#else
+	return (void*) lk_boot_args[2];
+#endif
+}
+
 int lk2nd_fdt_parse_early_uart(void)
 {
 	int offset, len;
 	const uint32_t *val;
+	void *fdt = lk2nd_get_fdt();
 
-	void *fdt = (void*) lk_boot_args[2];
 	if (!fdt || dev_tree_check_header(fdt))
 		return -1; // Will be reported later again. Hopefully.
 
@@ -335,7 +348,7 @@ int lk2nd_fdt_parse_early_uart(void)
 
 static void lk2nd_fdt_parse(void)
 {
-	void *fdt = (void*) lk_boot_args[2];
+	void *fdt = lk2nd_get_fdt();
 	if (!fdt)
 		return;
 

lk2nd/rules.mk

@@ -22,6 +22,12 @@ MODULES += lk2nd/smp
 DEFINES += SMP_SPIN_TABLE_BASE=$(SMP_SPIN_TABLE_BASE)
 endif
 
+ifneq ($(LK1ST_DTB),)
+LK1ST_DTB_PATH := dts/$(TARGET)/$(LK1ST_DTB).dtb
+$(BUILDDIR)/$(LOCAL_DIR)/lk2nd-device.o: $(BUILDDIR)/$(LK1ST_DTB_PATH)
+CFLAGS += -DLK1ST_DTB=\"$(LK1ST_DTB_PATH)\"
+endif
+
 ifneq ($(LK1ST_PANEL),)
 # Filter out original panel implementation
 OBJS := $(filter-out target/$(TARGET)/oem_panel.o, $(OBJS))