Browse Source

version bump

master
Olaf Rempel 7 years ago
parent
commit
65fdee2ad6
1 changed files with 77 additions and 32 deletions
  1. 77
    32
      Makefile

+ 77
- 32
Makefile View File

@@ -1,9 +1,10 @@
1
-# output dir:
2
-TOOLCHAIN=/opt/arm-toolchain
3
-
4 1
 # build arch:
5 2
 BUILDARCH=i686-linux-gnu
6
-TARGETARCH=arm-elf
3
+#TARGETARCH=arm-none-eabi
4
+TARGETARCH=arm-none-eabi
5
+
6
+# output dir:
7
+TOOLCHAIN=/opt/$(TARGETARCH)
7 8
 
8 9
 MAKEOPTS=-j4
9 10
 
@@ -21,51 +22,63 @@ PATH:=$(PATH):$(TOOLCHAIN)/bin
21 22
 WGET:=/usr/bin/wget --passive-ftp -nd
22 23
 
23 24
 # #####################################################################
24
-BINUTILS_VERSION=2.20.1
25
+BINUTILS_VERSION=2.22
25 26
 BINUTILS_PACKAGE=binutils-$(BINUTILS_VERSION).tar.bz2
26 27
 BINUTILS_DOWNLOAD=http://ftp.gnu.org/gnu/binutils/$(BINUTILS_PACKAGE)
27 28
 BINUTILS_SOURCE=$(SOURCE)/binutils-$(BINUTILS_VERSION)
28
-BINUTILS_BUILD=$(BINUTILS_SOURCE)-build
29
+BINUTILS_BUILD=$(BINUTILS_SOURCE)-build-$(TARGETARCH)
29 30
 
30 31
 # #####################################################################
31
-GCC_VERSION=4.4.3
32
+GCC_VERSION=4.6.3
32 33
 GCC_PACKAGE=gcc-$(GCC_VERSION).tar.bz2
33 34
 GCC_DOWNLOAD=http://ftp.gnu.org/gnu/gcc/gcc-$(GCC_VERSION)/$(GCC_PACKAGE)
34 35
 GCC_SOURCE=$(SOURCE)/gcc-$(GCC_VERSION)
35
-GCC_BUILD=$(GCC_SOURCE)-build
36
+GCC_BUILD=$(GCC_SOURCE)-build-$(TARGETARCH)
37
+
38
+# #####################################################################
39
+MPC_VERSION=0.9
40
+MPC_PACKAGE=mpc-$(MPC_VERSION).tar.gz
41
+MPC_DOWNLOAD=http://www.multiprecision.org/mpc/download/$(MPC_PACKAGE)
42
+MPC_SOURCE=$(SOURCE)/mpc-$(MPC_VERSION)
36 43
 
37 44
 # #####################################################################
38
-GMP_VERSION=4.3.2
45
+GMP_VERSION=5.0.5
39 46
 GMP_PACKAGE=gmp-$(GMP_VERSION).tar.bz2
40 47
 GMP_DOWNLOAD=http://ftp.gnu.org/gnu/gmp/$(GMP_PACKAGE)
41
-GMP_SOURCE=$(GCC_SOURCE)/gmp-$(GMP_VERSION)
48
+GMP_SOURCE=$(SOURCE)/gmp-$(GMP_VERSION)
42 49
 
43 50
 # #####################################################################
44
-MPFR_VERSION=2.4.2
51
+MPFR_VERSION=3.1.0
45 52
 MPFR_PACKAGE=mpfr-$(MPFR_VERSION).tar.bz2
46 53
 MPFR_DOWNLOAD=http://www.mpfr.org/mpfr-$(MPFR_VERSION)/$(MPFR_PACKAGE)
47
-MPFR_SOURCE=$(GCC_SOURCE)/mpfr-$(MPFR_VERSION)
54
+MPFR_SOURCE=$(SOURCE)/mpfr-$(MPFR_VERSION)
48 55
 
49 56
 # #####################################################################
50
-NEWLIB_VERSION=1.18.0
57
+NEWLIB_VERSION=1.20.0
51 58
 NEWLIB_PACKAGE=newlib-$(NEWLIB_VERSION).tar.gz
52 59
 NEWLIB_DOWNLOAD=ftp://sources.redhat.com/pub/newlib/$(NEWLIB_PACKAGE)
53 60
 NEWLIB_SOURCE=$(SOURCE)/newlib-$(NEWLIB_VERSION)
54
-NEWLIB_BUILD=$(NEWLIB_SOURCE)-build
61
+NEWLIB_BUILD=$(NEWLIB_SOURCE)-build-$(TARGETARCH)
55 62
 
56 63
 # #####################################################################
57
-GDB_VERSION=7.1
64
+GDB_VERSION=7.4
58 65
 GDB_PACKAGE=gdb-$(GDB_VERSION).tar.bz2
59 66
 GDB_DOWNLOAD=http://ftp.gnu.org/gnu/gdb/$(GDB_PACKAGE)
60 67
 GDB_SOURCE=$(SOURCE)/gdb-$(GDB_VERSION)
61
-GDB_BUILD=$(GDB_SOURCE)-build
68
+GDB_BUILD=$(GDB_SOURCE)-build-$(TARGETARCH)
62 69
 
63 70
 # #####################################################################
64
-OOCD_VERSION=0.4.0
71
+OOCD_VERSION=0.5.0
65 72
 OOCD_PACKAGE=openocd-$(OOCD_VERSION).tar.bz2
66 73
 OOCD_DOWNLOAD=http://downloads.sourceforge.net/project/openocd/openocd/$(OOCD_VERSION)/$(OOCD_PACKAGE)
67 74
 OOCD_SOURCE=$(SOURCE)/openocd-$(OOCD_VERSION)
68
-OOCD_BUILD=$(OOCD_SOURCE)-build
75
+OOCD_BUILD=$(OOCD_SOURCE)
76
+
77
+# #####################################################################
78
+FTD2XX_VERSION=1.1.10
79
+FTD2XX_PACKAGE=libftd2xx$(FTD2XX_VERSION).tar.gz
80
+FTD2XX_DOWNLOAD=http://www.ftdichip.com/Drivers/D2XX/Linux/$(FTD2XX_PACKAGE)
81
+FTD2XX_SOURCE=$(SOURCE)/ftd2xx-$(FTD2XX_VERSION)
69 82
 
70 83
 # #####################################################################
71 84
 binutils: $(BINUTILS_BUILD)/.installed
@@ -83,9 +96,9 @@ $(BINUTILS_BUILD)/.configured: $(BINUTILS_SOURCE)/.unpacked
83 96
 		--build=$(BUILDARCH) --host=$(BUILDARCH) --target=$(TARGETARCH) \
84 97
 		--prefix=$(TOOLCHAIN) \
85 98
 		--enable-interwork \
86
-		--enable-multilib \
87 99
 		--enable-target-optspace \
88 100
 		--disable-nls \
101
+		--disable-werror \
89 102
 		);
90 103
 	touch $@
91 104
 
@@ -107,17 +120,32 @@ $(GCC_SOURCE)/.unpacked: $(DOWNLOADS)/$(GCC_PACKAGE)
107 120
 	tar -C $(SOURCE) -xjf $^
108 121
 	touch $@
109 122
 
110
-$(GCC_BUILD)/.configured: $(GCC_SOURCE)/.unpacked $(GMP_SOURCE)/.unpacked $(MPFR_SOURCE)/.unpacked $(NEWLIB_SOURCE)/.unpacked
123
+$(GCC_SOURCE)/mpc: $(MPC_SOURCE)/.unpacked
124
+	ln -s $(MPC_SOURCE) $@
125
+
126
+$(GCC_SOURCE)/gmp: $(GMP_SOURCE)/.unpacked
127
+	ln -s $(GMP_SOURCE) $@
128
+
129
+$(GCC_SOURCE)/mpfr: $(MPFR_SOURCE)/.unpacked
130
+	ln -s $(MPFR_SOURCE) $@
131
+
132
+$(GCC_BUILD)/.configured: $(GCC_SOURCE)/.unpacked $(GCC_SOURCE)/mpc $(GCC_SOURCE)/gmp $(GCC_SOURCE)/mpfr $(NEWLIB_SOURCE)/.unpacked
111 133
 	mkdir -p $(GCC_BUILD)
112 134
 	(cd $(GCC_BUILD); $(GCC_SOURCE)/configure \
113 135
 		--build=$(BUILDARCH) --host=$(BUILDARCH) --target=$(TARGETARCH) \
114 136
 		--prefix=$(TOOLCHAIN) \
115 137
 		--enable-languages="c,c++" \
116 138
 		--enable-interwork \
117
-		--enable-multilib \
118 139
 		--disable-libssp \
119 140
 		--enable-target-optspace \
120
-		--with-cpu=arm7tdmi --with-cpu=cortex-m3 --with-cpu=arm966e-s \
141
+		--with-cpu=arm7tdmi \
142
+		--with-cpu=cortex-m3 \
143
+		--with-cpu=cortex-m4 \
144
+		--with-cpu=arm966e-s \
145
+		--with-gmp-include=$(GCC_BUILD)/gmp \
146
+		--with-gmp-lib=$(GCC_BUILD)/gmp/.libs \
147
+		--with-mpfr-include=$(GCC_SOURCE)/mpfr/src \
148
+		--with-mpfr-lib=$(GCC_BUILD)/mpfr/src/.libs \
121 149
 		--with-newlib --with-headers=$(NEWLIB_SOURCE)/newlib/libc/include \
122 150
 		--disable-nls \
123 151
 		);
@@ -143,21 +171,27 @@ $(GCC_BUILD)/.installed: $(GCC_BUILD)/.stage1.installed $(GCC_BUILD)/.stage2.ins
143 171
 	touch $@
144 172
 
145 173
 # #####################################################################
174
+$(DOWNLOADS)/$(MPC_PACKAGE):
175
+	$(WGET) -P $(DOWNLOADS) $(MPC_DOWNLOAD)
176
+
177
+$(MPC_SOURCE)/.unpacked: $(DOWNLOADS)/$(MPC_PACKAGE)
178
+	tar -C $(SOURCE) -xzf $(DOWNLOADS)/$(MPC_PACKAGE)
179
+	touch $@
180
+
181
+# #####################################################################
146 182
 $(DOWNLOADS)/$(GMP_PACKAGE):
147 183
 	$(WGET) -P $(DOWNLOADS) $(GMP_DOWNLOAD)
148 184
 
149
-$(GMP_SOURCE)/.unpacked: $(DOWNLOADS)/$(GMP_PACKAGE) $(GCC_SOURCE)/.unpacked
150
-	tar -C $(GCC_SOURCE) -xjf $(DOWNLOADS)/$(GMP_PACKAGE)
151
-	ln -s gmp-$(GMP_VERSION) $(GCC_SOURCE)/gmp
185
+$(GMP_SOURCE)/.unpacked: $(DOWNLOADS)/$(GMP_PACKAGE)
186
+	tar -C $(SOURCE) -xjf $(DOWNLOADS)/$(GMP_PACKAGE)
152 187
 	touch $@
153 188
 
154 189
 # #####################################################################
155 190
 $(DOWNLOADS)/$(MPFR_PACKAGE):
156 191
 	$(WGET) -P $(DOWNLOADS) $(MPFR_DOWNLOAD)
157 192
 
158
-$(MPFR_SOURCE)/.unpacked: $(DOWNLOADS)/$(MPFR_PACKAGE) $(GCC_SOURCE)/.unpacked
159
-	tar -C $(GCC_SOURCE) -xjf $(DOWNLOADS)/$(MPFR_PACKAGE)
160
-	ln -s mpfr-$(MPFR_VERSION) $(GCC_SOURCE)/mpfr
193
+$(MPFR_SOURCE)/.unpacked: $(DOWNLOADS)/$(MPFR_PACKAGE)
194
+	tar -C $(SOURCE) -xjf $(DOWNLOADS)/$(MPFR_PACKAGE)
161 195
 	touch $@
162 196
 
163 197
 # #####################################################################
@@ -176,7 +210,6 @@ $(NEWLIB_BUILD)/.configured: $(NEWLIB_SOURCE)/.unpacked $(GCC_BUILD)/.stage1.ins
176 210
 		--build=$(BUILDARCH) --host=$(BUILDARCH) --target=$(TARGETARCH) \
177 211
 		--prefix=$(TOOLCHAIN) \
178 212
 		--enable-interwork \
179
-		--enable-multilib \
180 213
 		--disable-newlib-io-float \
181 214
 		--disable-newlib-supplied-syscalls \
182 215
 		--disable-nls \
@@ -207,7 +240,6 @@ $(GDB_BUILD)/.configured: $(GDB_SOURCE)/.unpacked $(GCC_BUILD)/.installed
207 240
 		--build=$(BUILDARCH) --host=$(BUILDARCH) --target=$(TARGETARCH) \
208 241
 		--prefix=$(TOOLCHAIN) \
209 242
 		--enable-interwork \
210
-		--enable-multilib \
211 243
 		--disable-nls \
212 244
 		);
213 245
 	touch $@
@@ -230,14 +262,18 @@ $(OOCD_SOURCE)/.unpacked: $(DOWNLOADS)/$(OOCD_PACKAGE)
230 262
 	tar -C $(SOURCE) -xjf $^
231 263
 	touch $@
232 264
 
233
-$(OOCD_BUILD)/.configured: $(OOCD_SOURCE)/.unpacked
265
+$(OOCD_BUILD)/.configured: $(OOCD_SOURCE)/.unpacked $(FTD2XX_SOURCE)/.unpacked
234 266
 	mkdir -p $(OOCD_BUILD)
235 267
 	(cd $(OOCD_BUILD); $(OOCD_SOURCE)/configure \
236 268
 		--prefix=$(TOOLCHAIN) \
237 269
 		--disable-static \
238 270
 		--disable-doxygen-html \
239 271
 		--enable-parport \
240
-		--enable-ft2232_libftdi \
272
+		--enable-ft2232_ftd2xx \
273
+		--enable-usbprog \
274
+		--enable-jlink \
275
+		--enable-arm-jtag-ew \
276
+		--with-ftd2xx-linux-tardir=$(FTD2XX_SOURCE)/release \
241 277
 		);
242 278
 	touch $@
243 279
 
@@ -248,3 +284,12 @@ $(OOCD_BUILD)/.compiled: $(OOCD_BUILD)/.configured
248 284
 $(OOCD_BUILD)/.installed: $(OOCD_BUILD)/.compiled
249 285
 	$(MAKE) -C $(OOCD_BUILD) install
250 286
 	touch $@
287
+
288
+# #####################################################################
289
+$(DOWNLOADS)/$(FTD2XX_PACKAGE):
290
+	$(WGET) -P $(DOWNLOADS) $(FTD2XX_DOWNLOAD)
291
+
292
+$(FTD2XX_SOURCE)/.unpacked: $(DOWNLOADS)/$(FTD2XX_PACKAGE)
293
+	mkdir -p $(FTD2XX_SOURCE)
294
+	tar -C $(FTD2XX_SOURCE) -xzf $^
295
+	touch $@

Loading…
Cancel
Save