diff options
| author | Mark Wenning <wenning@us.ibm.com> | 2011-11-17 16:30:59 -0600 |
|---|---|---|
| committer | Mark W. Wenning <wenning@us.ibm.com> | 2011-11-29 11:05:42 -0600 |
| commit | 10323f3b80f94c5b329baa57c29309249cd5928c (patch) | |
| tree | 033b65ce255c6b12970534fa7de27660f16c2f2d /src/makefile | |
| parent | 8c3bafa06b1e664c7139c95cc4a1007eeee78455 (diff) | |
| download | blackbird-hostboot-10323f3b80f94c5b329baa57c29309249cd5928c.tar.gz blackbird-hostboot-10323f3b80f94c5b329baa57c29309249cd5928c.zip | |
Fix initsvc base and extended task tables
- resolve BASE_MODULES and EXTENDED_MODULES list in makefile
and base and extended image modules loaded in initsvc task files.
- fix merge conficts
Change-Id: I825de90c640501eb1847904ba905abff05898799
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/502
Tested-by: Jenkins Server
Reviewed-by: Mark W. Wenning <wenning@us.ibm.com>
Diffstat (limited to 'src/makefile')
| -rw-r--r-- | src/makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/makefile b/src/makefile index fd59896b2..322496a98 100644 --- a/src/makefile +++ b/src/makefile @@ -45,10 +45,10 @@ DIRECT_BOOT_OBJECTS = start.o kernel.o taskmgr.o cpumgr.o syscall.o \ RUNTIME_OBJECTS = BASE_MODULES = trace errl devicefw scom xscom initservice taskargs \ - pnor i2c fsi vfs + pnor i2c vfs -EXTENDED_MODULES = targeting ecmddatabuffer fapi hwp plat \ - extinitsvc istepdisp hwas fsiscom +EXTENDED_MODULES = targeting ecmddatabuffer fapi hwp plat \ + extinitsvc istepdisp hwas fsi fsiscom DIRECT_BOOT_MODULES = example RUNTIME_MODULES = |
