Merge master.kernel.org:/home/rmk/linux-2.6-arm (8995b161) · Commits · e / devices / android_kernel_oneplus_sm7250

arch/arm/Kconfig

+5 −2

Original line number	Diff line number	Diff line
		@@ -154,6 +154,7 @@ config ARCH_RPC
		select FIQ
		select TIMER_ACORN
		select ARCH_MAY_HAVE_PC_FDC
		select ISA_DMA_API
		help
		On the Acorn Risc-PC, Linux can support the internal IDE disk and
		CD-ROM interface, serial and parallel port, and the floppy drive.
		@@ -206,6 +207,7 @@ config ARCH_IMX

		config ARCH_H720X
		bool "Hynix-HMS720x-based"
		select ISA_DMA_API
		help
		This enables support for systems based on the Hynix HMS720x

		@@ -290,12 +292,14 @@ config ISA
		(MCA) or VESA. ISA is an older system, now being displaced by PCI;
		newer boards don't support it. If you have ISA, say Y, otherwise N.

		# Select ISA DMA controller support
		config ISA_DMA
		bool
		select ISA_DMA_API

		# Select ISA DMA interface
		config ISA_DMA_API
		bool
		default y

		config PCI
		bool "PCI support" if ARCH_INTEGRATOR_AP \|\| ARCH_VERSATILE_PB
		@@ -656,7 +660,6 @@ source "kernel/power/Kconfig"

		config APM
		tristate "Advanced Power Management Emulation"
		depends on PM_LEGACY
		---help---
		APM is a BIOS specification for saving power using several different
		techniques. This is mostly useful for battery powered laptops with

arch/arm/Makefile

+7 −8

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@
		# Copyright (C) 1995-2001 by Russell King

		LDFLAGS_vmlinux :=-p --no-undefined -X
		CPPFLAGS_vmlinux.lds = -DKERNEL_RAM_ADDR=$(TEXTADDR)
		CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET)
		OBJCOPYFLAGS :=-O binary -R .note -R .comment -S
		GZFLAGS :=-9
		#CFLAGS +=-pipe
		@@ -65,7 +65,7 @@ CHECKFLAGS += -D__arm__

		#Default value
		head-y := arch/arm/kernel/head.o arch/arm/kernel/init_task.o
		textaddr-y := 0xC0008000
		textofs-y := 0x00008000

		machine-$(CONFIG_ARCH_RPC) := rpc
		machine-$(CONFIG_ARCH_EBSA110) := ebsa110
		@@ -73,22 +73,20 @@ textaddr-y := 0xC0008000
		incdir-$(CONFIG_ARCH_CLPS7500) := cl7500
		machine-$(CONFIG_FOOTBRIDGE) := footbridge
		incdir-$(CONFIG_FOOTBRIDGE) := ebsa285
		textaddr-$(CONFIG_ARCH_CO285) := 0x60008000
		machine-$(CONFIG_ARCH_CO285) := footbridge
		incdir-$(CONFIG_ARCH_CO285) := ebsa285
		machine-$(CONFIG_ARCH_SHARK) := shark
		machine-$(CONFIG_ARCH_SA1100) := sa1100
		ifeq ($(CONFIG_ARCH_SA1100),y)
		# SA1111 DMA bug: we don't want the kernel to live in precious DMA-able memory
		textaddr-$(CONFIG_SA1111) := 0xc0208000
		textofs-$(CONFIG_SA1111) := 0x00208000
		endif
		machine-$(CONFIG_ARCH_PXA) := pxa
		machine-$(CONFIG_ARCH_L7200) := l7200
		machine-$(CONFIG_ARCH_INTEGRATOR) := integrator
		machine-$(CONFIG_ARCH_CAMELOT) := epxa10db
		textaddr-$(CONFIG_ARCH_CLPS711X) := 0xc0028000
		textofs-$(CONFIG_ARCH_CLPS711X) := 0x00028000
		machine-$(CONFIG_ARCH_CLPS711X) := clps711x
		textaddr-$(CONFIG_ARCH_FORTUNET) := 0xc0008000
		machine-$(CONFIG_ARCH_IOP3XX) := iop3xx
		machine-$(CONFIG_ARCH_IXP4XX) := ixp4xx
		machine-$(CONFIG_ARCH_IXP2000) := ixp2000
		@@ -110,7 +108,8 @@ CFLAGS_3c589_cs.o :=-DISA_SIXTEEN_BIT_PERIPHERAL
		export CFLAGS_3c589_cs.o
		endif

		TEXTADDR := $(textaddr-y)
		# The byte offset of the kernel image in RAM from the start of RAM.
		TEXT_OFFSET := $(textofs-y)

		ifeq ($(incdir-y),)
		incdir-y := $(machine-y)
		@@ -123,7 +122,7 @@ else
		MACHINE :=
		endif

		export TEXTADDR GZFLAGS
		export TEXT_OFFSET GZFLAGS

		# Do we have FASTFPE?
		FASTFPE :=arch/arm/fastfpe

arch/arm/boot/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@ include $(srctree)/$(MACHINE)/Makefile.boot
		endif

		# Note: the following conditions must always be true:
		# ZRELADDR == virt_to_phys(TEXTADDR)
		# ZRELADDR == virt_to_phys(PAGE_OFFSET + TEXT_OFFSET)
		# PARAMS_PHYS must be within 4MB of ZRELADDR
		# INITRD_PHYS must be in RAM
		ZRELADDR := $(zreladdr-y)

arch/arm/common/Kconfig

+3 −0

Original line number	Diff line number	Diff line
		@@ -23,5 +23,8 @@ config SHARP_LOCOMO
		config SHARP_PARAM
		bool

		config SHARPSL_PM
		bool

		config SHARP_SCOOP
		bool

arch/arm/common/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,6 @@
		#

		obj-y += rtctime.o
		obj-$(CONFIG_ARM_AMBA) += amba.o
		obj-$(CONFIG_ARM_GIC) += gic.o
		obj-$(CONFIG_ICST525) += icst525.o
		obj-$(CONFIG_ICST307) += icst307.o
		@@ -13,4 +12,5 @@ obj-$(CONFIG_DMABOUNCE) += dmabounce.o
		obj-$(CONFIG_TIMER_ACORN) += time-acorn.o
		obj-$(CONFIG_SHARP_LOCOMO) += locomo.o
		obj-$(CONFIG_SHARP_PARAM) += sharpsl_param.o
		obj-$(CONFIG_SHARPSL_PM) += sharpsl_pm.o
		obj-$(CONFIG_SHARP_SCOOP) += scoop.o