Update to RevoBoot v.1.5.21

.gitignore

@@ -1,5 +1,18 @@
 .DS_Store
-data-hp.h
-data-asus.h
-settings-hp.h
-setting-asus.h
+
+out.log
+obj/*
+sym/*
+
+i386/config/SETTINGS/*.h
+
+i386/config/ACPI/default.h
+i386/config/ACPI/*Mac*.h
+
+i386/config/EFI/default.h
+i386/config/EFI/*Mac*.h
+
+i386/config/SMBIOS/default.h
+i386/config/SMBIOS/*Mac*.h
+
+i386/util/libcc_kext.a

CHANGES

@@ -1,3 +1,104 @@
+RevoBoot v1.5.35
+================
+- SMBIOS related enhancements for RevoBoot v1.5.35 (PikerAlpha, November 2012).
+- VERSION updated to v1.5.35
+
+
+RevoBoot v1.5.34
+================
+- LOAD_STATIC_EFI_DATA_FROM_EXTRA in settings-template.h renamed to LOAD_MODEL_SPECIFIC_EFI_DATA (PikerAlpha, October 2012).
+- LOAD_STATIC_SMBIOS_DATA_FROM_EXTRA in settings-template.h renamed to LOAD_MODEL_SPECIFIC_SMBIOS_DATA (PikerAlpha, October 2012).
+- New LOAD_MODEL_SPECIFIC_ACPI_DATA setting in settings-template.h (PikerAlpha, October 2012).
+- New LOAD_MODEL_SPECIFIC_STATIC_DATA setting in settings-template.h (PikerAlpha, October 2012).
+- VERSION updated to v1.5.34
+
+Notes:
+
+Static EFI/SMBIOS data will be used when RevoBoot can't find model specific data: /Extra/[EFI/SMBIOS]/MacModelNN.bin
+DSDT.aml will be loaded when RevoBoot can't find: /Extra/ACPI/DSDT-MacModelNN.aml (example).
+You <i>must</i> use the latest version of RevoBoot/i386/config/settings-template.h or things won't work. 
+
+
+RevoBoot v1.5.33
+================
+- Restored lost lines in RevoBoot/i386/libsaio/SMBIOS/static_data.h (PikerAlpha, November 2012).
+- VERSION updated to v1.5.33
+
+
+RevoBoot v1.5.32
+================
+- Optionally include Recovery HD support code in boot.c (PikerAlpha, October 2012).
+- Renamed LION_RECOVERY_SUPPORT to CORE_STARAGE_SUPPORT in disk.c (PikerAlpha, October 2012).
+- Renamed LION_FILEVAULT_SUPPORT to CORE_STARAGE_SUPPORT in disk.c (PikerAlpha, November 2012).
+- Renamed encryptedBootPartition to coreStoragePartition in disk.c (PikerAlpha, October 2012).
+- Cleaned up settings-template.h (PikerAlpha, October 2012).
+- VERSION updated to v1.5.32
+
+
+RevoBoot v1.5.31
+================
+- STATIC_SYSTEM_SERIAL_NUMBER renamed to EFI_SYSTEM_SERIAL_NUMBER (PikerAlpha, October 2012).
+- Restored lost STATIC_SMSERIALNUMBER in setings-template.h (PikerAlpha, October 2012).
+- STATIC_SMSERIALNUMBER renamed to SMB_SYSTEM_SERIAL_NUMBER (PikerAlpha, October 2012).
+- VERSION updated to v1.5.31
+
+
+RevoBoot v1.5.30
+================
+- Move/update /Extra/ data reading to RevoBoot/i386/libsaio/load.c (PikerAlpha, October 2012).
+- Option to read /Extra/EFI/[MacModelNN.bin] when static EFI data is used (PikerAlpha, October 2012).
+- Option to read /Extra/SMBIOS/[MacModelNN.bin] when static SMBIOS data is used (PikerAlpha, October 2012).
+- Makefile changes for above features(PikerAlpha, October 2012).
+- VERSION updated to v1.5.30
+
+
+RevoBoot v1.5.25
+================
+- RevoBoot/i386/config/data.h is no longer included with (PikerAlpha, October 2012).
+- New static data paths in RevoBoot/i386/libsaio/Makefile (PikerAlpha, October 2012).
+- Use model identifier as filename for static data (PikerAlpha, October 2012).
+- VERSION updated to v1.5.25
+
+
+RevoBoot v1.5.23
+================
+- Bug fix and cleanups in RevoBoot/i386/libsaio/SMBIOS/dynamic_data.h (PikerAlpha, October 2012).
+- VERSION updated to v1.5.23
+
+
+RevoBoot v1.5.22
+================
+- Bug fix in RevoBoot/Makefile (PikerAlpha, October 2012).
+- VERSION updated to v1.5.22
+
+
+RevoBoot v1.5.21
+================
+- Model data for new Macmini6,N added (PikerAlpha, October 2012).
+- VERSION updated to v1.5.21
+
+
+RevoBoot v1.5.20
+================
+- Automatic data selection for ACPI/EFI and SMBIOS data (PikerAlpha, October 2012)
+- Copies ACPI/EFI/SMBIOS/data-template.h to [your model.h] for new configurations (PikerAlpha, October 2012)
+
+
+RevoBoot v1.5.10
+================
+- Makefiles cleaned up/optimized (PikerAlpha, October 2012).
+- make now defaults to Mountain Lion (PikerAlpha, October 2012).
+- MODEL=[your model] argument added to makefiles (PikerAlpha, October 2012).
+- MODEL=$1 added to RevoBoot/r for optional model identifier (PikerAlpha, October 2012).
+- make now creates RevoBoot/i386/config/SETTINGS when missing (PikerAlpha, October 2012).
+- Makefile now copies settings-template.h to SETTINGS/[your model.h] when missing (PikerAlpha, October 2012).
+
+
+RevoBoot v1.5.01
+================
+- MacPro SMBIOS board serial/type added (dgsga, October 2012).
+
+
 RevoBoot v1.5.00
 ================
 - RevoBoot project forked (PikerAlpha, October 2012).

Makefile

@@ -1,27 +1,33 @@
 #
-#	Makefile for RevoBoot
+# File: RevoBoot/Makefile
+#
+# Updates:
+#
+#			- Major cleanup (PikerAlpha, October 2012).
+#			- Output improvements (PikerAlpha, October 2012).
+#			- Default build target is now Mountain Lion (PikerAlpha, October 2012).
+#			- PRODUCT_MODEL_TARGET for target build model added (PikerAlpha, October 2012).
+#			- Creates RevoBoot/config/SETTINGS when missing (PikerAlpha, October 2012).
+#			- Copies settings-template.h to SETTINGS/ModelnameNN.h when missing (PikerAlpha, October 2012).
+#			- Automatic ACPI/EFI/SMBIOS data selection (PikerAlpha, October 2012).
+#			- Copies ACPI/EFI/SMBIOS/data-template.h for new conigurations (PikerAlpha, October 2012).
+#			- Output added for cp/mkdir/rm actions (PikerAlpha, November 2012).
+#			- New build target 'help' added (PikerAlpha, November 2012).
+#
+
+#
+# Include Apple makefile definitions.
 #
 
 export USE_APPLE_PB_SUPPORT = all
 
-# CFLAGS	= -O $(MORECPP) -arch i386 -g 
-DEFINES=
-CONFIG = hd
 LIBDIR = libsa
 INC = -I. -I$(LIBDIR)
-ifneq "" "$(wildcard /bin/mkdirs)"
-  MKDIRS = /bin/mkdirs
-else
-  MKDIRS = /bin/mkdir -p
-endif
-AS = as
-LD = ld
+
 PAX = /bin/pax
 
 OBJROOT = `pwd`/obj
 SYMROOT = `pwd`/sym
-DSTROOT = `pwd`/dst
-SRCROOT = /tmp
 
 #
 # Export version number (picked up by i386/libsaio/Makefile)
@@ -31,69 +37,156 @@ export PRODUCT_VERSION_NUMBER = `cat ../../VERSION`
 
 EXCLUDE = --exclude=.DS_Store --exclude=sym --exclude=obj --exclude=*.sh
 
-ARCHLESS_RC_CFLAGS=`echo $(RC_CFLAGS) | sed 's/-arch [a-z0-9]*//g'`
+#
+# Search paths.
+#
 
 VPATH = $(OBJROOT):$(SYMROOT)
 
-GENERIC_SUBDIRS =
-
 #
-# Export target OS type (picked up by i386/libsaio/Makefile)
+# Check if OS build target is specified (example: make mountain-lion).
 #
 
-ifeq ($(MAKECMDGOALS), mountain-lion)
+ifeq ($(MAKECMDGOALS),)
+	#
+	# No OS build target given. Build for Mountain Lion (default).
+	#
 	MAKE_TARGET_OS = 6;
+	MAKEGOAL = mountain-lion
 else
-	ifeq ($(MAKECMDGOALS), lion)
-		MAKE_TARGET_OS = 2;
+	#
+	# Setting MAKE_TARGET_OS and MAKEGOAL based on OS build target.
+	#
+	ifeq ($(MAKECMDGOALS), mountain-lion)
+		MAKE_TARGET_OS = 6;
+		MAKEGOAL = mountain-lion
 	else
-		MAKE_TARGET_OS = 1;
+		ifeq ($(MAKECMDGOALS), lion)
+			MAKE_TARGET_OS = 2;
+			MAKEGOAL = lion
+		else ifeq ($(MAKECMDGOALS), legacy)
+			MAKE_TARGET_OS = 1;
+			MAKEGOAL = legacy
+		endif
 	endif
 endif
 
+#
+# Export our make goal i.e. mountain-lion, lion or legacy (snow-leopard or leopard).
+#
+
+export MAKEGOAL
+
+#
+# Export OS build target (picked up by: i386/libsaio/Makefile).
+#
+
 export PRODUCT_OS_TARGET = `echo $(MAKE_TARGET_OS)`
 
-lion: all
-mountain-lion: all
-
-all: $(SYMROOT) $(OBJROOT)
-	@if [ -z "$(RC_ARCHS)" ]; then					  \
-		RC_ARCHS="i386";					  \
-	fi;								  \
-	SUBDIRS="$(GENERIC_SUBDIRS) $$RC_ARCHS";			  \
-	for i in $$SUBDIRS; 						  \
-	do \
-	    if [ -d $$i ]; then						  \
-		echo ================= make $@ for $$i =================; \
-		( OBJROOT=$(OBJROOT)/$${i};				  \
-		  SYMROOT=$(SYMROOT)/$${i};				  \
-		  DSTROOT=$(DSTROOT);					  \
-	          XCFLAGS=$(ARCHLESS_RC_CFLAGS);			  \
-	          GENSUBDIRS="$(GENERIC_SUBDIRS)";			  \
-	          for x in $$GENSUBDIRS;				  \
-	          do							  \
-	              if [ "$$x" == "$$i" ]; then			  \
-	                  XCFLAGS="$(RC_CFLAGS)";			  \
-	                  break;					  \
-	              fi						  \
-	          done;							  \
-		  echo "$$OBJROOT $$SYMROOT $$DSTROOT"; \
-		    cd $$i; ${MAKE}					  \
-			"OBJROOT=$$OBJROOT"		 	  	  \
-		  	"SYMROOT=$$SYMROOT"				  \
-			"DSTROOT=$$DSTROOT"				  \
-			"SRCROOT=$$SRCROOT"				  \
-			"RC_ARCHS=$$RC_ARCHS"				  \
-			"TARGET=$$i"					  \
-			"RC_CFLAGS=$$XCFLAGS" $@			  \
-		) || exit $$?; 						  \
-	    else							  \
-	    	echo "========= Nothing to build for $$i =========";	  \
-	    fi;								  \
-	done
+#
+# Check if a target model was specified (example: make MODEL=16 mountain-lion).
+#
+
+ifdef MODEL
+	#
+	# MODEL=[MacModelNN] specified, export target model as PRODUCT_MODEL_TARGET.
+	#
+	ifneq ($(MODEL),)
+		export MAKE_TARGET_MODEL = $(MODEL)
+		#
+		# Include static ACPI/EFI/SMBIOS data file per model identifier.
+		#
+		DATA_FILE = $(MODEL)
+	else
+		export MAKE_TARGET_MODEL = default
+		#
+		# Include default/empty static data file (no model identifier specified).
+		#
+		DATA_FILE = data-template
+	endif
+else
+	#
+	# Include default settings template (no model identifier specified).
+	#
+	export MAKE_TARGET_MODEL = default
+	#
+	# Include default/empty static data file (no model identifier specified).
+	#
+	DATA_FILE = data-template
+endif
+
+#
+# Export target filenames for static ACPI, EFI and SMBIOS data.
+# 
+
+export MAKE_ACPI_DATA_FILE = ACPI/$(DATA_FILE).h
+export MAKE_EFI_DATA_FILE = EFI/$(DATA_FILE).h
+export MAKE_SMBIOS_DATA_FILE = SMBIOS/$(DATA_FILE).h
+
+#
+# Our one and only build target directory.
+#
+
+ARCH_DIR=i386
+
+CONFIG_DIR=$(ARCH_DIR)/config
+
+SETTINGS_DIR=$(CONFIG_DIR)/SETTINGS
+SETTINGS_FILE=$(SETTINGS_DIR)/$(MAKE_TARGET_MODEL).h
+
+$(MAKEGOAL): $(SYMROOT) $(OBJROOT)
+	@if [ ! -f $(CONFIG_DIR)/$(MAKE_ACPI_DATA_FILE) ]; then \
+		echo "\t[CP] $(CONFIG_DIR)/ACPI/data-template.h $(CONFIG_DIR)/$(MAKE_ACPI_DATA_FILE)"; \
+		cp -n $(CONFIG_DIR)/ACPI/data-template.h $(CONFIG_DIR)/$(MAKE_ACPI_DATA_FILE); \
+	fi;
+
+	@if [ ! -f $(CONFIG_DIR)/$(MAKE_EFI_DATA_FILE) ]; then \
+		echo "\t[CP] $(CONFIG_DIR)/EFI/data-template.h $(CONFIG_DIR)/$(MAKE_EFI_DATA_FILE)"; \
+		cp -n $(CONFIG_DIR)/EFI/data-template.h $(CONFIG_DIR)/$(MAKE_EFI_DATA_FILE); \
+	fi;
+
+	@if [ ! -f $(CONFIG_DIR)/$(MAKE_SMBIOS_DATA_FILE) ]; then \
+		echo "\t[CP] $(CONFIG_DIR)/SMBIOS/data-template.h $(CONFIG_DIR)/$(MAKE_SMBIOS_DATA_FILE)"; \
+		cp -n $(CONFIG_DIR)/SMBIOS/data-template.h $(CONFIG_DIR)/$(MAKE_SMBIOS_DATA_FILE); \
+	fi;
+
+	@if [ ! -d $(SETTINGS_DIR) ]; then \
+		echo "\t[MKDIR] $(SETTINGS_DIR)"; \
+		/bin/mkdir -p $(SETTINGS_DIR); \
+	fi;
+
+	@if [ ! -f $(SETTINGS_FILE) ]; then \
+		echo "\t[CP] $(CONFIG_DIR)/settings-template.h $(SETTINGS_FILE)"; \
+		cp -n $(CONFIG_DIR)/settings-template.h $(SETTINGS_FILE); \
+	fi;
+
+	@if [ -d $(ARCH_DIR) ]; then \
+		echo ================= make MODEL=$(MAKE_TARGET_MODEL) $@ for: RevoBoot/$(ARCH_DIR) =================; \
+		( OBJROOT=$(OBJROOT)/$(ARCH_DIR); \
+		  SYMROOT=$(SYMROOT)/$(ARCH_DIR); \
+              XCFLAGS="$(RC_CFLAGS)"; \
+		  echo "$$OBJROOT $$SYMROOT"; \
+		    cd $(ARCH_DIR); ${MAKE}	\
+			"OBJROOT=$$OBJROOT" \
+		  	"SYMROOT=$$SYMROOT" \
+			"RC_ARCHS=$(ARCH_DIR)" \
+			"TARGET=$(ARCH_DIR)" \
+			"RC_CFLAGS=$$XCFLAGS" $@ \
+		) || exit $$?; \
+	fi;
 
 clean:
+	@if [ -d "$(OBJROOT)" ];then echo "\t[RMDIR] $(OBJROOT)"; fi
+	@if [ -d "$(SYMROOT)" ];then echo "\t[RMDIR] $(SYMROOT)"; fi
 	rm -rf sym obj dst out.log
 
-$(SYMROOT) $(OBJROOT) $(DSTROOT):
-	@$(MKDIRS) $@
+help:
+	@echo
+	@echo   'Build targets:'
+	@echo   '		- Build all targets [DEFAULT]'
+	@echo
+	@echo   'Cleaning targets:'
+	@echo   '  clean	- Remove generated files'
+
+$(SYMROOT) $(OBJROOT):
+	@/bin/mkdir -p $@