1*4882a593SmuzhiyunUse slashes instead of backslashes 2*4882a593Smuzhiyun 3*4882a593SmuzhiyunSigned-off-by: Alexandre Belloni <abelloni@adeneo-embedded.com> 4*4882a593Smuzhiyun--- 5*4882a593Smuzhiyun .../bsps/common/examples/buildfiles/makefile | 10 +++--- 6*4882a593Smuzhiyun .../startup/examples/burners/makefile.burner | 16 +++++----- 7*4882a593Smuzhiyun csps/lpc32xx/bsps/ea3250/source/makefile | 10 +++--- 8*4882a593Smuzhiyun csps/lpc32xx/bsps/fdi3250/source/makefile | 12 ++++---- 9*4882a593Smuzhiyun csps/lpc32xx/bsps/phy3250/examples/makefile | 2 +- 10*4882a593Smuzhiyun csps/lpc32xx/bsps/phy3250/source/makefile | 2 +- 11*4882a593Smuzhiyun .../examples/Burners/nor/kickstart/makefile | 2 +- 12*4882a593Smuzhiyun .../startup/examples/Burners/nor/norerase/makefile | 2 +- 13*4882a593Smuzhiyun .../startup/examples/Burners/nor/s1lapp/makefile | 2 +- 14*4882a593Smuzhiyun .../examples/Burners/spi/kickstart/makefile | 2 +- 15*4882a593Smuzhiyun csps/lpc32xx/source/makefile | 10 +++--- 16*4882a593Smuzhiyun lpc/source/makefile | 10 +++--- 17*4882a593Smuzhiyun makefile | 2 +- 18*4882a593Smuzhiyun makerule/common/make.rules.environment | 30 ++++++++++---------- 19*4882a593Smuzhiyun makerule/lpc32xx/make.lpc32xx.gnu | 2 +- 20*4882a593Smuzhiyun makerule/lpc32xx/make.lpc32xx.iar | 12 ++++---- 21*4882a593Smuzhiyun makerule/lpc32xx/make.lpc32xx.keil | 6 ++-- 22*4882a593Smuzhiyun makerule/lpc32xx/make.lpc32xx.rvw | 2 +- 23*4882a593Smuzhiyun 18 files changed, 67 insertions(+), 67 deletions(-) 24*4882a593Smuzhiyun 25*4882a593Smuzhiyundiff --git a/csps/lpc32xx/bsps/common/examples/buildfiles/makefile b/csps/lpc32xx/bsps/common/examples/buildfiles/makefile 26*4882a593Smuzhiyunindex cf4977c..1da2201 100644 27*4882a593Smuzhiyun--- a/csps/lpc32xx/bsps/common/examples/buildfiles/makefile 28*4882a593Smuzhiyun+++ b/csps/lpc32xx/bsps/common/examples/buildfiles/makefile 29*4882a593Smuzhiyun@@ -25,16 +25,16 @@ 30*4882a593Smuzhiyun # 31*4882a593Smuzhiyun ######################################################################## 32*4882a593Smuzhiyun 33*4882a593Smuzhiyun-include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) 34*4882a593Smuzhiyun+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) 35*4882a593Smuzhiyun 36*4882a593Smuzhiyun ######################################################################## 37*4882a593Smuzhiyun # 38*4882a593Smuzhiyun # Pick up the assembler and C source files in the directory 39*4882a593Smuzhiyun # 40*4882a593Smuzhiyun ######################################################################## 41*4882a593Smuzhiyun-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes 42*4882a593Smuzhiyun-AFLAGS +=-I..\Include 43*4882a593Smuzhiyun-CFLAGS +=-I..\Include 44*4882a593Smuzhiyun+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes 45*4882a593Smuzhiyun+AFLAGS +=-I../Include 46*4882a593Smuzhiyun+CFLAGS +=-I../Include 47*4882a593Smuzhiyun 48*4882a593Smuzhiyun ######################################################################## 49*4882a593Smuzhiyun # 50*4882a593Smuzhiyun@@ -42,6 +42,6 @@ CFLAGS +=-I..\Include 51*4882a593Smuzhiyun # 52*4882a593Smuzhiyun ######################################################################## 53*4882a593Smuzhiyun 54*4882a593Smuzhiyun-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build 55*4882a593Smuzhiyun+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build 56*4882a593Smuzhiyun 57*4882a593Smuzhiyun 58*4882a593Smuzhiyundiff --git a/csps/lpc32xx/bsps/common/startup/examples/burners/makefile.burner b/csps/lpc32xx/bsps/common/startup/examples/burners/makefile.burner 59*4882a593Smuzhiyunindex fca3947..18bd703 100644 60*4882a593Smuzhiyun--- a/csps/lpc32xx/bsps/common/startup/examples/burners/makefile.burner 61*4882a593Smuzhiyun+++ b/csps/lpc32xx/bsps/common/startup/examples/burners/makefile.burner 62*4882a593Smuzhiyun@@ -22,9 +22,9 @@ 63*4882a593Smuzhiyun # 64*4882a593Smuzhiyun ######################################################################## 65*4882a593Smuzhiyun 66*4882a593Smuzhiyun-COMMON_BASE := $(NXPMCU_SOFTWARE)\csps\$(CSP)\bsps\common 67*4882a593Smuzhiyun-include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) 68*4882a593Smuzhiyun-include $(COMMON_BASE)\startup\examples\buildfiles\make.env 69*4882a593Smuzhiyun+COMMON_BASE := $(NXPMCU_SOFTWARE)/csps/$(CSP)/bsps/common 70*4882a593Smuzhiyun+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) 71*4882a593Smuzhiyun+include $(COMMON_BASE)/startup/examples/buildfiles/make.env 72*4882a593Smuzhiyun 73*4882a593Smuzhiyun ######################################################################## 74*4882a593Smuzhiyun # ARM Realview 75*4882a593Smuzhiyun@@ -38,7 +38,7 @@ AFLAGS += --predefine "USE_ALL_STACKS SETL {TRUE}" 76*4882a593Smuzhiyun #AFLAGS += --predefine "RW_RELOC SETL {TRUE}" 77*4882a593Smuzhiyun 78*4882a593Smuzhiyun # This runs from IRAM 79*4882a593Smuzhiyun-LDSCRIPT =$(COMMON_BASE)\startup\examples\buildfiles\ldscript_iram_rvw.ld 80*4882a593Smuzhiyun+LDSCRIPT =$(COMMON_BASE)/startup/examples/buildfiles/ldscript_iram_rvw.ld 81*4882a593Smuzhiyun LDFLAGS = --remove 82*4882a593Smuzhiyun MAP = --map --info=totals,sizes,unused --symbols --list 83*4882a593Smuzhiyun endif 84*4882a593Smuzhiyun@@ -55,7 +55,7 @@ AFLAGS += --predefine "USE_ALL_STACKS SETL {TRUE}" 85*4882a593Smuzhiyun #AFLAGS += --predefine "RW_RELOC SETL {TRUE}" 86*4882a593Smuzhiyun 87*4882a593Smuzhiyun # This runs from IRAM 88*4882a593Smuzhiyun-LDSCRIPT =$(COMMON_BASE)\startup\examples\buildfiles\ldscript_iram_rvw.ld 89*4882a593Smuzhiyun+LDSCRIPT =$(COMMON_BASE)/startup/examples/buildfiles/ldscript_iram_rvw.ld 90*4882a593Smuzhiyun LDFLAGS = --remove 91*4882a593Smuzhiyun MAP = --map --info=totals,sizes,unused --symbols --list 92*4882a593Smuzhiyun endif 93*4882a593Smuzhiyun@@ -72,7 +72,7 @@ AFLAGS += --defsym USE_ALL_STACKS=1 94*4882a593Smuzhiyun #AFLAGS += --defsym RW_RELOC=1 95*4882a593Smuzhiyun 96*4882a593Smuzhiyun # This runs from IRAM 97*4882a593Smuzhiyun-LDSCRIPT =$(COMMON_BASE)\startup\examples\buildfiles\ldscript_iram_gnu.ld 98*4882a593Smuzhiyun+LDSCRIPT =$(COMMON_BASE)/startup/examples/buildfiles/ldscript_iram_gnu.ld 99*4882a593Smuzhiyun 100*4882a593Smuzhiyun endif 101*4882a593Smuzhiyun 102*4882a593Smuzhiyun@@ -108,7 +108,7 @@ endif 103*4882a593Smuzhiyun # Pick up the assembler and C source files in the directory 104*4882a593Smuzhiyun # 105*4882a593Smuzhiyun ######################################################################## 106*4882a593Smuzhiyun-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes 107*4882a593Smuzhiyun+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes 108*4882a593Smuzhiyun 109*4882a593Smuzhiyun ######################################################################## 110*4882a593Smuzhiyun # 111*4882a593Smuzhiyun@@ -157,6 +157,6 @@ endif 112*4882a593Smuzhiyun # 113*4882a593Smuzhiyun ######################################################################## 114*4882a593Smuzhiyun 115*4882a593Smuzhiyun-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build 116*4882a593Smuzhiyun+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build 117*4882a593Smuzhiyun 118*4882a593Smuzhiyun .PHONY: debug bin 119*4882a593Smuzhiyundiff --git a/csps/lpc32xx/bsps/ea3250/source/makefile b/csps/lpc32xx/bsps/ea3250/source/makefile 120*4882a593Smuzhiyunindex 7cada25..2899b20 100644 121*4882a593Smuzhiyun--- a/csps/lpc32xx/bsps/ea3250/source/makefile 122*4882a593Smuzhiyun+++ b/csps/lpc32xx/bsps/ea3250/source/makefile 123*4882a593Smuzhiyun@@ -22,16 +22,16 @@ 124*4882a593Smuzhiyun # 125*4882a593Smuzhiyun ######################################################################## 126*4882a593Smuzhiyun 127*4882a593Smuzhiyun-include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) 128*4882a593Smuzhiyun+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) 129*4882a593Smuzhiyun 130*4882a593Smuzhiyun ######################################################################## 131*4882a593Smuzhiyun # 132*4882a593Smuzhiyun # Pick up the assembler and C source files in the directory 133*4882a593Smuzhiyun # 134*4882a593Smuzhiyun ######################################################################## 135*4882a593Smuzhiyun-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes 136*4882a593Smuzhiyun-AFLAGS +=-I..\Include 137*4882a593Smuzhiyun-CFLAGS +=-I..\Include 138*4882a593Smuzhiyun+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes 139*4882a593Smuzhiyun+AFLAGS +=-I../Include 140*4882a593Smuzhiyun+CFLAGS +=-I../Include 141*4882a593Smuzhiyun 142*4882a593Smuzhiyun ######################################################################## 143*4882a593Smuzhiyun # 144*4882a593Smuzhiyun@@ -64,7 +64,7 @@ realclean: lib_realclean 145*4882a593Smuzhiyun # 146*4882a593Smuzhiyun ######################################################################## 147*4882a593Smuzhiyun 148*4882a593Smuzhiyun-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build 149*4882a593Smuzhiyun+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build 150*4882a593Smuzhiyun 151*4882a593Smuzhiyun .PHONY: all lib_clean lib_realclean 152*4882a593Smuzhiyun 153*4882a593Smuzhiyundiff --git a/csps/lpc32xx/bsps/fdi3250/source/makefile b/csps/lpc32xx/bsps/fdi3250/source/makefile 154*4882a593Smuzhiyunindex 4e153bb..11e4b63 100644 155*4882a593Smuzhiyun--- a/csps/lpc32xx/bsps/fdi3250/source/makefile 156*4882a593Smuzhiyun+++ b/csps/lpc32xx/bsps/fdi3250/source/makefile 157*4882a593Smuzhiyun@@ -22,16 +22,16 @@ 158*4882a593Smuzhiyun # 159*4882a593Smuzhiyun ######################################################################## 160*4882a593Smuzhiyun 161*4882a593Smuzhiyun-include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) 162*4882a593Smuzhiyun+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) 163*4882a593Smuzhiyun 164*4882a593Smuzhiyun ######################################################################## 165*4882a593Smuzhiyun # 166*4882a593Smuzhiyun # Pick up the assembler and C source files in the directory 167*4882a593Smuzhiyun # 168*4882a593Smuzhiyun ######################################################################## 169*4882a593Smuzhiyun-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes 170*4882a593Smuzhiyun-AFLAGS +=-I..\Include 171*4882a593Smuzhiyun-CFLAGS +=-I..\Include 172*4882a593Smuzhiyun+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes 173*4882a593Smuzhiyun+AFLAGS +=-I../Include 174*4882a593Smuzhiyun+CFLAGS +=-I../Include 175*4882a593Smuzhiyun 176*4882a593Smuzhiyun ######################################################################## 177*4882a593Smuzhiyun # 178*4882a593Smuzhiyun@@ -53,7 +53,7 @@ lib_clean: 179*4882a593Smuzhiyun # delete all targets this Makefile can make and all built libraries 180*4882a593Smuzhiyun # linked in 181*4882a593Smuzhiyun lib_realclean: 182*4882a593Smuzhiyun- -@$(RM) $(BSP_LIB_DIR)\*.a 183*4882a593Smuzhiyun+ -@$(RM) $(BSP_LIB_DIR)/*.a 184*4882a593Smuzhiyun -@$(RMDIR) $(BSP_LIB_DIR) 185*4882a593Smuzhiyun 186*4882a593Smuzhiyun clean: lib_clean 187*4882a593Smuzhiyun@@ -65,7 +65,7 @@ realclean: lib_realclean 188*4882a593Smuzhiyun # 189*4882a593Smuzhiyun ######################################################################## 190*4882a593Smuzhiyun 191*4882a593Smuzhiyun-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build 192*4882a593Smuzhiyun+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build 193*4882a593Smuzhiyun 194*4882a593Smuzhiyun .PHONY: all lib_clean lib_realclean 195*4882a593Smuzhiyun 196*4882a593Smuzhiyundiff --git a/csps/lpc32xx/bsps/phy3250/examples/makefile b/csps/lpc32xx/bsps/phy3250/examples/makefile 197*4882a593Smuzhiyunindex b939252..e7feaa6 100644 198*4882a593Smuzhiyun--- a/csps/lpc32xx/bsps/phy3250/examples/makefile 199*4882a593Smuzhiyun+++ b/csps/lpc32xx/bsps/phy3250/examples/makefile 200*4882a593Smuzhiyun@@ -25,7 +25,7 @@ 201*4882a593Smuzhiyun # 202*4882a593Smuzhiyun ######################################################################## 203*4882a593Smuzhiyun 204*4882a593Smuzhiyun-include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) 205*4882a593Smuzhiyun+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) 206*4882a593Smuzhiyun 207*4882a593Smuzhiyun SUBDIRS = adc dram_self_refresh hstimer hsuart i2c kscan lcd_colorbars 208*4882a593Smuzhiyun SUBDIRS += lcd_tsc mi2c mstimer pwm pwm_simple rtc sdcard sdcard_dma 209*4882a593Smuzhiyundiff --git a/csps/lpc32xx/bsps/phy3250/source/makefile b/csps/lpc32xx/bsps/phy3250/source/makefile 210*4882a593Smuzhiyunindex 7c48e7d..750b776 100644 211*4882a593Smuzhiyun--- a/csps/lpc32xx/bsps/phy3250/source/makefile 212*4882a593Smuzhiyun+++ b/csps/lpc32xx/bsps/phy3250/source/makefile 213*4882a593Smuzhiyun@@ -32,7 +32,7 @@ include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) 214*4882a593Smuzhiyun # Pick up the assembler and C source files in the directory 215*4882a593Smuzhiyun # 216*4882a593Smuzhiyun ######################################################################## 217*4882a593Smuzhiyun-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes 218*4882a593Smuzhiyun+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes 219*4882a593Smuzhiyun AFLAGS +=-I../Include 220*4882a593Smuzhiyun CFLAGS +=-I../Include 221*4882a593Smuzhiyun 222*4882a593Smuzhiyundiff --git a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/kickstart/makefile b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/kickstart/makefile 223*4882a593Smuzhiyunindex 01e2b38..526d6cc 100644 224*4882a593Smuzhiyun--- a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/kickstart/makefile 225*4882a593Smuzhiyun+++ b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/kickstart/makefile 226*4882a593Smuzhiyun@@ -78,7 +78,7 @@ endif 227*4882a593Smuzhiyun 228*4882a593Smuzhiyun ######################################################################## 229*4882a593Smuzhiyun # 230*4882a593Smuzhiyun-# Compiler\linker specific stuff 231*4882a593Smuzhiyun+# Compiler/linker specific stuff 232*4882a593Smuzhiyun # 233*4882a593Smuzhiyun ######################################################################## 234*4882a593Smuzhiyun 235*4882a593Smuzhiyundiff --git a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/norerase/makefile b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/norerase/makefile 236*4882a593Smuzhiyunindex ce329f5..e81b8db 100644 237*4882a593Smuzhiyun--- a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/norerase/makefile 238*4882a593Smuzhiyun+++ b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/norerase/makefile 239*4882a593Smuzhiyun@@ -77,7 +77,7 @@ endif 240*4882a593Smuzhiyun 241*4882a593Smuzhiyun ######################################################################## 242*4882a593Smuzhiyun # 243*4882a593Smuzhiyun-# Compiler\linker specific stuff 244*4882a593Smuzhiyun+# Compiler/linker specific stuff 245*4882a593Smuzhiyun # 246*4882a593Smuzhiyun ######################################################################## 247*4882a593Smuzhiyun 248*4882a593Smuzhiyundiff --git a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/s1lapp/makefile b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/s1lapp/makefile 249*4882a593Smuzhiyunindex 4426fc7..196faec 100644 250*4882a593Smuzhiyun--- a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/s1lapp/makefile 251*4882a593Smuzhiyun+++ b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/s1lapp/makefile 252*4882a593Smuzhiyun@@ -77,7 +77,7 @@ endif 253*4882a593Smuzhiyun 254*4882a593Smuzhiyun ######################################################################## 255*4882a593Smuzhiyun # 256*4882a593Smuzhiyun-# Compiler\linker specific stuff 257*4882a593Smuzhiyun+# Compiler/linker specific stuff 258*4882a593Smuzhiyun # 259*4882a593Smuzhiyun ######################################################################## 260*4882a593Smuzhiyun 261*4882a593Smuzhiyundiff --git a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/spi/kickstart/makefile b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/spi/kickstart/makefile 262*4882a593Smuzhiyunindex dc73b64..39fc304 100644 263*4882a593Smuzhiyun--- a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/spi/kickstart/makefile 264*4882a593Smuzhiyun+++ b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/spi/kickstart/makefile 265*4882a593Smuzhiyun@@ -78,7 +78,7 @@ endif 266*4882a593Smuzhiyun 267*4882a593Smuzhiyun ######################################################################## 268*4882a593Smuzhiyun # 269*4882a593Smuzhiyun-# Compiler\linker specific stuff 270*4882a593Smuzhiyun+# Compiler/linker specific stuff 271*4882a593Smuzhiyun # 272*4882a593Smuzhiyun ######################################################################## 273*4882a593Smuzhiyun 274*4882a593Smuzhiyundiff --git a/csps/lpc32xx/source/makefile b/csps/lpc32xx/source/makefile 275*4882a593Smuzhiyunindex 8e05456..16bd944 100644 276*4882a593Smuzhiyun--- a/csps/lpc32xx/source/makefile 277*4882a593Smuzhiyun+++ b/csps/lpc32xx/source/makefile 278*4882a593Smuzhiyun@@ -25,16 +25,16 @@ 279*4882a593Smuzhiyun # 280*4882a593Smuzhiyun ######################################################################## 281*4882a593Smuzhiyun 282*4882a593Smuzhiyun-include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) 283*4882a593Smuzhiyun+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) 284*4882a593Smuzhiyun 285*4882a593Smuzhiyun ######################################################################## 286*4882a593Smuzhiyun # 287*4882a593Smuzhiyun # Pick up the assembler and C source files in the directory 288*4882a593Smuzhiyun # 289*4882a593Smuzhiyun ######################################################################## 290*4882a593Smuzhiyun-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes 291*4882a593Smuzhiyun-AFLAGS +=-I..\Include 292*4882a593Smuzhiyun-CFLAGS +=-I..\Include 293*4882a593Smuzhiyun+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes 294*4882a593Smuzhiyun+AFLAGS +=-I../Include 295*4882a593Smuzhiyun+CFLAGS +=-I../Include 296*4882a593Smuzhiyun 297*4882a593Smuzhiyun 298*4882a593Smuzhiyun ######################################################################## 299*4882a593Smuzhiyun@@ -68,7 +68,7 @@ realclean: lib_realclean 300*4882a593Smuzhiyun # 301*4882a593Smuzhiyun ######################################################################## 302*4882a593Smuzhiyun 303*4882a593Smuzhiyun-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build 304*4882a593Smuzhiyun+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build 305*4882a593Smuzhiyun 306*4882a593Smuzhiyun .PHONY: all lib_clean lib_realclean 307*4882a593Smuzhiyun 308*4882a593Smuzhiyundiff --git a/lpc/source/makefile b/lpc/source/makefile 309*4882a593Smuzhiyunindex 2860db9..ae7d612 100644 310*4882a593Smuzhiyun--- a/lpc/source/makefile 311*4882a593Smuzhiyun+++ b/lpc/source/makefile 312*4882a593Smuzhiyun@@ -25,16 +25,16 @@ 313*4882a593Smuzhiyun # 314*4882a593Smuzhiyun ######################################################################## 315*4882a593Smuzhiyun 316*4882a593Smuzhiyun-include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) 317*4882a593Smuzhiyun+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) 318*4882a593Smuzhiyun 319*4882a593Smuzhiyun ######################################################################## 320*4882a593Smuzhiyun # 321*4882a593Smuzhiyun # Pick up the assembler and C source files in the directory 322*4882a593Smuzhiyun # 323*4882a593Smuzhiyun ######################################################################## 324*4882a593Smuzhiyun-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes 325*4882a593Smuzhiyun-AFLAGS +=-I..\Include 326*4882a593Smuzhiyun-CFLAGS +=-I..\Include 327*4882a593Smuzhiyun+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes 328*4882a593Smuzhiyun+AFLAGS +=-I../Include 329*4882a593Smuzhiyun+CFLAGS +=-I../Include 330*4882a593Smuzhiyun 331*4882a593Smuzhiyun ######################################################################## 332*4882a593Smuzhiyun # 333*4882a593Smuzhiyun@@ -67,7 +67,7 @@ realclean: lib_realclean 334*4882a593Smuzhiyun # 335*4882a593Smuzhiyun ######################################################################## 336*4882a593Smuzhiyun 337*4882a593Smuzhiyun-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build 338*4882a593Smuzhiyun+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build 339*4882a593Smuzhiyun 340*4882a593Smuzhiyun .PHONY: all lib_clean lib_realclean 341*4882a593Smuzhiyun 342*4882a593Smuzhiyundiff --git a/makefile b/makefile 343*4882a593Smuzhiyunindex 8645fcc..86fa6bc 100644 344*4882a593Smuzhiyun--- a/makefile 345*4882a593Smuzhiyun+++ b/makefile 346*4882a593Smuzhiyun@@ -34,7 +34,7 @@ TARGETS_CLN =gen_clean csp_clean bsp_clean 347*4882a593Smuzhiyun # 348*4882a593Smuzhiyun ######################################################################## 349*4882a593Smuzhiyun 350*4882a593Smuzhiyun-include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) 351*4882a593Smuzhiyun+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) 352*4882a593Smuzhiyun 353*4882a593Smuzhiyun ######################################################################## 354*4882a593Smuzhiyun # 355*4882a593Smuzhiyundiff --git a/makerule/common/make.rules.environment b/makerule/common/make.rules.environment 356*4882a593Smuzhiyunindex d5737fe..4e6df48 100644 357*4882a593Smuzhiyun--- a/makerule/common/make.rules.environment 358*4882a593Smuzhiyun+++ b/makerule/common/make.rules.environment 359*4882a593Smuzhiyun@@ -52,7 +52,7 @@ ASTYLE =astyle --options=$(BUILD_ROOT)/tools/astyle.cfg 360*4882a593Smuzhiyun # 361*4882a593Smuzhiyun ######################################################################## 362*4882a593Smuzhiyun 363*4882a593Smuzhiyun-CSP_LIB_DIR =$(BUILD_ROOT)\csps\$(CSP)\lib 364*4882a593Smuzhiyun+CSP_LIB_DIR =$(BUILD_ROOT)/csps/$(CSP)/lib 365*4882a593Smuzhiyun 366*4882a593Smuzhiyun ######################################################################## 367*4882a593Smuzhiyun # 368*4882a593Smuzhiyun@@ -60,7 +60,7 @@ CSP_LIB_DIR =$(BUILD_ROOT)\csps\$(CSP)\lib 369*4882a593Smuzhiyun # 370*4882a593Smuzhiyun ######################################################################## 371*4882a593Smuzhiyun 372*4882a593Smuzhiyun-BSP_LIB_DIR =$(BUILD_ROOT)\csps\$(CSP)\bsps\$(BSP)\lib 373*4882a593Smuzhiyun+BSP_LIB_DIR =$(BUILD_ROOT)/csps/$(CSP)/bsps/$(BSP)/lib 374*4882a593Smuzhiyun 375*4882a593Smuzhiyun ######################################################################## 376*4882a593Smuzhiyun # 377*4882a593Smuzhiyun@@ -68,7 +68,7 @@ BSP_LIB_DIR =$(BUILD_ROOT)\csps\$(CSP)\bsps\$(BSP)\lib 378*4882a593Smuzhiyun # 379*4882a593Smuzhiyun ######################################################################## 380*4882a593Smuzhiyun 381*4882a593Smuzhiyun-GEN_LIB_DIR =$(BUILD_ROOT)\$(GEN)\lib 382*4882a593Smuzhiyun+GEN_LIB_DIR =$(BUILD_ROOT)/$(GEN)/lib 383*4882a593Smuzhiyun 384*4882a593Smuzhiyun ######################################################################## 385*4882a593Smuzhiyun # 386*4882a593Smuzhiyun@@ -76,9 +76,9 @@ GEN_LIB_DIR =$(BUILD_ROOT)\$(GEN)\lib 387*4882a593Smuzhiyun # 388*4882a593Smuzhiyun ######################################################################## 389*4882a593Smuzhiyun 390*4882a593Smuzhiyun-CSP_DIR =$(BUILD_ROOT)\csps\$(CSP) 391*4882a593Smuzhiyun-CSP_SRC_DIR =$(CSP_DIR)\source 392*4882a593Smuzhiyun-CSP_INC_DIR =$(CSP_DIR)\include 393*4882a593Smuzhiyun+CSP_DIR =$(BUILD_ROOT)/csps/$(CSP) 394*4882a593Smuzhiyun+CSP_SRC_DIR =$(CSP_DIR)/source 395*4882a593Smuzhiyun+CSP_INC_DIR =$(CSP_DIR)/include 396*4882a593Smuzhiyun 397*4882a593Smuzhiyun ######################################################################## 398*4882a593Smuzhiyun # 399*4882a593Smuzhiyun@@ -86,9 +86,9 @@ CSP_INC_DIR =$(CSP_DIR)\include 400*4882a593Smuzhiyun # 401*4882a593Smuzhiyun ######################################################################## 402*4882a593Smuzhiyun 403*4882a593Smuzhiyun-BSP_DIR =$(BUILD_ROOT)\csps\$(CSP)\bsps\$(BSP) 404*4882a593Smuzhiyun-BSP_SRC_DIR =$(BSP_DIR)\source 405*4882a593Smuzhiyun-BSP_INC_DIR =$(BSP_DIR)\include 406*4882a593Smuzhiyun+BSP_DIR =$(BUILD_ROOT)/csps/$(CSP)/bsps/$(BSP) 407*4882a593Smuzhiyun+BSP_SRC_DIR =$(BSP_DIR)/source 408*4882a593Smuzhiyun+BSP_INC_DIR =$(BSP_DIR)/include 409*4882a593Smuzhiyun 410*4882a593Smuzhiyun ######################################################################## 411*4882a593Smuzhiyun # 412*4882a593Smuzhiyun@@ -96,9 +96,9 @@ BSP_INC_DIR =$(BSP_DIR)\include 413*4882a593Smuzhiyun # 414*4882a593Smuzhiyun ######################################################################## 415*4882a593Smuzhiyun 416*4882a593Smuzhiyun-GEN_DIR =$(BUILD_ROOT)\$(GEN) 417*4882a593Smuzhiyun-GEN_SRC_DIR =$(GEN_DIR)\source 418*4882a593Smuzhiyun-GEN_INC_DIR =$(GEN_DIR)\include 419*4882a593Smuzhiyun+GEN_DIR =$(BUILD_ROOT)/$(GEN) 420*4882a593Smuzhiyun+GEN_SRC_DIR =$(GEN_DIR)/source 421*4882a593Smuzhiyun+GEN_INC_DIR =$(GEN_DIR)/include 422*4882a593Smuzhiyun 423*4882a593Smuzhiyun ######################################################################## 424*4882a593Smuzhiyun # 425*4882a593Smuzhiyun@@ -151,6 +151,6 @@ endif 426*4882a593Smuzhiyun # 427*4882a593Smuzhiyun ######################################################################## 428*4882a593Smuzhiyun 429*4882a593Smuzhiyun-TARGET_CSP_LIB =$(CSP_LIB_DIR)\$(CSP_ARCHIVE) 430*4882a593Smuzhiyun-TARGET_BSP_LIB =$(BSP_LIB_DIR)\$(BSP_ARCHIVE) 431*4882a593Smuzhiyun-TARGET_GEN_LIB =$(GEN_LIB_DIR)\$(GEN_ARCHIVE) 432*4882a593Smuzhiyun+TARGET_CSP_LIB =$(CSP_LIB_DIR)/$(CSP_ARCHIVE) 433*4882a593Smuzhiyun+TARGET_BSP_LIB =$(BSP_LIB_DIR)/$(BSP_ARCHIVE) 434*4882a593Smuzhiyun+TARGET_GEN_LIB =$(GEN_LIB_DIR)/$(GEN_ARCHIVE) 435*4882a593Smuzhiyundiff --git a/makerule/lpc32xx/make.lpc32xx.gnu b/makerule/lpc32xx/make.lpc32xx.gnu 436*4882a593Smuzhiyunindex 3277d99..d80b98d 100644 437*4882a593Smuzhiyun--- a/makerule/lpc32xx/make.lpc32xx.gnu 438*4882a593Smuzhiyun+++ b/makerule/lpc32xx/make.lpc32xx.gnu 439*4882a593Smuzhiyun@@ -19,7 +19,7 @@ 440*4882a593Smuzhiyun # use without further testing or modification. 441*4882a593Smuzhiyun ######################################################################## 442*4882a593Smuzhiyun 443*4882a593Smuzhiyun-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.environment 444*4882a593Smuzhiyun+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.environment 445*4882a593Smuzhiyun 446*4882a593Smuzhiyun CPU = arm926ej-s 447*4882a593Smuzhiyun CFLAGS = -mcpu=arm926ej-s -Wall -Os 448*4882a593Smuzhiyundiff --git a/makerule/lpc32xx/make.lpc32xx.iar b/makerule/lpc32xx/make.lpc32xx.iar 449*4882a593Smuzhiyunindex 238ebbf..27d163f 100644 450*4882a593Smuzhiyun--- a/makerule/lpc32xx/make.lpc32xx.iar 451*4882a593Smuzhiyun+++ b/makerule/lpc32xx/make.lpc32xx.iar 452*4882a593Smuzhiyun@@ -19,12 +19,12 @@ 453*4882a593Smuzhiyun # use without further testing or modification. 454*4882a593Smuzhiyun ######################################################################## 455*4882a593Smuzhiyun 456*4882a593Smuzhiyun-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.environment 457*4882a593Smuzhiyun+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.environment 458*4882a593Smuzhiyun 459*4882a593Smuzhiyun-IARBASE = $(IAR_ROOT)\ARM 460*4882a593Smuzhiyun-IARTOOLS = $(IARBASE)\bin 461*4882a593Smuzhiyun-IAR_LIB = $(IARBASE)\lib 462*4882a593Smuzhiyun-IAR_INC = $(IARBASE)\inc 463*4882a593Smuzhiyun+IARBASE = $(IAR_ROOT)/ARM 464*4882a593Smuzhiyun+IARTOOLS = $(IARBASE)/bin 465*4882a593Smuzhiyun+IAR_LIB = $(IARBASE)/lib 466*4882a593Smuzhiyun+IAR_INC = $(IARBASE)/inc 467*4882a593Smuzhiyun CC = iccarm 468*4882a593Smuzhiyun CCP = iccarm 469*4882a593Smuzhiyun AS = iasmarm 470*4882a593Smuzhiyun@@ -36,7 +36,7 @@ CFLAGS += -I"$(IAR_INC)" 471*4882a593Smuzhiyun AFLAGS = --cpu 5TEJ 472*4882a593Smuzhiyun LDFLAGS = 473*4882a593Smuzhiyun LK = "$(TARGET_GEN_LIB)" "$(TARGET_CSP_LIB)" "$(TARGET_BSP_LIB)" 474*4882a593Smuzhiyun-;LK += "$(IAR_LIB)\dl4tpannl8f.r79" 475*4882a593Smuzhiyun+;LK += "$(IAR_LIB)/dl4tpannl8f.r79" 476*4882a593Smuzhiyun MAP = --map 477*4882a593Smuzhiyun LDESC = --config 478*4882a593Smuzhiyun ENTRY = --entry 479*4882a593Smuzhiyundiff --git a/makerule/lpc32xx/make.lpc32xx.keil b/makerule/lpc32xx/make.lpc32xx.keil 480*4882a593Smuzhiyunindex dd27583..7334d3f 100644 481*4882a593Smuzhiyun--- a/makerule/lpc32xx/make.lpc32xx.keil 482*4882a593Smuzhiyun+++ b/makerule/lpc32xx/make.lpc32xx.keil 483*4882a593Smuzhiyun@@ -19,7 +19,7 @@ 484*4882a593Smuzhiyun # use without further testing or modification. 485*4882a593Smuzhiyun ######################################################################## 486*4882a593Smuzhiyun 487*4882a593Smuzhiyun-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.environment 488*4882a593Smuzhiyun+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.environment 489*4882a593Smuzhiyun 490*4882a593Smuzhiyun CC =armcc 491*4882a593Smuzhiyun CCP =armcc 492*4882a593Smuzhiyun@@ -27,11 +27,11 @@ AS =armasm 493*4882a593Smuzhiyun LD =armlink 494*4882a593Smuzhiyun AR =armar -r -s 495*4882a593Smuzhiyun CFLAGS =--arm -O3 -g --device DARMP3 -D__MICROLIB 496*4882a593Smuzhiyun-CFLAGS +=-I$(KEIL_RVCT)\inc -I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR) 497*4882a593Smuzhiyun+CFLAGS +=-I$(KEIL_RVCT)/inc -I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR) 498*4882a593Smuzhiyun AFLAGS =--arm --device=DARMP3 499*4882a593Smuzhiyun AFLAGS +=-I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR) 500*4882a593Smuzhiyun LDFLAGS =--noremove 501*4882a593Smuzhiyun-LK =--device DARMP3 --libpath $(KEIL_RVCT)\lib --scan $(TARGET_CSP_LIB) 502*4882a593Smuzhiyun+LK =--device DARMP3 --libpath $(KEIL_RVCT)/lib --scan $(TARGET_CSP_LIB) 503*4882a593Smuzhiyun LK +=--scan $(TARGET_BSP_LIB) 504*4882a593Smuzhiyun LK +=--scan $(TARGET_GEN_LIB) 505*4882a593Smuzhiyun MAP =--map --list 506*4882a593Smuzhiyundiff --git a/makerule/lpc32xx/make.lpc32xx.rvw b/makerule/lpc32xx/make.lpc32xx.rvw 507*4882a593Smuzhiyunindex 59961dd..2419976 100644 508*4882a593Smuzhiyun--- a/makerule/lpc32xx/make.lpc32xx.rvw 509*4882a593Smuzhiyun+++ b/makerule/lpc32xx/make.lpc32xx.rvw 510*4882a593Smuzhiyun@@ -19,7 +19,7 @@ 511*4882a593Smuzhiyun # use without further testing or modification. 512*4882a593Smuzhiyun ######################################################################## 513*4882a593Smuzhiyun 514*4882a593Smuzhiyun-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.environment 515*4882a593Smuzhiyun+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.environment 516*4882a593Smuzhiyun 517*4882a593Smuzhiyun CC =armcc 518*4882a593Smuzhiyun CCP =armcpp 519*4882a593Smuzhiyun-- 520*4882a593Smuzhiyun1.7.7.3 521*4882a593Smuzhiyun 522