Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cf4d451 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (417 commits)
  MAINTAINERS: EB110ATX is not ebsa110
  MAINTAINERS: update Eric Miao's email address and status
  fb: add support of LCD display controller on pxa168/910 (base layer)
  [ARM] 5552/1: ep93xx get_uart_rate(): use EP93XX_SYSCON_PWRCNT and EP93XX_SYSCON_PWRCN
  [ARM] pxa/sharpsl_pm: zaurus needs generic pxa suspend/resume routines
  [ARM] 5544/1: Trust PrimeCell resource sizes
  [ARM] pxa/sharpsl_pm: cleanup of gpio-related code.
  [ARM] pxa/sharpsl_pm: drop set_irq_type calls
  [ARM] pxa/sharpsl_pm: merge pxa-specific code into generic one
  [ARM] pxa/sharpsl_pm: merge the two sharpsl_pm.c since it's now pxa specific
  [ARM] sa1100: remove unused collie_pm.c
  [ARM] pxa: fix the conflicting non-static declarations of global_gpios[]
  [ARM] 5550/1: Add default configure file for w90p910 platform
  [ARM] 5549/1: Add clock api for w90p910 platform.
  [ARM] 5548/1: Add gpio api for w90p910 platform
  [ARM] 5551/1: Add multi-function pin api for w90p910 platform.
  [ARM] Make ARM_VIC_NR depend on ARM_VIC
  [ARM] 5546/1: ARM PL022 SSP/SPI driver v3
  ARM: OMAP4: SMP: Update defconfig for OMAP4430
  ARM: OMAP4: SMP: Enable SMP support for OMAP4430
  ...
parents 44b7532b ce53895a

Documentation/arm/Samsung-S3C24XX/GPIO.txt

+5 −5
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ PIN Numbers 
-----------



  Each pin has an unique number associated with it in regs-gpio.h,

  eg S3C2410_GPA0 or S3C2410_GPF1. These defines are used to tell

  eg S3C2410_GPA(0) or S3C2410_GPF(1). These defines are used to tell

  the GPIO functions which pin is to be used.
@@ -65,11 +65,11 @@ Configuring a pin 


  Eg:



     s3c2410_gpio_cfgpin(S3C2410_GPA0, S3C2410_GPA0_ADDR0);

     s3c2410_gpio_cfgpin(S3C2410_GPE8, S3C2410_GPE8_SDDAT1);

     s3c2410_gpio_cfgpin(S3C2410_GPA(0), S3C2410_GPA0_ADDR0);

     s3c2410_gpio_cfgpin(S3C2410_GPE(8), S3C2410_GPE8_SDDAT1);



   which would turn GPA0 into the lowest Address line A0, and set

   GPE8 to be connected to the SDIO/MMC controller's SDDAT1 line.

   which would turn GPA(0) into the lowest Address line A0, and set

   GPE(8) to be connected to the SDIO/MMC controller's SDDAT1 line.





Reading the current configuration

MAINTAINERS

+75 −20
Original line number Diff line number Diff line
@@ -681,6 +681,13 @@ M: sakoman@gmail.com 
L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

S:	Maintained



ARM/H4700 (HP IPAQ HX4700) MACHINE SUPPORT

P:	Philipp Zabel

M:	philipp.zabel@gmail.com

S:	Maintained

F:	arch/arm/mach-pxa/hx4700.c

F:	arch/arm/mach-pxa/include/mach/hx4700.h



ARM/HP JORNADA 7XX MACHINE SUPPORT

P:	Kristoffer Ericson

M:	kristoffer.ericson@gmail.com
@@ -4159,6 +4166,69 @@ S: Maintained 
F:	drivers/video/riva/

F:	drivers/video/nvidia/



OMAP SUPPORT

P:	Tony Lindgren <tony@atomide.com>

M:	tony@atomide.com

L:	linux-omap@vger.kernel.org

W:	http://www.muru.com/linux/omap/

W:	http://linux.omap.com/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git

S:	Maintained

F:	arch/arm/*omap*



OMAP CLOCK FRAMEWORK SUPPORT

P:	Paul Walmsley

M:	paul@pwsan.com

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	arch/arm/*omap*/*clock*



OMAP POWER MANAGEMENT SUPPORT

P:	Kevin Hilman

M:	khilman@deeprootsystems.com

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	arch/arm/*omap*/*pm*



OMAP AUDIO SUPPORT

P:	Jarkko Nikula

M:	jhnikula@gmail.com

L:	alsa-devel@alsa-project.org (subscribers-only)

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	sound/soc/omap/



OMAP FRAMEBUFFER SUPPORT

P:	Imre Deak

M:	imre.deak@nokia.com

L:	linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	drivers/video/omap/



OMAP MMC SUPPORT

P:	Jarkko Lavinen

M:	jarkko.lavinen@nokia.com

L:	linux-kernel@vger.kernel.org

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	drivers/mmc/host/*omap*



OMAP RANDOM NUMBER GENERATOR SUPPORT

P:	Deepak Saxena

M:	dsaxena@plexity.net

S:	Maintained

F:	drivers/char/hw_random/omap-rng.c



OMAP USB SUPPORT

P:	Felipe Balbi

M:	felipe.balbi@nokia.com

P:	David Brownell

M:	dbrownell@users.sourceforge.net

L:	linux-usb@vger.kernel.org

L:	linux-omap@vger.kernel.org

S:	Maintained



OMFS FILESYSTEM

P:	Bob Copeland

M:	me@bobcopeland.com
@@ -4597,7 +4667,7 @@ F: drivers/media/video/pvrusb2/ 


PXA2xx/PXA3xx SUPPORT

P:	Eric Miao

M:	eric.miao@marvell.com

M:	eric.y.miao@gmail.com

P:	Russell King

M:	linux@arm.linux.org.uk

L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)
@@ -4612,19 +4682,19 @@ F: sound/soc/pxa 


PXA168 SUPPORT

P:	Eric Miao

M:	eric.miao@marvell.com

M:	eric.y.miao@gmail.com

P:	Jason Chagas

M:	jason.chagas@marvell.com

L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git

S:	Supported

S:	Maintained



PXA910 SUPPORT

P:	Eric Miao

M:	eric.miao@marvell.com

M:	eric.y.miao@gmail.com

L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git

S:	Supported

S:	Maintained



PXA MMCI DRIVER

S:	Orphan
@@ -5145,7 +5215,6 @@ P: Vincent Sanders 
M:	support@simtec.co.uk

W:	http://www.simtec.co.uk/products/EB110ATX/

S:	Supported

F:	arch/arm/mach-ebsa110/



SIMTEC EB2410ITX (BAST)

P:	Ben Dooks
@@ -5559,20 +5628,6 @@ F: drivers/misc/tifm* 
F:	drivers/mmc/host/tifm_sd.c

F:	include/linux/tifm.h



TI OMAP MMC INTERFACE DRIVER

P:	Carlos Aguiar, Anderson Briglia and Syed Khasim

M:	linux-omap@vger.kernel.org

W:	http://linux.omap.com

W:	http://www.muru.com/linux/omap/

S:	Maintained

F:	drivers/mmc/host/omap.c



TI OMAP RANDOM NUMBER GENERATOR SUPPORT

P:	Deepak Saxena

M:	dsaxena@plexity.net

S:	Maintained

F:	drivers/char/hw_random/omap-rng.c



TIPC NETWORK LAYER

P:	Per Liden

M:	per.liden@ericsson.com

arch/arm/Kconfig

+150 −100
Original line number Diff line number Diff line
@@ -34,15 +34,12 @@ config SYS_SUPPORTS_APM_EMULATION 


config GENERIC_GPIO

	bool

	default n



config GENERIC_TIME

	bool

	default n



config GENERIC_CLOCKEVENTS

	bool

	default n



config GENERIC_CLOCKEVENTS_BROADCAST

	bool
@@ -55,7 +52,6 @@ config MMU 


config NO_IOPORT

	bool

	default n



config EISA

	bool
@@ -126,11 +122,9 @@ config RWSEM_XCHGADD_ALGORITHM 


config ARCH_HAS_ILOG2_U32

	bool

	default n



config ARCH_HAS_ILOG2_U64

	bool

	default n



config GENERIC_HWEIGHT

	bool
@@ -253,6 +247,14 @@ config ARCH_CLPS711X 
	help

	  Support for Cirrus Logic 711x/721x based boards.



config ARCH_GEMINI

	bool "Cortina Systems Gemini"

	select CPU_FA526

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	help

	  Support for the Cortina Systems Gemini family SoCs



config ARCH_EBSA110

	bool "EBSA-110"

	select CPU_SA110
@@ -277,14 +279,6 @@ config ARCH_EP93XX 
	help

	  This enables support for the Cirrus EP93xx series of CPUs.



config ARCH_GEMINI

	bool "Cortina Systems Gemini"

	select CPU_FA526

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	help

	  Support for the Cortina Systems Gemini family SoCs



config ARCH_FOOTBRIDGE

	bool "FootBridge"

	select CPU_SA110
@@ -293,6 +287,30 @@ config ARCH_FOOTBRIDGE 
	  Support for systems based on the DC21285 companion chip

	  ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.



config ARCH_MXC

	bool "Freescale MXC/iMX-based"

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select ARCH_MTD_XIP

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select HAVE_CLK

	help

	  Support for Freescale MXC/iMX-based family of processors



config ARCH_STMP3XXX

	bool "Freescale STMP3xxx"

	select CPU_ARM926T

	select HAVE_CLK

	select COMMON_CLKDEV

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select USB_ARCH_HAS_EHCI

	help

	  Support for systems based on the Freescale 3xxx CPUs.



config ARCH_NETX

	bool "Hilscher NetX based"

	select CPU_ARM926T
@@ -309,15 +327,6 @@ config ARCH_H720X 
	help

	  This enables support for systems based on the Hynix HMS720x



config ARCH_IMX

	bool "IMX"

	select CPU_ARM920T

	select GENERIC_GPIO

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	help

	  Support for Motorola's i.MX family of processors (MX1, MXL).



config ARCH_IOP13XX

	bool "IOP13xx-based"

	depends on MMU
@@ -398,6 +407,7 @@ config ARCH_KIRKWOOD 
	select CPU_FEROCEON

	select PCI

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select PLAT_ORION
@@ -405,28 +415,6 @@ config ARCH_KIRKWOOD 
	  Support for the following Marvell Kirkwood series SoCs:

	  88F6180, 88F6192 and 88F6281.



config ARCH_KS8695

	bool "Micrel/Kendin KS8695"

	select CPU_ARM922T

	select GENERIC_GPIO

        select ARCH_REQUIRE_GPIOLIB

	help

	  Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based

	  System-on-Chip devices.



config ARCH_NS9XXX

	bool "NetSilicon NS9xxx"

	select CPU_ARM926T

	select GENERIC_GPIO

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	help

	  Say Y here if you intend to run this kernel on a NetSilicon NS9xxx

	  System.



	  <http://www.digi.com/products/microprocessors/index.jsp>



config ARCH_LOKI

	bool "Marvell Loki (88RC8480)"

	select CPU_FEROCEON
@@ -441,6 +429,7 @@ config ARCH_MV78XX0 
	select CPU_FEROCEON

	select PCI

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select PLAT_ORION
@@ -448,23 +437,13 @@ config ARCH_MV78XX0 
	  Support for the following Marvell MV78xx0 series SoCs:

	  MV781x0, MV782x0.



config ARCH_MXC

	bool "Freescale MXC/iMX-based"

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select ARCH_MTD_XIP

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select HAVE_CLK

	help

	  Support for Freescale MXC/iMX-based family of processors



config ARCH_ORION5X

	bool "Marvell Orion"

	depends on MMU

	select CPU_FEROCEON

	select PCI

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select PLAT_ORION
@@ -473,6 +452,52 @@ config ARCH_ORION5X 
	  Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),

	  Orion-2 (5281), Orion-1-90 (6183).



config ARCH_MMP

	bool "Marvell PXA168/910"

	depends on MMU

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select HAVE_CLK

	select COMMON_CLKDEV

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select TICK_ONESHOT

	select PLAT_PXA

	help

	  Support for Marvell's PXA168/910 processor line.



config ARCH_KS8695

	bool "Micrel/Kendin KS8695"

	select CPU_ARM922T

	select GENERIC_GPIO

        select ARCH_REQUIRE_GPIOLIB

	help

	  Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based

	  System-on-Chip devices.



config ARCH_NS9XXX

	bool "NetSilicon NS9xxx"

	select CPU_ARM926T

	select GENERIC_GPIO

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	help

	  Say Y here if you intend to run this kernel on a NetSilicon NS9xxx

	  System.



	  <http://www.digi.com/products/microprocessors/index.jsp>



config ARCH_W90X900

	bool "Nuvoton W90X900 CPU"

	select CPU_ARM926T

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_GPIO

	select COMMON_CLKDEV

	help

		Support for Nuvoton (Winbond logic dept.) ARM9 processor,You

		can login www.mcuos.com or www.nuvoton.com to know more.



config ARCH_PNX4008

	bool "Philips Nexperia PNX4008 Mobile"

	select CPU_ARM926T
@@ -495,19 +520,16 @@ config ARCH_PXA 
	help

	  Support for Intel/Marvell's PXA2xx/PXA3xx processor line.



config ARCH_MMP

	bool "Marvell PXA168/910"

	depends on MMU

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select HAVE_CLK

	select COMMON_CLKDEV

config ARCH_MSM

	bool "Qualcomm MSM"

	select CPU_V6

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select TICK_ONESHOT

	select PLAT_PXA

	help

	  Support for Marvell's PXA168/910 processor line.

	  Support for Qualcomm MSM7K based systems.  This runs on the ARM11

	  apps processor of the MSM7K and depends on a shared memory

	  interface to the ARM9 modem processor which runs the baseband stack

	  and controls some vital subsystems (clock and power control, etc).



config ARCH_RPC

	bool "RiscPC"
@@ -576,6 +598,20 @@ config ARCH_LH7A40X 
	  core with a wide array of integrated devices for

	  hand-held and low-power applications.



config ARCH_U300

	bool "ST-Ericsson U300 Series"

	depends on MMU

	select CPU_ARM926T

	select ARM_AMBA

	select ARM_VIC

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select COMMON_CLKDEV

	select GENERIC_GPIO

	help

	  Support for ST-Ericsson U300 series mobile platforms.



config ARCH_DAVINCI

	bool "TI DaVinci"

	select CPU_ARM926T
@@ -587,6 +623,7 @@ config ARCH_DAVINCI 
	select ZONE_DMA

	select HAVE_IDE

	select COMMON_CLKDEV

	select GENERIC_ALLOCATOR

	help

	  Support for TI's DaVinci platform.
@@ -600,24 +637,6 @@ config ARCH_OMAP 
	help

	  Support for TI's OMAP platform (OMAP1 and OMAP2).



config ARCH_MSM

	bool "Qualcomm MSM"

	select CPU_V6

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	help

	  Support for Qualcomm MSM7K based systems.  This runs on the ARM11

	  apps processor of the MSM7K and depends on a shared memory

	  interface to the ARM9 modem processor which runs the baseband stack

	  and controls some vital subsystems (clock and power control, etc).



config ARCH_W90X900

	bool "Nuvoton W90X900 CPU"

	select CPU_ARM926T

	help

		Support for Nuvoton (Winbond logic dept.) ARM9 processor,You

		can login www.mcuos.com or www.nuvoton.com to know more.



endchoice



source "arch/arm/mach-clps711x/Kconfig"
@@ -681,9 +700,9 @@ source "arch/arm/mach-s3c6400/Kconfig" 
source "arch/arm/mach-s3c6410/Kconfig"

endif



source "arch/arm/mach-lh7a40x/Kconfig"

source "arch/arm/plat-stmp3xxx/Kconfig"



source "arch/arm/mach-imx/Kconfig"

source "arch/arm/mach-lh7a40x/Kconfig"



source "arch/arm/mach-h720x/Kconfig"
@@ -707,6 +726,8 @@ source "arch/arm/mach-ks8695/Kconfig" 


source "arch/arm/mach-msm/Kconfig"



source "arch/arm/mach-u300/Kconfig"



source "arch/arm/mach-w90x900/Kconfig"



# Definitions to make life easier
@@ -859,8 +880,11 @@ source "kernel/time/Kconfig" 


config SMP

	bool "Symmetric Multi-Processing (EXPERIMENTAL)"

	depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP)

	depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP ||\

		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4)

	depends on GENERIC_CLOCKEVENTS

	select USE_GENERIC_SMP_HELPERS

	select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4)

	help

	  This enables support for systems with more than one CPU. If you have

	  a system with only one CPU, like most personal computers, say N. If
@@ -878,6 +902,18 @@ config SMP 


	  If you don't know what to do here, say N.



config HAVE_ARM_SCU

	bool

	depends on SMP

	help

	  This option enables support for the ARM system coherency unit



config HAVE_ARM_TWD

	bool

	depends on SMP

	help

	  This options enables support for the ARM timer and watchdog unit



choice

	prompt "Memory split"

	default VMSPLIT_3G
@@ -916,8 +952,10 @@ config HOTPLUG_CPU 


config LOCAL_TIMERS

	bool "Use local timer interrupts"

	depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || REALVIEW_EB_A9MP)

	depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || \

		REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4)

	default y

	select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_OMAP4)

	help

	  Enable support for local timers on SMP platforms, rather then the

	  legacy IPI broadcast method.  Local timers allows the system
@@ -979,7 +1017,6 @@ config OABI_COMPAT 


config ARCH_HAS_HOLES_MEMORYMODEL

	bool

	default n



# Discontigmem is deprecated

config ARCH_DISCONTIGMEM_ENABLE
@@ -1022,12 +1059,12 @@ source "mm/Kconfig" 
config LEDS

	bool "Timer and CPU usage LEDs"

	depends on ARCH_CDB89712 || ARCH_EBSA110 || \

		   ARCH_EBSA285 || ARCH_IMX || ARCH_INTEGRATOR || \

		   ARCH_EBSA285 || ARCH_INTEGRATOR || \

		   ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \

		   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \

		   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \

		   ARCH_AT91 || ARCH_DAVINCI || \

		   ARCH_KS8695 || MACH_RD88F5182

		   ARCH_KS8695 || MACH_RD88F5182 || ARCH_REALVIEW

	help

	  If you say Y here, the LEDs on your machine will be used

	  to provide useful information about your current system status.
@@ -1085,6 +1122,22 @@ config ALIGNMENT_TRAP 
	  correct operation of some network protocols. With an IP-only

	  configuration it is safe to say N, otherwise say Y.



config UACCESS_WITH_MEMCPY

	bool "Use kernel mem{cpy,set}() for {copy_to,clear}_user() (EXPERIMENTAL)"

	depends on MMU && EXPERIMENTAL

	default y if CPU_FEROCEON

	help

	  Implement faster copy_to_user and clear_user methods for CPU

	  cores where a 8-word STM instruction give significantly higher

	  memory write throughput than a sequence of individual 32bit stores.



	  A possible side effect is a slight increase in scheduling latency

	  between threads sharing the same address space if they invoke

	  such copy operations with large buffers.



	  However, if the CPU data cache is using a write-allocate mode,

	  this option is unlikely to provide any performance gain.



endmenu



menu "Boot options"
@@ -1188,7 +1241,7 @@ endmenu 


menu "CPU Power Management"



if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA)

if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_PXA)



source "drivers/cpufreq/Kconfig"
@@ -1213,14 +1266,11 @@ config CPU_FREQ_INTEGRATOR 


	  If in doubt, say Y.



config CPU_FREQ_IMX

	tristate "CPUfreq driver for i.MX CPUs"

	depends on ARCH_IMX && CPU_FREQ

	default n

	help

	  This enables the CPUfreq driver for i.MX CPUs.



	  If in doubt, say N.

config CPU_FREQ_PXA

	bool

	depends on CPU_FREQ && ARCH_PXA && PXA25x

	default y

	select CPU_FREQ_DEFAULT_GOV_USERSPACE



endif

arch/arm/Makefile

+68 −56
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@ 
# Copyright (C) 1995-2001 by Russell King



LDFLAGS_vmlinux	:=-p --no-undefined -X

ifeq ($(CONFIG_CPU_ENDIAN_BE8),y)

LDFLAGS_vmlinux	+= --be8

endif

CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET)

OBJCOPYFLAGS	:=-O binary -R .note -R .note.gnu.build-id -R .comment -S

GZFLAGS		:=-9
@@ -99,64 +102,73 @@ CHECKFLAGS += -D__arm__ 
#Default value

head-y		:= arch/arm/kernel/head$(MMUEXT).o arch/arm/kernel/init_task.o

textofs-y	:= 0x00008000



 machine-$(CONFIG_ARCH_RPC)	   := rpc

 machine-$(CONFIG_ARCH_EBSA110)	   := ebsa110

 machine-$(CONFIG_FOOTBRIDGE)	   := footbridge

 machine-$(CONFIG_ARCH_SHARK)	   := shark

 machine-$(CONFIG_ARCH_SA1100)	   := sa1100

ifeq ($(CONFIG_ARCH_SA1100),y)

textofs-$(CONFIG_ARCH_CLPS711X) := 0x00028000

# SA1111 DMA bug: we don't want the kernel to live in precious DMA-able memory

ifeq ($(CONFIG_ARCH_SA1100),y)

textofs-$(CONFIG_SA1111) := 0x00208000

endif

 machine-$(CONFIG_ARCH_PXA)	   := pxa

 machine-$(CONFIG_ARCH_MMP)	   := mmp

    plat-$(CONFIG_PLAT_PXA)	   := pxa

 machine-$(CONFIG_ARCH_L7200)	   := l7200

 machine-$(CONFIG_ARCH_INTEGRATOR) := integrator

 machine-$(CONFIG_ARCH_GEMINI)     := gemini

 textofs-$(CONFIG_ARCH_CLPS711X)   := 0x00028000



# Machine directory name.  This list is sorted alphanumerically

# by CONFIG_* macro name.

machine-$(CONFIG_ARCH_AAEC2000)		:= aaec2000

machine-$(CONFIG_ARCH_AT91)		:= at91

machine-$(CONFIG_ARCH_CLPS711X)		:= clps711x

machine-$(CONFIG_ARCH_DAVINCI)		:= davinci

machine-$(CONFIG_ARCH_EBSA110)		:= ebsa110

machine-$(CONFIG_ARCH_EP93XX)		:= ep93xx

machine-$(CONFIG_ARCH_GEMINI)		:= gemini

machine-$(CONFIG_ARCH_H720X)		:= h720x

machine-$(CONFIG_ARCH_INTEGRATOR)	:= integrator

machine-$(CONFIG_ARCH_IOP13XX)		:= iop13xx

machine-$(CONFIG_ARCH_IOP32X)		:= iop32x

machine-$(CONFIG_ARCH_IOP33X)		:= iop33x

 machine-$(CONFIG_ARCH_IOP13XX)	   := iop13xx

    plat-$(CONFIG_PLAT_IOP)	   := iop

 machine-$(CONFIG_ARCH_IXP4XX)	   := ixp4xx

machine-$(CONFIG_ARCH_IXP2000)		:= ixp2000

machine-$(CONFIG_ARCH_IXP23XX)		:= ixp23xx

machine-$(CONFIG_ARCH_IXP4XX)		:= ixp4xx

machine-$(CONFIG_ARCH_KIRKWOOD)		:= kirkwood

machine-$(CONFIG_ARCH_KS8695)		:= ks8695

machine-$(CONFIG_ARCH_L7200)		:= l7200

machine-$(CONFIG_ARCH_LH7A40X)		:= lh7a40x

machine-$(CONFIG_ARCH_LOKI) 		:= loki

machine-$(CONFIG_ARCH_MMP)		:= mmp

machine-$(CONFIG_ARCH_MSM)		:= msm

machine-$(CONFIG_ARCH_MV78XX0)		:= mv78xx0

machine-$(CONFIG_ARCH_MX1)		:= mx1

machine-$(CONFIG_ARCH_MX2)		:= mx2

machine-$(CONFIG_ARCH_MX3)		:= mx3

machine-$(CONFIG_ARCH_NETX)		:= netx

machine-$(CONFIG_ARCH_NS9XXX)		:= ns9xxx

machine-$(CONFIG_ARCH_OMAP1)		:= omap1

machine-$(CONFIG_ARCH_OMAP2)		:= omap2

machine-$(CONFIG_ARCH_OMAP3)		:= omap2

    plat-$(CONFIG_ARCH_OMAP)	   := omap

machine-$(CONFIG_ARCH_OMAP4)		:= omap2

machine-$(CONFIG_ARCH_ORION5X)		:= orion5x

machine-$(CONFIG_ARCH_PNX4008)		:= pnx4008

machine-$(CONFIG_ARCH_PXA)		:= pxa

machine-$(CONFIG_ARCH_REALVIEW)		:= realview

machine-$(CONFIG_ARCH_RPC)		:= rpc

machine-$(CONFIG_ARCH_S3C2410)		:= s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443

machine-$(CONFIG_ARCH_S3C24A0)		:= s3c24a0

    plat-$(CONFIG_PLAT_S3C24XX)	   := s3c24xx s3c

machine-$(CONFIG_ARCH_S3C64XX)		:= s3c6400 s3c6410

    plat-$(CONFIG_PLAT_S3C64XX)	   := s3c64xx s3c

 machine-$(CONFIG_ARCH_LH7A40X)	   := lh7a40x

machine-$(CONFIG_ARCH_SA1100)		:= sa1100

machine-$(CONFIG_ARCH_SHARK)		:= shark

machine-$(CONFIG_ARCH_STMP378X)		:= stmp378x

machine-$(CONFIG_ARCH_STMP37XX)		:= stmp37xx

machine-$(CONFIG_ARCH_U300)		:= u300

machine-$(CONFIG_ARCH_VERSATILE)	:= versatile

 machine-$(CONFIG_ARCH_IMX)	   := imx

 machine-$(CONFIG_ARCH_H720X)	   := h720x

 machine-$(CONFIG_ARCH_AAEC2000)   := aaec2000

 machine-$(CONFIG_ARCH_REALVIEW)   := realview

 machine-$(CONFIG_ARCH_AT91)	   := at91

 machine-$(CONFIG_ARCH_EP93XX)	   := ep93xx

 machine-$(CONFIG_ARCH_PNX4008)	   := pnx4008

 machine-$(CONFIG_ARCH_NETX)	   := netx

 machine-$(CONFIG_ARCH_NS9XXX)	   := ns9xxx

 machine-$(CONFIG_ARCH_DAVINCI)	   := davinci

 machine-$(CONFIG_ARCH_KIRKWOOD)   := kirkwood

 machine-$(CONFIG_ARCH_KS8695)     := ks8695

machine-$(CONFIG_ARCH_W90X900)		:= w90x900

machine-$(CONFIG_FOOTBRIDGE)		:= footbridge



# Platform directory name.  This list is sorted alphanumerically

# by CONFIG_* macro name.

plat-$(CONFIG_ARCH_MXC)		:= mxc

 machine-$(CONFIG_ARCH_MX2)	   := mx2

 machine-$(CONFIG_ARCH_MX3)	   := mx3

 machine-$(CONFIG_ARCH_MX1)	   := mx1

 machine-$(CONFIG_ARCH_ORION5X)	   := orion5x

plat-$(CONFIG_ARCH_OMAP)	:= omap

plat-$(CONFIG_PLAT_IOP)		:= iop

plat-$(CONFIG_PLAT_ORION)	:= orion

 machine-$(CONFIG_ARCH_MSM)	   := msm

 machine-$(CONFIG_ARCH_LOKI)       := loki

 machine-$(CONFIG_ARCH_MV78XX0)    := mv78xx0

 machine-$(CONFIG_ARCH_W90X900)    := w90x900

plat-$(CONFIG_PLAT_PXA)		:= pxa

plat-$(CONFIG_PLAT_S3C24XX)	:= s3c24xx s3c

plat-$(CONFIG_PLAT_S3C64XX)	:= s3c64xx s3c

plat-$(CONFIG_ARCH_STMP3XXX)	:= stmp3xxx



ifeq ($(CONFIG_ARCH_EBSA110),y)

# This is what happens if you forget the IOCS16 line.

arch/arm/boot/compressed/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ ifeq ($(CONFIG_PXA_SHARPSL),y) 
OBJS		+= head-sharpsl.o

endif



ifeq ($(CONFIG_CPU_BIG_ENDIAN),y)

ifeq ($(CONFIG_CPU_ENDIAN_BE32),y)

ifeq ($(CONFIG_CPU_CP15),y)

OBJS		+= big-endian.o

else
@@ -78,6 +78,9 @@ EXTRA_AFLAGS := -Wa,-march=all 
# linker symbols.  We only define initrd_phys and params_phys if the

# machine class defined the corresponding makefile variable.

LDFLAGS_vmlinux := --defsym zreladdr=$(ZRELADDR)

ifeq ($(CONFIG_CPU_ENDIAN_BE8),y)

LDFLAGS_vmlinux += --be8

endif

ifneq ($(INITRD_PHYS),)

LDFLAGS_vmlinux += --defsym initrd_phys=$(INITRD_PHYS)

endif