diff options
| -rw-r--r-- | Makefile | 82 | ||||
| -rw-r--r-- | Makefile.gen | 233 | ||||
| -rw-r--r-- | board-js2x/Makefile | 81 | ||||
| -rw-r--r-- | board-js2x/rtas/Makefile | 4 | ||||
| -rw-r--r-- | board-qemu/Makefile | 69 | ||||
| -rw-r--r-- | clients/takeover/Makefile | 8 | ||||
| -rw-r--r-- | romfs/tools/Makefile | 2 | ||||
| -rw-r--r-- | slof/Makefile.inc | 4 |
8 files changed, 213 insertions, 270 deletions
@@ -37,17 +37,17 @@ all: echo " $(STD_BOARDS)"; \ exit 1; \ fi - @make `cat .target` + @$(MAKE) `cat .target` rom: @echo "******* Build $(BOARD) System ********" @echo $(BOARD) > .target - @make -C board-$(BOARD) + @$(MAKE) -C board-$(BOARD) @$(RM) -f .crc_flash rw: @echo "******* Build $(BOARD) system (RISCWatch boot) ********" @echo $(BOARD) > .target - @make -C board-$(BOARD) l2b + @$(MAKE) -C board-$(BOARD) l2b @$(RM) -f .crc_flash $(STD_BOARDS): @@ -55,7 +55,7 @@ $(STD_BOARDS): @if [ -f .target ]; then \ if [ `cat .target` != $@ ]; then \ echo "Configuration changed - cleaning up first..."; \ - make distclean; \ + $(MAKE) distclean; \ echo $@ > .target; \ fi; \ else \ @@ -65,14 +65,14 @@ $(STD_BOARDS): if [ -n "$$b" ]; then \ subboard=$${b##*-}; \ board=$${b%%-*}; \ - make -C board-$$board SUBBOARD=$$subboard; \ + $(MAKE) -C board-$$board SUBBOARD=$$subboard; \ else \ - make -C board-$@; \ + $(MAKE) -C board-$@; \ fi @$(RM) .crc_flash test_all: - @for i in $(STD_BOARDS); do make distclean $$i; done + @for i in $(STD_BOARDS); do $(MAKE) distclean $$i; done driver: @echo "******** Building $(BOARD) system ********" @@ -80,54 +80,54 @@ driver: if [ -n "$$b" ]; then \ subboard=$${b##*-}; \ board=$${b%%-*}; \ - DRIVER=1 make -C board-$$board SUBBOARD=$$subboard driver; \ + DRIVER=1 $(MAKE) -C board-$$board SUBBOARD=$$subboard driver; \ else \ - DRIVER=1 make -C board-$(BOARD) driver; \ + DRIVER=1 $(MAKE) -C board-$(BOARD) driver; \ fi @$(RM) -f .crc_flash .boot_xdr.ffs cli: - make -C clients + $(MAKE) -C clients # Rules for making clean: clean_here: - rm -f boot_rom.bin .boot_rom.ffs boot_xdr.bin .boot_xdr.ffs - rm -f boot_l2-dd2.ad boot_l2b.bin .crc_flash + $(RM) boot_rom.bin .boot_rom.ffs boot_xdr.bin .boot_xdr.ffs + $(RM) boot_l2-dd2.ad boot_l2b.bin .crc_flash clean: clean_here - @if [ -e .target ]; then \ - tar=`cat .target`; \ - b=`echo $$tar | grep "-"`; \ - if [ -n "$$b" ]; then \ - subboard=$${b##*-}; \ - board=$${b%%-*}; \ - make -C board-$$board SUBBOARD=$$subboard clean; \ - else \ - pwd; \ - make -C board-$$tar clean; \ - fi \ - fi + @if [ -e .target ]; then \ + tar=`cat .target`; \ + b=`echo $$tar | grep "-"`; \ + if [ -n "$$b" ]; then \ + subboard=$${b##*-}; \ + board=$${b%%-*}; \ + $(MAKE) -C board-$$board SUBBOARD=$$subboard clean; \ + else \ + pwd; \ + $(MAKE) -C board-$$tar clean; \ + fi \ + fi distclean: clean_here - @if [ -e .target ]; then \ - tar=`cat .target`; \ - b=`echo $$tar | grep "-"`; \ - if [ -n "$$b" ]; then \ - subboard=$${b##*-}; \ - board=$${b%%-*}; \ - make -C board-$$board SUBBOARD=$$subboard distclean; \ - else \ - make -C board-$$tar distclean; \ - fi; \ - rm -f .target; \ - fi + @if [ -e .target ]; then \ + tar=`cat .target`; \ + b=`echo $$tar | grep "-"`; \ + if [ -n "$$b" ]; then \ + subboard=$${b##*-}; \ + board=$${b%%-*}; \ + $(MAKE) -C board-$$board SUBBOARD=$$subboard distclean; \ + else \ + $(MAKE) -C board-$$tar distclean; \ + fi; \ + $(RM) .target; \ + fi distclean_all: clean_here - @for dir in board-* ; do \ - $(MAKE) -C $$dir distclean || exit 1; \ - done - rm -f .target + @for dir in board-* ; do \ + $(MAKE) -C $$dir distclean || exit 1; \ + done + $(RM) .target cli-clean: - make -C clients clean + $(MAKE) -C clients clean diff --git a/Makefile.gen b/Makefile.gen index 3c5d116..69bcdf1 100644 --- a/Makefile.gen +++ b/Makefile.gen @@ -34,180 +34,127 @@ DTB_ROMFS_FLAG ?= 0 DTB_ROMFS_ADDR ?= 0 llfw_disassembly: - make -C $(LLFWBRDDIR) stage1.dis stage2.dis stageS.dis + $(MAKE) -C $(LLFWBRDDIR) stage1.dis stage2.dis stageS.dis clients_build: - @echo " ====== Building clients ======" - make -C ../clients $(MAKEARG) + @echo " ====== Building clients ======" + $(MAKE) -C ../clients $(MAKEARG) other_licence_build: - make -C ../other-licence $(MAKEARG) + $(MAKE) -C ../other-licence $(MAKEARG) tools_build: - make -C ../tools + $(MAKE) -C ../tools romfs_build: - make -C ../romfs/tools $(MAKEARG) + $(MAKE) -C ../romfs/tools $(MAKEARG) ../build_info.img: - @echo "$(CC)" > ../build_info.img - @$(CC) -v >> ../build_info.img 2>&1 - @$(LD) -V >> ../build_info.img 2>&1 + @echo "$(CC)" > ../build_info.img + @$(CC) -v >> ../build_info.img 2>&1 + @$(LD) -V >> ../build_info.img 2>&1 ../$(SUBBOARD).dtb: - @if [ -e dts/$(SUBBOARD).dts ]; then \ - dtc -q -I dts -O dtb dts/$(SUBBOARD).dts > $@; \ - fi - -boot_rom.bin boot_xdr.bin: $(BUILDS) ../build_info.img ../$(SUBBOARD).dtb -ifeq ($(DO_COMPRESS),1) - - @echo " ====== Building packed $@ ======" - @if [ -e $(ROMFSBRDDIR)/boot_rom.$(SUBBOARD).ffs ]; then \ - cat $(ROMFSBRDDIR)/boot_rom.$(SUBBOARD).ffs > ../.boot_rom.ffs; \ - cat $(ROMFSBRDDIR)/boot_rom.$(SUBBOARD).pack.ffs > ../.boot_rom.pack.ffs; \ - else \ - cat $(ROMFSBRDDIR)/boot_rom.ffs > ../.boot_rom.ffs; \ - cat $(ROMFSBRDDIR)/boot_rom.pack.ffs > ../.boot_rom.pack.ffs; \ - fi - @if [ -e $(PCDBRDDIR)/pcdfiles.ffs ]; then \ - cat $(PCDBRDDIR)/pcdfiles.ffs >> ../.boot_rom.ffs; \ - cat $(PCDBRDDIR)/pcdfiles.ffs >> ../.boot_rom.pack.ffs; \ - fi - - @echo "romfs.pack boot_rom.bin.pack.nv 0 0" >> ../.boot_rom.ffs - - cat $(SLOFBRDDIR)/OF.ffs >> ../.boot_rom.pack.ffs - @echo build_info.img build_info.img 0 0 >> ../.boot_rom.pack.ffs - @if [ -e ../$(SUBBOARD).dtb ]; then \ - echo dtb $(SUBBOARD).dtb $(DTB_ROMFS_FLAG) \ - $(DTB_ROMFS_ADDR) >> ../.boot_rom.pack.ffs; \ - fi; - cd .. && ./romfs/tools/build_romfs $(ROMFS_OPTIONS) .boot_rom.pack.ffs boot_rom.bin.pack - cd .. && ./tools/pknova -q boot_rom.bin.pack boot_rom.bin.pack.nv; - cd .. && ./romfs/tools/build_romfs $(ROMFS_OPTIONS) .boot_rom.ffs $@ - if [ "$@" = "boot_rom.bin" ]; then \ - rm ../boot_rom.bin.pack; \ - rm ../boot_rom.bin.pack.nv; \ - fi; -else - @echo " ====== Building $@ ======" - @if [ -e $(ROMFSBRDDIR)/boot_rom.$(SUBBOARD).ffs ]; then \ - cat $(ROMFSBRDDIR)/boot_rom.$(SUBBOARD).ffs > ../.boot_rom.ffs; \ - else \ - cat $(ROMFSBRDDIR)/boot_rom.ffs > ../.boot_rom.ffs; \ - fi - @if [ -e $(PCDBRDDIR)/pcdfiles.ffs ]; then \ - cat $(PCDBRDDIR)/pcdfiles.ffs >> ../.boot_rom.ffs; \ - fi - cat $(SLOFBRDDIR)/OF.ffs >> ../.boot_rom.ffs - @echo build_info.img build_info.img 0 0 >> ../.boot_rom.ffs - @if [ -e ../$(SUBBOARD).dtb ]; then \ - echo dtb $(SUBBOARD).dtb $(DTB_ROMFS_FLAG) \ - $(DTB_ROMFS_ADDR) >> ../.boot_rom.ffs; \ - fi - @if [ -e slik.elf ]; then \ - echo "slik.elf available ..."; \ - echo slik board-$(BOARD)/slik.elf 0 0 >> \ - ../.boot_rom.ffs; \ - fi - cd .. && ./romfs/tools/build_romfs $(ROMFS_OPTIONS) .boot_rom.ffs $@ -endif - cd .. && if [ -f $@.gz ]; then rm -f $@.gz; gzip -9 $@ ; fi - rm -f ../.boot_rom.*ffs - rm -f ../$(SUBBOARD).dtb - -../boot_l2b.bin: $(BUILDS) ../romfs/copyright.img ../$(SUBBOARD).dtb - @if [ -e $(ROMFSBRDDIR)/boot_l2.$(SUBBOARD).ffs ]; then \ - cd .. && ./romfs/tools/build_romfs $(ROMFS_OPTIONS) $(ROMFSBRDDIR)/boot_l2.$(SUBBOARD).ffs boot_l2b.bin; \ - else \ - cd .. && ./romfs/tools/build_romfs $(ROMFS_OPTIONS) $(ROMFSBRDDIR)/boot_l2.ffs boot_l2b.bin; \ - fi - @if [ -e ../$(SUBBOARD).dtb ]; then \ - echo dtb $(SUBBOARD).dtb $(DTB_ROMFS_FLAG) \ - $(DTB_ROMFS_ADDR) >> ../.boot_rom.ffs; \ - fi - rm -f ../$(SUBBOARD).dtb - -boot_l2.ad boot_l2-dd2.ad: ../boot_l2b.bin - @cd ../tools && ./elf2l2 dd2 ../boot_l2b.bin 0 ../$@ + @if [ -e dts/$(SUBBOARD).dts ]; then \ + dtc -q -I dts -O dtb dts/$(SUBBOARD).dts > $@; \ + fi + +boot_rom.bin: $(BUILDS) ../build_info.img ../$(SUBBOARD).dtb + @echo " ====== Building $@ ======" + @if [ -e $(ROMFSBRDDIR)/boot_rom.$(SUBBOARD).ffs ]; then \ + cat $(ROMFSBRDDIR)/boot_rom.$(SUBBOARD).ffs > ../.boot_rom.ffs; \ + else \ + cat $(ROMFSBRDDIR)/boot_rom.ffs > ../.boot_rom.ffs; \ + fi + @if [ -e $(PCDBRDDIR)/pcdfiles.ffs ]; then \ + cat $(PCDBRDDIR)/pcdfiles.ffs >> ../.boot_rom.ffs; \ + fi + cat $(SLOFBRDDIR)/OF.ffs >> ../.boot_rom.ffs + @echo build_info.img build_info.img 0 0 >> ../.boot_rom.ffs + @if [ -e ../$(SUBBOARD).dtb ]; then \ + echo dtb $(SUBBOARD).dtb $(DTB_ROMFS_FLAG) \ + $(DTB_ROMFS_ADDR) >> ../.boot_rom.ffs; \ + fi + cd .. && ./romfs/tools/build_romfs $(ROMFS_OPTIONS) .boot_rom.ffs $@ + cd .. && if [ -f $@.gz ]; then rm -f $@.gz; gzip -9 $@ ; fi + rm -f ../.boot_rom.*ffs + rm -f ../$(SUBBOARD).dtb + external_flasher: ../boot_rom.bin - ../tools/make-flasher-image.sh $(FLASH_SIZE) ../boot_rom.bin \ - ../boot_rom-$(FLASH_SIZE_MB)MB-BigEndian.bin + ../tools/make-flasher-image.sh $(FLASH_SIZE) ../boot_rom.bin \ + ../boot_rom-$(FLASH_SIZE_MB)MB-BigEndian.bin driver_dirs: - @rm -rf ../driver-$(RELEASE) - @mkdir -p ../driver-$(RELEASE)/{rom,l2b,disassemblies} + @rm -rf ../driver-$(RELEASE) + @mkdir -p ../driver-$(RELEASE)/{rom,l2b,disassemblies} driver_prep: - @echo "Building driver "$(RELEASE)" for $(BOARD)" + @echo "Building driver "$(RELEASE)" for $(BOARD)" copy_disassemblies: llfw_disassembly - cp $(LLFWBRDDIR)/stage1.dis \ - ../driver-$(RELEASE)/disassemblies/$(RELEASE)-stage1.dis - cp $(LLFWBRDDIR)/stage2.dis \ - ../driver-$(RELEASE)/disassemblies/$(RELEASE)-stage2.dis - cp $(LLFWBRDDIR)/stageS.dis \ - ../driver-$(RELEASE)/disassemblies/$(RELEASE)-stageS.dis - cp $(LLFWBRDDIR)/meminit.dis \ - ../driver-$(RELEASE)/disassemblies/$(RELEASE)-meminit.dis - @if [ -e ../clients/snk/client.dis ]; then cp ../clients/snk/client.dis \ - ../driver-$(RELEASE)/disassemblies/$(RELEASE)-client.dis; fi + cp $(LLFWBRDDIR)/stage1.dis \ + ../driver-$(RELEASE)/disassemblies/$(RELEASE)-stage1.dis + cp $(LLFWBRDDIR)/stage2.dis \ + ../driver-$(RELEASE)/disassemblies/$(RELEASE)-stage2.dis + cp $(LLFWBRDDIR)/stageS.dis \ + ../driver-$(RELEASE)/disassemblies/$(RELEASE)-stageS.dis + cp $(LLFWBRDDIR)/meminit.dis \ + ../driver-$(RELEASE)/disassemblies/$(RELEASE)-meminit.dis + @if [ -e ../clients/snk/client.dis ]; then cp ../clients/snk/client.dis \ + ../driver-$(RELEASE)/disassemblies/$(RELEASE)-client.dis; fi copy_driver: copy_disassemblies external_flasher - mv ../boot_rom-$(FLASH_SIZE_MB)MB-BigEndian.bin \ - ../driver-$(RELEASE)/rom/$(RELEASE)-boot_rom-$(FLASH_SIZE_MB)MB-BigEndian.bin - mv ../boot_rom.bin \ - ../driver-$(RELEASE)/rom/$(RELEASE)-boot_rom.bin - if [ -e ../boot_l2-dd2.ad ]; then \ - mv ../boot_l2-dd2.ad \ - ../driver-$(RELEASE)/l2b/; \ - else \ - mv ../boot_l2.ad \ - ../driver-$(RELEASE)/l2b/; fi - mv ../boot_xdr.bin \ - ../driver-$(RELEASE)/l2b/ - cp ../VERSION ../driver-$(RELEASE) - cd ../driver-$(RELEASE) && md5sum rom/*.bin > md5sum.txt + mv ../boot_rom-$(FLASH_SIZE_MB)MB-BigEndian.bin \ + ../driver-$(RELEASE)/rom/$(RELEASE)-boot_rom-$(FLASH_SIZE_MB)MB-BigEndian.bin + mv ../boot_rom.bin \ + ../driver-$(RELEASE)/rom/$(RELEASE)-boot_rom.bin + if [ -e ../boot_l2-dd2.ad ]; then \ + mv ../boot_l2-dd2.ad ../driver-$(RELEASE)/l2b/; \ + else \ + mv ../boot_l2.ad ../driver-$(RELEASE)/l2b/; \ + fi + mv ../boot_xdr.bin ../driver-$(RELEASE)/l2b/ + cp ../VERSION ../driver-$(RELEASE) + cd ../driver-$(RELEASE) && md5sum rom/*.bin > md5sum.txt tar_gz: copy_driver - @cp -a ../driver-$(RELEASE) ../driver-$(RELEASE)-$(DRVDATE)-devel - tar czf ../driver-$(RELEASE)-$(DRVDATE)-devel.tar.gz \ - ../driver-$(RELEASE)-$(DRVDATE)-devel > /dev/null 2>&1 - @rm -rf ../driver-$(RELEASE)-$(DRVDATE)-devel - @rm -rf ../driver-$(RELEASE)/disassemblies - @mv ../driver-$(RELEASE) ../driver-$(RELEASE)-$(DRVDATE) - tar czf ../driver-$(RELEASE)-$(DRVDATE).tar.gz \ - ../driver-$(RELEASE)-$(DRVDATE) > /dev/null 2>&1 - @rm -rf ../driver-$(RELEASE)-$(DRVDATE) + @cp -a ../driver-$(RELEASE) ../driver-$(RELEASE)-$(DRVDATE)-devel + tar czf ../driver-$(RELEASE)-$(DRVDATE)-devel.tar.gz \ + ../driver-$(RELEASE)-$(DRVDATE)-devel > /dev/null 2>&1 + @rm -rf ../driver-$(RELEASE)-$(DRVDATE)-devel + @rm -rf ../driver-$(RELEASE)/disassemblies + @mv ../driver-$(RELEASE) ../driver-$(RELEASE)-$(DRVDATE) + tar czf ../driver-$(RELEASE)-$(DRVDATE).tar.gz \ + ../driver-$(RELEASE)-$(DRVDATE) > /dev/null 2>&1 + @rm -rf ../driver-$(RELEASE)-$(DRVDATE) clean_top: - @rm -f ../build_info.img - @rm -f ../.crc_flash - @rm -f ../$(SUBBOARD).dtb + @rm -f ../build_info.img + @rm -f ../.crc_flash + @rm -f ../$(SUBBOARD).dtb clean_gen: clean_top - make -C ../romfs/tools BOARD=$(BOARD) clean - make -C ../tools clean - make -C ../other-licence clean - make -C ../clients clean - @for dir in $(COMMON_LIBS); do \ - $(MAKE) -C ../lib/$$dir clean || exit 1; \ - done + $(MAKE) -C ../romfs/tools BOARD=$(BOARD) clean + $(MAKE) -C ../tools clean + $(MAKE) -C ../other-licence clean + $(MAKE) -C ../clients clean + @for dir in $(COMMON_LIBS); do \ + $(MAKE) -C ../lib/$$dir clean || exit 1; \ + done distclean_gen: clean_top - make -C ../romfs/tools BOARD=$(BOARD) distclean - make -C ../tools distclean - make -C ../other-licence distclean - make -C ../clients distclean - @for dir in $(COMMON_LIBS); do \ - $(MAKE) -C ../lib/$$dir distclean || exit 1; \ - done + $(MAKE) -C ../romfs/tools BOARD=$(BOARD) distclean + $(MAKE) -C ../tools distclean + $(MAKE) -C ../other-licence distclean + $(MAKE) -C ../clients distclean + @for dir in $(COMMON_LIBS); do \ + $(MAKE) -C ../lib/$$dir distclean || exit 1; \ + done common-libs: - @echo " ====== Building common libraries ======" - $(MAKE) -C $(LIBCMNDIR) $(COMMON_LIBS) + @echo " ====== Building common libraries ======" + $(MAKE) -C $(LIBCMNDIR) $(COMMON_LIBS) board-libs: - $(MAKE) -C lib $(MAKEARG) + $(MAKE) -C lib $(MAKEARG) diff --git a/board-js2x/Makefile b/board-js2x/Makefile index cf17f98..56f9607 100644 --- a/board-js2x/Makefile +++ b/board-js2x/Makefile @@ -10,12 +10,13 @@ # * IBM Corporation - initial implementation # ****************************************************************************/ -JS2X_TARGETS = tools_build romfs_build clients_build bcm57xx stage1 +BOARD_TARGETS = tools_build romfs_build clients_build bcm57xx stage1 subdirs SUBDIRS = slof rtas COMMON_LIBS = libc libipmi libbootmsg libbases libnvram libelf -all: $(JS2X_TARGETS) subdirs boot_rom.bin +all: $(BOARD_TARGETS) + $(MAKE) boot_rom.bin .PHONY : subdirs $(SUBDIRS) clean distclean @@ -27,59 +28,59 @@ include $(TOPCMNDIR)/Makefile.gen subdirs: $(SUBDIRS) $(SUBDIRS): common-libs - @echo " ====== Building $@ ======" - $(MAKE) -C $@ $(MAKEARG) + @echo " ====== Building $@ ======" + $(MAKE) -C $@ $(MAKEARG) stage1: common-libs - @echo " ====== Building llfw ======" - make -C llfw RELEASE=-DRELEASE=\"\\\"$(RELEASE)\\\"\" + @echo " ====== Building llfw ======" + $(MAKE) -C llfw RELEASE=-DRELEASE=\"\\\"$(RELEASE)\\\"\" bcm57xx: - make -C ../other-licence/bcm + $(MAKE) -C ../other-licence/bcm clean_here: - rm -f ../slof/OF.ffs - rm -f ../boot_rom.bin + rm -f ../slof/OF.ffs + rm -f ../boot_rom.bin clean: clean_here clean_gen - @for dir in $(SUBDIRS); do \ - $(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 + @for dir in $(SUBDIRS); do \ + $(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 distclean: clean_here distclean_gen - @for dir in $(SUBDIRS); do \ - $(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 + @for dir in $(SUBDIRS); do \ + $(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 takeover: all - $(MAKE) -C $(TOPCMNDIR)/clients/takeover + $(MAKE) -C $(TOPCMNDIR)/clients/takeover .driver_dirs: - @rm -rf ../driver-$(RELEASE) - @mkdir -p ../driver-$(RELEASE) + @rm -rf ../driver-$(RELEASE) + @mkdir -p ../driver-$(RELEASE) .tar_gz: .driver_dirs takeover external_flasher - @mv ../boot_rom.bin \ - ../driver-$(RELEASE)/$(RELEASE)-js2x.bin - @mv ../boot_rom-$(FLASH_SIZE_MB)MB-BigEndian.bin \ - ../driver-$(RELEASE)/$(RELEASE)-$(FLASH_SIZE_MB)MB-BigEndian.bin - @mv $(TOPCMNDIR)/clients/takeover/takeover.elf \ - ../driver-$(RELEASE)/$(RELEASE)-takeover.bin - @cp ../VERSION ../driver-$(RELEASE) - @cp changes.txt ../driver-$(RELEASE) - @cd ../driver-$(RELEASE) && md5sum * > md5sum.txt - @chmod 644 ../driver-$(RELEASE)/* - @mv ../driver-$(RELEASE) ../driver-$(RELEASE)-`date +%Y-%h%d` - @tar czf ../driver-$(RELEASE)-`date +%Y-%h%d`.tar.gz \ - ../driver-$(RELEASE)-`date +%Y-%h%d` > /dev/null 2>&1 - @rm -rf ../driver-$(RELEASE)-`date +%Y-%h%d` + @mv ../boot_rom.bin \ + ../driver-$(RELEASE)/$(RELEASE)-js2x.bin + @mv ../boot_rom-$(FLASH_SIZE_MB)MB-BigEndian.bin \ + ../driver-$(RELEASE)/$(RELEASE)-$(FLASH_SIZE_MB)MB-BigEndian.bin + @mv $(TOPCMNDIR)/clients/takeover/takeover.elf \ + ../driver-$(RELEASE)/$(RELEASE)-takeover.bin + @cp ../VERSION ../driver-$(RELEASE) + @cp changes.txt ../driver-$(RELEASE) + @cd ../driver-$(RELEASE) && md5sum * > md5sum.txt + @chmod 644 ../driver-$(RELEASE)/* + @mv ../driver-$(RELEASE) ../driver-$(RELEASE)-`date +%Y-%h%d` + @tar czf ../driver-$(RELEASE)-`date +%Y-%h%d`.tar.gz \ + ../driver-$(RELEASE)-`date +%Y-%h%d` > /dev/null 2>&1 + @rm -rf ../driver-$(RELEASE)-`date +%Y-%h%d` driver: driver_prep clean .tar_gz diff --git a/board-js2x/rtas/Makefile b/board-js2x/rtas/Makefile index 70e506f..5ab5c34 100644 --- a/board-js2x/rtas/Makefile +++ b/board-js2x/rtas/Makefile @@ -63,10 +63,10 @@ $(TOOLSDIR)/gen_reloc_table: $(TOOLSDIR)/gen_reloc_table.c $(MAKE) -C $(TOOLSDIR) gen_reloc_table ../../lib/libc.a: - make -C ../../lib + $(MAKE) -C ../../lib clean: - make -C ../../lib clean + $(MAKE) -C ../../lib clean rm -f $(OBJS) reloc_table.o rtas rtas.bin distclean : clean diff --git a/board-qemu/Makefile b/board-qemu/Makefile index b67ee24..79fcf3c 100644 --- a/board-qemu/Makefile +++ b/board-qemu/Makefile @@ -10,12 +10,13 @@ # * IBM Corporation - initial implementation # ****************************************************************************/ -BOARD_TARGETS = tools_build romfs_build clients_build net_veth stage1 +BOARD_TARGETS = tools_build romfs_build clients_build stage1 subdirs -SUBDIRS = slof +SUBDIRS = slof veth COMMON_LIBS = libc libbootmsg libbases libnvram libelf libhvcall -all: $(BOARD_TARGETS) subdirs boot_rom.bin +all: $(BOARD_TARGETS) + $(MAKE) boot_rom.bin .PHONY : subdirs $(SUBDIRS) clean distclean @@ -27,50 +28,44 @@ include $(TOPCMNDIR)/Makefile.gen subdirs: $(SUBDIRS) $(SUBDIRS): common-libs - @echo " ====== Building $@ ======" - $(MAKE) -C $@ $(MAKEARG) + @echo " ====== Building $@ ======" + $(MAKE) -C $@ $(MAKEARG) stage1: common-libs - @echo " ====== Building llfw ======" - make -C llfw RELEASE=-DRELEASE=\"\\\"$(RELEASE)\\\"\" - -net_veth: common-libs - @echo " ====== Building veth ======" - make -C veth + @echo " ====== Building llfw ======" + $(MAKE) -C llfw RELEASE=-DRELEASE=\"\\\"$(RELEASE)\\\"\" clean_here: - rm -f ../slof/OF.ffs - rm -f ../boot_rom.bin + rm -f ../slof/OF.ffs + rm -f ../boot_rom.bin -clean: clean_here clean_gen - @for dir in $(SUBDIRS); do \ - $(MAKE) -C $$dir clean || exit 1; \ - done - rm -f ../boot_rom.bin - @make -C llfw clean - make -C veth clean +clean: clean_here clean_gen + @for dir in $(SUBDIRS); do \ + $(MAKE) -C $$dir clean || exit 1; \ + done + rm -f ../boot_rom.bin + @$(MAKE) -C llfw clean distclean: clean_here distclean_gen - @for dir in $(SUBDIRS); do \ - $(MAKE) -C $$dir distclean || exit 1; \ - done - rm -f ../boot_rom.bin - make -C llfw clean - make -C veth distclean + @for dir in $(SUBDIRS); do \ + $(MAKE) -C $$dir distclean || exit 1; \ + done + rm -f ../boot_rom.bin + $(MAKE) -C llfw clean .driver_dirs: - @rm -rf ../driver-$(RELEASE) - @mkdir -p ../driver-$(RELEASE) + @rm -rf ../driver-$(RELEASE) + @mkdir -p ../driver-$(RELEASE) .tar_gz: .driver_dirs - @mv ../boot_rom.bin ../driver-$(RELEASE)/$(RELEASE)-slof.bin - @cp ../VERSION ../driver-$(RELEASE) - @cp changes.txt ../driver-$(RELEASE) - @cd ../driver-$(RELEASE) && md5sum * > md5sum.txt - @chmod 644 ../driver-$(RELEASE)/* - @mv ../driver-$(RELEASE) ../driver-$(RELEASE)-`date +%Y-%h%d` - @tar czf ../driver-$(RELEASE)-`date +%Y-%h%d`.tar.gz \ - ../driver-$(RELEASE)-`date +%Y-%h%d` > /dev/null 2>&1 - @rm -rf ../driver-$(RELEASE)-`date +%Y-%h%d` + @mv ../boot_rom.bin ../driver-$(RELEASE)/$(RELEASE)-slof.bin + @cp ../VERSION ../driver-$(RELEASE) + @cp changes.txt ../driver-$(RELEASE) + @cd ../driver-$(RELEASE) && md5sum * > md5sum.txt + @chmod 644 ../driver-$(RELEASE)/* + @mv ../driver-$(RELEASE) ../driver-$(RELEASE)-`date +%Y-%h%d` + @tar czf ../driver-$(RELEASE)-`date +%Y-%h%d`.tar.gz \ + ../driver-$(RELEASE)-`date +%Y-%h%d` > /dev/null 2>&1 + @rm -rf ../driver-$(RELEASE)-`date +%Y-%h%d` driver: driver_prep clean .tar_gz diff --git a/clients/takeover/Makefile b/clients/takeover/Makefile index ed73ef1..e58e8d1 100644 --- a/clients/takeover/Makefile +++ b/clients/takeover/Makefile @@ -37,8 +37,8 @@ takeover.elf: ppc32wrap.o takeover.elf32 $(LDFLAGS) $^ -o $@ takeover.elf64: entry.o main.o takeover.o $(SNKDIR)/libc/time/timer.o of.elf - make -C $(LIBCMNDIR) libc - make -C $(CLIENTSDIR) + $(MAKE) -C $(LIBCMNDIR) libc + $(MAKE) -C $(CLIENTSDIR) $(LD) $(LDFLAGS) -o $@ -Tclient.lds $(OBJS) of.elf: ../../boot_rom.bin @@ -52,8 +52,8 @@ ppc32wrap.o: ppc32wrap.S $(CROSS)gcc -m32 -a32 $(CFLAGS) -c $< -o $@ clean distclean: - make -C $(LIBCMNDIR) $@ - make -C $(CLIENTSDIR) $@ + $(MAKE) -C $(LIBCMNDIR) $@ + $(MAKE) -C $(CLIENTSDIR) $@ $(RM) *.o *.bin *.elf $(RM) takeover.elf32 takeover.elf64 takeover.tmp %.o: %.oco diff --git a/romfs/tools/Makefile b/romfs/tools/Makefile index 8f399a8..f86803d 100644 --- a/romfs/tools/Makefile +++ b/romfs/tools/Makefile @@ -31,7 +31,7 @@ build_romfs: $(OBJS) $(HOSTCC) $(HOSTCFLAGS) $(FLAG) -o $@ $^ testing: build_romfs - make -C test + $(MAKE) -C test %.o: %.c $(HOSTCC) $(CPPFLAGS) $(HOSTCFLAGS) $(FLAG) -c $< -o $@ diff --git a/slof/Makefile.inc b/slof/Makefile.inc index 0500f04..57db3bc 100644 --- a/slof/Makefile.inc +++ b/slof/Makefile.inc @@ -111,10 +111,10 @@ checkpoint.o: $(CC) $(CPPFLAGS) $(ASFLAGS) -c -o $@ $(LLFWCMNDIR)/checkpoint.S $(LLFWBRDDIR)/board_io.o: - make -C $(LLFWBRDDIR) board_io.o + $(MAKE) -C $(LLFWBRDDIR) board_io.o $(LLFWBRDDIR)/io_generic_lib.o: - make -C $(LLFWBRDDIR) io_generic_lib.o + $(MAKE) -C $(LLFWBRDDIR) io_generic_lib.o default-font.o: $(SLOFCMNDIR)/default-font.c $(CC) $(CPPFLAGS) $< -c -o default-font.o |