Commit 39710479 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: (96 commits)
  Blackfin: stop cleaning include/asm/asm-offsets.h
  Blackfin: scale calibration when cpu freq changes
  Blackfin: eat spurious space in asm/dpmc.h
  Blackfin: fix anomaly 283 handling with exact hardware error
  Blackfin: bf537-stamp: add example ADXL346 orientation resources
  Blackfin: bf537-stamp: add example AD2S1210 IIO resources
  Blackfin: don't support keypad wakeup from hibernate
  Blackfin: bf537-stamp: add example AD7416 IIO resources
  Blackfin: bf537-stamp: add example ADP8860 backlight/led resources
  Blackfin: bf537-stamp: add example AD7414 temp sensor resources
  Blackfin: rename AD1836 to AD183X in board files
  Blackfin: bf537-stamp: add example AD2S120x resources
  Blackfin: add support for the on-chip MAC status interrupts
  Blackfin: asm/page.h: pull in asm-generic headers
  Blackfin: mark gpio lib functions static
  Blackfin: bf537-stamp: add example ADAU1361 resources
  Blackfin: GPIO: implement to_irq handler
  Blackfin: bf537-stamp: add example ADP122/ADP150 power regulator resources
  Blackfin: bf537-stamp: add example AD2S90 resources
  Blackfin: bf537-stamp: add example AD5398 power regulator resources
  ...
parents 9d20593a eb63e5d1

arch/blackfin/Kconfig

+39 −42
Original line number Diff line number Diff line
@@ -23,12 +23,15 @@ config RWSEM_XCHGADD_ALGORITHM 


config BLACKFIN

	def_bool y

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_TRACEHOOK

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_TRACE_MCOUNT_TEST

	select HAVE_IDE

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_LZMA

	select HAVE_KERNEL_GZIP if RAMKERNEL

	select HAVE_KERNEL_BZIP2 if RAMKERNEL

	select HAVE_KERNEL_LZMA if RAMKERNEL

	select HAVE_OPROFILE

	select ARCH_WANT_OPTIONAL_GPIOLIB
@@ -45,9 +48,6 @@ config ZONE_DMA 
config GENERIC_FIND_NEXT_BIT

	def_bool y



config GENERIC_HWEIGHT

	def_bool y



config GENERIC_HARDIRQS

	def_bool y
@@ -239,7 +239,7 @@ endchoice 


config SMP

	depends on BF561

	select GENERIC_CLOCKEVENTS

	select TICKSOURCE_CORETMR

	bool "Symmetric multi-processing support"

	---help---

	  This enables support for systems with more than one CPU,
@@ -253,11 +253,20 @@ config NR_CPUS 
	depends on SMP

	default 2 if BF561



config HOTPLUG_CPU

	bool "Support for hot-pluggable CPUs"

	depends on SMP && HOTPLUG

	default y



config IRQ_PER_CPU

	bool

	depends on SMP

	default y



config HAVE_LEGACY_PER_CPU_AREA

	def_bool y

	depends on SMP



config BF_REV_MIN

	int

	default 0 if (BF51x || BF52x || (BF54x && !BF54xM))
@@ -349,7 +358,7 @@ config MEM_MT48LC8M32B2B5_7 


config MEM_MT48LC32M16A2TG_75

	bool

	depends on (BFIN527_EZKIT || BFIN532_IP0X || BLACKSTAMP)

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

	default y



config MEM_MT48LC32M8A2_75
@@ -401,10 +410,18 @@ config BOOT_LOAD 
config ROM_BASE

	hex "Kernel ROM Base"

	depends on ROMKERNEL

	default "0x20040000"

	default "0x20040040"

	range 0x20000000 0x20400000 if !(BF54x || BF561)

	range 0x20000000 0x30000000 if (BF54x || BF561)

	help

	  Make sure your ROM base does not include any file-header

	  information that is prepended to the kernel.



	  For example, the bootable U-Boot format (created with

	  mkimage) has a 64 byte header (0x40).  So while the image

	  you write to flash might start at say 0x20080000, you have

	  to add 0x40 to get the kernel's ROM base as it will come

	  after the header.



comment "Clock/PLL Setup"
@@ -448,7 +465,7 @@ config VCO_MULT 
	range 1 64

	default "22" if BFIN533_EZKIT

	default "45" if BFIN533_STAMP

	default "20" if (BFIN537_STAMP || BFIN527_EZKIT || BFIN548_EZKIT || BFIN548_BLUETECHNIX_CM || BFIN538_EZKIT)

	default "20" if (BFIN537_STAMP || BFIN527_EZKIT || BFIN527_EZKIT_V2 || BFIN548_EZKIT || BFIN548_BLUETECHNIX_CM || BFIN538_EZKIT)

	default "22" if BFIN533_BLUETECHNIX_CM

	default "20" if (BFIN537_BLUETECHNIX_CM_E || BFIN537_BLUETECHNIX_CM_U || BFIN527_BLUETECHNIX_CM || BFIN561_BLUETECHNIX_CM)

	default "20" if BFIN561_EZKIT
@@ -609,23 +626,23 @@ config GENERIC_CLOCKEVENTS 
	bool "Generic clock events"

	default y



choice

	prompt "Kernel Tick Source"

menu "Clock event device"

	depends on GENERIC_CLOCKEVENTS

	default TICKSOURCE_CORETMR



config TICKSOURCE_GPTMR0

	bool "Gptimer0 (SCLK domain)"

	bool "GPTimer0"

	depends on !SMP

	select BFIN_GPTIMERS



config TICKSOURCE_CORETMR

	bool "Core timer (CCLK domain)"



endchoice

	bool "Core timer"

	default y

endmenu



config CYCLES_CLOCKSOURCE

	bool "Use 'CYCLES' as a clocksource"

menu "Clock souce"

	depends on GENERIC_CLOCKEVENTS

config CYCLES_CLOCKSOURCE

	bool "CYCLES"

	default y

	depends on !BFIN_SCRATCH_REG_CYCLES

	depends on !SMP

	help
@@ -636,10 +653,10 @@ config CYCLES_CLOCKSOURCE 
	  writing the registers will most likely crash the kernel.



config GPTMR0_CLOCKSOURCE

	bool "Use GPTimer0 as a clocksource"

	bool "GPTimer0"

	select BFIN_GPTIMERS

	depends on GENERIC_CLOCKEVENTS

	depends on !TICKSOURCE_GPTMR0

endmenu



config ARCH_USES_GETTIMEOFFSET

	depends on !GENERIC_CLOCKEVENTS
@@ -1116,24 +1133,6 @@ config PCI 


source "drivers/pci/Kconfig"



config HOTPLUG

	bool "Support for hot-pluggable device"

	  help

	  Say Y here if you want to plug devices into your computer while

	  the system is running, and be able to use them quickly.  In many

	  cases, the devices can likewise be unplugged at any time too.



	  One well known example of this is PCMCIA- or PC-cards, credit-card

	  size devices such as network cards, modems or hard drives which are

	  plugged into slots found on all modern laptop computers.  Another

	  example, used on modern desktops as well as laptops, is USB.



	  Enable HOTPLUG and build a modular kernel.  Get agent software

	  (from <http://linux-hotplug.sourceforge.net/>) and install it.

	  Then your kernel will automatically call out to a user mode "policy

	  agent" (/sbin/hotplug) to load modules and set up software needed

	  to use devices as you hotplug them.



source "drivers/pcmcia/Kconfig"



source "drivers/pci/hotplug/Kconfig"
@@ -1147,7 +1146,6 @@ source "fs/Kconfig.binfmt" 
endmenu



menu "Power management options"

	depends on !SMP



source "kernel/power/Kconfig"
@@ -1240,7 +1238,6 @@ config PM_BFIN_WAKE_GP 
endmenu



menu "CPU Frequency scaling"

	depends on !SMP



source "drivers/cpufreq/Kconfig"

arch/blackfin/Kconfig.debug

+9 −3
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@ config DEBUG_STACK_USAGE 


	  This option will slow down process creation somewhat.



config HAVE_ARCH_KGDB

	def_bool y



config DEBUG_VERBOSE

	bool "Verbose fault messages"

	default y
@@ -238,6 +235,15 @@ config EARLY_PRINTK 
	  all of this lives in the init section and is thrown away after the

	  kernel boots completely.



config NMI_WATCHDOG

	bool "Enable NMI watchdog to help debugging lockup on SMP"

	default n

	depends on (SMP && !BFIN_SCRATCH_REG_RETN)

	help

	  If any CPU in the system does not execute the period local timer

	  interrupt for more than 5 seconds, then the NMI handler dumps debug

	  information. This information can be used to debug the lockup.



config CPLB_INFO

	bool "Display the CPLB information"

	help

arch/blackfin/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ OBJCOPYFLAGS := -O binary -R .note -R .comment -S 
GZFLAGS          := -9



KBUILD_CFLAGS           += $(call cc-option,-mno-fdpic)

ifeq ($(CONFIG_ROMKERNEL),y)

KBUILD_CFLAGS           += -mlong-calls

endif

KBUILD_AFLAGS           += $(call cc-option,-mno-fdpic)

CFLAGS_MODULE    += -mlong-calls

LDFLAGS_MODULE   += -m elf32bfin
@@ -130,7 +133,6 @@ KBUILD_CFLAGS += -Iarch/$(ARCH)/mach-$(MACHINE)/include 
KBUILD_CPPFLAGS	+= $(patsubst %,-I$(srctree)/%include,$(machdirs))



CLEAN_FILES += \

	arch/$(ARCH)/include/asm/asm-offsets.h \

	arch/$(ARCH)/kernel/asm-offsets.s \



archclean:
@@ -138,7 +140,7 @@ archclean: 


INSTALL_PATH ?= /tftpboot

boot := arch/$(ARCH)/boot

BOOT_TARGETS = vmImage vmImage.bin vmImage.bz2 vmImage.gz vmImage.lzma

BOOT_TARGETS = vmImage vmImage.bin vmImage.bz2 vmImage.gz vmImage.lzma vmImage.xip

PHONY += $(BOOT_TARGETS) install

KBUILD_IMAGE := $(boot)/vmImage
@@ -156,6 +158,7 @@ define archhelp 
  echo  '  vmImage.bz2     - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.bz2)'

  echo  '* vmImage.gz      - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.gz)'

  echo  '  vmImage.lzma    - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.lzma)'

  echo  '  vmImage.xip     - XIP Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.xip)'

  echo  '  install         - Install kernel using'

  echo  '                     (your) ~/bin/$(INSTALLKERNEL) or'

  echo  '                     (distribution) PATH: $(INSTALLKERNEL) or'

arch/blackfin/boot/Makefile

+19 −4
Original line number Diff line number Diff line
@@ -8,14 +8,18 @@ 


MKIMAGE := $(srctree)/scripts/mkuboot.sh



targets := vmImage vmImage.bin vmImage.bz2 vmImage.gz vmImage.lzma

extra-y += vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma

targets := vmImage vmImage.bin vmImage.bz2 vmImage.gz vmImage.lzma vmImage.xip

extra-y += vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma vmlinux.bin.xip



UIMAGE_OPTS-y :=

UIMAGE_OPTS-$(CONFIG_RAMKERNEL) += -a $(CONFIG_BOOT_LOAD)

UIMAGE_OPTS-$(CONFIG_ROMKERNEL) += -a $(CONFIG_ROM_BASE) -x



quiet_cmd_uimage = UIMAGE  $@

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

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

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

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

                   -d $< $@

                   $(UIMAGE_OPTS-y) -d $< $@



$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)
@@ -29,6 +33,12 @@ $(obj)/vmlinux.bin.bz2: $(obj)/vmlinux.bin FORCE 
$(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE

	$(call if_changed,lzma)



# The mkimage tool wants 64bytes prepended to the image

quiet_cmd_mk_bin_xip = BIN     $@

      cmd_mk_bin_xip = ( printf '%64s' | tr ' ' '\377' ; cat $< ) > $@

$(obj)/vmlinux.bin.xip: $(obj)/vmlinux.bin FORCE

	$(call if_changed,mk_bin_xip)



$(obj)/vmImage.bin: $(obj)/vmlinux.bin

	$(call if_changed,uimage,none)
@@ -41,10 +51,15 @@ $(obj)/vmImage.gz: $(obj)/vmlinux.bin.gz 
$(obj)/vmImage.lzma: $(obj)/vmlinux.bin.lzma

	$(call if_changed,uimage,lzma)



$(obj)/vmImage.xip: $(obj)/vmlinux.bin.xip

	$(call if_changed,uimage,none)



suffix-y                      := bin

suffix-$(CONFIG_KERNEL_GZIP)  := gz

suffix-$(CONFIG_KERNEL_BZIP2) := bz2

suffix-$(CONFIG_KERNEL_LZMA)  := lzma

suffix-$(CONFIG_ROMKERNEL)    := xip



$(obj)/vmImage: $(obj)/vmImage.$(suffix-y)

	@ln -sf $(notdir $<) $@

CRA Git | Maintained and supported by SUSTech CRA and CCSE