aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-03 00:05:14 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-03 00:05:14 -0400
commitca9c5ffd9d12e136f72fa52840cda83485d586cd (patch)
tree55894647a47c69d563b7b135484c05f6c36a62d6
parentc1fa238762ad2518ab6003983c16508470be6d81 (diff)
parent7718457dc8fd98a9f61a5e42653161bac3904a65 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: Blackfin arch: remove zero-sized include/asm-blackfin/macros.h Blackfin arch: update board defconfig files Blackfin arch: Fix up remaining printks with proper log levels Blackfin arch: Add proper -mcpu option according to the cpu and silicon revision configuration
Diffstat
-rw-r--r--arch/blackfin/Kconfig6
-rw-r--r--arch/blackfin/Makefile21
-rw-r--r--arch/blackfin/configs/BF533-EZKIT_defconfig12
-rw-r--r--arch/blackfin/configs/BF533-STAMP_defconfig26
-rw-r--r--arch/blackfin/configs/BF537-STAMP_defconfig26
-rw-r--r--arch/blackfin/configs/BF561-EZKIT_defconfig12
-rw-r--r--arch/blackfin/configs/PNAV-10_defconfig13
-rw-r--r--arch/blackfin/kernel/setup.c18
-rw-r--r--arch/blackfin/kernel/traps.c3
-rw-r--r--include/asm-blackfin/macros.h0
-rw-r--r--include/asm-blackfin/processor.h4
11 files changed, 123 insertions, 18 deletions
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 1fad8560c7af..d98bafcaca59 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -142,6 +142,12 @@ config BF_REV_0_5
142 bool "0.5" 142 bool "0.5"
143 depends on (BF561 || BF533 || BF532 || BF531) 143 depends on (BF561 || BF533 || BF532 || BF531)
144 144
145config BF_REV_ANY
146 bool "any"
147
148config BF_REV_NONE
149 bool "none"
150
145endchoice 151endchoice
146 152
147config BFIN_DUAL_CORE 153config BFIN_DUAL_CORE
diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile
index 75e89c324756..6971a4418dfe 100644
--- a/arch/blackfin/Makefile
+++ b/arch/blackfin/Makefile
@@ -28,6 +28,27 @@ machine-$(CONFIG_BF561) := bf561
28MACHINE := $(machine-y) 28MACHINE := $(machine-y)
29export MACHINE 29export MACHINE
30 30
31cpu-$(CONFIG_BF531) := bf531
32cpu-$(CONFIG_BF532) := bf532
33cpu-$(CONFIG_BF533) := bf533
34cpu-$(CONFIG_BF534) := bf534
35cpu-$(CONFIG_BF536) := bf536
36cpu-$(CONFIG_BF537) := bf537
37cpu-$(CONFIG_BF548) := bf548
38cpu-$(CONFIG_BF549) := bf549
39cpu-$(CONFIG_BF561) := bf561
40
41rev-$(CONFIG_BF_REV_0_0) := 0.0
42rev-$(CONFIG_BF_REV_0_1) := 0.1
43rev-$(CONFIG_BF_REV_0_2) := 0.2
44rev-$(CONFIG_BF_REV_0_3) := 0.3
45rev-$(CONFIG_BF_REV_0_4) := 0.4
46rev-$(CONFIG_BF_REV_0_5) := 0.5
47rev-$(CONFIG_BF_REV_NONE) := none
48rev-$(CONFIG_BF_REV_ANY) := any
49
50CFLAGS += -mcpu=$(cpu-y)-$(rev-y)
51AFLAGS += -mcpu=$(cpu-y)-$(rev-y)
31 52
32head-y := arch/$(ARCH)/mach-$(MACHINE)/head.o arch/$(ARCH)/kernel/init_task.o 53head-y := arch/$(ARCH)/mach-$(MACHINE)/head.o arch/$(ARCH)/kernel/init_task.o
33 54
diff --git a/arch/blackfin/configs/BF533-EZKIT_defconfig b/arch/blackfin/configs/BF533-EZKIT_defconfig
index 90d58aabe693..1cf1ab28dc66 100644
--- a/arch/blackfin/configs/BF533-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF533-EZKIT_defconfig
@@ -1,6 +1,6 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.21.3 3# Linux kernel version: 2.6.21.5
4# 4#
5# CONFIG_MMU is not set 5# CONFIG_MMU is not set
6# CONFIG_FPU is not set 6# CONFIG_FPU is not set
@@ -115,17 +115,26 @@ CONFIG_BF533=y
115# CONFIG_BF534 is not set 115# CONFIG_BF534 is not set
116# CONFIG_BF536 is not set 116# CONFIG_BF536 is not set
117# CONFIG_BF537 is not set 117# CONFIG_BF537 is not set
118# CONFIG_BF542 is not set
119# CONFIG_BF544 is not set
120# CONFIG_BF548 is not set
121# CONFIG_BF549 is not set
118# CONFIG_BF561 is not set 122# CONFIG_BF561 is not set
123# CONFIG_BF_REV_0_0 is not set
119# CONFIG_BF_REV_0_2 is not set 124# CONFIG_BF_REV_0_2 is not set
120CONFIG_BF_REV_0_3=y 125CONFIG_BF_REV_0_3=y
121# CONFIG_BF_REV_0_4 is not set 126# CONFIG_BF_REV_0_4 is not set
122# CONFIG_BF_REV_0_5 is not set 127# CONFIG_BF_REV_0_5 is not set
128# CONFIG_BF_REV_ANY is not set
129# CONFIG_BF_REV_NONE is not set
130CONFIG_BF53x=y
123CONFIG_BFIN_SINGLE_CORE=y 131CONFIG_BFIN_SINGLE_CORE=y
124CONFIG_BFIN533_EZKIT=y 132CONFIG_BFIN533_EZKIT=y
125# CONFIG_BFIN533_STAMP is not set 133# CONFIG_BFIN533_STAMP is not set
126# CONFIG_BFIN537_STAMP is not set 134# CONFIG_BFIN537_STAMP is not set
127# CONFIG_BFIN533_BLUETECHNIX_CM is not set 135# CONFIG_BFIN533_BLUETECHNIX_CM is not set
128# CONFIG_BFIN537_BLUETECHNIX_CM is not set 136# CONFIG_BFIN537_BLUETECHNIX_CM is not set
137# CONFIG_BFIN548_EZKIT is not set
129# CONFIG_BFIN561_BLUETECHNIX_CM is not set 138# CONFIG_BFIN561_BLUETECHNIX_CM is not set
130# CONFIG_BFIN561_EZKIT is not set 139# CONFIG_BFIN561_EZKIT is not set
131# CONFIG_BFIN561_TEPLA is not set 140# CONFIG_BFIN561_TEPLA is not set
@@ -634,6 +643,7 @@ CONFIG_NETDEVICES=y
634CONFIG_NET_ETHERNET=y 643CONFIG_NET_ETHERNET=y
635CONFIG_MII=y 644CONFIG_MII=y
636CONFIG_SMC91X=y 645CONFIG_SMC91X=y
646# CONFIG_SMSC911X is not set
637 647
638# 648#
639# Ethernet (1000 Mbit) 649# Ethernet (1000 Mbit)
diff --git a/arch/blackfin/configs/BF533-STAMP_defconfig b/arch/blackfin/configs/BF533-STAMP_defconfig
index fee918957392..64b7f1b3b2af 100644
--- a/arch/blackfin/configs/BF533-STAMP_defconfig
+++ b/arch/blackfin/configs/BF533-STAMP_defconfig
@@ -1,6 +1,6 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.21.3 3# Linux kernel version: 2.6.21.5
4# 4#
5# CONFIG_MMU is not set 5# CONFIG_MMU is not set
6# CONFIG_FPU is not set 6# CONFIG_FPU is not set
@@ -115,17 +115,26 @@ CONFIG_BF533=y
115# CONFIG_BF534 is not set 115# CONFIG_BF534 is not set
116# CONFIG_BF536 is not set 116# CONFIG_BF536 is not set
117# CONFIG_BF537 is not set 117# CONFIG_BF537 is not set
118# CONFIG_BF542 is not set
119# CONFIG_BF544 is not set
120# CONFIG_BF548 is not set
121# CONFIG_BF549 is not set
118# CONFIG_BF561 is not set 122# CONFIG_BF561 is not set
123# CONFIG_BF_REV_0_0 is not set
119# CONFIG_BF_REV_0_2 is not set 124# CONFIG_BF_REV_0_2 is not set
120CONFIG_BF_REV_0_3=y 125CONFIG_BF_REV_0_3=y
121# CONFIG_BF_REV_0_4 is not set 126# CONFIG_BF_REV_0_4 is not set
122# CONFIG_BF_REV_0_5 is not set 127# CONFIG_BF_REV_0_5 is not set
128# CONFIG_BF_REV_ANY is not set
129# CONFIG_BF_REV_NONE is not set
130CONFIG_BF53x=y
123CONFIG_BFIN_SINGLE_CORE=y 131CONFIG_BFIN_SINGLE_CORE=y
124# CONFIG_BFIN533_EZKIT is not set 132# CONFIG_BFIN533_EZKIT is not set
125CONFIG_BFIN533_STAMP=y 133CONFIG_BFIN533_STAMP=y
126# CONFIG_BFIN537_STAMP is not set 134# CONFIG_BFIN537_STAMP is not set
127# CONFIG_BFIN533_BLUETECHNIX_CM is not set 135# CONFIG_BFIN533_BLUETECHNIX_CM is not set
128# CONFIG_BFIN537_BLUETECHNIX_CM is not set 136# CONFIG_BFIN537_BLUETECHNIX_CM is not set
137# CONFIG_BFIN548_EZKIT is not set
129# CONFIG_BFIN561_BLUETECHNIX_CM is not set 138# CONFIG_BFIN561_BLUETECHNIX_CM is not set
130# CONFIG_BFIN561_EZKIT is not set 139# CONFIG_BFIN561_EZKIT is not set
131# CONFIG_BFIN561_TEPLA is not set 140# CONFIG_BFIN561_TEPLA is not set
@@ -646,6 +655,7 @@ CONFIG_NETDEVICES=y
646CONFIG_NET_ETHERNET=y 655CONFIG_NET_ETHERNET=y
647CONFIG_MII=y 656CONFIG_MII=y
648CONFIG_SMC91X=y 657CONFIG_SMC91X=y
658# CONFIG_SMSC911X is not set
649 659
650# 660#
651# Ethernet (1000 Mbit) 661# Ethernet (1000 Mbit)
@@ -986,9 +996,17 @@ CONFIG_SND_VERBOSE_PROCFS=y
986# 996#
987# ALSA Blackfin devices 997# ALSA Blackfin devices
988# 998#
989# CONFIG_SND_BLACKFIN_AD1836 is not set 999CONFIG_SND_BLACKFIN_AD1836=m
990# CONFIG_SND_BLACKFIN_AD1981B is not set 1000CONFIG_SND_BLACKFIN_AD1836_TDM=y
991# CONFIG_SND_BFIN_AD73311 is not set 1001# CONFIG_SND_BLACKFIN_AD1836_I2S is not set
1002CONFIG_SND_BLACKFIN_AD1836_MULSUB=y
1003# CONFIG_SND_BLACKFIN_AD1836_5P1 is not set
1004CONFIG_SND_BLACKFIN_AD1981B=m
1005CONFIG_SND_BLACKFIN_SPORT=0
1006CONFIG_SND_BLACKFIN_SPI_PFBIT=4
1007CONFIG_SND_BFIN_AD73311=m
1008CONFIG_SND_BFIN_SPORT=0
1009CONFIG_SND_BFIN_AD73311_SE=4
992 1010
993# 1011#
994# SoC audio support 1012# SoC audio support
diff --git a/arch/blackfin/configs/BF537-STAMP_defconfig b/arch/blackfin/configs/BF537-STAMP_defconfig
index 37688bb55b9a..ccf09dc09a18 100644
--- a/arch/blackfin/configs/BF537-STAMP_defconfig
+++ b/arch/blackfin/configs/BF537-STAMP_defconfig
@@ -1,6 +1,6 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.21.3 3# Linux kernel version: 2.6.21.5
4# 4#
5# CONFIG_MMU is not set 5# CONFIG_MMU is not set
6# CONFIG_FPU is not set 6# CONFIG_FPU is not set
@@ -115,17 +115,26 @@ CONFIG_PREEMPT_VOLUNTARY=y
115# CONFIG_BF534 is not set 115# CONFIG_BF534 is not set
116# CONFIG_BF536 is not set 116# CONFIG_BF536 is not set
117CONFIG_BF537=y 117CONFIG_BF537=y
118# CONFIG_BF542 is not set
119# CONFIG_BF544 is not set
120# CONFIG_BF548 is not set
121# CONFIG_BF549 is not set
118# CONFIG_BF561 is not set 122# CONFIG_BF561 is not set
123# CONFIG_BF_REV_0_0 is not set
119CONFIG_BF_REV_0_2=y 124CONFIG_BF_REV_0_2=y
120# CONFIG_BF_REV_0_3 is not set 125# CONFIG_BF_REV_0_3 is not set
121# CONFIG_BF_REV_0_4 is not set 126# CONFIG_BF_REV_0_4 is not set
122# CONFIG_BF_REV_0_5 is not set 127# CONFIG_BF_REV_0_5 is not set
128# CONFIG_BF_REV_ANY is not set
129# CONFIG_BF_REV_NONE is not set
130CONFIG_BF53x=y
123CONFIG_BFIN_SINGLE_CORE=y 131CONFIG_BFIN_SINGLE_CORE=y
124# CONFIG_BFIN533_EZKIT is not set 132# CONFIG_BFIN533_EZKIT is not set
125# CONFIG_BFIN533_STAMP is not set 133# CONFIG_BFIN533_STAMP is not set
126CONFIG_BFIN537_STAMP=y 134CONFIG_BFIN537_STAMP=y
127# CONFIG_BFIN533_BLUETECHNIX_CM is not set 135# CONFIG_BFIN533_BLUETECHNIX_CM is not set
128# CONFIG_BFIN537_BLUETECHNIX_CM is not set 136# CONFIG_BFIN537_BLUETECHNIX_CM is not set
137# CONFIG_BFIN548_EZKIT is not set
129# CONFIG_BFIN561_BLUETECHNIX_CM is not set 138# CONFIG_BFIN561_BLUETECHNIX_CM is not set
130# CONFIG_BFIN561_EZKIT is not set 139# CONFIG_BFIN561_EZKIT is not set
131# CONFIG_BFIN561_TEPLA is not set 140# CONFIG_BFIN561_TEPLA is not set
@@ -664,6 +673,7 @@ CONFIG_BFIN_MAC_USE_L1=y
664CONFIG_BFIN_TX_DESC_NUM=10 673CONFIG_BFIN_TX_DESC_NUM=10
665CONFIG_BFIN_RX_DESC_NUM=20 674CONFIG_BFIN_RX_DESC_NUM=20
666# CONFIG_BFIN_MAC_RMII is not set 675# CONFIG_BFIN_MAC_RMII is not set
676# CONFIG_SMSC911X is not set
667 677
668# 678#
669# Ethernet (1000 Mbit) 679# Ethernet (1000 Mbit)
@@ -1020,9 +1030,17 @@ CONFIG_SND_VERBOSE_PROCFS=y
1020# 1030#
1021# ALSA Blackfin devices 1031# ALSA Blackfin devices
1022# 1032#
1023# CONFIG_SND_BLACKFIN_AD1836 is not set 1033CONFIG_SND_BLACKFIN_AD1836=m
1024# CONFIG_SND_BLACKFIN_AD1981B is not set 1034CONFIG_SND_BLACKFIN_AD1836_TDM=y
1025# CONFIG_SND_BFIN_AD73311 is not set 1035# CONFIG_SND_BLACKFIN_AD1836_I2S is not set
1036CONFIG_SND_BLACKFIN_AD1836_MULSUB=y
1037# CONFIG_SND_BLACKFIN_AD1836_5P1 is not set
1038CONFIG_SND_BLACKFIN_AD1981B=m
1039CONFIG_SND_BLACKFIN_SPORT=0
1040CONFIG_SND_BLACKFIN_SPI_PFBIT=4
1041CONFIG_SND_BFIN_AD73311=m
1042CONFIG_SND_BFIN_SPORT=0
1043CONFIG_SND_BFIN_AD73311_SE=4
1026 1044
1027# 1045#
1028# SoC audio support 1046# SoC audio support
diff --git a/arch/blackfin/configs/BF561-EZKIT_defconfig b/arch/blackfin/configs/BF561-EZKIT_defconfig
index fe4e67debaca..51c0b6f97798 100644
--- a/arch/blackfin/configs/BF561-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF561-EZKIT_defconfig
@@ -1,6 +1,6 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.21.3 3# Linux kernel version: 2.6.21.5
4# 4#
5# CONFIG_MMU is not set 5# CONFIG_MMU is not set
6# CONFIG_FPU is not set 6# CONFIG_FPU is not set
@@ -115,17 +115,25 @@ CONFIG_PREEMPT_VOLUNTARY=y
115# CONFIG_BF534 is not set 115# CONFIG_BF534 is not set
116# CONFIG_BF536 is not set 116# CONFIG_BF536 is not set
117# CONFIG_BF537 is not set 117# CONFIG_BF537 is not set
118# CONFIG_BF542 is not set
119# CONFIG_BF544 is not set
120# CONFIG_BF548 is not set
121# CONFIG_BF549 is not set
118CONFIG_BF561=y 122CONFIG_BF561=y
123# CONFIG_BF_REV_0_0 is not set
119# CONFIG_BF_REV_0_2 is not set 124# CONFIG_BF_REV_0_2 is not set
120CONFIG_BF_REV_0_3=y 125CONFIG_BF_REV_0_3=y
121# CONFIG_BF_REV_0_4 is not set 126# CONFIG_BF_REV_0_4 is not set
122# CONFIG_BF_REV_0_5 is not set 127# CONFIG_BF_REV_0_5 is not set
128# CONFIG_BF_REV_ANY is not set
129# CONFIG_BF_REV_NONE is not set
123CONFIG_BFIN_DUAL_CORE=y 130CONFIG_BFIN_DUAL_CORE=y
124# CONFIG_BFIN533_EZKIT is not set 131# CONFIG_BFIN533_EZKIT is not set
125# CONFIG_BFIN533_STAMP is not set 132# CONFIG_BFIN533_STAMP is not set
126# CONFIG_BFIN537_STAMP is not set 133# CONFIG_BFIN537_STAMP is not set
127# CONFIG_BFIN533_BLUETECHNIX_CM is not set 134# CONFIG_BFIN533_BLUETECHNIX_CM is not set
128# CONFIG_BFIN537_BLUETECHNIX_CM is not set 135# CONFIG_BFIN537_BLUETECHNIX_CM is not set
136# CONFIG_BFIN548_EZKIT is not set
129# CONFIG_BFIN561_BLUETECHNIX_CM is not set 137# CONFIG_BFIN561_BLUETECHNIX_CM is not set
130CONFIG_BFIN561_EZKIT=y 138CONFIG_BFIN561_EZKIT=y
131# CONFIG_BFIN561_TEPLA is not set 139# CONFIG_BFIN561_TEPLA is not set
@@ -673,6 +681,7 @@ CONFIG_NETDEVICES=y
673CONFIG_NET_ETHERNET=y 681CONFIG_NET_ETHERNET=y
674CONFIG_MII=y 682CONFIG_MII=y
675CONFIG_SMC91X=y 683CONFIG_SMC91X=y
684# CONFIG_SMSC911X is not set
676 685
677# 686#
678# Ethernet (1000 Mbit) 687# Ethernet (1000 Mbit)
@@ -801,7 +810,6 @@ CONFIG_WATCHDOG=y
801CONFIG_BFIN_WDT=y 810CONFIG_BFIN_WDT=y
802CONFIG_HW_RANDOM=y 811CONFIG_HW_RANDOM=y
803# CONFIG_GEN_RTC is not set 812# CONFIG_GEN_RTC is not set
804# CONFIG_BLACKFIN_DPMC is not set
805# CONFIG_DTLK is not set 813# CONFIG_DTLK is not set
806# CONFIG_R3964 is not set 814# CONFIG_R3964 is not set
807# CONFIG_RAW_DRIVER is not set 815# CONFIG_RAW_DRIVER is not set
diff --git a/arch/blackfin/configs/PNAV-10_defconfig b/arch/blackfin/configs/PNAV-10_defconfig
index a783ff69ace1..983ed181c896 100644
--- a/arch/blackfin/configs/PNAV-10_defconfig
+++ b/arch/blackfin/configs/PNAV-10_defconfig
@@ -1,6 +1,6 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.21.3 3# Linux kernel version: 2.6.21.5
4# 4#
5# CONFIG_MMU is not set 5# CONFIG_MMU is not set
6# CONFIG_FPU is not set 6# CONFIG_FPU is not set
@@ -114,17 +114,26 @@ CONFIG_PREEMPT_VOLUNTARY=y
114# CONFIG_BF534 is not set 114# CONFIG_BF534 is not set
115# CONFIG_BF536 is not set 115# CONFIG_BF536 is not set
116CONFIG_BF537=y 116CONFIG_BF537=y
117# CONFIG_BF542 is not set
118# CONFIG_BF544 is not set
119# CONFIG_BF548 is not set
120# CONFIG_BF549 is not set
117# CONFIG_BF561 is not set 121# CONFIG_BF561 is not set
122# CONFIG_BF_REV_0_0 is not set
118CONFIG_BF_REV_0_2=y 123CONFIG_BF_REV_0_2=y
119# CONFIG_BF_REV_0_3 is not set 124# CONFIG_BF_REV_0_3 is not set
120# CONFIG_BF_REV_0_4 is not set 125# CONFIG_BF_REV_0_4 is not set
121# CONFIG_BF_REV_0_5 is not set 126# CONFIG_BF_REV_0_5 is not set
127# CONFIG_BF_REV_ANY is not set
128# CONFIG_BF_REV_NONE is not set
129CONFIG_BF53x=y
122CONFIG_BFIN_SINGLE_CORE=y 130CONFIG_BFIN_SINGLE_CORE=y
123# CONFIG_BFIN533_EZKIT is not set 131# CONFIG_BFIN533_EZKIT is not set
124# CONFIG_BFIN533_STAMP is not set 132# CONFIG_BFIN533_STAMP is not set
125# CONFIG_BFIN537_STAMP is not set 133# CONFIG_BFIN537_STAMP is not set
126# CONFIG_BFIN533_BLUETECHNIX_CM is not set 134# CONFIG_BFIN533_BLUETECHNIX_CM is not set
127# CONFIG_BFIN537_BLUETECHNIX_CM is not set 135# CONFIG_BFIN537_BLUETECHNIX_CM is not set
136# CONFIG_BFIN548_EZKIT is not set
128# CONFIG_BFIN561_BLUETECHNIX_CM is not set 137# CONFIG_BFIN561_BLUETECHNIX_CM is not set
129# CONFIG_BFIN561_EZKIT is not set 138# CONFIG_BFIN561_EZKIT is not set
130# CONFIG_BFIN561_TEPLA is not set 139# CONFIG_BFIN561_TEPLA is not set
@@ -598,6 +607,7 @@ CONFIG_BFIN_MAC=y
598CONFIG_BFIN_TX_DESC_NUM=100 607CONFIG_BFIN_TX_DESC_NUM=100
599CONFIG_BFIN_RX_DESC_NUM=100 608CONFIG_BFIN_RX_DESC_NUM=100
600CONFIG_BFIN_MAC_RMII=y 609CONFIG_BFIN_MAC_RMII=y
610# CONFIG_SMSC911X is not set
601 611
602# 612#
603# Ethernet (1000 Mbit) 613# Ethernet (1000 Mbit)
@@ -746,7 +756,6 @@ CONFIG_CAN_BLACKFIN=m
746# CONFIG_WATCHDOG is not set 756# CONFIG_WATCHDOG is not set
747CONFIG_HW_RANDOM=y 757CONFIG_HW_RANDOM=y
748# CONFIG_GEN_RTC is not set 758# CONFIG_GEN_RTC is not set
749CONFIG_BLACKFIN_DPMC=y
750# CONFIG_DTLK is not set 759# CONFIG_DTLK is not set
751# CONFIG_R3964 is not set 760# CONFIG_R3964 is not set
752# CONFIG_RAW_DRIVER is not set 761# CONFIG_RAW_DRIVER is not set
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index 5b9b434c1ed9..83060f98d15d 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -307,10 +307,20 @@ void __init setup_arch(char **cmdline_p)
307 init_leds(); 307 init_leds();
308 308
309 printk(KERN_INFO "Blackfin support (C) 2004-2007 Analog Devices, Inc.\n"); 309 printk(KERN_INFO "Blackfin support (C) 2004-2007 Analog Devices, Inc.\n");
310 printk(KERN_INFO "Compiled for ADSP-%s Rev 0.%d\n", CPU, bfin_compiled_revid()); 310 if (bfin_compiled_revid() == 0xffff)
311 if (bfin_revid() != bfin_compiled_revid()) 311 printk(KERN_INFO "Compiled for ADSP-%s Rev any\n", CPU);
312 printk(KERN_ERR "Warning: Compiled for Rev %d, but running on Rev %d\n", 312 else if (bfin_compiled_revid() == -1)
313 bfin_compiled_revid(), bfin_revid()); 313 printk(KERN_INFO "Compiled for ADSP-%s Rev none\n", CPU);
314 else
315 printk(KERN_INFO "Compiled for ADSP-%s Rev 0.%d\n", CPU, bfin_compiled_revid());
316 if (bfin_revid() != bfin_compiled_revid()) {
317 if (bfin_compiled_revid() == -1)
318 printk(KERN_ERR "Warning: Compiled for Rev none, but running on Rev %d\n",
319 bfin_revid());
320 else if (bfin_compiled_revid() != 0xffff)
321 printk(KERN_ERR "Warning: Compiled for Rev %d, but running on Rev %d\n",
322 bfin_compiled_revid(), bfin_revid());
323 }
314 if (bfin_revid() < SUPPORTED_REVID) 324 if (bfin_revid() < SUPPORTED_REVID)
315 printk(KERN_ERR "Warning: Unsupported Chip Revision ADSP-%s Rev 0.%d detected\n", 325 printk(KERN_ERR "Warning: Unsupported Chip Revision ADSP-%s Rev 0.%d detected\n",
316 CPU, bfin_revid()); 326 CPU, bfin_revid());
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c
index aa660f32d8c8..56058b0b6d4a 100644
--- a/arch/blackfin/kernel/traps.c
+++ b/arch/blackfin/kernel/traps.c
@@ -545,7 +545,8 @@ void dump_bfin_regs(struct pt_regs *fp, void *retaddr)
545 545
546 if (current->mm) { 546 if (current->mm) {
547 printk(KERN_EMERG "TEXT = 0x%p-0x%p DATA = 0x%p-0x%p\n" 547 printk(KERN_EMERG "TEXT = 0x%p-0x%p DATA = 0x%p-0x%p\n"
548 "BSS = 0x%p-0x%p USER-STACK = 0x%p\n\n", 548 KERN_EMERG "BSS = 0x%p-0x%p USER-STACK = 0x%p\n"
549 KERN_EMERG "\n",
549 (void*)current->mm->start_code, 550 (void*)current->mm->start_code,
550 (void*)current->mm->end_code, 551 (void*)current->mm->end_code,
551 (void*)current->mm->start_data, 552 (void*)current->mm->start_data,
diff --git a/include/asm-blackfin/macros.h b/include/asm-blackfin/macros.h
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/include/asm-blackfin/macros.h
+++ /dev/null
diff --git a/include/asm-blackfin/processor.h b/include/asm-blackfin/processor.h
index aba2b30a8ed8..6bb3e0d4705d 100644
--- a/include/asm-blackfin/processor.h
+++ b/include/asm-blackfin/processor.h
@@ -124,6 +124,10 @@ static inline __attribute_pure__ uint32_t bfin_compiled_revid(void)
124 return 4; 124 return 4;
125#elif defined(CONFIG_BF_REV_0_5) 125#elif defined(CONFIG_BF_REV_0_5)
126 return 5; 126 return 5;
127#elif defined(CONFIG_BF_REV_ANY)
128 return 0xffff;
129#else
130 return -1;
127#endif 131#endif
128} 132}
129 133
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-22 12:34:46 -0500