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

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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (49 commits)
  [POWERPC] Add zImage.iseries to arch/powerpc/boot/.gitignore
  [POWERPC] bootwrapper: fix build error on virtex405-head.S
  [POWERPC] 4xx: Fix 460GT support to not enable FPU
  [POWERPC] 4xx: Add NOR FLASH entries to Canyonlands and Glacier dts
  [POWERPC] Xilinx: of_serial support for Xilinx uart 16550.
  [POWERPC] Xilinx: boot support for Xilinx uart 16550.
  [POWERPC] celleb: Add support for PCI Express
  [POWERPC] celleb: Move miscellaneous files for Beat
  [POWERPC] celleb: Move a file for SPU on Beat
  [POWERPC] celleb: Move files for Beat mmu and iommu
  [POWERPC] celleb: Move files for Beat hvcall interfaces
  [POWERPC] celleb: Move the SCC related code for celleb
  [POWERPC] celleb: Move the files for celleb base support
  [POWERPC] celleb: Consolidate io-workarounds code
  [POWERPC] cell: Generalize io-workarounds code
  [POWERPC] Add CONFIG_PPC_PSERIES_DEBUG to enable debugging for platforms/pseries
  [POWERPC] Convert from DBG() to pr_debug() in platforms/pseries/
  [POWERPC] Register udbg console early on pseries LPAR
  [POWERPC] Mark udbg console as CON_ANYTIME, ie. callable early in boot
  [POWERPC] Set udbg_console index to 0
  ...
parents 6e18933f f360bf00

Documentation/powerpc/booting-without-of.txt

+11 −0
Original line number Diff line number Diff line
@@ -2601,6 +2601,17 @@ platforms are moved over to use the flattened-device-tree model. 
                      differ between different families.  May be

                      'virtex2p', 'virtex4', or 'virtex5'.



      vi) Xilinx Uart 16550



      Xilinx UART 16550 devices are very similar to the NS16550 but with

      different register spacing and an offset from the base address.



      Requred properties:

       - clock-frequency : Frequency of the clock input

       - reg-offset : A value of 3 is required

       - reg-shift : A value of 2 is required





    p) Freescale Synchronous Serial Interface



       The SSI is a serial device that communicates with audio codecs.  It can

MAINTAINERS

+25 −0
Original line number Diff line number Diff line
@@ -1106,6 +1106,12 @@ M: kernel@wantstofly.org 
L:	linux-usb@vger.kernel.org

S:	Maintained



CIRRUS LOGIC CS4270 SOUND DRIVER

P:	Timur Tabi

M:	timur@freescale.com

L:	alsa-devel@alsa-project.org

S:	Supported



CIRRUS LOGIC CS4280/CS461x SOUNDDRIVER

P:	Cirrus Logic Corporation (kernel 2.2 driver)

M:	Cirrus Logic Corporation, Thomas Woller <twoller@crystal.cirrus.com>
@@ -1628,6 +1634,12 @@ L: linuxppc-dev@ozlabs.org 
L:	netdev@vger.kernel.org

S:	Maintained



FREESCALE QUICC ENGINE LIBRARY

P:	Timur Tabi

M:	timur@freescale.com

L:	linuxppc-dev@ozlabs.org

S:	Supported



FREESCALE HIGHSPEED USB DEVICE DRIVER

P:	Li Yang

M:	leoli@freescale.com
@@ -1642,6 +1654,19 @@ L: netdev@vger.kernel.org 
L:	linuxppc-dev@ozlabs.org

S:	Maintained



FREESCALE QUICC ENGINE UCC UART DRIVER

P:	Timur Tabi

M:	timur@freescale.com

L:	linuxppc-dev@ozlabs.org

S:	Supported



FREESCALE SOC SOUND DRIVERS

P:	Timur Tabi

M:	timur@freescale.com

L:	alsa-devel@alsa-project.org

L:	linuxppc-dev@ozlabs.org

S:	Supported



FILE LOCKING (flock() and fcntl()/lockf())

P:	Matthew Wilcox

M:	matthew@wil.cx

arch/powerpc/Kconfig

+66 −17
Original line number Diff line number Diff line
@@ -626,20 +626,6 @@ config ADVANCED_OPTIONS 
comment "Default settings for advanced configuration options are used"

	depends on !ADVANCED_OPTIONS



config HIGHMEM_START_BOOL

	bool "Set high memory pool address"

	depends on ADVANCED_OPTIONS && HIGHMEM

	help

	  This option allows you to set the base address of the kernel virtual

	  area used to map high memory pages.  This can be useful in

	  optimizing the layout of kernel virtual memory.



	  Say N here unless you know what you are doing.



config HIGHMEM_START

	hex "Virtual start address of high memory pool" if HIGHMEM_START_BOOL

	default "0xfe000000"



config LOWMEM_SIZE_BOOL

	bool "Set maximum low memory"

	depends on ADVANCED_OPTIONS
@@ -656,21 +642,76 @@ config LOWMEM_SIZE 
	hex "Maximum low memory size (in bytes)" if LOWMEM_SIZE_BOOL

	default "0x30000000"



config RELOCATABLE

	bool "Build a relocatable kernel (EXPERIMENTAL)"

	depends on EXPERIMENTAL && ADVANCED_OPTIONS && FLATMEM && FSL_BOOKE

	help

	  This builds a kernel image that is capable of running at the

	  location the kernel is loaded at (some alignment restrictions may

	  exist).



	  One use is for the kexec on panic case where the recovery kernel

	  must live at a different physical address than the primary

	  kernel.



	  Note: If CONFIG_RELOCATABLE=y, then the kernel runs from the address

	  it has been loaded at and the compile time physical addresses

	  CONFIG_PHYSICAL_START is ignored.  However CONFIG_PHYSICAL_START

	  setting can still be useful to bootwrappers that need to know the

	  load location of the kernel (eg. u-boot/mkimage).



config PAGE_OFFSET_BOOL

	bool "Set custom page offset address"

	depends on ADVANCED_OPTIONS

	help

	  This option allows you to set the kernel virtual address at which

	  the kernel will map low memory.  This can be useful in optimizing

	  the virtual memory layout of the system.



	  Say N here unless you know what you are doing.



config PAGE_OFFSET

	hex "Virtual address of memory base" if PAGE_OFFSET_BOOL

	default "0xc0000000"



config KERNEL_START_BOOL

	bool "Set custom kernel base address"

	depends on ADVANCED_OPTIONS

	help

	  This option allows you to set the kernel virtual address at which

	  the kernel will map low memory (the kernel image will be linked at

	  this address).  This can be useful in optimizing the virtual memory

	  layout of the system.

	  the kernel will be loaded.  Normally this should match PAGE_OFFSET

	  however there are times (like kdump) that one might not want them

	  to be the same.



	  Say N here unless you know what you are doing.



config KERNEL_START

	hex "Virtual address of kernel base" if KERNEL_START_BOOL

	default PAGE_OFFSET if PAGE_OFFSET_BOOL

	default "0xc2000000" if CRASH_DUMP

	default "0xc0000000"



config PHYSICAL_START_BOOL

	bool "Set physical address where the kernel is loaded"

	depends on ADVANCED_OPTIONS && FLATMEM && FSL_BOOKE

	help

	  This gives the physical address where the kernel is loaded.



	  Say N here unless you know what you are doing.



config PHYSICAL_START

	hex "Physical address where the kernel is loaded" if PHYSICAL_START_BOOL

	default "0x02000000" if PPC_STD_MMU && CRASH_DUMP

	default "0x00000000"



config PHYSICAL_ALIGN

	hex

	default "0x10000000" if FSL_BOOKE

	help

	  This value puts the alignment restrictions on physical address

	  where kernel is loaded and run from. Kernel is compiled for an

	  address which meets above alignment restriction.



config TASK_SIZE_BOOL

	bool "Set custom user task size"

	depends on ADVANCED_OPTIONS
@@ -717,9 +758,17 @@ config PIN_TLB 
endmenu



if PPC64

config PAGE_OFFSET

	hex

	default "0xc000000000000000"

config KERNEL_START

	hex

	default "0xc000000002000000" if CRASH_DUMP

	default "0xc000000000000000"

config PHYSICAL_START

	hex

	default "0x02000000" if CRASH_DUMP

	default "0x00000000"

endif



source "net/Kconfig"

arch/powerpc/boot/.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ zImage.chrp 
zImage.coff

zImage.coff.lds

zImage.ep*

zImage.iseries

zImage.*lds

zImage.miboot

zImage.pmac

arch/powerpc/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ $(obj)/ebony.o: BOOTCFLAGS += -mcpu=405 
$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405

$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405

$(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405

$(obj)/virtex405-head.o: BOOTCFLAGS += -mcpu=405

$(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405





zlib       := inffast.c inflate.c inftrees.c