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

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

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
  Blackfin arch: update boards files
  Blackfin arch: dma add some API and cleanup bf54x DMA definition
  Blackfin arch: cleanup and promote the general purpose timers api to a core blackfin component
  Blackfin arch: add a cheesy install target
  Blackfin arch: add functions for converting between sclks and usecs
  Blackfin arch: add assembly function for doing 64bit unsigned division
  Blackfin arch: -mno-fdpic works
  Blackfin arch: use "char bfin_board_name[]" rather than "char *bfin_board_name" per discussion on lkml as the former uses less storage
  Blackfin arch: Fixing Bug: balance calls to get_task_mm with corresponding mmput calls
  Blackfin serial driver Kconfig: depend on DMA not being enabled rather than a specific DMA size
  Blackfin arch: Fix bug: missing CHIPID register field definition of BF54x
  Blackfin arch: Fix up /proc/cpuinfo so it is like everyone else
  Blackfin arch: Optimization - no need to make additional math here
  Blackfin arch: force irq_flags into the .data section
  Blackfin arch BF548 defconfig: enable watchdog by default
  Blackfin arch: add new processor ADSP-BF52x arch/mach support
parents 2fb59d62 d4b1d273

arch/blackfin/Kconfig

+55 −6
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ config GENERIC_CALIBRATE_DELAY 


config IRQCHIP_DEMUX_GPIO

	bool

	depends on (BF53x || BF561 || BF54x)

	depends on (BF52x || BF53x || BF561 || BF54x)

	default y



source "init/Kconfig"
@@ -85,6 +85,21 @@ choice 
	prompt "CPU"

	default BF533



config BF522

	bool "BF522"

	help

	  BF522 Processor Support.



config BF525

	bool "BF525"

	help

	  BF525 Processor Support.



config BF527

	bool "BF527"

	help

	  BF527 Processor Support.



config BF531

	bool "BF531"

	help
@@ -144,13 +159,18 @@ endchoice 


choice

	prompt "Silicon Rev"

	default BF_REV_0_1 if BF527

	default BF_REV_0_2 if BF537

	default BF_REV_0_3 if BF533

	default BF_REV_0_0 if BF549



config BF_REV_0_0

	bool "0.0"

	depends on (BF549)

	depends on (BF549 || BF527)



config BF_REV_0_1

	bool "0.2"

	depends on (BF549 || BF527)



config BF_REV_0_2

	bool "0.2"
@@ -176,6 +196,11 @@ config BF_REV_NONE 


endchoice



config BF52x

	bool

	depends on (BF522 || BF525 || BF527)

	default y



config BF53x

	bool

	depends on (BF531 || BF532 || BF533 || BF534 || BF536 || BF537)
@@ -204,6 +229,12 @@ choice 
	  configuration to ensure that all the other settings are

	  correct.



config BFIN527_EZKIT

	bool "BF527-EZKIT"

	depends on (BF522 || BF525 || BF527)

	help

	  BF533-EZKIT-LITE board Support.



config BFIN533_EZKIT

	bool "BF533-EZKIT"

	depends on (BF533 || BF532 || BF531)
@@ -299,11 +330,17 @@ config MEM_MT48LC8M32B2B5_7 
	depends on (BFIN561_BLUETECHNIX_CM)

	default y



config MEM_MT48LC32M16A2TG_75

	bool

	depends on (BFIN527_EZKIT)

	default y



config BFIN_SHARED_FLASH_ENET

	bool

	depends on (BFIN533_STAMP)

	default y



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

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

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

source "arch/blackfin/mach-bf537/Kconfig"
@@ -329,7 +366,7 @@ config CLKIN_HZ 
	int "Crystal Frequency in Hz"

	default "11059200" if BFIN533_STAMP

	default "27000000" if BFIN533_EZKIT

	default "25000000" if BFIN537_STAMP

	default "25000000" if (BFIN537_STAMP || BFIN527_EZKIT)

	default "30000000" if BFIN561_EZKIT

	default "24576000" if PNAV10

	help
@@ -362,7 +399,7 @@ config VCO_MULT 
	range 1 64

	default "22" if BFIN533_EZKIT

	default "45" if BFIN533_STAMP

	default "20" if BFIN537_STAMP

	default "20" if (BFIN537_STAMP || BFIN527_EZKIT)

	default "22" if BFIN533_BLUETECHNIX_CM

	default "20" if BFIN537_BLUETECHNIX_CM

	default "20" if BFIN561_BLUETECHNIX_CM
@@ -398,7 +435,7 @@ config SCLK_DIV 
	range 1 15

	default 5 if BFIN533_EZKIT

	default 5 if BFIN533_STAMP

	default 4 if BFIN537_STAMP

	default 4 if (BFIN537_STAMP || BFIN527_EZKIT)

	default 5 if BFIN533_BLUETECHNIX_CM

	default 4 if BFIN537_BLUETECHNIX_CM

	default 4 if BFIN561_BLUETECHNIX_CM
@@ -450,6 +487,7 @@ comment "Memory Setup" 
config MEM_SIZE

	int "SDRAM Memory Size in MBytes"

	default  32 if BFIN533_EZKIT

	default  64 if BFIN527_EZKIT

	default  64 if BFIN537_STAMP

	default  64 if BFIN561_EZKIT

	default 128 if BFIN533_STAMP
@@ -459,6 +497,7 @@ config MEM_ADD_WIDTH 
	int "SDRAM Memory Address Width"

	default  9 if BFIN533_EZKIT

	default  9 if BFIN561_EZKIT

	default 10 if BFIN527_EZKIT

	default 10 if BFIN537_STAMP

	default 11 if BFIN533_STAMP

	default 10 if PNAV10
@@ -749,9 +788,19 @@ config LARGE_ALLOCS 
	  a lot of RAM, and you need to able to allocate very large

	  contiguous chunks. If unsure, say N.



config BFIN_GPTIMERS

	tristate "Enable Blackfin General Purpose Timers API"

	default n

	help

	  Enable support for the General Purpose Timers API.  If you

	  are unsure, say N.



	  To compile this driver as a module, choose M here: the module

	  will be called gptimers.ko.



config BFIN_DMA_5XX

	bool "Enable DMA Support"

	depends on (BF533 || BF532 || BF531 || BF537 || BF536 || BF534 || BF561 || BF54x)

	depends on (BF52x || BF53x || BF561 || BF54x)

	default y

	help

	  DMA driver for BF5xx.

arch/blackfin/Makefile

+21 −2
Original line number Diff line number Diff line
@@ -12,12 +12,17 @@ LDFLAGS_vmlinux := -X 
OBJCOPYFLAGS     := -O binary -R .note -R .comment -S

GZFLAGS          := -9



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

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

CFLAGS_MODULE    += -mlong-calls

KALLSYMS         += --symbol-prefix=_



KBUILD_DEFCONFIG := BF537-STAMP_defconfig



# setup the machine name and the machine dependent settings

machine-$(CONFIG_BF522) := bf527

machine-$(CONFIG_BF525) := bf527

machine-$(CONFIG_BF527) := bf527

machine-$(CONFIG_BF531) := bf533

machine-$(CONFIG_BF532) := bf533

machine-$(CONFIG_BF533) := bf533
@@ -32,6 +37,9 @@ machine-$(CONFIG_BF561) := bf561 
MACHINE := $(machine-y)

export MACHINE



cpu-$(CONFIG_BF522) := bf522

cpu-$(CONFIG_BF525) := bf525

cpu-$(CONFIG_BF527) := bf527

cpu-$(CONFIG_BF531) := bf531

cpu-$(CONFIG_BF532) := bf532

cpu-$(CONFIG_BF533) := bf533
@@ -97,12 +105,23 @@ archclean: 
	$(Q)$(MAKE) $(clean)=$(boot)





all: vmImage

boot := arch/$(ARCH)/boot

BOOT_TARGETS = vmImage

.PHONY: $(BOOT_TARGETS)

PHONY += $(BOOT_TARGETS) install

KBUILD_IMAGE := $(boot)/vmImage



all: vmImage



$(BOOT_TARGETS): vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@



install:

	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install



define archhelp

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

  echo  '  install         - Install kernel using'

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

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

  echo  '                     install to $$(INSTALL_PATH)'

endef

arch/blackfin/boot/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -26,3 +26,6 @@ $(obj)/vmlinux.gz: $(obj)/vmlinux.bin FORCE 
$(obj)/vmImage: $(obj)/vmlinux.gz

	$(call if_changed,uimage)

	@echo 'Kernel: $@ is ready'



install:

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

arch/blackfin/boot/install.sh

0 → 100644
+57 −0
Original line number Diff line number Diff line 
#!/bin/sh

#

# arch/blackfin/boot/install.sh

#

# This file is subject to the terms and conditions of the GNU General Public

# License.  See the file "COPYING" in the main directory of this archive

# for more details.

#

# Copyright (C) 1995 by Linus Torvalds

#

# Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin

# Adapted from code in arch/i386/boot/install.sh by Mike Frysinger

#

# "make install" script for Blackfin architecture

#

# Arguments:

#   $1 - kernel version

#   $2 - kernel image file

#   $3 - kernel map file

#   $4 - default install path (blank if root directory)

#



verify () {

	if [ ! -f "$1" ]; then

		echo ""                                                   1>&2

		echo " *** Missing file: $1"                              1>&2

		echo ' *** You need to run "make" before "make install".' 1>&2

		echo ""                                                   1>&2

		exit 1

 	fi

}



# Make sure the files actually exist

verify "$2"

verify "$3"



# User may have a custom install script



if [ -x ~/bin/${CROSS_COMPILE}installkernel ]; then exec ~/bin/${CROSS_COMPILE}installkernel "$@"; fi

if which ${CROSS_COMPILE}installkernel >/dev/null 2>&1; then

	exec ${CROSS_COMPILE}installkernel "$@"

fi



# Default install - same as make zlilo



back_it_up() {

	local file=$1

	[ -f ${file} ] || return 0

	local stamp=$(stat -c %Y ${file} 2>/dev/null)

	mv ${file} ${file}.${stamp:-old}

}



back_it_up $4/uImage

back_it_up $4/System.map



cat $2 > $4/uImage

cp $3 $4/System.map

arch/blackfin/configs/BF527-EZKIT_defconfig

0 → 100644
+1241 −0

File added.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE