---

yaml --- r: 340089 b: refs/heads/master c: ea7d1bc h: refs/heads/master i: 340087: 3231c3b v: v3
git-mirror · Nov 21, 2012 · 87e63e7 · 87e63e7
1 parent b92276f
commit 87e63e7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49a88052b02df16266f1afc0d665abda5ae9d685
+refs/heads/master: ea7d1bc97d91e9b83436a6188cde987aab79aacf
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -366,6 +366,7 @@ config ARCH_CLPS711X
 	bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
 	select ARCH_REQUIRE_GPIOLIB
 	select ARCH_USES_GETTIMEOFFSET
+	select AUTO_ZRELADDR
 	select CLKDEV_LOOKUP
 	select COMMON_CLK
 	select CPU_ARM720T

diff --git a/trunk/arch/arm/mach-clps711x/Makefile.boot b/trunk/arch/arm/mach-clps711x/Makefile.boot
@@ -1,5 +1,4 @@
 # The standard locations for stuff on CLPS711x type processors
-   zreladdr-y				+= 0xc0028000
 params_phys-y				:= 0xc0000100
 # Should probably have some agreement on these...
 initrd_phys-$(CONFIG_ARCH_P720T)	:= 0xc0400000