Commit 8d6cea51 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: hook up new rt_tgsigqueueinfo syscall
  Blackfin: improve CLKIN_HZ config default
  Blackfin: initial support for ftrace grapher
  Blackfin: initial support for ftrace
  Blackfin: enable support for LOCKDEP
  Blackfin: add preliminary support for STACKTRACE
  Blackfin: move custom sections into sections.h
  Blackfin: punt unused/wrong mutex-dec.h
  Blackfin: add support for irqflags
  Blackfin: add support for bzip2/lzma compressed kernel images
  Blackfin: convert Kconfig style to def_bool
  Blackfin: bf548-ezkit: update smsc911x resources
  Blackfin: update aedos-ipipe code to upstream 1.10-00
  Blackfin: bf537-stamp: update ADP5520 resources
  Blackfin: bf518f-ezbrd: fix SPI CS for SPI flash
  Blackfin: define SPI IRQ in board resources
  Blackfin: do not configure the UART early if on wrong processor
  Blackfin: fix deadlock in SMP IPI handler
  Blackfin: fix flag storage for irq funcs
  Blackfin: push down exception oops checking
  ...
parents 6a454f71 61cdd7a2

arch/blackfin/Kconfig

+33 −27
Original line number Diff line number Diff line
@@ -6,59 +6,65 @@ 
mainmenu "Blackfin Kernel Configuration"



config MMU

	bool

	default n

	def_bool n



config FPU

	bool

	default n

	def_bool n



config RWSEM_GENERIC_SPINLOCK

	bool

	default y

	def_bool y



config RWSEM_XCHGADD_ALGORITHM

	bool

	default n

	def_bool n



config BLACKFIN

	bool

	default y

	def_bool y

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_TRACER

	select HAVE_IDE

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_LZMA

	select HAVE_OPROFILE

	select ARCH_WANT_OPTIONAL_GPIOLIB



config GENERIC_BUG

	def_bool y

	depends on BUG



config ZONE_DMA

	bool

	default y

	def_bool y



config GENERIC_FIND_NEXT_BIT

	bool

	default y

	def_bool y



config GENERIC_HWEIGHT

	bool

	default y

	def_bool y



config GENERIC_HARDIRQS

	bool

	default y

	def_bool y



config GENERIC_IRQ_PROBE

	bool

	default y

	def_bool y



config GENERIC_GPIO

	bool

	default y

	def_bool y



config FORCE_MAX_ZONEORDER

	int

	default "14"



config GENERIC_CALIBRATE_DELAY

	bool

	default y

	def_bool y



config LOCKDEP_SUPPORT

	def_bool y



config STACKTRACE_SUPPORT

	def_bool y



config TRACE_IRQFLAGS_SUPPORT

	def_bool y



source "init/Kconfig"
@@ -408,12 +414,12 @@ comment "Clock/PLL Setup" 


config CLKIN_HZ

	int "Frequency of the crystal on the board in Hz"

	default "10000000" if BFIN532_IP0X

	default "11059200" if BFIN533_STAMP

	default "24576000" if PNAV10

	default "25000000" # most people use this

	default "27000000" if BFIN533_EZKIT

	default "25000000" if (BFIN537_STAMP || BFIN527_EZKIT || H8606_HVSISTEMAS || BLACKSTAMP || BFIN526_EZBRD || BFIN538_EZKIT || BFIN518F-EZBRD)

	default "30000000" if BFIN561_EZKIT

	default "24576000" if PNAV10

	default "10000000" if BFIN532_IP0X

	help

	  The frequency of CLKIN crystal oscillator on the board in Hz.

	  Warning: This value should match the crystal on the board. Otherwise,

arch/blackfin/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ archclean: 


INSTALL_PATH ?= /tftpboot

boot := arch/$(ARCH)/boot

BOOT_TARGETS = vmImage

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

PHONY += $(BOOT_TARGETS) install

KBUILD_IMAGE := $(boot)/vmImage
@@ -150,7 +150,10 @@ install: 
	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install



define archhelp

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

  echo  '* vmImage         - Alias to selected kernel format (vmImage.gz by default)'

  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  '  install         - Install kernel using'

  echo  '                     (your) ~/bin/$(CROSS_COMPILE)installkernel or'

  echo  '                     (distribution) PATH: $(CROSS_COMPILE)installkernel or'

arch/blackfin/boot/.gitignore

+2 −1
Original line number Diff line number Diff line 
+vmImage
 
vmImage*

vmlinux*

arch/blackfin/boot/Makefile

+24 −7
Original line number Diff line number Diff line
@@ -8,24 +8,41 @@ 


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



targets := vmImage

extra-y += vmlinux.bin vmlinux.gz

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

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 gzip -n 'Linux-$(KERNELRELEASE)' -a $(CONFIG_BOOT_LOAD) \

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

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

                   -d $< $@



$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)



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

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

	$(call if_changed,gzip)



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

	$(call if_changed,uimage)

	@$(kecho) 'Kernel: $@ is ready'

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

	$(call if_changed,bzip2)



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

	$(call if_changed,lzma)



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

	$(call if_changed,uimage,bzip2)



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

	$(call if_changed,uimage,gzip)



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

	$(call if_changed,uimage,lzma)



suffix-$(CONFIG_KERNEL_GZIP)  := gz

suffix-$(CONFIG_KERNEL_BZIP2) := bz2

suffix-$(CONFIG_KERNEL_LZMA)  := lzma

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

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



install:

	sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)"

arch/blackfin/include/asm/atomic.h

+8 −8
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static inline int atomic_test_mask(int mask, atomic_t *v) 


static inline void atomic_add(int i, atomic_t *v)

{

	long flags;

	unsigned long flags;



	local_irq_save_hw(flags);

	v->counter += i;
@@ -99,7 +99,7 @@ static inline void atomic_add(int i, atomic_t *v) 


static inline void atomic_sub(int i, atomic_t *v)

{

	long flags;

	unsigned long flags;



	local_irq_save_hw(flags);

	v->counter -= i;
@@ -110,7 +110,7 @@ static inline void atomic_sub(int i, atomic_t *v) 
static inline int atomic_add_return(int i, atomic_t *v)

{

	int __temp = 0;

	long flags;

	unsigned long flags;



	local_irq_save_hw(flags);

	v->counter += i;
@@ -124,7 +124,7 @@ static inline int atomic_add_return(int i, atomic_t *v) 
static inline int atomic_sub_return(int i, atomic_t *v)

{

	int __temp = 0;

	long flags;

	unsigned long flags;



	local_irq_save_hw(flags);

	v->counter -= i;
@@ -136,7 +136,7 @@ static inline int atomic_sub_return(int i, atomic_t *v) 


static inline void atomic_inc(volatile atomic_t *v)

{

	long flags;

	unsigned long flags;



	local_irq_save_hw(flags);

	v->counter++;
@@ -145,7 +145,7 @@ static inline void atomic_inc(volatile atomic_t *v) 


static inline void atomic_dec(volatile atomic_t *v)

{

	long flags;

	unsigned long flags;



	local_irq_save_hw(flags);

	v->counter--;
@@ -154,7 +154,7 @@ static inline void atomic_dec(volatile atomic_t *v) 


static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)

{

	long flags;

	unsigned long flags;



	local_irq_save_hw(flags);

	v->counter &= ~mask;
@@ -163,7 +163,7 @@ static inline void atomic_clear_mask(unsigned int mask, atomic_t *v) 


static inline void atomic_set_mask(unsigned int mask, atomic_t *v)

{

	long flags;

	unsigned long flags;



	local_irq_save_hw(flags);

	v->counter |= mask;

CRA Git | Maintained and supported by SUSTech CRA and CCSE