Skip to content

Commit eda58a8

Browse files
torvaldstorvalds
committed
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: (40 commits) Blackfin arch: Remove outdated code Blackfin arch: Fix udelay implementation Blackfin arch: Update Copyright information Blackfin arch: Add BF561 PPI POLS, POLC Masks Blackfin arch: Update CM-BF527 kernel config Blackfin arch: define bfin_memmap as static since it is only used here Blackfin arch: cplb mananger: use a do...while loop rather than a for loop Blackfin arch: fix bug - traps test case 19 for exception 0x2d fails Blackfin arch: add platform device bfin_mii-bus and KSZ8893M switch driver platform resources to board files Blackfin arch: build jtag tty driver as a module by default Blackfin arch: fix 2 bugs related to debug Blackfin arch: Add ANOMALY_05000380 to BF54x to kill the compile warning Blackfin arch: Fix bug - 561 SMP kernel can't boot from jffs2 Blackfin arch: base SIC_IWR# programming on whether the MMR exists Blackfin arch: read SYSCR on newer parts that mirror the bits of SWRST in it Blackfin arch: fixup board init function name Blackfin arch: drop CONFIG_I2C_BOARDINFO ifdefs Blackfin arch: bfin_reset->_bfin_reset redirection no longer needed Blackfin arch: sync reboot handler with version in u-boot Blackfin arch: Faster Implementation of csum_tcpudp_nofold() ...
2 parents 024bb96 + c8e6741 commit eda58a8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+985
-867
lines changed

‎MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,7 @@ S: Maintained
911911
BLACKFIN ARCHITECTURE
912912
P: Bryan Wu
913913
M: [email protected]
914-
L: [email protected] (subscribers-only)
914+
L: [email protected]
915915
W: http://blackfin.uclinux.org
916916
S: Supported
917917

‎arch/blackfin/Kconfig

Lines changed: 41 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -169,26 +169,51 @@ config BF542
169169
help
170170
BF542 Processor Support.
171171

172+
config BF542M
173+
bool "BF542m"
174+
help
175+
BF542 Processor Support.
176+
172177
config BF544
173178
bool "BF544"
174179
help
175180
BF544 Processor Support.
176181

182+
config BF544M
183+
bool "BF544m"
184+
help
185+
BF544 Processor Support.
186+
177187
config BF547
178188
bool "BF547"
179189
help
180190
BF547 Processor Support.
181191

192+
config BF547M
193+
bool "BF547m"
194+
help
195+
BF547 Processor Support.
196+
182197
config BF548
183198
bool "BF548"
184199
help
185200
BF548 Processor Support.
186201

202+
config BF548M
203+
bool "BF548m"
204+
help
205+
BF548 Processor Support.
206+
187207
config BF549
188208
bool "BF549"
189209
help
190210
BF549 Processor Support.
191211

212+
config BF549M
213+
bool "BF549m"
214+
help
215+
BF549 Processor Support.
216+
192217
config BF561
193218
bool "BF561"
194219
help
@@ -224,39 +249,39 @@ config TICK_SOURCE_SYSTMR0
224249

225250
config BF_REV_MIN
226251
int
227-
default 0 if (BF51x || BF52x || BF54x)
252+
default 0 if (BF51x || BF52x || (BF54x && !BF54xM))
228253
default 2 if (BF537 || BF536 || BF534)
229-
default 3 if (BF561 ||BF533 || BF532 || BF531)
254+
default 3 if (BF561 || BF533 || BF532 || BF531 || BF54xM)
230255
default 4 if (BF538 || BF539)
231256

232257
config BF_REV_MAX
233258
int
234-
default 2 if (BF51x || BF52x || BF54x)
235-
default 3 if (BF537 || BF536 || BF534)
259+
default 2 if (BF51x || BF52x || (BF54x && !BF54xM))
260+
default 3 if (BF537 || BF536 || BF534 || BF54xM)
236261
default 5 if (BF561 || BF538 || BF539)
237262
default 6 if (BF533 || BF532 || BF531)
238263

239264
choice
240265
prompt "Silicon Rev"
241-
default BF_REV_0_1 if (BF51x || BF52x || BF54x)
266+
default BF_REV_0_1 if (BF51x || BF52x || (BF54x && !BF54xM))
242267
default BF_REV_0_2 if (BF534 || BF536 || BF537)
243-
default BF_REV_0_3 if (BF531 || BF532 || BF533 || BF561)
268+
default BF_REV_0_3 if (BF531 || BF532 || BF533 || BF54xM || BF561)
244269

245270
config BF_REV_0_0
246271
bool "0.0"
247-
depends on (BF51x || BF52x || BF54x)
272+
depends on (BF51x || BF52x || (BF54x && !BF54xM))
248273

249274
config BF_REV_0_1
250275
bool "0.1"
251-
depends on (BF52x || BF54x)
276+
depends on (BF52x || (BF54x && !BF54xM))
252277

253278
config BF_REV_0_2
254279
bool "0.2"
255-
depends on (BF52x || BF537 || BF536 || BF534 || BF54x)
280+
depends on (BF52x || BF537 || BF536 || BF534 || (BF54x && !BF54xM))
256281

257282
config BF_REV_0_3
258283
bool "0.3"
259-
depends on (BF561 || BF537 || BF536 || BF534 || BF533 || BF532 || BF531)
284+
depends on (BF54xM || BF561 || BF537 || BF536 || BF534 || BF533 || BF532 || BF531)
260285

261286
config BF_REV_0_4
262287
bool "0.4"
@@ -293,9 +318,14 @@ config BF53x
293318
depends on (BF531 || BF532 || BF533 || BF534 || BF536 || BF537)
294319
default y
295320

321+
config BF54xM
322+
bool
323+
depends on (BF542M || BF544M || BF547M || BF548M || BF549M)
324+
default y
325+
296326
config BF54x
297327
bool
298-
depends on (BF542 || BF544 || BF547 || BF548 || BF549)
328+
depends on (BF542 || BF544 || BF547 || BF548 || BF549 || BF54xM)
299329
default y
300330

301331
config MEM_GENERIC_BOARD

‎arch/blackfin/Makefile

Lines changed: 58 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -21,57 +21,67 @@ KALLSYMS += --symbol-prefix=_
2121
KBUILD_DEFCONFIG := BF537-STAMP_defconfig
2222

2323
# setup the machine name and the machine dependent settings
24-
machine-$(CONFIG_BF512) := bf518
25-
machine-$(CONFIG_BF514) := bf518
26-
machine-$(CONFIG_BF516) := bf518
27-
machine-$(CONFIG_BF518) := bf518
28-
machine-$(CONFIG_BF522) := bf527
29-
machine-$(CONFIG_BF523) := bf527
30-
machine-$(CONFIG_BF524) := bf527
31-
machine-$(CONFIG_BF525) := bf527
32-
machine-$(CONFIG_BF526) := bf527
33-
machine-$(CONFIG_BF527) := bf527
34-
machine-$(CONFIG_BF531) := bf533
35-
machine-$(CONFIG_BF532) := bf533
36-
machine-$(CONFIG_BF533) := bf533
37-
machine-$(CONFIG_BF534) := bf537
38-
machine-$(CONFIG_BF536) := bf537
39-
machine-$(CONFIG_BF537) := bf537
40-
machine-$(CONFIG_BF538) := bf538
41-
machine-$(CONFIG_BF539) := bf538
42-
machine-$(CONFIG_BF542) := bf548
43-
machine-$(CONFIG_BF544) := bf548
44-
machine-$(CONFIG_BF547) := bf548
45-
machine-$(CONFIG_BF548) := bf548
46-
machine-$(CONFIG_BF549) := bf548
47-
machine-$(CONFIG_BF561) := bf561
24+
machine-$(CONFIG_BF512) := bf518
25+
machine-$(CONFIG_BF514) := bf518
26+
machine-$(CONFIG_BF516) := bf518
27+
machine-$(CONFIG_BF518) := bf518
28+
machine-$(CONFIG_BF522) := bf527
29+
machine-$(CONFIG_BF523) := bf527
30+
machine-$(CONFIG_BF524) := bf527
31+
machine-$(CONFIG_BF525) := bf527
32+
machine-$(CONFIG_BF526) := bf527
33+
machine-$(CONFIG_BF527) := bf527
34+
machine-$(CONFIG_BF531) := bf533
35+
machine-$(CONFIG_BF532) := bf533
36+
machine-$(CONFIG_BF533) := bf533
37+
machine-$(CONFIG_BF534) := bf537
38+
machine-$(CONFIG_BF536) := bf537
39+
machine-$(CONFIG_BF537) := bf537
40+
machine-$(CONFIG_BF538) := bf538
41+
machine-$(CONFIG_BF539) := bf538
42+
machine-$(CONFIG_BF542) := bf548
43+
machine-$(CONFIG_BF542M) := bf548
44+
machine-$(CONFIG_BF544) := bf548
45+
machine-$(CONFIG_BF544M) := bf548
46+
machine-$(CONFIG_BF547) := bf548
47+
machine-$(CONFIG_BF547M) := bf548
48+
machine-$(CONFIG_BF548) := bf548
49+
machine-$(CONFIG_BF548M) := bf548
50+
machine-$(CONFIG_BF549) := bf548
51+
machine-$(CONFIG_BF549M) := bf548
52+
machine-$(CONFIG_BF561) := bf561
4853
MACHINE := $(machine-y)
4954
export MACHINE
5055

51-
cpu-$(CONFIG_BF512) := bf512
52-
cpu-$(CONFIG_BF514) := bf514
53-
cpu-$(CONFIG_BF516) := bf516
54-
cpu-$(CONFIG_BF518) := bf518
55-
cpu-$(CONFIG_BF522) := bf522
56-
cpu-$(CONFIG_BF523) := bf523
57-
cpu-$(CONFIG_BF524) := bf524
58-
cpu-$(CONFIG_BF525) := bf525
59-
cpu-$(CONFIG_BF526) := bf526
60-
cpu-$(CONFIG_BF527) := bf527
61-
cpu-$(CONFIG_BF531) := bf531
62-
cpu-$(CONFIG_BF532) := bf532
63-
cpu-$(CONFIG_BF533) := bf533
64-
cpu-$(CONFIG_BF534) := bf534
65-
cpu-$(CONFIG_BF536) := bf536
66-
cpu-$(CONFIG_BF537) := bf537
67-
cpu-$(CONFIG_BF538) := bf538
68-
cpu-$(CONFIG_BF539) := bf539
69-
cpu-$(CONFIG_BF542) := bf542
70-
cpu-$(CONFIG_BF544) := bf544
71-
cpu-$(CONFIG_BF547) := bf547
72-
cpu-$(CONFIG_BF548) := bf548
73-
cpu-$(CONFIG_BF549) := bf549
74-
cpu-$(CONFIG_BF561) := bf561
56+
cpu-$(CONFIG_BF512) := bf512
57+
cpu-$(CONFIG_BF514) := bf514
58+
cpu-$(CONFIG_BF516) := bf516
59+
cpu-$(CONFIG_BF518) := bf518
60+
cpu-$(CONFIG_BF522) := bf522
61+
cpu-$(CONFIG_BF523) := bf523
62+
cpu-$(CONFIG_BF524) := bf524
63+
cpu-$(CONFIG_BF525) := bf525
64+
cpu-$(CONFIG_BF526) := bf526
65+
cpu-$(CONFIG_BF527) := bf527
66+
cpu-$(CONFIG_BF531) := bf531
67+
cpu-$(CONFIG_BF532) := bf532
68+
cpu-$(CONFIG_BF533) := bf533
69+
cpu-$(CONFIG_BF534) := bf534
70+
cpu-$(CONFIG_BF536) := bf536
71+
cpu-$(CONFIG_BF537) := bf537
72+
cpu-$(CONFIG_BF538) := bf538
73+
cpu-$(CONFIG_BF539) := bf539
74+
cpu-$(CONFIG_BF542) := bf542
75+
cpu-$(CONFIG_BF542M) := bf542m
76+
cpu-$(CONFIG_BF544) := bf544
77+
cpu-$(CONFIG_BF544M) := bf544m
78+
cpu-$(CONFIG_BF547) := bf547
79+
cpu-$(CONFIG_BF547M) := bf547m
80+
cpu-$(CONFIG_BF548) := bf548
81+
cpu-$(CONFIG_BF548M) := bf548m
82+
cpu-$(CONFIG_BF549) := bf549
83+
cpu-$(CONFIG_BF549M) := bf549m
84+
cpu-$(CONFIG_BF561) := bf561
7585

7686
rev-$(CONFIG_BF_REV_0_0) := 0.0
7787
rev-$(CONFIG_BF_REV_0_1) := 0.1

‎arch/blackfin/configs/BF518F-EZBRD_defconfig

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#
22
# Automatically generated make config: don't edit
33
# Linux kernel version: 2.6.28-rc2
4+
# Fri Jan 9 17:58:41 2009
45
#
56
# CONFIG_MMU is not set
67
# CONFIG_FPU is not set
@@ -149,6 +150,7 @@ CONFIG_BF_REV_0_0=y
149150
# CONFIG_BF_REV_ANY is not set
150151
# CONFIG_BF_REV_NONE is not set
151152
CONFIG_BF51x=y
153+
CONFIG_MEM_MT48LC32M8A2_75=y
152154
CONFIG_BFIN518F_EZBRD=y
153155

154156
#
@@ -598,7 +600,10 @@ CONFIG_PHYLIB=y
598600
# CONFIG_MDIO_BITBANG is not set
599601
CONFIG_NET_ETHERNET=y
600602
CONFIG_MII=y
601-
# CONFIG_BFIN_MAC is not set
603+
CONFIG_BFIN_MAC=y
604+
CONFIG_BFIN_TX_DESC_NUM=10
605+
CONFIG_BFIN_RX_DESC_NUM=20
606+
# CONFIG_BFIN_MAC_RMII is not set
602607
# CONFIG_SMC91X is not set
603608
# CONFIG_SMSC911X is not set
604609
# CONFIG_DM9000 is not set
@@ -679,7 +684,7 @@ CONFIG_VT_CONSOLE=y
679684
CONFIG_HW_CONSOLE=y
680685
# CONFIG_VT_HW_CONSOLE_BINDING is not set
681686
# CONFIG_DEVKMEM is not set
682-
# CONFIG_BFIN_JTAG_COMM is not set
687+
CONFIG_BFIN_JTAG_COMM=m
683688
# CONFIG_SERIAL_NONSTANDARD is not set
684689

685690
#

‎arch/blackfin/configs/BF526-EZBRD_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@ CONFIG_VT_CONSOLE=y
723723
CONFIG_HW_CONSOLE=y
724724
# CONFIG_VT_HW_CONSOLE_BINDING is not set
725725
# CONFIG_DEVKMEM is not set
726-
# CONFIG_BFIN_JTAG_COMM is not set
726+
CONFIG_BFIN_JTAG_COMM=m
727727
# CONFIG_SERIAL_NONSTANDARD is not set
728728

729729
#

‎arch/blackfin/configs/BF527-EZKIT_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,7 @@ CONFIG_VT_CONSOLE=y
767767
CONFIG_HW_CONSOLE=y
768768
# CONFIG_VT_HW_CONSOLE_BINDING is not set
769769
# CONFIG_DEVKMEM is not set
770-
# CONFIG_BFIN_JTAG_COMM is not set
770+
CONFIG_BFIN_JTAG_COMM=m
771771
# CONFIG_SERIAL_NONSTANDARD is not set
772772

773773
#

‎arch/blackfin/configs/BF533-EZKIT_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ CONFIG_BFIN_DMA_INTERFACE=m
672672
CONFIG_SIMPLE_GPIO=m
673673
# CONFIG_VT is not set
674674
# CONFIG_DEVKMEM is not set
675-
# CONFIG_BFIN_JTAG_COMM is not set
675+
CONFIG_BFIN_JTAG_COMM=m
676676
# CONFIG_SERIAL_NONSTANDARD is not set
677677

678678
#

‎arch/blackfin/configs/BF533-STAMP_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ CONFIG_BFIN_DMA_INTERFACE=m
679679
CONFIG_SIMPLE_GPIO=m
680680
# CONFIG_VT is not set
681681
# CONFIG_DEVKMEM is not set
682-
# CONFIG_BFIN_JTAG_COMM is not set
682+
CONFIG_BFIN_JTAG_COMM=m
683683
# CONFIG_SERIAL_NONSTANDARD is not set
684684

685685
#

‎arch/blackfin/configs/BF537-STAMP_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@ CONFIG_BFIN_DMA_INTERFACE=m
722722
CONFIG_SIMPLE_GPIO=m
723723
# CONFIG_VT is not set
724724
# CONFIG_DEVKMEM is not set
725-
# CONFIG_BFIN_JTAG_COMM is not set
725+
CONFIG_BFIN_JTAG_COMM=m
726726
# CONFIG_SERIAL_NONSTANDARD is not set
727727

728728
#

‎arch/blackfin/configs/BF538-EZKIT_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ CONFIG_BFIN_DMA_INTERFACE=m
726726
CONFIG_SIMPLE_GPIO=m
727727
# CONFIG_VT is not set
728728
# CONFIG_DEVKMEM is not set
729-
# CONFIG_BFIN_JTAG_COMM is not set
729+
CONFIG_BFIN_JTAG_COMM=m
730730
# CONFIG_SERIAL_NONSTANDARD is not set
731731

732732
#

‎arch/blackfin/configs/BF548-EZKIT_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,7 @@ CONFIG_VT_CONSOLE=y
856856
CONFIG_HW_CONSOLE=y
857857
# CONFIG_VT_HW_CONSOLE_BINDING is not set
858858
# CONFIG_DEVKMEM is not set
859-
# CONFIG_BFIN_JTAG_COMM is not set
859+
CONFIG_BFIN_JTAG_COMM=m
860860
# CONFIG_SERIAL_NONSTANDARD is not set
861861

862862
#

‎arch/blackfin/configs/BF561-EZKIT_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@ CONFIG_BFIN_DMA_INTERFACE=m
709709
CONFIG_SIMPLE_GPIO=m
710710
# CONFIG_VT is not set
711711
# CONFIG_DEVKMEM is not set
712-
# CONFIG_BFIN_JTAG_COMM is not set
712+
CONFIG_BFIN_JTAG_COMM=m
713713
# CONFIG_SERIAL_NONSTANDARD is not set
714714

715715
#

0 commit comments

Comments
 (0)