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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (27 commits)
  Blackfin: fix dma-mapping build errors
  Blackfin: hook up new perf_counter_open syscall
  Blackfin: drop BF535-specific text for exception 0x2A (unaligned instruction)
  Blackfin: fix early crash when booting on wrong cpu
  Blackfin: fix GPTMR0_CLOCKSOURCE dependency on BFIN_GPTIMERS
  Blackfin: drop unused ISP1760 port1_disable from board resources
  Blackfin: bf526-ezbrd: handle different SDRAM chips
  Blackfin: fix typo in TRAS define in mem_init.h header
  Blackfin: unify memory map headers
  Blackfin: stick the CPU name into boot image name
  Blackfin: update defconfigs
  Blackfin: decouple unrelated cache settings to get exact behavior
  Blackfin: update I-pipe patch level
  Blackfin: remove obsolete mcount support from I-pipe code
  Blackfin: allow CONFIG_TICKSOURCE_GPTMR0 with interrupt pipeline
  Blackfin: convert interrupt pipeline to irqflags
  Blackfin: allow people to select BF51x-0.1 silicon rev
  Blackfin: bf526-ezbrd: set SPI flash resources to SST device
  Blackfin: fix accidental reset in some boot modes
  Blackfin: abstract irq14 lowering in do_irq
  ...
parents 687d6809 42b86e06

arch/blackfin/Kconfig

+47 −21
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ config BF_REV_0_0 


config BF_REV_0_1

	bool "0.1"

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

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



config BF_REV_0_2

	bool "0.2"
@@ -358,7 +358,7 @@ config MEM_MT48LC8M32B2B5_7 


config MEM_MT48LC32M16A2TG_75

	bool

	depends on (BFIN527_EZKIT || BFIN532_IP0X || BLACKSTAMP || BFIN526_EZBRD)

	depends on (BFIN527_EZKIT || BFIN532_IP0X || BLACKSTAMP)

	default y



config MEM_MT48LC32M8A2_75
@@ -366,6 +366,11 @@ config MEM_MT48LC32M8A2_75 
	depends on (BFIN518F_EZBRD)

	default y



config MEM_MT48H32M16LFCJ_75

	bool

	depends on (BFIN526_EZBRD)

	default y



source "arch/blackfin/mach-bf518/Kconfig"

source "arch/blackfin/mach-bf527/Kconfig"

source "arch/blackfin/mach-bf533/Kconfig"
@@ -623,7 +628,6 @@ choice 
config TICKSOURCE_GPTMR0

	bool "Gptimer0 (SCLK domain)"

	select BFIN_GPTIMERS

	depends on !IPIPE



config TICKSOURCE_CORETMR

	bool "Core timer (CCLK domain)"
@@ -644,6 +648,7 @@ config CYCLES_CLOCKSOURCE 


config GPTMR0_CLOCKSOURCE

	bool "Use GPTimer0 as a clocksource (higher rating)"

	select BFIN_GPTIMERS

	depends on GENERIC_CLOCKEVENTS

	depends on !TICKSOURCE_GPTMR0
@@ -908,23 +913,41 @@ endchoice 




comment "Cache Support"



config BFIN_ICACHE

	bool "Enable ICACHE"

	default y

config BFIN_ICACHE_LOCK

	bool "Enable Instruction Cache Locking"

	depends on BFIN_ICACHE

	default n

config BFIN_EXTMEM_ICACHEABLE

	bool "Enable ICACHE for external memory"

	depends on BFIN_ICACHE

	default y

config BFIN_L2_ICACHEABLE

	bool "Enable ICACHE for L2 SRAM"

	depends on BFIN_ICACHE

	depends on BF54x || BF561

	default n



config BFIN_DCACHE

	bool "Enable DCACHE"

	default y

config BFIN_DCACHE_BANKA

	bool "Enable only 16k BankA DCACHE - BankB is SRAM"

	depends on BFIN_DCACHE && !BF531

	default n

config BFIN_ICACHE_LOCK

	bool "Enable Instruction Cache Locking"



choice

	prompt "External memory cache policy"

config BFIN_EXTMEM_DCACHEABLE

	bool "Enable DCACHE for external memory"

	depends on BFIN_DCACHE

	default BFIN_WB if !SMP

	default BFIN_WT if SMP

config BFIN_WB

	default y

choice

	prompt "External memory DCACHE policy"

	depends on BFIN_EXTMEM_DCACHEABLE

	default BFIN_EXTMEM_WRITEBACK if !SMP

	default BFIN_EXTMEM_WRITETHROUGH if SMP

config BFIN_EXTMEM_WRITEBACK

	bool "Write back"

	depends on !SMP

	help
@@ -942,7 +965,7 @@ config BFIN_WB 
	  If you are unsure of the options and you want to be safe,

	  then go with Write Through.



config BFIN_WT

config BFIN_EXTMEM_WRITETHROUGH

	bool "Write through"

	help

	  Write Back Policy:
@@ -961,23 +984,26 @@ config BFIN_WT 


endchoice



config BFIN_L2_DCACHEABLE

	bool "Enable DCACHE for L2 SRAM"

	depends on BFIN_DCACHE

	depends on BF54x || BF561

	default n

choice

	prompt "L2 SRAM cache policy"

	depends on (BF54x || BF561)

	default BFIN_L2_WT

config BFIN_L2_WB

	prompt "L2 SRAM DCACHE policy"

	depends on BFIN_L2_DCACHEABLE

	default BFIN_L2_WRITEBACK

config BFIN_L2_WRITEBACK

	bool "Write back"

	depends on !SMP



config BFIN_L2_WT

config BFIN_L2_WRITETHROUGH

	bool "Write through"

	depends on !SMP



config BFIN_L2_NOT_CACHED

	bool "Not cached"



endchoice





comment "Memory Protection Unit"

config MPU

	bool "Enable the memory protection unit (EXPERIMENTAL)"

	default n

arch/blackfin/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ extra-y += vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma 


quiet_cmd_uimage = UIMAGE  $@

      cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A $(ARCH) -O linux -T kernel \

                   -C $(2) -n 'Linux-$(KERNELRELEASE)' -a $(CONFIG_BOOT_LOAD) \

                   -C $(2) -n '$(MACHINE)-$(KERNELRELEASE)' -a $(CONFIG_BOOT_LOAD) \

                   -e $(shell $(NM) vmlinux | awk '$$NF == "__start" {print $$1}') \

                   -d $< $@

arch/blackfin/configs/BF518F-EZBRD_defconfig

+15 −9
Original line number Diff line number Diff line
@@ -326,11 +326,17 @@ CONFIG_DMA_UNCACHED_1M=y 
# Cache Support

#

CONFIG_BFIN_ICACHE=y

# CONFIG_BFIN_ICACHE_LOCK is not set

CONFIG_BFIN_DCACHE=y

# CONFIG_BFIN_DCACHE_BANKA is not set

# CONFIG_BFIN_ICACHE_LOCK is not set

CONFIG_BFIN_WB=y

# CONFIG_BFIN_WT is not set

CONFIG_BFIN_EXTMEM_ICACHEABLE=y

CONFIG_BFIN_EXTMEM_DCACHEABLE=y

CONFIG_BFIN_EXTMEM_WRITEBACK=y

# CONFIG_BFIN_EXTMEM_WRITETHROUGH is not set



#

# Memory Protection Unit

#

# CONFIG_MPU is not set



#
@@ -413,11 +419,11 @@ CONFIG_IP_PNP=y 
# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_XFRM_TUNNEL is not set

# CONFIG_INET_TUNNEL is not set

CONFIG_INET_XFRM_MODE_TRANSPORT=y

CONFIG_INET_XFRM_MODE_TUNNEL=y

CONFIG_INET_XFRM_MODE_BEET=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

CONFIG_INET_DIAG=y

# CONFIG_INET_DIAG is not set

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_CUBIC=y
@@ -916,7 +922,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y 
# CONFIG_MMC_SDHCI is not set

CONFIG_SDH_BFIN=m

CONFIG_SDH_BFIN_MISSING_CMD_PULLUP_WORKAROUND=y

CONFIG_SDH_BFIN_ENABLE_SDIO_IRQ=y

# CONFIG_SDH_BFIN_ENABLE_SDIO_IRQ is not set

# CONFIG_MMC_SPI is not set

# CONFIG_MEMSTICK is not set

# CONFIG_NEW_LEDS is not set
@@ -1147,7 +1153,7 @@ CONFIG_SCHED_DEBUG=y 
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set

# CONFIG_DEBUG_KOBJECT is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_DEBUG_BUGVERBOSE=y

CONFIG_DEBUG_INFO=y

# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_WRITECOUNT is not set

arch/blackfin/configs/BF526-EZBRD_defconfig

+12 −10
Original line number Diff line number Diff line
@@ -331,16 +331,18 @@ CONFIG_DMA_UNCACHED_1M=y 
# Cache Support

#

CONFIG_BFIN_ICACHE=y

# CONFIG_BFIN_ICACHE_LOCK is not set

CONFIG_BFIN_DCACHE=y

# CONFIG_BFIN_DCACHE_BANKA is not set

# CONFIG_BFIN_ICACHE_LOCK is not set

CONFIG_BFIN_WB=y

# CONFIG_BFIN_WT is not set

# CONFIG_MPU is not set

CONFIG_BFIN_EXTMEM_ICACHEABLE=y

CONFIG_BFIN_EXTMEM_DCACHEABLE=y

CONFIG_BFIN_EXTMEM_WRITEBACK=y

# CONFIG_BFIN_EXTMEM_WRITETHROUGH is not set



#

# Asynchonous Memory Configuration

# Memory Protection Unit

#

# CONFIG_MPU is not set



#

# EBIU_AMGCTL Global Control
@@ -418,11 +420,11 @@ CONFIG_IP_PNP=y 
# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_XFRM_TUNNEL is not set

# CONFIG_INET_TUNNEL is not set

CONFIG_INET_XFRM_MODE_TRANSPORT=y

CONFIG_INET_XFRM_MODE_TUNNEL=y

CONFIG_INET_XFRM_MODE_BEET=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

CONFIG_INET_DIAG=y

# CONFIG_INET_DIAG is not set

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_CUBIC=y
@@ -1424,7 +1426,7 @@ CONFIG_SCHED_DEBUG=y 
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set

# CONFIG_DEBUG_KOBJECT is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_DEBUG_BUGVERBOSE=y

CONFIG_DEBUG_INFO=y

# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_WRITECOUNT is not set

arch/blackfin/configs/BF527-EZKIT_defconfig

+14 −8
Original line number Diff line number Diff line
@@ -331,11 +331,17 @@ CONFIG_DMA_UNCACHED_1M=y 
# Cache Support

#

CONFIG_BFIN_ICACHE=y

# CONFIG_BFIN_ICACHE_LOCK is not set

CONFIG_BFIN_DCACHE=y

# CONFIG_BFIN_DCACHE_BANKA is not set

# CONFIG_BFIN_ICACHE_LOCK is not set

CONFIG_BFIN_WB=y

# CONFIG_BFIN_WT is not set

CONFIG_BFIN_EXTMEM_ICACHEABLE=y

CONFIG_BFIN_EXTMEM_DCACHEABLE=y

CONFIG_BFIN_EXTMEM_WRITEBACK=y

# CONFIG_BFIN_EXTMEM_WRITETHROUGH is not set



#

# Memory Protection Unit

#

# CONFIG_MPU is not set



#
@@ -418,11 +424,11 @@ CONFIG_IP_PNP=y 
# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_XFRM_TUNNEL is not set

# CONFIG_INET_TUNNEL is not set

CONFIG_INET_XFRM_MODE_TRANSPORT=y

CONFIG_INET_XFRM_MODE_TUNNEL=y

CONFIG_INET_XFRM_MODE_BEET=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

CONFIG_INET_DIAG=y

# CONFIG_INET_DIAG is not set

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_CUBIC=y
@@ -1505,7 +1511,7 @@ CONFIG_SCHED_DEBUG=y 
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set

# CONFIG_DEBUG_KOBJECT is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_DEBUG_BUGVERBOSE=y

CONFIG_DEBUG_INFO=y

# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_WRITECOUNT is not set

CRA Git | Maintained and supported by SUSTech CRA and CCSE