Commit eda58a85 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
  ...
parents 024bb961 c8e67412

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -911,7 +911,7 @@ S: Maintained 
BLACKFIN ARCHITECTURE

P:	Bryan Wu

M:	cooloney@kernel.org

L:	uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)

L:	uclinux-dist-devel@blackfin.uclinux.org

W:	http://blackfin.uclinux.org

S:	Supported

arch/blackfin/Kconfig

+41 −11
Original line number Diff line number Diff line
@@ -169,26 +169,51 @@ config BF542 
	help

	  BF542 Processor Support.



config BF542M

	bool "BF542m"

	help

	  BF542 Processor Support.



config BF544

	bool "BF544"

	help

	  BF544 Processor Support.



config BF544M

	bool "BF544m"

	help

	  BF544 Processor Support.



config BF547

	bool "BF547"

	help

	  BF547 Processor Support.



config BF547M

	bool "BF547m"

	help

	  BF547 Processor Support.



config BF548

	bool "BF548"

	help

	  BF548 Processor Support.



config BF548M

	bool "BF548m"

	help

	  BF548 Processor Support.



config BF549

	bool "BF549"

	help

	  BF549 Processor Support.



config BF549M

	bool "BF549m"

	help

	  BF549 Processor Support.



config BF561

	bool "BF561"

	help
@@ -224,39 +249,39 @@ config TICK_SOURCE_SYSTMR0 


config BF_REV_MIN

	int

	default 0 if (BF51x || BF52x || BF54x)

	default 0 if (BF51x || BF52x || (BF54x && !BF54xM))

	default 2 if (BF537 || BF536 || BF534)

	default 3 if (BF561 ||BF533 || BF532 || BF531)

	default 3 if (BF561 || BF533 || BF532 || BF531 || BF54xM)

	default 4 if (BF538 || BF539)



config BF_REV_MAX

	int

	default 2 if (BF51x || BF52x || BF54x)

	default 3 if (BF537 || BF536 || BF534)

	default 2 if (BF51x || BF52x || (BF54x && !BF54xM))

	default 3 if (BF537 || BF536 || BF534 || BF54xM)

	default 5 if (BF561 || BF538 || BF539)

	default 6 if (BF533 || BF532 || BF531)



choice

	prompt "Silicon Rev"

	default BF_REV_0_1 if (BF51x || BF52x || BF54x)

	default BF_REV_0_1 if (BF51x || BF52x || (BF54x && !BF54xM))

	default BF_REV_0_2 if (BF534 || BF536 || BF537)

	default BF_REV_0_3 if (BF531 || BF532 || BF533 || BF561)

	default BF_REV_0_3 if (BF531 || BF532 || BF533 || BF54xM || BF561)



config BF_REV_0_0

	bool "0.0"

	depends on (BF51x || BF52x || BF54x)

	depends on (BF51x || BF52x || (BF54x && !BF54xM))



config BF_REV_0_1

	bool "0.1"

	depends on (BF52x || BF54x)

	depends on (BF52x || (BF54x && !BF54xM))



config BF_REV_0_2

	bool "0.2"

	depends on (BF52x || BF537 || BF536 || BF534 || BF54x)

	depends on (BF52x || BF537 || BF536 || BF534 || (BF54x && !BF54xM))



config BF_REV_0_3

	bool "0.3"

	depends on (BF561 || BF537 || BF536 || BF534 || BF533 || BF532 || BF531)

	depends on (BF54xM || BF561 || BF537 || BF536 || BF534 || BF533 || BF532 || BF531)



config BF_REV_0_4

	bool "0.4"
@@ -293,9 +318,14 @@ config BF53x 
	depends on (BF531 || BF532 || BF533 || BF534 || BF536 || BF537)

	default y



config BF54xM

	bool

	depends on (BF542M || BF544M || BF547M || BF548M || BF549M)

	default y



config BF54x

	bool

	depends on (BF542 || BF544 || BF547 || BF548 || BF549)

	depends on (BF542 || BF544 || BF547 || BF548 || BF549 || BF54xM)

	default y



config MEM_GENERIC_BOARD

arch/blackfin/Makefile

+58 −48
Original line number Diff line number Diff line
@@ -40,10 +40,15 @@ machine-$(CONFIG_BF537) := bf537 
machine-$(CONFIG_BF538)  := bf538

machine-$(CONFIG_BF539)  := bf538

machine-$(CONFIG_BF542)  := bf548

machine-$(CONFIG_BF542M) := bf548

machine-$(CONFIG_BF544)  := bf548

machine-$(CONFIG_BF544M) := bf548

machine-$(CONFIG_BF547)  := bf548

machine-$(CONFIG_BF547M) := bf548

machine-$(CONFIG_BF548)  := bf548

machine-$(CONFIG_BF548M) := bf548

machine-$(CONFIG_BF549)  := bf548

machine-$(CONFIG_BF549M) := bf548

machine-$(CONFIG_BF561)  := bf561

MACHINE := $(machine-y)

export MACHINE
@@ -67,10 +72,15 @@ cpu-$(CONFIG_BF537) := bf537 
cpu-$(CONFIG_BF538)  := bf538

cpu-$(CONFIG_BF539)  := bf539

cpu-$(CONFIG_BF542)  := bf542

cpu-$(CONFIG_BF542M) := bf542m

cpu-$(CONFIG_BF544)  := bf544

cpu-$(CONFIG_BF544M) := bf544m

cpu-$(CONFIG_BF547)  := bf547

cpu-$(CONFIG_BF547M) := bf547m

cpu-$(CONFIG_BF548)  := bf548

cpu-$(CONFIG_BF548M) := bf548m

cpu-$(CONFIG_BF549)  := bf549

cpu-$(CONFIG_BF549M) := bf549m

cpu-$(CONFIG_BF561)  := bf561



rev-$(CONFIG_BF_REV_0_0)  := 0.0

arch/blackfin/configs/BF518F-EZBRD_defconfig

+7 −2
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.28-rc2

# Fri Jan  9 17:58:41 2009

#

# CONFIG_MMU is not set

# CONFIG_FPU is not set
@@ -149,6 +150,7 @@ CONFIG_BF_REV_0_0=y 
# CONFIG_BF_REV_ANY is not set

# CONFIG_BF_REV_NONE is not set

CONFIG_BF51x=y

CONFIG_MEM_MT48LC32M8A2_75=y

CONFIG_BFIN518F_EZBRD=y



#
@@ -598,7 +600,10 @@ CONFIG_PHYLIB=y 
# CONFIG_MDIO_BITBANG is not set

CONFIG_NET_ETHERNET=y

CONFIG_MII=y

# CONFIG_BFIN_MAC is not set

CONFIG_BFIN_MAC=y

CONFIG_BFIN_TX_DESC_NUM=10

CONFIG_BFIN_RX_DESC_NUM=20

# CONFIG_BFIN_MAC_RMII is not set

# CONFIG_SMC91X is not set

# CONFIG_SMSC911X is not set

# CONFIG_DM9000 is not set
@@ -679,7 +684,7 @@ CONFIG_VT_CONSOLE=y 
CONFIG_HW_CONSOLE=y

# CONFIG_VT_HW_CONSOLE_BINDING is not set

# CONFIG_DEVKMEM is not set

# CONFIG_BFIN_JTAG_COMM is not set

CONFIG_BFIN_JTAG_COMM=m

# CONFIG_SERIAL_NONSTANDARD is not set



#

arch/blackfin/configs/BF526-EZBRD_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -723,7 +723,7 @@ CONFIG_VT_CONSOLE=y 
CONFIG_HW_CONSOLE=y

# CONFIG_VT_HW_CONSOLE_BINDING is not set

# CONFIG_DEVKMEM is not set

# CONFIG_BFIN_JTAG_COMM is not set

CONFIG_BFIN_JTAG_COMM=m

# CONFIG_SERIAL_NONSTANDARD is not set



#

CRA Git | Maintained and supported by SUSTech CRA and CCSE