diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 09:59:18 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 11:35:50 -0400 |
| commit | 090a80cba39f2763a488b6f7c65e38922d5aa17a (patch) | |
| tree | ba3797eeca74c42be95bc592ed2db1be99e329d2 /arch/arm/mach-spear6xx/Makefile.boot | |
| parent | 36be50515fe2aef61533b516fa2576a2c7fe7664 (diff) | |
| parent | eb3f995d7e73fd78b8fcdc55cfbf01a74a09a6e8 (diff) | |
Merge branch 'spear/13xx' into next/soc2
* spear/13xx:
pinctrl: SPEAr1310: Fix pin numbers for clcd_high_res
SPEAr: Update MAINTAINERS and Documentation
SPEAr13xx: Add defconfig
SPEAr13xx: Add compilation support
SPEAr13xx: Add dts and dtsi files
pinctrl: Add SPEAr13xx pinctrl drivers
pinctrl: SPEAr: Create macro for declaring GPIO PINS
SPEAr13xx: Add common clock framework support
SPEAr13xx: Add source files
SPEAr13xx: Add header files
Depends on clock, pinctrl and dt branches to go first.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-spear6xx/Makefile.boot')
| -rw-r--r-- | arch/arm/mach-spear6xx/Makefile.boot | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-spear6xx/Makefile.boot b/arch/arm/mach-spear6xx/Makefile.boot index 4674a4c221db..af493da37ab6 100644 --- a/arch/arm/mach-spear6xx/Makefile.boot +++ b/arch/arm/mach-spear6xx/Makefile.boot | |||
| @@ -1,3 +1,5 @@ | |||
| 1 | zreladdr-y += 0x00008000 | 1 | zreladdr-y += 0x00008000 |
| 2 | params_phys-y := 0x00000100 | 2 | params_phys-y := 0x00000100 |
| 3 | initrd_phys-y := 0x00800000 | 3 | initrd_phys-y := 0x00800000 |
| 4 | |||
| 5 | dtb-$(CONFIG_BOARD_SPEAR600_DT) += spear600-evb.dtb | ||