X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/0b4e3aa066abc0728aacb4bbeb86f53f9737156e..13f56ec4e58bf8687e2a68032c093c0213dd519b:/pexpert/conf/Makefile

diff --git a/pexpert/conf/Makefile b/pexpert/conf/Makefile
index 4baa6f1cf..06a9defdf 100644
--- a/pexpert/conf/Makefile
+++ b/pexpert/conf/Makefile
@@ -7,8 +7,7 @@ export MakeInc_dir=${SRCROOT}/makedefs/MakeInc.dir
 include $(MakeInc_cmd)
 include $(MakeInc_def)
 
-SETUP_SUBDIRS = \
-	tools
+SETUP_SUBDIRS =
 
 COMP_SUBDIRS = 
 
@@ -18,47 +17,40 @@ ifndef PEXPERT_KERNEL_CONFIG
 export PEXPERT_KERNEL_CONFIG = $(KERNEL_CONFIG)
 endif
 
-COMPOBJROOT=$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)
+ifneq ($(MACHINE_CONFIG), DEFAULT)
+export COMPOBJROOT=$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)_$(MACHINE_CONFIG)/$(COMPONENT)
+else
+export COMPOBJROOT=$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)
+endif
 
-$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf:
-	make build_setup 
+MASTER_CPU_PER_SOC = $(SOURCE)/MASTER.$(ARCH_CONFIG_LC).$(MACHINE_CONFIG_LC)
 
 $(COMPOBJROOT)/$(PEXPERT_KERNEL_CONFIG)/Makefile :  $(SOURCE)/MASTER  \
 	$(SOURCE)/MASTER.$(ARCH_CONFIG_LC) \
 	$(SOURCE)/Makefile.template  \
 	$(SOURCE)/Makefile.$(ARCH_CONFIG_LC)  \
 	$(SOURCE)/files \
-	$(SOURCE)/files.$(ARCH_CONFIG_LC) \
-	$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf
-	@echo "Running doconf for $(PEXPERT_KERNEL_CONFIG)";
-	(doconf_target=$(addsuffix /conf, $(TARGET)); \
-	echo $${doconf_target};\
+	$(SOURCE)/files.$(ARCH_CONFIG_LC)
+	$(_v)(doconf_target=$(addsuffix /conf, $(TARGET)); \
 	$(MKDIR) $${doconf_target}; \
 	cd $${doconf_target}; \
 	rm -f $(notdir $?); \
 	cp  $? $${doconf_target}; \
-	$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf -c -cpu $(ARCH_CONFIG_LC) -d  $(TARGET)/$(PEXPERT_KERNEL_CONFIG) $(PEXPERT_KERNEL_CONFIG); \
+	if [ -f $(MASTER_CPU_PER_SOC) ]; then cp $(MASTER_CPU_PER_SOC) $${doconf_target}; fi; \
+	$(SRCROOT)/SETUP/config/doconf -c -cpu $(ARCH_CONFIG_LC) -soc $(MACHINE_CONFIG_LC) -d  $(TARGET)/$(PEXPERT_KERNEL_CONFIG) $(PEXPERT_KERNEL_CONFIG); \
 	);
 
-.ORDER: $(COMPOBJROOT)/$(PEXPERT_KERNEL_CONFIG)/Makefile 
-
-do_setup_conf: $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf \
-		$(COMPOBJROOT)/$(PEXPERT_KERNEL_CONFIG)/Makefile 
-
-do_all: do_setup_conf
-	@echo "[ $(SOURCE) ] Starting do_all  $(COMPONENT) $(PEXPERT_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";	\
-	(cd $(COMPOBJROOT)/$(PEXPERT_KERNEL_CONFIG);				\
-	next_source=$(subst conf/,,$(SOURCE));			\
-	${MAKE} MAKEFILES=$(TARGET)/$(PEXPERT_KERNEL_CONFIG)/Makefile	\
+do_all: $(COMPOBJROOT)/$(PEXPERT_KERNEL_CONFIG)/Makefile 
+	$(_v)next_source=$(subst conf/,,$(SOURCE));			\
+	${MAKE} -C $(COMPOBJROOT)/$(PEXPERT_KERNEL_CONFIG)	\
+		MAKEFILES=$(TARGET)/$(PEXPERT_KERNEL_CONFIG)/Makefile	\
 		SOURCE=$${next_source}			\
 		TARGET=$(TARGET)					\
 		INCL_MAKEDEP=FALSE	\
-		build_all	\
-	);		\
-	echo "[ $(SOURCE) ] Returning do_all $(COMPONENT) $(PEXPERT_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";
+		KERNEL_CONFIG=$(PEXPERT_KERNEL_CONFIG)	\
+		build_all;
 
 do_build_all: do_all 
 
 include $(MakeInc_rule)
 include $(MakeInc_dir)
-