--- zzzz-none-000/linux-3.10.107/arch/arm/include/asm/prom.h	2017-06-27 09:49:32.000000000 +0000
+++ scorpion-7490-727/linux-3.10.107/arch/arm/include/asm/prom.h	2021-02-04 17:41:59.000000000 +0000
@@ -11,23 +11,46 @@
 #ifndef __ASMARM_PROM_H
 #define __ASMARM_PROM_H
 
-#define HAVE_ARCH_DEVTREE_FIXUPS
-
 #ifdef CONFIG_OF
 
-extern struct machine_desc *setup_machine_fdt(unsigned int dt_phys);
-extern void arm_dt_memblock_reserve(void);
+extern const struct machine_desc *setup_machine_fdt(unsigned int dt_phys);
 extern void __init arm_dt_init_cpu_maps(void);
 
 #else /* CONFIG_OF */
 
-static inline struct machine_desc *setup_machine_fdt(unsigned int dt_phys)
+static inline const struct machine_desc *setup_machine_fdt(unsigned int dt_phys)
 {
 	return NULL;
 }
 
-static inline void arm_dt_memblock_reserve(void) { }
 static inline void arm_dt_init_cpu_maps(void) { }
 
 #endif /* CONFIG_OF */
+
+/* AVM non-dt work-arounds follow */
+
+#if defined(CONFIG_ARCH_QCOM)
+#include <linux/kernel.h>
+#include <linux/printk.h>
+#define prom_printf early_printk
+#else
+extern void prom_printf(const char *fmt, ...);
+#endif
+extern char *prom_getcmdline(void);
+extern char *prom_getenv(char *name);
+
+
+
+extern char *arm_get_machine_name(void);
+extern void arm_set_machine_name(const char *name);
+/* Memory descriptor management. */
+#define PROM_MAX_PMEMBLOCKS    32
+struct prom_pmemblock {
+	unsigned long base; /* Within KSEG0. */
+	unsigned int size;  /* In bytes. */
+	unsigned int type;  /* free or prom memory */
+};
+
+
+#include <asm/prealloc_memory.h>
 #endif /* ASMARM_PROM_H */