Changes to 4903.221.2 for ARM64

fergofrog · Dec 23, 2018 · 70b35d4 · 70b35d4
1 parent 726a2e6
commit 70b35d4
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 40 deletions.
diff --git a/EXTERNAL_HEADERS/Makefile b/EXTERNAL_HEADERS/Makefile
@@ -41,7 +41,7 @@ INSTALL_MI_LIST =
 
 INSTALL_MI_DIR = .
 
-INSTALL_KF_MI_LIST = ${KERNEL_FILES}
+INSTALL_KF_MI_LIST = ${EXPORT_FILES} ${KERNEL_FILES}
 
 INSTALL_KF_MI_LCL_LIST = ${KERNEL_FILES}
 

diff --git a/makedefs/MakeInc.cmd b/makedefs/MakeInc.cmd
@@ -126,12 +126,12 @@ SUPPORTED_SIMULATOR_PLATFORMS := iPhoneSimulator iPhoneNanoSimulator tvSimulator
 SUPPORTED_PLATFORMS := MacOSX $(SUPPORTED_SIMULATOR_PLATFORMS) $(SUPPORTED_EMBEDDED_PLATFORMS)
 
 # Platform-specific tools
-ifneq ($(filter $(SUPPORTED_EMBEDDED_PLATFORMS),$(PLATFORM)),)
-ifeq ($(EMBEDDED_DEVICE_MAP),)
-	export EMBEDDED_DEVICE_MAP := $(shell $(XCRUN) -sdk $(SDKROOT) -find embedded_device_map)
-endif
-EDM_DBPATH ?= $(PLATFORMPATH)/usr/local/standalone/firmware/device_map.db
-endif
+#ifneq ($(filter $(SUPPORTED_EMBEDDED_PLATFORMS),$(PLATFORM)),)
+#ifeq ($(EMBEDDED_DEVICE_MAP),)
+#	export EMBEDDED_DEVICE_MAP := $(shell $(XCRUN) -sdk $(SDKROOT) -find embedded_device_map)
+#endif
+#EDM_DBPATH ?= $(PLATFORMPATH)/usr/local/standalone/firmware/device_map.db
+#endif
 
 # Scripts or tools we build ourselves
 #

diff --git a/makedefs/MakeInc.top b/makedefs/MakeInc.top
@@ -131,41 +131,41 @@ ARCH_CONFIGS_EMBEDDED := $(strip $(shell echo $(ARCH_CONFIGS) | $(TR) a-z A-Z))
 endif
 
 # Find supported products from the device map
-DEVICEMAP_PRODUCTS_ARMV7  := $(shell $(EMBEDDED_DEVICE_MAP) -db $(EDM_DBPATH)		\
-				-query 'SELECT DISTINCT TargetType			\
-					FROM Files					\
-					  INNER JOIN Manifests USING (manifestID)	\
-					  INNER JOIN Targets USING (Target)		\
-					WHERE (KernelMachOArchitecture LIKE "armv7"	\
-					   AND fileType in ("KernelCache", "RestoreKernelCache"))')
-DEVICEMAP_PRODUCTS_ARMV7S := $(shell $(EMBEDDED_DEVICE_MAP) -db $(EDM_DBPATH)		\
-				-query 'SELECT DISTINCT TargetType			\
-					FROM Files					\
-					  INNER JOIN Manifests USING (manifestID)	\
-					  INNER JOIN Targets USING (Target)		\
-					WHERE (KernelMachOArchitecture LIKE "armv7s"	\
-					   AND fileType in ("KernelCache", "RestoreKernelCache"))')
-DEVICEMAP_PRODUCTS_ARMV7K := $(shell $(EMBEDDED_DEVICE_MAP) -db $(EDM_DBPATH)		\
-				-query 'SELECT DISTINCT TargetType			\
-					FROM Files					\
-					  INNER JOIN Manifests USING (manifestID)	\
-					  INNER JOIN Targets USING (Target)		\
-					WHERE (KernelMachOArchitecture LIKE "armv7k"	\
-					   AND fileType in ("KernelCache", "RestoreKernelCache"))')
-DEVICEMAP_PRODUCTS_ARM := $(DEVICEMAP_PRODUCTS_ARMV7) $(DEVICEMAP_PRODUCTS_ARMV7S) $(DEVICEMAP_PRODUCTS_ARMV7K)
-
-
-DEVICEMAP_PRODUCTS_ARM64 := $(shell $(EMBEDDED_DEVICE_MAP) -db $(EDM_DBPATH)		\
-				-query 'SELECT DISTINCT TargetType			\
-					FROM Files					\
-					  INNER JOIN Manifests USING (manifestID)	\
-					  INNER JOIN Targets USING (Target)		\
-					WHERE (KernelMachOArchitecture LIKE "arm64"	\
-					   AND fileType in ("KernelCache", "RestoreKernelCache"))')
+#DEVICEMAP_PRODUCTS_ARMV7  := $(shell $(EMBEDDED_DEVICE_MAP) -db $(EDM_DBPATH)		\
+#				-query 'SELECT DISTINCT TargetType			\
+#					FROM Files					\
+#					  INNER JOIN Manifests USING (manifestID)	\
+#					  INNER JOIN Targets USING (Target)		\
+#					WHERE (KernelMachOArchitecture LIKE "armv7"	\
+#					   AND fileType in ("KernelCache", "RestoreKernelCache"))')
+#DEVICEMAP_PRODUCTS_ARMV7S := $(shell $(EMBEDDED_DEVICE_MAP) -db $(EDM_DBPATH)		\
+#				-query 'SELECT DISTINCT TargetType			\
+#					FROM Files					\
+#					  INNER JOIN Manifests USING (manifestID)	\
+#					  INNER JOIN Targets USING (Target)		\
+#					WHERE (KernelMachOArchitecture LIKE "armv7s"	\
+#					   AND fileType in ("KernelCache", "RestoreKernelCache"))')
+#DEVICEMAP_PRODUCTS_ARMV7K := $(shell $(EMBEDDED_DEVICE_MAP) -db $(EDM_DBPATH)		\
+#				-query 'SELECT DISTINCT TargetType			\
+#					FROM Files					\
+#					  INNER JOIN Manifests USING (manifestID)	\
+#					  INNER JOIN Targets USING (Target)		\
+#					WHERE (KernelMachOArchitecture LIKE "armv7k"	\
+#					   AND fileType in ("KernelCache", "RestoreKernelCache"))')
+#DEVICEMAP_PRODUCTS_ARM := $(DEVICEMAP_PRODUCTS_ARMV7) $(DEVICEMAP_PRODUCTS_ARMV7S) $(DEVICEMAP_PRODUCTS_ARMV7K)
+
+
+#DEVICEMAP_PRODUCTS_ARM64 := $(shell $(EMBEDDED_DEVICE_MAP) -db $(EDM_DBPATH)		\
+#				-query 'SELECT DISTINCT TargetType			\
+#					FROM Files					\
+#					  INNER JOIN Manifests USING (manifestID)	\
+#					  INNER JOIN Targets USING (Target)		\
+#					WHERE (KernelMachOArchitecture LIKE "arm64"	\
+#					   AND fileType in ("KernelCache", "RestoreKernelCache"))')
 
 
 # Generate a list of mappings of the form "n75:arm;t8002" based on the device map
-DEVICEMAP_PRODUCT_SOC_MAPPINGS := $(shell $(EMBEDDED_DEVICE_MAP) -db $(EDM_DBPATH) -query SELECT DISTINCT TargetType, KernelMachOArchitecture, KernelPlatform FROM Targets | awk -F\| '{ if ($$2 ~ /armv[0-9][a-z]?/) { print $$1 ":arm;" $$3 } else if ($$2 ~ /arm64[a-z]?/) { print $$1 ":arm64;" $$3 ";" $$4} else { print $$1 ":" $$2 ";" $$3 ";" $$4} }' )
+#DEVICEMAP_PRODUCT_SOC_MAPPINGS := $(shell $(EMBEDDED_DEVICE_MAP) -db $(EDM_DBPATH) -query SELECT DISTINCT TargetType, KernelMachOArchitecture, KernelPlatform FROM Targets | awk -F\| '{ if ($$2 ~ /armv[0-9][a-z]?/) { print $$1 ":arm;" $$3 } else if ($$2 ~ /arm64[a-z]?/) { print $$1 ":arm64;" $$3 ";" $$4} else { print $$1 ":" $$2 ";" $$3 ";" $$4} }' )
 
 # Map a product like "n75" to "arm;t8002"
 # $(1) is a product name in lower case
@@ -178,7 +178,7 @@ function_lookup_product = $(call function_substitute_word_with_replacement,	\
 # Generate a list of mappings for products that use a different platform for their kernel configuration than their true platform
 # of the form "n71m:arm64;s8000;s8003". The 4th element is the true SoC platform, which will get an on-disk copy, while the
 # kernel's recursive build system will build the 3rd element as the KernelPlatform
-DEVICEMAP_PRODUCT_SOC_ALIASES := $(shell $(EMBEDDED_DEVICE_MAP) -db $(EDM_DBPATH) -query SELECT DISTINCT TargetType, KernelMachOArchitecture, KernelPlatform, Platform FROM Targets WHERE KernelPlatform "!=" Platform | awk -F\| '{ if ($$2 ~ /armv[0-9][a-z]?/) { print $$1 ":arm;" $$3 ";" $$4} else if ($$2 ~ /arm64[a-z]?/) { print $$1 ":arm64;" $$3 ";" $$4} else { print $$1 ":" $$2 ";" $$3 ";" $$4} }' )
+#DEVICEMAP_PRODUCT_SOC_ALIASES := $(shell $(EMBEDDED_DEVICE_MAP) -db $(EDM_DBPATH) -query SELECT DISTINCT TargetType, KernelMachOArchitecture, KernelPlatform, Platform FROM Targets WHERE KernelPlatform "!=" Platform | awk -F\| '{ if ($$2 ~ /armv[0-9][a-z]?/) { print $$1 ":arm;" $$3 ";" $$4} else if ($$2 ~ /arm64[a-z]?/) { print $$1 ":arm64;" $$3 ";" $$4} else { print $$1 ":" $$2 ";" $$3 ";" $$4} }' )
 
 function_lookup_product_alias = $(call function_substitute_word_with_replacement,	\
 					$(1),						\