Commit 7556afa0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
  [AVR32] extint: Set initial irq type to low level
  [AVR32] extint: change set_irq_type() handling
  [AVR32] NMI debugging
  [AVR32] constify function pointer tables
  [AVR32] ATNGW100: Update defconfig
  [AVR32] ATSTK1002: Update defconfig
  [AVR32] Kconfig: Choose daughterboard instead of CPU
  [AVR32] Add support for ATSTK1003 and ATSTK1004
  [AVR32] Clean up external DAC setup code
  [AVR32] ATSTK1000: Move gpio-leds setup to setup.c
  [AVR32] Add support for AT32AP7001 and AT32AP7002
  [AVR32] Provide more CPU information in /proc/cpuinfo and dmesg
  [AVR32] Oprofile support
  [AVR32] Include instrumentation menu
  Disable VGA text console for AVR32 architecture
  [AVR32] Enable debugging only when needed
  ptrace: Call arch_ptrace_attach() when request=PTRACE_TRACEME
  [AVR32] Remove redundant try_to_freeze() call from do_signal()
  [AVR32] Drop GFP_COMP for DMA memory allocations
parents e07dd2ad d6c49a7a

Documentation/kernel-parameters.txt

+5 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ parameter is applicable: 
	ALSA	ALSA sound support is enabled.

	APIC	APIC support is enabled.

	APM	Advanced Power Management support is enabled.

	AVR32	AVR32 architecture is enabled.

	AX25	Appropriate AX.25 support is enabled.

	BLACKFIN Blackfin architecture is enabled.

	DRM	Direct Rendering Management support is enabled.
@@ -1123,6 +1124,10 @@ and is between 256 and 4096 characters. It is defined in the file 
			of returning the full 64-bit number.

			The default is to return 64-bit inode numbers.



	nmi_debug=	[KNL,AVR32] Specify one or more actions to take

			when a NMI is triggered.

			Format: [state][,regs][,debounce][,die]



	nmi_watchdog=	[KNL,BUGS=X86-32] Debugging features for SMP kernels



	no387		[BUGS=X86-32] Tells the kernel to use the 387 maths

arch/avr32/Kconfig

+33 −14
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ config ARCH_HAS_ILOG2_U32 
config ARCH_HAS_ILOG2_U64

	def_bool n



config ARCH_SUPPORTS_OPROFILE

	def_bool y



config GENERIC_HWEIGHT

	def_bool y
@@ -81,19 +84,23 @@ config PLATFORM_AT32AP 
	select MMU

	select PERFORMANCE_COUNTERS



choice

	prompt "AVR32 CPU type"

	default CPU_AT32AP7000

#

# CPU types

#



config CPU_AT32AP7000

	bool "AT32AP7000"

# AP7000 derivatives

config CPU_AT32AP700X

	bool

	select PLATFORM_AT32AP

endchoice



#

# CPU Daughterboards for ATSTK1000

config BOARD_ATSTK1002

config CPU_AT32AP7000

	bool

	select CPU_AT32AP700X

config CPU_AT32AP7001

	bool

	select CPU_AT32AP700X

config CPU_AT32AP7002

	bool

	select CPU_AT32AP700X



choice

	prompt "AVR32 board type"
@@ -101,10 +108,10 @@ choice 


config BOARD_ATSTK1000

	bool "ATSTK1000 evaluation board"

	select BOARD_ATSTK1002 if CPU_AT32AP7000



config BOARD_ATNGW100

	bool "ATNGW100 Network Gateway"

	select CPU_AT32AP7000

endchoice



if BOARD_ATSTK1000
@@ -123,15 +130,15 @@ source "arch/avr32/mach-at32ap/Kconfig" 


config LOAD_ADDRESS

	hex

	default 0x10000000 if LOADER_U_BOOT=y && CPU_AT32AP7000=y

	default 0x10000000 if LOADER_U_BOOT=y && CPU_AT32AP700X=y



config ENTRY_ADDRESS

	hex

	default 0x90000000 if LOADER_U_BOOT=y && CPU_AT32AP7000=y

	default 0x90000000 if LOADER_U_BOOT=y && CPU_AT32AP700X=y



config PHYS_OFFSET

	hex

	default 0x10000000 if CPU_AT32AP7000=y

	default 0x10000000 if CPU_AT32AP700X=y



source "kernel/Kconfig.preempt"
@@ -163,6 +170,16 @@ config OWNERSHIP_TRACE 
	  enabling Nexus-compliant debuggers to keep track of the PID of the

	  currently executing task.



config NMI_DEBUGGING

	bool "NMI Debugging"

	default n

	help

	  Say Y here and pass the nmi_debug command-line parameter to

	  the kernel to turn on NMI debugging. Depending on the value

	  of the nmi_debug option, various pieces of information will

	  be dumped to the console when a Non-Maskable Interrupt

	  happens.



# FPU emulation goes here



source "kernel/Kconfig.hz"
@@ -219,6 +236,8 @@ source "drivers/Kconfig" 


source "fs/Kconfig"



source "kernel/Kconfig.instrumentation"



source "arch/avr32/Kconfig.debug"



source "security/Kconfig"

arch/avr32/Kconfig.debug

+0 −10
Original line number Diff line number Diff line
@@ -6,14 +6,4 @@ config TRACE_IRQFLAGS_SUPPORT 


source "lib/Kconfig.debug"



config KPROBES

	bool "Kprobes"

	depends on DEBUG_KERNEL

	help

	  Kprobes allows you to trap at almost any kernel address and

          execute a callback function.  register_kprobe() establishes

          a probepoint and specifies the callback.  Kprobes is useful

          for kernel debugging, non-intrusive instrumentation and testing.

          If in doubt, say "N".



endmenu

arch/avr32/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ KBUILD_AFLAGS += -mrelax -mno-pic 
CFLAGS_MODULE	+= -mno-relax

LDFLAGS_vmlinux	+= --relax



cpuflags-$(CONFIG_CPU_AT32AP7000)	+= -mcpu=ap7000

cpuflags-$(CONFIG_PLATFORM_AT32AP)	+= -march=ap



KBUILD_CFLAGS	+= $(cpuflags-y)

KBUILD_AFLAGS	+= $(cpuflags-y)
@@ -31,6 +31,7 @@ core-$(CONFIG_BOARD_ATNGW100) += arch/avr32/boards/atngw100/ 
core-$(CONFIG_LOADER_U_BOOT)		+= arch/avr32/boot/u-boot/

core-y					+= arch/avr32/kernel/

core-y					+= arch/avr32/mm/

drivers-$(CONFIG_OPROFILE)		+= arch/avr32/oprofile/

libs-y					+= arch/avr32/lib/



archincdir-$(CONFIG_PLATFORM_AT32AP)	:= arch-at32ap

arch/avr32/boards/atngw100/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <asm/io.h>

#include <asm/setup.h>



#include <asm/arch/at32ap7000.h>

#include <asm/arch/at32ap700x.h>

#include <asm/arch/board.h>

#include <asm/arch/init.h>

#include <asm/arch/portmux.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE