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
This commit is contained in:
Linus Torvalds
Коммит
ca9c5ffd9d
|
|
@ -142,6 +142,12 @@ config BF_REV_0_5
|
|||
bool "0.5"
|
||||
depends on (BF561 || BF533 || BF532 || BF531)
|
||||
|
||||
config BF_REV_ANY
|
||||
bool "any"
|
||||
|
||||
config BF_REV_NONE
|
||||
bool "none"
|
||||
|
||||
endchoice
|
||||
|
||||
config BFIN_DUAL_CORE
|
||||
|
|
|
|||
|
|
@ -28,6 +28,27 @@ machine-$(CONFIG_BF561) := bf561
|
|||
MACHINE := $(machine-y)
|
||||
export MACHINE
|
||||
|
||||
cpu-$(CONFIG_BF531) := bf531
|
||||
cpu-$(CONFIG_BF532) := bf532
|
||||
cpu-$(CONFIG_BF533) := bf533
|
||||
cpu-$(CONFIG_BF534) := bf534
|
||||
cpu-$(CONFIG_BF536) := bf536
|
||||
cpu-$(CONFIG_BF537) := bf537
|
||||
cpu-$(CONFIG_BF548) := bf548
|
||||
cpu-$(CONFIG_BF549) := bf549
|
||||
cpu-$(CONFIG_BF561) := bf561
|
||||
|
||||
rev-$(CONFIG_BF_REV_0_0) := 0.0
|
||||
rev-$(CONFIG_BF_REV_0_1) := 0.1
|
||||
rev-$(CONFIG_BF_REV_0_2) := 0.2
|
||||
rev-$(CONFIG_BF_REV_0_3) := 0.3
|
||||
rev-$(CONFIG_BF_REV_0_4) := 0.4
|
||||
rev-$(CONFIG_BF_REV_0_5) := 0.5
|
||||
rev-$(CONFIG_BF_REV_NONE) := none
|
||||
rev-$(CONFIG_BF_REV_ANY) := any
|
||||
|
||||
CFLAGS += -mcpu=$(cpu-y)-$(rev-y)
|
||||
AFLAGS += -mcpu=$(cpu-y)-$(rev-y)
|
||||
|
||||
head-y := arch/$(ARCH)/mach-$(MACHINE)/head.o arch/$(ARCH)/kernel/init_task.o
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux kernel version: 2.6.21.3
|
||||
# Linux kernel version: 2.6.21.5
|
||||
#
|
||||
# CONFIG_MMU is not set
|
||||
# CONFIG_FPU is not set
|
||||
|
|
@ -115,17 +115,26 @@ CONFIG_BF533=y
|
|||
# CONFIG_BF534 is not set
|
||||
# CONFIG_BF536 is not set
|
||||
# CONFIG_BF537 is not set
|
||||
# CONFIG_BF542 is not set
|
||||
# CONFIG_BF544 is not set
|
||||
# CONFIG_BF548 is not set
|
||||
# CONFIG_BF549 is not set
|
||||
# CONFIG_BF561 is not set
|
||||
# CONFIG_BF_REV_0_0 is not set
|
||||
# CONFIG_BF_REV_0_2 is not set
|
||||
CONFIG_BF_REV_0_3=y
|
||||
# CONFIG_BF_REV_0_4 is not set
|
||||
# CONFIG_BF_REV_0_5 is not set
|
||||
# CONFIG_BF_REV_ANY is not set
|
||||
# CONFIG_BF_REV_NONE is not set
|
||||
CONFIG_BF53x=y
|
||||
CONFIG_BFIN_SINGLE_CORE=y
|
||||
CONFIG_BFIN533_EZKIT=y
|
||||
# CONFIG_BFIN533_STAMP is not set
|
||||
# CONFIG_BFIN537_STAMP is not set
|
||||
# CONFIG_BFIN533_BLUETECHNIX_CM is not set
|
||||
# CONFIG_BFIN537_BLUETECHNIX_CM is not set
|
||||
# CONFIG_BFIN548_EZKIT is not set
|
||||
# CONFIG_BFIN561_BLUETECHNIX_CM is not set
|
||||
# CONFIG_BFIN561_EZKIT is not set
|
||||
# CONFIG_BFIN561_TEPLA is not set
|
||||
|
|
@ -634,6 +643,7 @@ CONFIG_NETDEVICES=y
|
|||
CONFIG_NET_ETHERNET=y
|
||||
CONFIG_MII=y
|
||||
CONFIG_SMC91X=y
|
||||
# CONFIG_SMSC911X is not set
|
||||
|
||||
#
|
||||
# Ethernet (1000 Mbit)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux kernel version: 2.6.21.3
|
||||
# Linux kernel version: 2.6.21.5
|
||||
#
|
||||
# CONFIG_MMU is not set
|
||||
# CONFIG_FPU is not set
|
||||
|
|
@ -115,17 +115,26 @@ CONFIG_BF533=y
|
|||
# CONFIG_BF534 is not set
|
||||
# CONFIG_BF536 is not set
|
||||
# CONFIG_BF537 is not set
|
||||
# CONFIG_BF542 is not set
|
||||
# CONFIG_BF544 is not set
|
||||
# CONFIG_BF548 is not set
|
||||
# CONFIG_BF549 is not set
|
||||
# CONFIG_BF561 is not set
|
||||
# CONFIG_BF_REV_0_0 is not set
|
||||
# CONFIG_BF_REV_0_2 is not set
|
||||
CONFIG_BF_REV_0_3=y
|
||||
# CONFIG_BF_REV_0_4 is not set
|
||||
# CONFIG_BF_REV_0_5 is not set
|
||||
# CONFIG_BF_REV_ANY is not set
|
||||
# CONFIG_BF_REV_NONE is not set
|
||||
CONFIG_BF53x=y
|
||||
CONFIG_BFIN_SINGLE_CORE=y
|
||||
# CONFIG_BFIN533_EZKIT is not set
|
||||
CONFIG_BFIN533_STAMP=y
|
||||
# CONFIG_BFIN537_STAMP is not set
|
||||
# CONFIG_BFIN533_BLUETECHNIX_CM is not set
|
||||
# CONFIG_BFIN537_BLUETECHNIX_CM is not set
|
||||
# CONFIG_BFIN548_EZKIT is not set
|
||||
# CONFIG_BFIN561_BLUETECHNIX_CM is not set
|
||||
# CONFIG_BFIN561_EZKIT is not set
|
||||
# CONFIG_BFIN561_TEPLA is not set
|
||||
|
|
@ -646,6 +655,7 @@ CONFIG_NETDEVICES=y
|
|||
CONFIG_NET_ETHERNET=y
|
||||
CONFIG_MII=y
|
||||
CONFIG_SMC91X=y
|
||||
# CONFIG_SMSC911X is not set
|
||||
|
||||
#
|
||||
# Ethernet (1000 Mbit)
|
||||
|
|
@ -986,9 +996,17 @@ CONFIG_SND_VERBOSE_PROCFS=y
|
|||
#
|
||||
# ALSA Blackfin devices
|
||||
#
|
||||
# CONFIG_SND_BLACKFIN_AD1836 is not set
|
||||
# CONFIG_SND_BLACKFIN_AD1981B is not set
|
||||
# CONFIG_SND_BFIN_AD73311 is not set
|
||||
CONFIG_SND_BLACKFIN_AD1836=m
|
||||
CONFIG_SND_BLACKFIN_AD1836_TDM=y
|
||||
# CONFIG_SND_BLACKFIN_AD1836_I2S is not set
|
||||
CONFIG_SND_BLACKFIN_AD1836_MULSUB=y
|
||||
# CONFIG_SND_BLACKFIN_AD1836_5P1 is not set
|
||||
CONFIG_SND_BLACKFIN_AD1981B=m
|
||||
CONFIG_SND_BLACKFIN_SPORT=0
|
||||
CONFIG_SND_BLACKFIN_SPI_PFBIT=4
|
||||
CONFIG_SND_BFIN_AD73311=m
|
||||
CONFIG_SND_BFIN_SPORT=0
|
||||
CONFIG_SND_BFIN_AD73311_SE=4
|
||||
|
||||
#
|
||||
# SoC audio support
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux kernel version: 2.6.21.3
|
||||
# Linux kernel version: 2.6.21.5
|
||||
#
|
||||
# CONFIG_MMU is not set
|
||||
# CONFIG_FPU is not set
|
||||
|
|
@ -115,17 +115,26 @@ CONFIG_PREEMPT_VOLUNTARY=y
|
|||
# CONFIG_BF534 is not set
|
||||
# CONFIG_BF536 is not set
|
||||
CONFIG_BF537=y
|
||||
# CONFIG_BF542 is not set
|
||||
# CONFIG_BF544 is not set
|
||||
# CONFIG_BF548 is not set
|
||||
# CONFIG_BF549 is not set
|
||||
# CONFIG_BF561 is not set
|
||||
# CONFIG_BF_REV_0_0 is not set
|
||||
CONFIG_BF_REV_0_2=y
|
||||
# CONFIG_BF_REV_0_3 is not set
|
||||
# CONFIG_BF_REV_0_4 is not set
|
||||
# CONFIG_BF_REV_0_5 is not set
|
||||
# CONFIG_BF_REV_ANY is not set
|
||||
# CONFIG_BF_REV_NONE is not set
|
||||
CONFIG_BF53x=y
|
||||
CONFIG_BFIN_SINGLE_CORE=y
|
||||
# CONFIG_BFIN533_EZKIT is not set
|
||||
# CONFIG_BFIN533_STAMP is not set
|
||||
CONFIG_BFIN537_STAMP=y
|
||||
# CONFIG_BFIN533_BLUETECHNIX_CM is not set
|
||||
# CONFIG_BFIN537_BLUETECHNIX_CM is not set
|
||||
# CONFIG_BFIN548_EZKIT is not set
|
||||
# CONFIG_BFIN561_BLUETECHNIX_CM is not set
|
||||
# CONFIG_BFIN561_EZKIT is not set
|
||||
# CONFIG_BFIN561_TEPLA is not set
|
||||
|
|
@ -664,6 +673,7 @@ CONFIG_BFIN_MAC_USE_L1=y
|
|||
CONFIG_BFIN_TX_DESC_NUM=10
|
||||
CONFIG_BFIN_RX_DESC_NUM=20
|
||||
# CONFIG_BFIN_MAC_RMII is not set
|
||||
# CONFIG_SMSC911X is not set
|
||||
|
||||
#
|
||||
# Ethernet (1000 Mbit)
|
||||
|
|
@ -1020,9 +1030,17 @@ CONFIG_SND_VERBOSE_PROCFS=y
|
|||
#
|
||||
# ALSA Blackfin devices
|
||||
#
|
||||
# CONFIG_SND_BLACKFIN_AD1836 is not set
|
||||
# CONFIG_SND_BLACKFIN_AD1981B is not set
|
||||
# CONFIG_SND_BFIN_AD73311 is not set
|
||||
CONFIG_SND_BLACKFIN_AD1836=m
|
||||
CONFIG_SND_BLACKFIN_AD1836_TDM=y
|
||||
# CONFIG_SND_BLACKFIN_AD1836_I2S is not set
|
||||
CONFIG_SND_BLACKFIN_AD1836_MULSUB=y
|
||||
# CONFIG_SND_BLACKFIN_AD1836_5P1 is not set
|
||||
CONFIG_SND_BLACKFIN_AD1981B=m
|
||||
CONFIG_SND_BLACKFIN_SPORT=0
|
||||
CONFIG_SND_BLACKFIN_SPI_PFBIT=4
|
||||
CONFIG_SND_BFIN_AD73311=m
|
||||
CONFIG_SND_BFIN_SPORT=0
|
||||
CONFIG_SND_BFIN_AD73311_SE=4
|
||||
|
||||
#
|
||||
# SoC audio support
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux kernel version: 2.6.21.3
|
||||
# Linux kernel version: 2.6.21.5
|
||||
#
|
||||
# CONFIG_MMU is not set
|
||||
# CONFIG_FPU is not set
|
||||
|
|
@ -115,17 +115,25 @@ CONFIG_PREEMPT_VOLUNTARY=y
|
|||
# CONFIG_BF534 is not set
|
||||
# CONFIG_BF536 is not set
|
||||
# CONFIG_BF537 is not set
|
||||
# CONFIG_BF542 is not set
|
||||
# CONFIG_BF544 is not set
|
||||
# CONFIG_BF548 is not set
|
||||
# CONFIG_BF549 is not set
|
||||
CONFIG_BF561=y
|
||||
# CONFIG_BF_REV_0_0 is not set
|
||||
# CONFIG_BF_REV_0_2 is not set
|
||||
CONFIG_BF_REV_0_3=y
|
||||
# CONFIG_BF_REV_0_4 is not set
|
||||
# CONFIG_BF_REV_0_5 is not set
|
||||
# CONFIG_BF_REV_ANY is not set
|
||||
# CONFIG_BF_REV_NONE is not set
|
||||
CONFIG_BFIN_DUAL_CORE=y
|
||||
# CONFIG_BFIN533_EZKIT is not set
|
||||
# CONFIG_BFIN533_STAMP is not set
|
||||
# CONFIG_BFIN537_STAMP is not set
|
||||
# CONFIG_BFIN533_BLUETECHNIX_CM is not set
|
||||
# CONFIG_BFIN537_BLUETECHNIX_CM is not set
|
||||
# CONFIG_BFIN548_EZKIT is not set
|
||||
# CONFIG_BFIN561_BLUETECHNIX_CM is not set
|
||||
CONFIG_BFIN561_EZKIT=y
|
||||
# CONFIG_BFIN561_TEPLA is not set
|
||||
|
|
@ -673,6 +681,7 @@ CONFIG_NETDEVICES=y
|
|||
CONFIG_NET_ETHERNET=y
|
||||
CONFIG_MII=y
|
||||
CONFIG_SMC91X=y
|
||||
# CONFIG_SMSC911X is not set
|
||||
|
||||
#
|
||||
# Ethernet (1000 Mbit)
|
||||
|
|
@ -801,7 +810,6 @@ CONFIG_WATCHDOG=y
|
|||
CONFIG_BFIN_WDT=y
|
||||
CONFIG_HW_RANDOM=y
|
||||
# CONFIG_GEN_RTC is not set
|
||||
# CONFIG_BLACKFIN_DPMC is not set
|
||||
# CONFIG_DTLK is not set
|
||||
# CONFIG_R3964 is not set
|
||||
# CONFIG_RAW_DRIVER is not set
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux kernel version: 2.6.21.3
|
||||
# Linux kernel version: 2.6.21.5
|
||||
#
|
||||
# CONFIG_MMU is not set
|
||||
# CONFIG_FPU is not set
|
||||
|
|
@ -114,17 +114,26 @@ CONFIG_PREEMPT_VOLUNTARY=y
|
|||
# CONFIG_BF534 is not set
|
||||
# CONFIG_BF536 is not set
|
||||
CONFIG_BF537=y
|
||||
# CONFIG_BF542 is not set
|
||||
# CONFIG_BF544 is not set
|
||||
# CONFIG_BF548 is not set
|
||||
# CONFIG_BF549 is not set
|
||||
# CONFIG_BF561 is not set
|
||||
# CONFIG_BF_REV_0_0 is not set
|
||||
CONFIG_BF_REV_0_2=y
|
||||
# CONFIG_BF_REV_0_3 is not set
|
||||
# CONFIG_BF_REV_0_4 is not set
|
||||
# CONFIG_BF_REV_0_5 is not set
|
||||
# CONFIG_BF_REV_ANY is not set
|
||||
# CONFIG_BF_REV_NONE is not set
|
||||
CONFIG_BF53x=y
|
||||
CONFIG_BFIN_SINGLE_CORE=y
|
||||
# CONFIG_BFIN533_EZKIT is not set
|
||||
# CONFIG_BFIN533_STAMP is not set
|
||||
# CONFIG_BFIN537_STAMP is not set
|
||||
# CONFIG_BFIN533_BLUETECHNIX_CM is not set
|
||||
# CONFIG_BFIN537_BLUETECHNIX_CM is not set
|
||||
# CONFIG_BFIN548_EZKIT is not set
|
||||
# CONFIG_BFIN561_BLUETECHNIX_CM is not set
|
||||
# CONFIG_BFIN561_EZKIT is not set
|
||||
# CONFIG_BFIN561_TEPLA is not set
|
||||
|
|
@ -598,6 +607,7 @@ CONFIG_BFIN_MAC=y
|
|||
CONFIG_BFIN_TX_DESC_NUM=100
|
||||
CONFIG_BFIN_RX_DESC_NUM=100
|
||||
CONFIG_BFIN_MAC_RMII=y
|
||||
# CONFIG_SMSC911X is not set
|
||||
|
||||
#
|
||||
# Ethernet (1000 Mbit)
|
||||
|
|
@ -746,7 +756,6 @@ CONFIG_CAN_BLACKFIN=m
|
|||
# CONFIG_WATCHDOG is not set
|
||||
CONFIG_HW_RANDOM=y
|
||||
# CONFIG_GEN_RTC is not set
|
||||
CONFIG_BLACKFIN_DPMC=y
|
||||
# CONFIG_DTLK is not set
|
||||
# CONFIG_R3964 is not set
|
||||
# CONFIG_RAW_DRIVER is not set
|
||||
|
|
|
|||
|
|
@ -307,10 +307,20 @@ void __init setup_arch(char **cmdline_p)
|
|||
init_leds();
|
||||
|
||||
printk(KERN_INFO "Blackfin support (C) 2004-2007 Analog Devices, Inc.\n");
|
||||
printk(KERN_INFO "Compiled for ADSP-%s Rev 0.%d\n", CPU, bfin_compiled_revid());
|
||||
if (bfin_revid() != bfin_compiled_revid())
|
||||
printk(KERN_ERR "Warning: Compiled for Rev %d, but running on Rev %d\n",
|
||||
bfin_compiled_revid(), bfin_revid());
|
||||
if (bfin_compiled_revid() == 0xffff)
|
||||
printk(KERN_INFO "Compiled for ADSP-%s Rev any\n", CPU);
|
||||
else if (bfin_compiled_revid() == -1)
|
||||
printk(KERN_INFO "Compiled for ADSP-%s Rev none\n", CPU);
|
||||
else
|
||||
printk(KERN_INFO "Compiled for ADSP-%s Rev 0.%d\n", CPU, bfin_compiled_revid());
|
||||
if (bfin_revid() != bfin_compiled_revid()) {
|
||||
if (bfin_compiled_revid() == -1)
|
||||
printk(KERN_ERR "Warning: Compiled for Rev none, but running on Rev %d\n",
|
||||
bfin_revid());
|
||||
else if (bfin_compiled_revid() != 0xffff)
|
||||
printk(KERN_ERR "Warning: Compiled for Rev %d, but running on Rev %d\n",
|
||||
bfin_compiled_revid(), bfin_revid());
|
||||
}
|
||||
if (bfin_revid() < SUPPORTED_REVID)
|
||||
printk(KERN_ERR "Warning: Unsupported Chip Revision ADSP-%s Rev 0.%d detected\n",
|
||||
CPU, bfin_revid());
|
||||
|
|
|
|||
|
|
@ -545,7 +545,8 @@ void dump_bfin_regs(struct pt_regs *fp, void *retaddr)
|
|||
|
||||
if (current->mm) {
|
||||
printk(KERN_EMERG "TEXT = 0x%p-0x%p DATA = 0x%p-0x%p\n"
|
||||
"BSS = 0x%p-0x%p USER-STACK = 0x%p\n\n",
|
||||
KERN_EMERG "BSS = 0x%p-0x%p USER-STACK = 0x%p\n"
|
||||
KERN_EMERG "\n",
|
||||
(void*)current->mm->start_code,
|
||||
(void*)current->mm->end_code,
|
||||
(void*)current->mm->start_data,
|
||||
|
|
|
|||
|
|
@ -124,6 +124,10 @@ static inline __attribute_pure__ uint32_t bfin_compiled_revid(void)
|
|||
return 4;
|
||||
#elif defined(CONFIG_BF_REV_0_5)
|
||||
return 5;
|
||||
#elif defined(CONFIG_BF_REV_ANY)
|
||||
return 0xffff;
|
||||
#else
|
||||
return -1;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче