From a2fbc8cb2e51821331f3ba8d920dddf8ab0fb96d Mon Sep 17 00:00:00 2001 From: Mark Wenning Date: Mon, 6 Jun 2011 14:07:51 -0500 Subject: Initialization Service (Flow Control) - save off changes before switch branch - rename to get rid of '_' in filenames. - split into separate files - adding errorlogs, saved off so CC guru could work - fix problem in vfs_main where we would crash if there is no _start in launched task. - refactor - fix problems with coding guidelines - add testcases for startTask and reportError - add fixes from code review Change-Id: I2ae34cb6097c466d4f6d0e41b4b32c2eba47e9df Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/145 Tested-by: Jenkins Server Reviewed-by: A. Patrick Williams III --- src/makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/makefile') diff --git a/src/makefile b/src/makefile index 5411d747a..c86f33ea5 100644 --- a/src/makefile +++ b/src/makefile @@ -5,34 +5,34 @@ IMGS = hbicore hbicore_test EXTRA_LIDS = dslid BASE_OBJECTS = console.o spinlock.o string.o stdlib.o assert.o stdio.o \ - builtins.o vfs_init.o heapmgr.o pagemgr.o + builtins.o vfs_init.o heapmgr.o pagemgr.o DIRECT_BOOT_OBJECTS = start.o kernel.o taskmgr.o cpumgr.o syscall.o \ - scheduler.o exception.o vmmmgr.o timemgr.o \ - syscall_stub.o syscall_task.o \ - syscall_msg.o syscall_mmio.o syscall_time.o \ - init_main.o vfs_main.o sync.o futexmgr.o + scheduler.o exception.o vmmmgr.o timemgr.o \ + syscall_stub.o syscall_task.o \ + syscall_msg.o syscall_mmio.o syscall_time.o \ + init_main.o vfs_main.o sync.o futexmgr.o RUNTIME_OBJECTS = -BASE_MODULES = trace errl devicefw scom xscom +BASE_MODULES = trace errl devicefw scom xscom initservice EXTENDED_MODULES = targeting DIRECT_BOOT_MODULES = example RUNTIME_MODULES = TESTCASE_MODULES = cxxtest testerrl testdevicefw testsyslib \ - testscom testxscom testtargeting + testscom testxscom testtargeting testinitservice RELOCATABLE_IMAGE_LDFLAGS = -pie --export-dynamic hbicore_OBJECTS = ${BASE_OBJECTS} ${DIRECT_BOOT_OBJECTS} -hbicore_MODULES = ${BASE_MODULES} ${EXTENDED_MODULES} ${DIRECT_BOOT_MODULES} +hbicore_MODULES = ${BASE_MODULES} ${EXTENDED_MODULES} ${DIRECT_BOOT_MODULES} hbicore_LIDNUMBER = 80f00100 hbicore_test_OBJECTS = ${hbicore_OBJECTS} hbicore_test_MODULES = ${hbicore_MODULES} ${TESTCASE_MODULES} #halruntime_OBJECTS = ${BASE_OBJECTS} ${RUNTIME_OBJECTS} -#halruntime_MODULES = ${BASE_MODULES} ${EXTENDED_MODULES} ${RUNTIME_MODULES} +#halruntime_MODULES = ${BASE_MODULES} ${EXTENDED_MODULES} ${RUNTIME_MODULES} #halruntime_LDFLAGS = ${RELOCATABLE_IMAGE_LDFLAGS} #halruntime_LIDNUMBER = 80f00101 -- cgit v1.2.1