Chameleon Commit Details - 892 - Chameleon open source boot loader project.

Date:

2011-05-27 04:44:54 (12 years 10 months ago)

Author:

Evan Lojewski

Commit:

892

Parents:

891

Message:

Start compiled in modules

Changes:

File differences

-76
77 77
78 78
79
79 80
80 81
81 82
+␊
endif␊
␊
␉@${MKDIRS} $(OBJROOT)/../boot2_modules/␊
␉@echo "\t[LD] boot.sys"␊
␉@$(CC) -Wl,-segaddr,__INIT,$(BOOT2ADDR) -Wl,-segalign,20 -Wl,-preload \␊
␉␉␉-nostdlib -arch i386 -static \␊
 ␊
 endif␊
 ␊
+␉@${MKDIRS} $(OBJROOT)/../boot2_modules/␊
 ␉@echo "\t[LD] boot.sys"␊
 ␉@$(CC) -Wl,-segaddr,__INIT,$(BOOT2ADDR) -Wl,-segalign,20 -Wl,-preload \␊
 ␉␉␉-nostdlib -arch i386 -static \␊

-10
11 11
12 12
13
13 14
14 15
15 16
... ...
40 41
41 42
42 43
44
45
46
47
43 48
44 49
45 50
+#include "boot.h"␊
#include "bootstruct.h"␊
#include "modules.h"␊
#include "boot_modules.h"␊
␊
␊
#if CONFIG_MODULE_DEBUG␊

 */␊
int init_module_system()␊
{␊
    // Start any modules that were compiled in first.␊
    start_built_in_modules();␊
    ␊
    ␊
␉int retVal = 0;␊
␉void (*module_start)(void) = NULL;␊
␉char* module_data = symbols_module_start + BOOT2_ADDR;␊
 ...
 #include "boot.h"␊
 #include "bootstruct.h"␊
 #include "modules.h"␊
+#include "boot_modules.h"␊
 ␊
 ␊
 #if CONFIG_MODULE_DEBUG␊
  */␊
 int init_module_system()␊
 {␊
+    // Start any modules that were compiled in first.␊
+    start_built_in_modules();␊
+    ␊
+    ␊
 ␉int retVal = 0;␊
 ␉void (*module_start)(void) = NULL;␊
 ␉char* module_data = symbols_module_start + BOOT2_ADDR;␊

-22
23 23
24 24
25 
25
26 26
27 27
28 28
... ...
43 43
44 44
45 45
46 
46
47
48
49
47 50
48 51
49 52
+␊
␊
ifeq (${CONFIG_MODULES}, y)␊
all install: $(SYMROOT) $(OBJROOT) objroot_dirs $(SYMROOT)/boot_modules.c $(SYMROOT)/boot_modules.h␊
all: $(SYMROOT) $(OBJROOT) objroot_dirs $(SYMROOT)/boot_modules.c $(SYMROOT)/boot_modules.h␊
␉@for i in ${SUBDIRS}; \␊
␉do \␊
␉␉echo ================= make $@ for $$i =================; \␊

␊
␉␊
else␊
all:␊
all: $(SYMROOT) $(OBJROOT) objroot_dirs $(SYMROOT)/boot_modules.c $(SYMROOT)/boot_modules.h␊
␉@# Finish up boot_modules.c␊
␉@echo "}" >> $(SYMROOT)/boot_modules.c␊
␊
endif␊
␊
.PHONY: objroot_dirs␊
 ...
 ␊
 ␊
 ifeq (${CONFIG_MODULES}, y)␊
-all install: $(SYMROOT) $(OBJROOT) objroot_dirs $(SYMROOT)/boot_modules.c $(SYMROOT)/boot_modules.h␊
+all: $(SYMROOT) $(OBJROOT) objroot_dirs $(SYMROOT)/boot_modules.c $(SYMROOT)/boot_modules.h␊
 ␉@for i in ${SUBDIRS}; \␊
 ␉do \␊
 ␉␉echo ================= make $@ for $$i =================; \␊
 ␊
 ␉␊
 else␊
-all:␊
+all: $(SYMROOT) $(OBJROOT) objroot_dirs $(SYMROOT)/boot_modules.c $(SYMROOT)/boot_modules.h␊
+␉@# Finish up boot_modules.c␊
+␉@echo "}" >> $(SYMROOT)/boot_modules.c␊
+␊
 endif␊
 ␊
 .PHONY: objroot_dirs␊