Skip to content

Commit 70b35d4

Browse files
fergofrogfergofrog
committed
Changes to 4903.221.2 for ARM64
1 parent 726a2e6 commit 70b35d4

File tree

3 files changed

+40
-40
lines changed

3 files changed

+40
-40
lines changed

‎EXTERNAL_HEADERS/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ INSTALL_MI_LIST =
4141

4242
INSTALL_MI_DIR = .
4343

44-
INSTALL_KF_MI_LIST = ${KERNEL_FILES}
44+
INSTALL_KF_MI_LIST = ${EXPORT_FILES} ${KERNEL_FILES}
4545

4646
INSTALL_KF_MI_LCL_LIST = ${KERNEL_FILES}
4747

‎makedefs/MakeInc.cmd

+6-6
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,12 @@ SUPPORTED_SIMULATOR_PLATFORMS := iPhoneSimulator iPhoneNanoSimulator tvSimulator
126126
SUPPORTED_PLATFORMS := MacOSX $(SUPPORTED_SIMULATOR_PLATFORMS) $(SUPPORTED_EMBEDDED_PLATFORMS)
127127

128128
# Platform-specific tools
129-
ifneq ($(filter $(SUPPORTED_EMBEDDED_PLATFORMS),$(PLATFORM)),)
130-
ifeq ($(EMBEDDED_DEVICE_MAP),)
131-
export EMBEDDED_DEVICE_MAP := $(shell $(XCRUN) -sdk $(SDKROOT) -find embedded_device_map)
132-
endif
133-
EDM_DBPATH ?= $(PLATFORMPATH)/usr/local/standalone/firmware/device_map.db
134-
endif
129+
#ifneq ($(filter $(SUPPORTED_EMBEDDED_PLATFORMS),$(PLATFORM)),)
130+
#ifeq ($(EMBEDDED_DEVICE_MAP),)
131+
# export EMBEDDED_DEVICE_MAP := $(shell $(XCRUN) -sdk $(SDKROOT) -find embedded_device_map)
132+
#endif
133+
#EDM_DBPATH ?= $(PLATFORMPATH)/usr/local/standalone/firmware/device_map.db
134+
#endif
135135

136136
# Scripts or tools we build ourselves
137137
#

‎makedefs/MakeInc.top

+33-33
Original file line numberDiff line numberDiff line change
@@ -131,41 +131,41 @@ ARCH_CONFIGS_EMBEDDED := $(strip $(shell echo $(ARCH_CONFIGS) | $(TR) a-z A-Z))
131131
endif
132132

133133
# Find supported products from the device map
134-
DEVICEMAP_PRODUCTS_ARMV7 := $(shell $(EMBEDDED_DEVICE_MAP) -db $(EDM_DBPATH) \
135-
-query 'SELECT DISTINCT TargetType \
136-
FROM Files \
137-
INNER JOIN Manifests USING (manifestID) \
138-
INNER JOIN Targets USING (Target) \
139-
WHERE (KernelMachOArchitecture LIKE "armv7" \
140-
AND fileType in ("KernelCache", "RestoreKernelCache"))')
141-
DEVICEMAP_PRODUCTS_ARMV7S := $(shell $(EMBEDDED_DEVICE_MAP) -db $(EDM_DBPATH) \
142-
-query 'SELECT DISTINCT TargetType \
143-
FROM Files \
144-
INNER JOIN Manifests USING (manifestID) \
145-
INNER JOIN Targets USING (Target) \
146-
WHERE (KernelMachOArchitecture LIKE "armv7s" \
147-
AND fileType in ("KernelCache", "RestoreKernelCache"))')
148-
DEVICEMAP_PRODUCTS_ARMV7K := $(shell $(EMBEDDED_DEVICE_MAP) -db $(EDM_DBPATH) \
149-
-query 'SELECT DISTINCT TargetType \
150-
FROM Files \
151-
INNER JOIN Manifests USING (manifestID) \
152-
INNER JOIN Targets USING (Target) \
153-
WHERE (KernelMachOArchitecture LIKE "armv7k" \
154-
AND fileType in ("KernelCache", "RestoreKernelCache"))')
155-
DEVICEMAP_PRODUCTS_ARM := $(DEVICEMAP_PRODUCTS_ARMV7) $(DEVICEMAP_PRODUCTS_ARMV7S) $(DEVICEMAP_PRODUCTS_ARMV7K)
156-
157-
158-
DEVICEMAP_PRODUCTS_ARM64 := $(shell $(EMBEDDED_DEVICE_MAP) -db $(EDM_DBPATH) \
159-
-query 'SELECT DISTINCT TargetType \
160-
FROM Files \
161-
INNER JOIN Manifests USING (manifestID) \
162-
INNER JOIN Targets USING (Target) \
163-
WHERE (KernelMachOArchitecture LIKE "arm64" \
164-
AND fileType in ("KernelCache", "RestoreKernelCache"))')
134+
#DEVICEMAP_PRODUCTS_ARMV7 := $(shell $(EMBEDDED_DEVICE_MAP) -db $(EDM_DBPATH) \
135+
# -query 'SELECT DISTINCT TargetType \
136+
# FROM Files \
137+
# INNER JOIN Manifests USING (manifestID) \
138+
# INNER JOIN Targets USING (Target) \
139+
# WHERE (KernelMachOArchitecture LIKE "armv7" \
140+
# AND fileType in ("KernelCache", "RestoreKernelCache"))')
141+
#DEVICEMAP_PRODUCTS_ARMV7S := $(shell $(EMBEDDED_DEVICE_MAP) -db $(EDM_DBPATH) \
142+
# -query 'SELECT DISTINCT TargetType \
143+
# FROM Files \
144+
# INNER JOIN Manifests USING (manifestID) \
145+
# INNER JOIN Targets USING (Target) \
146+
# WHERE (KernelMachOArchitecture LIKE "armv7s" \
147+
# AND fileType in ("KernelCache", "RestoreKernelCache"))')
148+
#DEVICEMAP_PRODUCTS_ARMV7K := $(shell $(EMBEDDED_DEVICE_MAP) -db $(EDM_DBPATH) \
149+
# -query 'SELECT DISTINCT TargetType \
150+
# FROM Files \
151+
# INNER JOIN Manifests USING (manifestID) \
152+
# INNER JOIN Targets USING (Target) \
153+
# WHERE (KernelMachOArchitecture LIKE "armv7k" \
154+
# AND fileType in ("KernelCache", "RestoreKernelCache"))')
155+
#DEVICEMAP_PRODUCTS_ARM := $(DEVICEMAP_PRODUCTS_ARMV7) $(DEVICEMAP_PRODUCTS_ARMV7S) $(DEVICEMAP_PRODUCTS_ARMV7K)
156+
157+
158+
#DEVICEMAP_PRODUCTS_ARM64 := $(shell $(EMBEDDED_DEVICE_MAP) -db $(EDM_DBPATH) \
159+
# -query 'SELECT DISTINCT TargetType \
160+
# FROM Files \
161+
# INNER JOIN Manifests USING (manifestID) \
162+
# INNER JOIN Targets USING (Target) \
163+
# WHERE (KernelMachOArchitecture LIKE "arm64" \
164+
# AND fileType in ("KernelCache", "RestoreKernelCache"))')
165165

166166

167167
# Generate a list of mappings of the form "n75:arm;t8002" based on the device map
168-
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} }' )
168+
#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} }' )
169169

170170
# Map a product like "n75" to "arm;t8002"
171171
# $(1) is a product name in lower case
@@ -178,7 +178,7 @@ function_lookup_product = $(call function_substitute_word_with_replacement, \
178178
# Generate a list of mappings for products that use a different platform for their kernel configuration than their true platform
179179
# of the form "n71m:arm64;s8000;s8003". The 4th element is the true SoC platform, which will get an on-disk copy, while the
180180
# kernel's recursive build system will build the 3rd element as the KernelPlatform
181-
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} }' )
181+
#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} }' )
182182

183183
function_lookup_product_alias = $(call function_substitute_word_with_replacement, \
184184
$(1), \

0 commit comments

Comments
 (0)