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

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus 

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (71 commits)
  MIPS: Lasat: Fix botched changes to sysctl code.
  RTC: rtc-cmos.c: Fix warning on MIPS
  MIPS: Cleanup random differences beween lmo and Linus' kernel.
  MIPS: No longer hardwire CONFIG_EMBEDDED to y
  MIPS: Fix and enhance built-in kernel command line
  MIPS: eXcite: Remove platform.
  MIPS: Loongson: Cleanups of serial port support
  MIPS: Lemote 2F: Suspend CS5536 MFGPT Timer
  MIPS: Excite: move iodev_remove to .devexit.text
  MIPS: Lasat: Convert to proc_fops / seq_file
  MIPS: Cleanup signal code initialization
  MIPS: Modularize COP2 handling
  MIPS: Move EARLY_PRINTK to Kconfig.debug
  MIPS: Yeeloong 2F: Cleanup reset logic using the new ec_write function
  MIPS: Yeeloong 2F: Add LID open event as the wakeup event
  MIPS: Yeeloong 2F: Add basic EC operations
  MIPS: Move several variables from .bss to .init.data
  MIPS: Tracing: Make function graph tracer work with -mmcount-ra-address
  MIPS: Tracing: Reserve $12(t0) for mcount-ra-address of gcc 4.5
  MIPS: Tracing: Make ftrace for MIPS work without -fno-omit-frame-pointer
  ...
parents 7c508e50 606d62fa

arch/mips/Kconfig

+75 −44
Original line number Diff line number Diff line
@@ -5,9 +5,12 @@ config MIPS 
	select HAVE_IDE

	select HAVE_OPROFILE

	select HAVE_ARCH_KGDB

	# Horrible source of confusion.  Die, die, die ...

	select EMBEDDED

	select RTC_LIB if !LEMOTE_FULOONG2E

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_TRACE_MCOUNT_TEST

	select HAVE_DYNAMIC_FTRACE

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_FUNCTION_GRAPH_TRACER

	select RTC_LIB if !MACH_LOONGSON



mainmenu "Linux/MIPS Kernel Configuration"
@@ -22,6 +25,7 @@ choice 


config MACH_ALCHEMY

	bool "Alchemy processor based machines"

	select SYS_SUPPORTS_ZBOOT



config AR7

	bool "Texas Instruments AR7"
@@ -36,6 +40,7 @@ config AR7 
	select SYS_HAS_EARLY_PRINTK

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_ZBOOT_UART16550

	select GENERIC_GPIO

	select GCD

	select VLYNQ
@@ -43,23 +48,6 @@ config AR7 
	  Support for the Texas Instruments AR7 System-on-a-Chip

	  family: TNETD7100, 7200 and 7300.



config BASLER_EXCITE

	bool "Basler eXcite smart camera"

	select CEVT_R4K

	select CSRC_R4K

	select DMA_COHERENT

	select HW_HAS_PCI

	select IRQ_CPU

	select IRQ_CPU_RM7K

	select IRQ_CPU_RM9K

	select MIPS_RM9122

	select SYS_HAS_CPU_RM9000

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	help

	  The eXcite is a smart camera platform manufactured by

	  Basler Vision Technologies AG.



config BCM47XX

	bool "BCM47XX based boards"

	select CEVT_R4K
@@ -192,6 +180,7 @@ config LASAT 


config MACH_LOONGSON

	bool "Loongson family of machines"

	select SYS_SUPPORTS_ZBOOT_UART16550

	help

	  This enables the support of Loongson family of machines.
@@ -233,6 +222,7 @@ config MIPS_MALTA 
	select SYS_SUPPORTS_MIPS_CMP

	select SYS_SUPPORTS_MULTITHREADING

	select SYS_SUPPORTS_SMARTMIPS

	select SYS_SUPPORTS_ZBOOT

	help

	  This enables support for the MIPS Technologies Malta evaluation

	  board.
@@ -334,6 +324,24 @@ config PMC_YOSEMITE 
	  Yosemite is an evaluation board for the RM9000x2 processor

	  manufactured by PMC-Sierra.



config POWERTV

	bool "Cisco PowerTV"

	select BOOT_ELF32

	select CEVT_R4K

	select CPU_MIPSR2_IRQ_VI

	select CPU_MIPSR2_IRQ_EI

	select CSRC_POWERTV

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select SYS_HAS_EARLY_PRINTK

	select SYS_HAS_CPU_MIPS32_R2

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_HIGHMEM

	select USB_OHCI_LITTLE_ENDIAN

	help

	  This enables support for the Cisco PowerTV Platform.



config SGI_IP22

	bool "SGI IP22 (Indy/Indigo2)"

	select ARC
@@ -674,11 +682,11 @@ config CAVIUM_OCTEON_REFERENCE_BOARD 
endchoice



source "arch/mips/alchemy/Kconfig"

source "arch/mips/basler/excite/Kconfig"

source "arch/mips/bcm63xx/Kconfig"

source "arch/mips/jazz/Kconfig"

source "arch/mips/lasat/Kconfig"

source "arch/mips/pmc-sierra/Kconfig"

source "arch/mips/powertv/Kconfig"

source "arch/mips/sgi-ip27/Kconfig"

source "arch/mips/sibyte/Kconfig"

source "arch/mips/txx9/Kconfig"
@@ -778,6 +786,9 @@ config CSRC_BCM1480 
config CSRC_IOASIC

	bool



config CSRC_POWERTV

	bool



config CSRC_R4K_LIB

	bool
@@ -806,20 +817,6 @@ config DMA_NONCOHERENT 
config DMA_NEED_PCI_MAP_STATE

	bool



config EARLY_PRINTK

	bool "Early printk" if EMBEDDED && DEBUG_KERNEL

	depends on SYS_HAS_EARLY_PRINTK

	default y

	help

	  This option enables special console drivers which allow the kernel

	  to print messages very early in the bootup process.



	  This is useful for kernel debugging when your machine crashes very

	  early before the console code is initialized. For normal operation,

	  it is not recommended because it looks ugly on some machines and

	  doesn't cooperate with an X server. You should normally say N here,

	  unless you want to debug such a crash.



config SYS_HAS_EARLY_PRINTK

	bool
@@ -1069,6 +1066,21 @@ config CPU_LOONGSON2E 
	  The Loongson 2E processor implements the MIPS III instruction set

	  with many extensions.



	  It has an internal FPGA northbridge, which is compatiable to

	  bonito64.



config CPU_LOONGSON2F

	bool "Loongson 2F"

	depends on SYS_HAS_CPU_LOONGSON2F

	select CPU_LOONGSON2

	help

	  The Loongson 2F processor implements the MIPS III instruction set

	  with many extensions.



	  Loongson2F have built-in DDR2 and PCIX controller. The PCIX controller

	  have a similar programming interface with FPGA northbridge used in

	  Loongson2E.



config CPU_MIPS32_R1

	bool "MIPS32 Release 1"

	depends on SYS_HAS_CPU_MIPS32_R1
@@ -1294,6 +1306,16 @@ config CPU_CAVIUM_OCTEON 


endchoice



config SYS_SUPPORTS_ZBOOT

	bool

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_LZMA



config SYS_SUPPORTS_ZBOOT_UART16550

	bool

	select SYS_SUPPORTS_ZBOOT



config CPU_LOONGSON2

	bool

	select CPU_SUPPORTS_32BIT_KERNEL
@@ -1303,6 +1325,12 @@ config CPU_LOONGSON2 
config SYS_HAS_CPU_LOONGSON2E

	bool



config SYS_HAS_CPU_LOONGSON2F

	bool

	select CPU_SUPPORTS_CPUFREQ

	select CPU_SUPPORTS_ADDRWINCFG if 64BIT

	select CPU_SUPPORTS_UNCACHED_ACCELERATED



config SYS_HAS_CPU_MIPS32_R1

	bool
@@ -1411,8 +1439,17 @@ config CPU_SUPPORTS_32BIT_KERNEL 
	bool

config CPU_SUPPORTS_64BIT_KERNEL

	bool

config CPU_SUPPORTS_CPUFREQ

	bool

config CPU_SUPPORTS_ADDRWINCFG

	bool

config CPU_SUPPORTS_HUGEPAGES

	bool

config CPU_SUPPORTS_UNCACHED_ACCELERATED

	bool

config MIPS_PGD_C0_CONTEXT

	bool

	default y if 64BIT && CPU_MIPSR2



#

# Set to y for ptrace access to watch registers.
@@ -2024,15 +2061,6 @@ config STACKTRACE_SUPPORT 


source "init/Kconfig"



config PROBE_INITRD_HEADER

	bool "Probe initrd header created by addinitrd"

	depends on BLK_DEV_INITRD

	help

	  Probe initrd header at the last page of kernel image.

	  Say Y here if you are using arch/mips/boot/addinitrd.c to

	  add initrd or initramfs image to the kernel image.

	  Otherwise, say N.



source "kernel/Kconfig.freezer"



menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)"
@@ -2104,6 +2132,7 @@ config MMU 


config I8253

	bool

	select MIPS_EXTERNAL_TIMER



config ZONE_DMA32

	bool
@@ -2180,6 +2209,8 @@ source "kernel/power/Kconfig" 


endmenu



source "arch/mips/kernel/cpufreq/Kconfig"



source "net/Kconfig"



source "drivers/Kconfig"

arch/mips/Kconfig.debug

+55 −4
Original line number Diff line number Diff line
@@ -6,15 +6,66 @@ config TRACE_IRQFLAGS_SUPPORT 


source "lib/Kconfig.debug"



config EARLY_PRINTK

	bool "Early printk" if EMBEDDED

	depends on SYS_HAS_EARLY_PRINTK

	default y

	help

	  This option enables special console drivers which allow the kernel

	  to print messages very early in the bootup process.



	  This is useful for kernel debugging when your machine crashes very

	  early before the console code is initialized. For normal operation,

	  it is not recommended because it looks ugly on some machines and

	  doesn't cooperate with an X server. You should normally say N here,

	  unless you want to debug such a crash.



config CMDLINE_BOOL

	bool "Built-in kernel command line"

	default n

	help

	  For most systems, it is firmware or second stage bootloader that

	  by default specifies the kernel command line options.  However,

	  it might be necessary or advantageous to either override the

	  default kernel command line or add a few extra options to it.

	  For such cases, this option allows you to hardcode your own

	  command line options directly into the kernel.  For that, you

	  should choose 'Y' here, and fill in the extra boot arguments

	  in CONFIG_CMDLINE.



	  The built-in options will be concatenated to the default command

	  line if CMDLINE_OVERRIDE is set to 'N'. Otherwise, the default

	  command line will be ignored and replaced by the built-in string.



	  Most MIPS systems will normally expect 'N' here and rely upon

	  the command line from the firmware or the second-stage bootloader.



config CMDLINE

	string "Default kernel command string"

	depends on CMDLINE_BOOL

	default ""

	help

	  On some platforms, there is currently no way for the boot loader to

	  pass arguments to the kernel. For these platforms, you can supply

	  some command-line options at build time by entering them here.  In

	  other cases you can specify kernel args so that you don't have

	  to set them up in board prom initialization routines.

	  pass arguments to the kernel.  For these platforms, and for the cases

	  when you want to add some extra options to the command line or ignore

	  the default command line, you can supply some command-line options at

	  build time by entering them here.  In other cases you can specify

	  kernel args so that you don't have to set them up in board prom

	  initialization routines.



	  For more information, see the CMDLINE_BOOL and CMDLINE_OVERRIDE

	  options.



config CMDLINE_OVERRIDE

	bool "Built-in command line overrides firware arguments"

	default n

	depends on CMDLINE_BOOL

	help

	  By setting this option to 'Y' you will have your kernel ignore

	  command line arguments from firmware or second stage bootloader.

	  Instead, the built-in command line will be used exclusively.



	  Normally, you will choose 'N' here.



config DEBUG_STACK_USAGE

	bool "Enable stack utilization instrumentation"

arch/mips/Makefile

+47 −10
Original line number Diff line number Diff line
@@ -48,7 +48,16 @@ ifneq ($(SUBARCH),$(ARCH)) 
  endif

endif



ifndef CONFIG_FUNCTION_TRACER

cflags-y := -ffunction-sections

endif

ifdef CONFIG_FUNCTION_GRAPH_TRACER

  ifndef KBUILD_MCOUNT_RA_ADDRESS

    ifeq ($(call cc-option-yn,-mmcount-ra-address), y)

      cflags-y += -mmcount-ra-address -DKBUILD_MCOUNT_RA_ADDRESS

    endif

  endif

endif

cflags-y += $(call cc-option, -mno-check-zero-division)



ifdef CONFIG_32BIT
@@ -69,6 +78,7 @@ endif 


all-$(CONFIG_BOOT_ELF32)	:= $(vmlinux-32)

all-$(CONFIG_BOOT_ELF64)	:= $(vmlinux-64)

all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlinuz



#

# GCC uses -G 0 -mabicalls -fpic as default.  We don't want PIC in the kernel
@@ -124,6 +134,8 @@ cflags-$(CONFIG_CPU_TX49XX) += -march=r4600 -Wa,--trap 
cflags-$(CONFIG_CPU_LOONGSON2)	+= -Wa,--trap

cflags-$(CONFIG_CPU_LOONGSON2E) += \

	$(call cc-option,-march=loongson2e,-march=r4600)

cflags-$(CONFIG_CPU_LOONGSON2F) += \

	$(call cc-option,-march=loongson2f,-march=r4600)



cflags-$(CONFIG_CPU_MIPS32_R1)	+= $(call cc-option,-march=mips32,-mips32 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \

			-Wa,-mips32 -Wa,--trap
@@ -324,6 +336,7 @@ core-$(CONFIG_MACH_LOONGSON) +=arch/mips/loongson/ 
cflags-$(CONFIG_MACH_LOONGSON) += -I$(srctree)/arch/mips/include/asm/mach-loongson \

                    -mno-branch-likely

load-$(CONFIG_LEMOTE_FULOONG2E) +=0xffffffff80100000

load-$(CONFIG_LEMOTE_MACH2F) +=0xffffffff80200000



#

# MIPS Malta board
@@ -331,7 +344,7 @@ load-$(CONFIG_LEMOTE_FULOONG2E) +=0xffffffff80100000 
core-$(CONFIG_MIPS_MALTA)	+= arch/mips/mti-malta/

cflags-$(CONFIG_MIPS_MALTA)	+= -I$(srctree)/arch/mips/include/asm/mach-malta

load-$(CONFIG_MIPS_MALTA)	+= 0xffffffff80100000

all-$(CONFIG_MIPS_MALTA)	:= vmlinux.bin

all-$(CONFIG_MIPS_MALTA)	:= vmlinuz.bin



#

# MIPS SIM
@@ -355,13 +368,6 @@ core-$(CONFIG_PMC_YOSEMITE) += arch/mips/pmc-sierra/yosemite/ 
cflags-$(CONFIG_PMC_YOSEMITE)	+= -I$(srctree)/arch/mips/include/asm/mach-yosemite

load-$(CONFIG_PMC_YOSEMITE)	+= 0xffffffff80100000



#

# Basler eXcite

#

core-$(CONFIG_BASLER_EXCITE)	+= arch/mips/basler/excite/

cflags-$(CONFIG_BASLER_EXCITE)	+= -I$(srctree)/arch/mips/include/asm/mach-excite

load-$(CONFIG_BASLER_EXCITE)	+= 0x80100000



#

# LASAT platforms

#
@@ -440,6 +446,13 @@ cflags-$(CONFIG_SOC_EMMA2RH) += -I$(srctree)/arch/mips/include/asm/mach-emma2rh 
core-$(CONFIG_NEC_MARKEINS)	+= arch/mips/emma/markeins/

load-$(CONFIG_NEC_MARKEINS)	+= 0xffffffff88100000



#

# Cisco PowerTV Platform

#

core-$(CONFIG_POWERTV)		+= arch/mips/powertv/

cflags-$(CONFIG_POWERTV)        += -I$(srctree)/arch/mips/include/asm/mach-powertv

load-$(CONFIG_POWERTV)		+= 0xffffffff90800000



#

# SGI IP22 (Indy/Indigo2)

#
@@ -581,7 +594,7 @@ load-$(CONFIG_SNI_RM) += 0xffffffff80600000 
else

load-$(CONFIG_SNI_RM)		+= 0xffffffff80030000

endif

all-$(CONFIG_SNI_RM)		:= vmlinux.ecoff

all-$(CONFIG_SNI_RM)		:= vmlinuz.ecoff



#

# Common TXx9
@@ -699,9 +712,23 @@ vmlinux.64: vmlinux 
	$(OBJCOPY) -O $(64bit-bfd) $(OBJCOPYFLAGS) $< $@



makeboot =$(Q)$(MAKE) $(build)=arch/mips/boot VMLINUX=$(vmlinux-32) $(1)

makezboot =$(Q)$(MAKE) $(build)=arch/mips/boot/compressed \

	   VMLINUX_LOAD_ADDRESS=$(load-y) 32bit-bfd=$(32bit-bfd) $(1)



all:	$(all-y)



vmlinuz: vmlinux FORCE

	+@$(call makezboot,$@)



vmlinuz.bin: vmlinux

	+@$(call makezboot,$@)



vmlinuz.ecoff: vmlinux

	+@$(call makezboot,$@)



vmlinuz.srec: vmlinux

	+@$(call makezboot,$@)



vmlinux.bin: $(vmlinux-32)

	+@$(call makeboot,$@)
@@ -726,11 +753,13 @@ endif 


install:

	$(Q)install -D -m 755 vmlinux $(INSTALL_PATH)/vmlinux-$(KERNELRELEASE)

	$(Q)install -D -m 755 vmlinuz $(INSTALL_PATH)/vmlinuz-$(KERNELRELEASE)

	$(Q)install -D -m 644 .config $(INSTALL_PATH)/config-$(KERNELRELEASE)

	$(Q)install -D -m 644 System.map $(INSTALL_PATH)/System.map-$(KERNELRELEASE)



archclean:

	@$(MAKE) $(clean)=arch/mips/boot

	@$(MAKE) $(clean)=arch/mips/boot/compressed

	@$(MAKE) $(clean)=arch/mips/lasat



define archhelp
@@ -738,10 +767,18 @@ define archhelp 
	echo '  vmlinux.ecoff        - ECOFF boot image'

	echo '  vmlinux.bin          - Raw binary boot image'

	echo '  vmlinux.srec         - SREC boot image'

	echo '  vmlinuz              - Compressed boot(zboot) image'

	echo '  vmlinuz.ecoff        - ECOFF zboot image'

	echo '  vmlinuz.bin          - Raw binary zboot image'

	echo '  vmlinuz.srec         - SREC zboot image'

	echo

	echo '  These will be default as apropriate for a configured platform.'

endef



CLEAN_FILES += vmlinux.32 \

	       vmlinux.64 \

	       vmlinux.ecoff
 
	       vmlinux.ecoff \

	       vmlinuz \

	       vmlinuz.ecoff \

	       vmlinuz.bin \

	       vmlinuz.srec

arch/mips/ar7/platform.c

+1 −1
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ static int __init ar7_register_devices(void) 
	int res;

	u32 *bootcr, val;

#ifdef CONFIG_SERIAL_8250

	static struct uart_port uart_port[2];

	static struct uart_port uart_port[2] __initdata;



	memset(uart_port, 0, sizeof(struct uart_port) * 2);

arch/mips/basler/excite/Kconfig

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
config BASLER_EXCITE_PROTOTYPE

	bool "Support for pre-release units"

	depends on BASLER_EXCITE

	default n

	help

	  Pre-series (prototype) units are different from later ones in

	  some ways. Select this option if you have one of these. Please

	  note that a kernel built with this option selected will not be

	  able to run on normal units.

CRA Git | Maintained and supported by SUSTech CRA and CCSE