diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 17:09:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 17:09:31 -0700 |
| commit | 4b30b6f23a1a59cda29cc12566eb4f32a22a8069 (patch) | |
| tree | 69e262a5065ce8be21c919febd29d5d9660f3e97 /arch/arm/mach-zynq/Makefile.boot | |
| parent | 38da590bef19f23d4b610aecaad4f32de483890d (diff) | |
| parent | 6c59c115b0f295434cc4f917d180fecd84d39f81 (diff) | |
| download | linux-4b30b6f23a1a59cda29cc12566eb4f32a22a8069.tar.bz2 | |
Merge branch 'next/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
* 'next/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
MAINTAINERS: add maintainer of CSR SiRFprimaII machine
ARM: CSR: initializing L2 cache
ARM: CSR: mapping early DEBUG_LL uart
ARM: CSR: Adding CSR SiRFprimaII board support
OMAP4: clocks: Update the clock tree with 4460 clock nodes
OMAP4: PRCM: OMAP4460 specific PRM and CM register bitshifts
OMAP4: ID: add omap_has_feature for max freq supported
OMAP: ID: introduce chip detection for OMAP4460
ARM: Xilinx: merge board file into main platform code
ARM: Xilinx: Adding Xilinx board support
Fix up conflicts in arch/arm/mach-omap2/cm-regbits-44xx.h
Diffstat (limited to 'arch/arm/mach-zynq/Makefile.boot')
| -rw-r--r-- | arch/arm/mach-zynq/Makefile.boot | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-zynq/Makefile.boot b/arch/arm/mach-zynq/Makefile.boot new file mode 100644 index 000000000000..67039c3e0c48 --- /dev/null +++ b/arch/arm/mach-zynq/Makefile.boot @@ -0,0 +1,3 @@ + zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 |