diff options
| author | Thomas Huth <thuth@linux.vnet.ibm.com> | 2011-09-23 14:08:13 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@linux.vnet.ibm.com> | 2011-10-12 16:24:55 +0200 |
| commit | beaa972b824cbc3db92977afd7f9a5a23ff83fdd (patch) | |
| tree | 9f119e742cb12c05e8f297fdf2772abb86c0a216 /board-js2x | |
| parent | 580d42015fa68a3f9019e71bd4521b48d7605655 (diff) | |
| download | SLOF-beaa972b824cbc3db92977afd7f9a5a23ff83fdd.zip SLOF-beaa972b824cbc3db92977afd7f9a5a23ff83fdd.tar.gz SLOF-beaa972b824cbc3db92977afd7f9a5a23ff83fdd.tar.bz2 | |
Moved bcm57xx driver to a new directory called "drivers".
The bcm57xx driver is a normal part of the SLOF firmware, so it does not make
sense that it resides in the other-licence directory. Moved it to a new
directory called "drivers" now.
Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Diffstat (limited to 'board-js2x')
| -rw-r--r-- | board-js2x/Makefile | 8 | ||||
| -rw-r--r-- | board-js2x/romfs/boot_rom.ffs | 22 |
2 files changed, 14 insertions, 16 deletions
diff --git a/board-js2x/Makefile b/board-js2x/Makefile index 56f9607..5c1e845 100644 --- a/board-js2x/Makefile +++ b/board-js2x/Makefile @@ -10,7 +10,7 @@ # * IBM Corporation - initial implementation # ****************************************************************************/ -BOARD_TARGETS = tools_build romfs_build clients_build bcm57xx stage1 subdirs +BOARD_TARGETS = tools_build romfs_build clients_build netdrivers stage1 subdirs SUBDIRS = slof rtas COMMON_LIBS = libc libipmi libbootmsg libbases libnvram libelf @@ -35,8 +35,8 @@ stage1: common-libs @echo " ====== Building llfw ======" $(MAKE) -C llfw RELEASE=-DRELEASE=\"\\\"$(RELEASE)\\\"\" -bcm57xx: - $(MAKE) -C ../other-licence/bcm +netdrivers: common-libs + $(MAKE) -C ../drivers clean_here: rm -f ../slof/OF.ffs @@ -47,7 +47,6 @@ clean: clean_here clean_gen $(MAKE) -C $$dir clean || exit 1; \ done rm -f ../boot_rom.bin ../js2*.img - $(MAKE) -C ../other-licence/bcm clean @$(MAKE) -C llfw clean @$(MAKE) -C $(TOPCMNDIR)/clients/takeover clean @@ -56,7 +55,6 @@ distclean: clean_here distclean_gen $(MAKE) -C $$dir distclean || exit 1; \ done rm -f ../boot_rom.bin ../js2*.img - $(MAKE) -C ../other-licence/bcm clean $(MAKE) -C llfw clean $(MAKE) -C $(TOPCMNDIR)/clients/takeover distclean diff --git a/board-js2x/romfs/boot_rom.ffs b/board-js2x/romfs/boot_rom.ffs index a27cec9..d1bb50a 100644 --- a/board-js2x/romfs/boot_rom.ffs +++ b/board-js2x/romfs/boot_rom.ffs @@ -10,14 +10,14 @@ # * IBM Corporation - initial implementation # ****************************************************************************/ -# FFile-Name Real Filename Flags ROM-Offset i/a -#--------------|-----------------------|-----------------------|-------------- -header romfs/header.img 0 0 -stage1 board-js2x/llfw/stage1.bin 1 0x100 -xvect slof/xvect.bin 0 0 -ofw_main board-js2x/slof/paflof 0 0 -stageS board-js2x/llfw/stageS.bin 0 0 -bootinfo board-js2x/llfw/Cboot.bin 0 0 -rtas board-js2x/rtas/rtas.bin 0 0 -snk clients/net-snk.client 0 0 -net_bcm other-licence/bcm/net_bcm57xx.elf 0 0 +# FFile-Name Real Filename Flags ROM-Offset i/a +#--------------|-------------------------------|---------------|-------------- +header romfs/header.img 0 0 +stage1 board-js2x/llfw/stage1.bin 1 0x100 +xvect slof/xvect.bin 0 0 +ofw_main board-js2x/slof/paflof 0 0 +stageS board-js2x/llfw/stageS.bin 0 0 +bootinfo board-js2x/llfw/Cboot.bin 0 0 +rtas board-js2x/rtas/rtas.bin 0 0 +snk clients/net-snk.client 0 0 +net_bcm drivers/bcm57xx/net_bcm57xx.elf 0 0 |