diff options
| -rw-r--r-- | Makefile.gen | 2 | ||||
| -rw-r--r-- | board-js2x/Makefile | 8 | ||||
| -rw-r--r-- | board-js2x/romfs/boot_rom.ffs | 22 | ||||
| -rw-r--r-- | drivers/Makefile | 28 | ||||
| -rw-r--r-- | drivers/bcm57xx/Makefile (renamed from other-licence/bcm/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/bcm57xx/bcm57xx.c (renamed from other-licence/bcm/bcm57xx.c) | 0 | ||||
| -rw-r--r-- | drivers/bcm57xx/bcm57xx.h (renamed from other-licence/bcm/bcm57xx.h) | 0 | ||||
| -rw-r--r-- | drivers/bcm57xx/types.h (renamed from other-licence/bcm/types.h) | 0 | ||||
| -rw-r--r-- | drivers/common/Makefile (renamed from other-licence/common/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/common/module.lds (renamed from other-licence/common/module.lds) | 0 | ||||
| -rw-r--r-- | drivers/common/module_entry.c (renamed from other-licence/common/module_entry.c) | 0 | ||||
| -rw-r--r-- | other-licence/Makefile | 10 |
12 files changed, 49 insertions, 21 deletions
diff --git a/Makefile.gen b/Makefile.gen index 69bcdf1..00cac13 100644 --- a/Makefile.gen +++ b/Makefile.gen @@ -138,6 +138,7 @@ clean_gen: clean_top $(MAKE) -C ../romfs/tools BOARD=$(BOARD) clean $(MAKE) -C ../tools clean $(MAKE) -C ../other-licence clean + $(MAKE) -C ../drivers clean $(MAKE) -C ../clients clean @for dir in $(COMMON_LIBS); do \ $(MAKE) -C ../lib/$$dir clean || exit 1; \ @@ -147,6 +148,7 @@ distclean_gen: clean_top $(MAKE) -C ../romfs/tools BOARD=$(BOARD) distclean $(MAKE) -C ../tools distclean $(MAKE) -C ../other-licence distclean + $(MAKE) -C ../drivers distclean $(MAKE) -C ../clients distclean @for dir in $(COMMON_LIBS); do \ $(MAKE) -C ../lib/$$dir distclean || exit 1; \ 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 diff --git a/drivers/Makefile b/drivers/Makefile new file mode 100644 index 0000000..93b04c2 --- /dev/null +++ b/drivers/Makefile @@ -0,0 +1,28 @@ +# ***************************************************************************** +# * Copyright (c) 2004, 2011 IBM Corporation +# * All rights reserved. +# * This program and the accompanying materials +# * are made available under the terms of the BSD License +# * which accompanies this distribution, and is available at +# * http://www.opensource.org/licenses/bsd-license.php +# * +# * Contributors: +# * IBM Corporation - initial implementation +# ****************************************************************************/ + +ifndef TOP + TOP = $(shell while ! test -e make.rules; do cd .. ; done; pwd) + export TOP +endif +include $(TOP)/make.rules + +SUBDIRS=common bcm57xx +CLEANSUBDIRS = $(SUBDIRS) + + +all: + for subdir in $(SUBDIRS) ; do $(MAKE) -C $${subdir} || exit 1 ; done + +# Common targets for all subdirectories: +clean distclean depend: + for subdir in $(CLEANSUBDIRS) ; do $(MAKE) -C $${subdir} $@ ; done diff --git a/other-licence/bcm/Makefile b/drivers/bcm57xx/Makefile index 87bb3bf..87bb3bf 100644 --- a/other-licence/bcm/Makefile +++ b/drivers/bcm57xx/Makefile diff --git a/other-licence/bcm/bcm57xx.c b/drivers/bcm57xx/bcm57xx.c index 65b319b..65b319b 100644 --- a/other-licence/bcm/bcm57xx.c +++ b/drivers/bcm57xx/bcm57xx.c diff --git a/other-licence/bcm/bcm57xx.h b/drivers/bcm57xx/bcm57xx.h index d968313..d968313 100644 --- a/other-licence/bcm/bcm57xx.h +++ b/drivers/bcm57xx/bcm57xx.h diff --git a/other-licence/bcm/types.h b/drivers/bcm57xx/types.h index fb562d7..fb562d7 100644 --- a/other-licence/bcm/types.h +++ b/drivers/bcm57xx/types.h diff --git a/other-licence/common/Makefile b/drivers/common/Makefile index 8b3ebe1..8b3ebe1 100644 --- a/other-licence/common/Makefile +++ b/drivers/common/Makefile diff --git a/other-licence/common/module.lds b/drivers/common/module.lds index df42f53..df42f53 100644 --- a/other-licence/common/module.lds +++ b/drivers/common/module.lds diff --git a/other-licence/common/module_entry.c b/drivers/common/module_entry.c index be1a110..be1a110 100644 --- a/other-licence/common/module_entry.c +++ b/drivers/common/module_entry.c diff --git a/other-licence/Makefile b/other-licence/Makefile index fb5397d..f46dc17 100644 --- a/other-licence/Makefile +++ b/other-licence/Makefile @@ -16,16 +16,16 @@ ifndef TOP endif include $(TOP)/make.rules -SUBDIRS=common bcm +SUBDIRS= ifeq ($(SNK_BIOSEMU_APPS), 1) SUBDIRS += x86emu endif CLEANSUBDIRS = $(SUBDIRS) -all : - for subdir in $(SUBDIRS) ; do $(MAKE) -C $${subdir} || exit 1 ; done +all : + for subdir in $(SUBDIRS) ; do $(MAKE) -C $${subdir} || exit 1 ; done # Common targets for all subdirectories: -clean distclean depend: - for subdir in $(CLEANSUBDIRS) ; do $(MAKE) -C $${subdir} $@ ; done +clean distclean depend: + for subdir in $(CLEANSUBDIRS) ; do $(MAKE) -C $${subdir} $@ ; done |