diff options
author | William Bryan <wilbryan@us.ibm.com> | 2015-02-11 17:02:41 -0600 |
---|---|---|
committer | Stephan Broyles <sbroyles@us.ibm.com> | 2015-02-12 14:37:59 -0600 |
commit | 6d0342e8707fd3b393936e114d7715966ad17b8c (patch) | |
tree | 68dadcbd82d2b053e89784e12559baec3e5e29ec | |
parent | 2adf5f493db7436dd0df0fcb846c16b93dd1f374 (diff) | |
download | talos-occ-6d0342e8707fd3b393936e114d7715966ad17b8c.tar.gz talos-occ-6d0342e8707fd3b393936e114d7715966ad17b8c.zip |
Infrastructure fixes for makefiles
Change-Id: I867d760d5bed3d180590ba321f0456c9d58b95c3
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/15673
Reviewed-by: Stephan Broyles <sbroyles@us.ibm.com>
Tested-by: Stephan Broyles <sbroyles@us.ibm.com>
-rwxr-xr-x | src/Makefile | 12 | ||||
-rwxr-xr-x | src/occ/app.mk | 2 | ||||
-rwxr-xr-x | src/occ/errl/test/app.mk | 2 | ||||
-rwxr-xr-x | src/occ/proc/test/app.mk | 2 | ||||
-rwxr-xr-x | src/occ/pss/test/app.mk | 2 | ||||
-rwxr-xr-x | src/occ/rtls/test/app.mk | 2 | ||||
-rwxr-xr-x | src/occ/thread/test/app.mk | 2 | ||||
-rwxr-xr-x | src/occApplet/Makefile | 12 | ||||
-rwxr-xr-x | src/occApplet/productApplet/Makefile | 18 | ||||
-rwxr-xr-x | src/occApplet/testApplet/Makefile | 12 | ||||
-rwxr-xr-x | src/ssx/pgp/ssx.mk | 2 |
11 files changed, 34 insertions, 34 deletions
diff --git a/src/Makefile b/src/Makefile index 7dec650..d90b2f0 100755 --- a/src/Makefile +++ b/src/Makefile @@ -10,9 +10,9 @@ endif SUBDIRS = tracepp occBootLoader occ occApplet COMBINE_IMAGE_SUBDIRS = occBootLoader occ occApplet CLEAN_SUBDIRS = occBootLoader occ occApplet ssx/pgp lib -CLEANCMD = $(MAKE) clean -C $(dir); -ALLCMD = $(MAKE) -j6 -C $(dir); -COMBINEIMAGE = $(MAKE) combineImage -C $(dir); +CLEANCMD = $(MAKE) clean -C $(dir) +ALLCMD = $(MAKE) -C $(dir) +COMBINEIMAGE = $(MAKE) combineImage -C $(dir) IMAGEFILE = image.bin export TRACEPP = $(ROOTPATH)/tracepp/tracepp @@ -22,7 +22,7 @@ TRACEHASH = $(ROOTPATH)/tracepp/tracehash.pl # Compilation #******************************************************************************* all: - $(foreach dir,$(SUBDIRS),$(ALLCMD)) + $(foreach dir,$(SUBDIRS),$(ALLCMD) &&) true #******************************************************************************* # Combine Objects/Executables into OCC Image @@ -30,7 +30,7 @@ all: .PHONY : combineImage combineImage: rm -rf $(IMAGEFILE) - $(foreach dir,$(COMBINE_IMAGE_SUBDIRS),$(COMBINEIMAGE)) + $(foreach dir,$(COMBINE_IMAGE_SUBDIRS),$(COMBINEIMAGE) &&) true #******************************************************************************* # Create lid or ruhx out of OCC Image @@ -63,6 +63,6 @@ srcPluginFile: # Clean #******************************************************************************* clean: - $(foreach dir,$(CLEAN_SUBDIRS),$(CLEANCMD)) + $(foreach dir,$(CLEAN_SUBDIRS),$(CLEANCMD) &&) true rm -rf image.bin diff --git a/src/occ/app.mk b/src/occ/app.mk index 7b86d10..2ce5e81 100755 --- a/src/occ/app.mk +++ b/src/occ/app.mk @@ -181,5 +181,5 @@ clean_all: $(MAKE) -C $(PGP) clean ifneq ($(MAKECMDGOALS),clean) -include $(OBJECTS:.o=.d) +-include $(OBJECTS:.o=.d) endif diff --git a/src/occ/errl/test/app.mk b/src/occ/errl/test/app.mk index af7dda1..f17074d 100755 --- a/src/occ/errl/test/app.mk +++ b/src/occ/errl/test/app.mk @@ -102,4 +102,4 @@ clean_all: $(MAKE) clean $(MAKE) -C $(PGP) clean -include $(OBJECTS:.o=.d) +-include $(OBJECTS:.o=.d) diff --git a/src/occ/proc/test/app.mk b/src/occ/proc/test/app.mk index 9644b1f..3568dfb 100755 --- a/src/occ/proc/test/app.mk +++ b/src/occ/proc/test/app.mk @@ -101,4 +101,4 @@ clean_all: $(MAKE) clean $(MAKE) -C $(PGP) clean -include $(OBJECTS:.o=.d) +-include $(OBJECTS:.o=.d) diff --git a/src/occ/pss/test/app.mk b/src/occ/pss/test/app.mk index 927987f..fdb4a6d 100755 --- a/src/occ/pss/test/app.mk +++ b/src/occ/pss/test/app.mk @@ -100,4 +100,4 @@ doc: # .d file creation #******************************************************************************* -include $(OBJECTS:.o=.d) +-include $(OBJECTS:.o=.d) diff --git a/src/occ/rtls/test/app.mk b/src/occ/rtls/test/app.mk index 2c17a1a..a214b0b 100755 --- a/src/occ/rtls/test/app.mk +++ b/src/occ/rtls/test/app.mk @@ -77,4 +77,4 @@ clean_all: doc: doxygen doc/Doxyfile -include $(OBJECTS:.o=.d) +-include $(OBJECTS:.o=.d) diff --git a/src/occ/thread/test/app.mk b/src/occ/thread/test/app.mk index d04b65b..34bf102 100755 --- a/src/occ/thread/test/app.mk +++ b/src/occ/thread/test/app.mk @@ -78,4 +78,4 @@ clean_all: doc: doxygen doc/Doxyfile -include $(OBJECTS:.o=.d) +-include $(OBJECTS:.o=.d) diff --git a/src/occApplet/Makefile b/src/occApplet/Makefile index d12c3b7..3a338be 100755 --- a/src/occApplet/Makefile +++ b/src/occApplet/Makefile @@ -32,26 +32,26 @@ endif # Variables #******************************************************************************* SUBDIRS = productApplet testApplet -CLEANCMD = $(MAKE) clean -C $(dir); -ALLCMD = $(MAKE) -j6 -C $(dir); -COMBINEIMAGE = $(MAKE) combineImage -C $(dir); +CLEANCMD = $(MAKE) clean -C $(dir) +ALLCMD = $(MAKE) -C $(dir) +COMBINEIMAGE = $(MAKE) combineImage -C $(dir) #******************************************************************************* # Compilation #******************************************************************************* all: - $(foreach dir,$(SUBDIRS),$(ALLCMD)) + $(foreach dir,$(SUBDIRS),$(ALLCMD) &&) true #******************************************************************************* # combineImage #******************************************************************************* .PHONY : combineImage combineImage: - $(foreach dir,$(SUBDIRS),$(COMBINEIMAGE)) + $(foreach dir,$(SUBDIRS),$(COMBINEIMAGE) &&) true #******************************************************************************* # Clean #******************************************************************************* clean: - $(foreach dir,$(SUBDIRS),$(CLEANCMD)) + $(foreach dir,$(SUBDIRS),$(CLEANCMD) &&) true diff --git a/src/occApplet/productApplet/Makefile b/src/occApplet/productApplet/Makefile index f3caf55..ab233e1 100755 --- a/src/occApplet/productApplet/Makefile +++ b/src/occApplet/productApplet/Makefile @@ -43,13 +43,13 @@ LDFLAGS = -L $(SSX)/ssx -L $(SSX)/ppc32 -L $(SSX)/ppc405 -L $(SSX)/pgp \ -L $(OCC) -L $(LIB) -lssx -lppc32 --oformat=elf32-powerpc -melf32ppc buildImage = $(LD) -R $(OCC)/occ.out $(obj) -Tlinkscript $(LDFLAGS) \ --Map $(basename $(obj)).map -Bstatic -o $(basename $(obj)).out; \ -$(OBJCOPY) -I elf32-powerpc -O binary $(basename $(obj)).out $(basename $(obj)).bin; \ -$(OBJDUMP) -d $(basename $(obj)).out > $(basename $(obj)).dis; \ -$(BOOTLOADER)/imageHdrScript $(basename $(obj)).bin `md5sum $(OCC)/occ.out | cut -c 1-4`; +-Map $(basename $(obj)).map -Bstatic -o $(basename $(obj)).out && \ +$(OBJCOPY) -I elf32-powerpc -O binary $(basename $(obj)).out $(basename $(obj)).bin && \ +$(OBJDUMP) -d $(basename $(obj)).out > $(basename $(obj)).dis && \ +$(BOOTLOADER)/imageHdrScript $(basename $(obj)).bin `md5sum $(OCC)/occ.out | cut -c 1-4` -image = $(BOOTLOADER)/imageHdrScript $(basename $(obj)).bin combineImage; \ -$(BOOTLOADER)/imageHdrScript $(basename $(obj)).out displaySize; +image = $(BOOTLOADER)/imageHdrScript $(basename $(obj)).bin combineImage && \ +$(BOOTLOADER)/imageHdrScript $(basename $(obj)).out displaySize #******************************************************************************* # Includes @@ -71,21 +71,21 @@ DEFS += -DUSE_SSX_APP_CFG_H=1 # Note: Do not use SDA sections for product applets GCC-CFLAGS = -c -g -Wall -fsigned-char -msoft-float -pipe \ --Wa,-m405 -m32 -mcpu=405 -mmultiple -mstring -meabi -ffreestanding -Os -mno-sdata +-Wa,-m405 -mbig-endian -m32 -mcpu=405 -mmultiple -mstring -meabi -ffreestanding -Os -mno-sdata #******************************************************************************* # Compilation #******************************************************************************* all: $(PRDTAPLT_OBJECTS) $(CPP) -P $(DEFS) < linkProductApplet.cmd > linkscript - $(foreach obj,$(PRDTAPLT_OBJECTS),$(buildImage)) + $(foreach obj,$(PRDTAPLT_OBJECTS),$(buildImage) &&) true #******************************************************************************* # combineImage #******************************************************************************* .PHONY : combineImage combineImage: - $(foreach obj,$(PRDTAPLT_OBJECTS),$(image)) + $(foreach obj,$(PRDTAPLT_OBJECTS),$(image) &&) true #******************************************************************************* # Clean diff --git a/src/occApplet/testApplet/Makefile b/src/occApplet/testApplet/Makefile index 3e78279..09d1622 100755 --- a/src/occApplet/testApplet/Makefile +++ b/src/occApplet/testApplet/Makefile @@ -40,10 +40,10 @@ LIB = ../../lib LDFLAGS += --oformat=elf32-powerpc -melf32ppc buildImage = $(LD) -R $(OCC)/occ.out $(obj) -Tlinkscript $(LDFLAGS) \ --Map $(basename $(obj)).map -Bstatic -o $(basename $(obj)).out; \ -$(OBJCOPY) -I elf32-powerpc -O binary $(basename $(obj)).out $(basename $(obj)).bin; \ -$(OBJDUMP) -d $(basename $(obj)).out > $(basename $(obj)).dis; \ -$(BOOTLOADER)/imageHdrScript $(basename $(obj)).bin `md5sum $(OCC)/occ.out | cut -c 1-4`; \ +-Map $(basename $(obj)).map -Bstatic -o $(basename $(obj)).out && \ +$(OBJCOPY) -I elf32-powerpc -O binary $(basename $(obj)).out $(basename $(obj)).bin && \ +$(OBJDUMP) -d $(basename $(obj)).out > $(basename $(obj)).dis && \ +$(BOOTLOADER)/imageHdrScript $(basename $(obj)).bin `md5sum $(OCC)/occ.out | cut -c 1-4` #******************************************************************************* # Includes @@ -63,7 +63,7 @@ DEFS += $(D) DEFS += -DOCC=1 -DUSE_SSX_APP_CFG_H=1 GCC-CFLAGS = -c -g -Wall -fsigned-char -msoft-float -pipe \ --m32 -Wa,-m405 -mcpu=405 -mmultiple -mstring -meabi \ +-m32 -mbig-endian -Wa,-m405 -mcpu=405 -mmultiple -mstring -meabi \ -ffreestanding -Os -mno-sdata #******************************************************************************* @@ -71,7 +71,7 @@ GCC-CFLAGS = -c -g -Wall -fsigned-char -msoft-float -pipe \ #******************************************************************************* all: $(TESTAPLT_OBJECTS) $(CPP) -P $(DEFS) < linkTestApplet.cmd > linkscript - $(foreach obj,$(TESTAPLT_OBJECTS),$(buildImage)) + $(foreach obj,$(TESTAPLT_OBJECTS),$(buildImage) &&) true #******************************************************************************* # combineImage diff --git a/src/ssx/pgp/ssx.mk b/src/ssx/pgp/ssx.mk index 21a605c..0741493 100755 --- a/src/ssx/pgp/ssx.mk +++ b/src/ssx/pgp/ssx.mk @@ -135,7 +135,7 @@ INCLUDES += $(APP_INCLUDES) \ PIPE-CFLAGS = -pipe -Wa,-m405 GCC-CFLAGS += -g -Wall -fsigned-char -msoft-float \ - -m32 -mcpu=405 -mmultiple -mstring \ + -m32 -mbig-endian -mcpu=405 -mmultiple -mstring \ -meabi -msdata=eabi -ffreestanding -fno-common \ -fno-inline-functions-called-once |