xnu-1699.22.73.tar.gz

[apple/xnu.git] / iokit / conf / Makefile

diff --git a/iokit/conf/Makefile b/iokit/conf/Makefile
index 750aadb652610bab18c4a58956a63270f5e72418..7b37a4736eb8e521c9c84c13df639de97e82c027 100644 (file)
--- a/iokit/conf/Makefile
+++ b/iokit/conf/Makefile
@@ -7,8 +7,7 @@ export MakeInc_dir=${SRCROOT}/makedefs/MakeInc.dir
 include $(MakeInc_cmd)
 include $(MakeInc_def)
 
 include $(MakeInc_cmd)
 include $(MakeInc_def)
 

-SETUP_SUBDIRS = \
-       tools
+SETUP_SUBDIRS =

 
 COMP_SUBDIRS = 
 
 
 COMP_SUBDIRS = 
 


@@ -24,30 +23,24 @@ else
 export COMPOBJROOT=$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)
 endif
 
 export COMPOBJROOT=$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)
 endif
 

-$(COMPOBJROOT)/doconf:
-       @make build_setup 
+MASTER_CPU_PER_SOC = $(SOURCE)/MASTER.$(ARCH_CONFIG_LC).$(MACHINE_CONFIG_LC)

 
 $(COMPOBJROOT)/$(IOKIT_KERNEL_CONFIG)/Makefile :  $(SOURCE)/MASTER  \
        $(SOURCE)/MASTER.$(ARCH_CONFIG_LC) \
        $(SOURCE)/Makefile.template  \
        $(SOURCE)/Makefile.$(ARCH_CONFIG_LC)  \
        $(SOURCE)/files \
 
 $(COMPOBJROOT)/$(IOKIT_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) \
-       $(COMPOBJROOT)/doconf
+       $(SOURCE)/files.$(ARCH_CONFIG_LC)

        $(_v)(doconf_target=$(addsuffix /conf, $(TARGET)); \
        $(MKDIR) $${doconf_target}; \
        cd $${doconf_target}; \
        rm -f $(notdir $?); \
        cp  $? $${doconf_target}; \
        $(_v)(doconf_target=$(addsuffix /conf, $(TARGET)); \
        $(MKDIR) $${doconf_target}; \
        cd $${doconf_target}; \
        rm -f $(notdir $?); \
        cp  $? $${doconf_target}; \

-       $(COMPOBJROOT)/doconf -c -cpu $(ARCH_CONFIG_LC) -d  $(TARGET)/$(IOKIT_KERNEL_CONFIG) $(IOKIT_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)/$(IOKIT_KERNEL_CONFIG) $(IOKIT_KERNEL_CONFIG); \

        );
 
        );
 

-.ORDER: $(COMPOBJROOT)/$(IOKIT_KERNEL_CONFIG)/Makefile 
-
-do_setup_conf: $(COMPOBJROOT)/doconf \
-               $(COMPOBJROOT)/$(IOKIT_KERNEL_CONFIG)/Makefile 
-
-do_all: do_setup_conf
+do_all: $(COMPOBJROOT)/$(IOKIT_KERNEL_CONFIG)/Makefile

        $(_v)next_source=$(subst conf/,,$(SOURCE));                     \
        ${MAKE} -C $(COMPOBJROOT)/$(IOKIT_KERNEL_CONFIG)        \
                MAKEFILES=$(TARGET)/$(IOKIT_KERNEL_CONFIG)/Makefile     \
        $(_v)next_source=$(subst conf/,,$(SOURCE));                     \
        ${MAKE} -C $(COMPOBJROOT)/$(IOKIT_KERNEL_CONFIG)        \
                MAKEFILES=$(TARGET)/$(IOKIT_KERNEL_CONFIG)/Makefile     \