summaryrefslogtreecommitdiffstats
path: root/src/occApplet
diff options
context:
space:
mode:
authorWilliam Bryan <wilbryan@us.ibm.com>2015-02-11 17:02:41 -0600
committerStephan Broyles <sbroyles@us.ibm.com>2015-02-12 14:37:59 -0600
commit6d0342e8707fd3b393936e114d7715966ad17b8c (patch)
tree68dadcbd82d2b053e89784e12559baec3e5e29ec /src/occApplet
parent2adf5f493db7436dd0df0fcb846c16b93dd1f374 (diff)
downloadtalos-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>
Diffstat (limited to 'src/occApplet')
-rwxr-xr-xsrc/occApplet/Makefile12
-rwxr-xr-xsrc/occApplet/productApplet/Makefile18
-rwxr-xr-xsrc/occApplet/testApplet/Makefile12
3 files changed, 21 insertions, 21 deletions
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
OpenPOWER on IntegriCloud