Index: trunk/TODO
===================================================================
--- trunk/TODO	(revision 883)
+++ trunk/TODO	(revision 884)
@@ -1,5 +1,6 @@
 TODO List for Chameleon Boot Loader
 ====================================
+- Setup makefile to use module config for determining which modules to compile in and which to compile as modules
 - Fix the module system when booting chameleon with multiboot. Cleanup the xcode 4 fix.
 
 - Integrate Prasys current work on options and quick shortcut modified version of 18seven
Index: trunk/CHANGES
===================================================================
--- trunk/CHANGES	(revision 883)
+++ trunk/CHANGES	(revision 884)
@@ -1,4 +1,5 @@
-- Added the BOOT2_MAX_LENGTH constant in memory.h. This is now used in moot.c to relocate the correct number of bytes for boot2.
+- New makefile + configuration system.
+- Added the BOOT2_MAX_LENGTH constant in memory.h. This is now used in mboot.c to relocate the correct number of bytes for boot2.
 - Added new ATi/AMD Graphics Card Enabler.
 - Added new SMBIOS patcher.
 - Added module system.