From beaa972b824cbc3db92977afd7f9a5a23ff83fdd Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Fri, 23 Sep 2011 14:08:13 +0200 Subject: 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 --- board-js2x/Makefile | 8 +++----- board-js2x/romfs/boot_rom.ffs | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 16 deletions(-) (limited to 'board-js2x') 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 -- cgit v1.1