summaryrefslogtreecommitdiff
path: root/arch/powerpc/cpu
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2011-01-12 02:48:53 -0600
committerKumar Gala <galak@kernel.crashing.org>2011-01-19 22:58:23 -0600
commit7a577fda2243cc55b7b942310259f7d1341f0011 (patch)
tree5b1c19cf19b820f4601c68d3293f40337c0df2a8 /arch/powerpc/cpu
parentfc0c2b6fc929f1d4038c4f0de1b631170b8f397c (diff)
downloadu-boot-imx-7a577fda2243cc55b7b942310259f7d1341f0011.zip
u-boot-imx-7a577fda2243cc55b7b942310259f7d1341f0011.tar.gz
u-boot-imx-7a577fda2243cc55b7b942310259f7d1341f0011.tar.bz2
powerpc/85xx: Move RESET_VECTOR_ADDRESS into config.h
Rather than defining it config.mk we can set it in config.h and remove config.mk from several boards that don't need it. We mimic what 4xx does and introduce CONFIG_RESET_VECTOR_ADDRESS for config.h to set. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'arch/powerpc/cpu')
-rw-r--r--arch/powerpc/cpu/mpc85xx/u-boot.lds8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds
index 67d7763..506c7f2 100644
--- a/arch/powerpc/cpu/mpc85xx/u-boot.lds
+++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds
@@ -1,5 +1,5 @@
/*
- * Copyright 2007-2009 Freescale Semiconductor, Inc.
+ * Copyright 2007-2009, 2011 Freescale Semiconductor, Inc.
*
* See file CREDITS for list of people who contributed to this
* project.
@@ -20,7 +20,11 @@
* MA 02111-1307 USA
*/
-#ifndef RESET_VECTOR_ADDRESS
+#include "config.h" /* CONFIG_BOARDDIR */
+
+#ifdef CONFIG_RESET_VECTOR_ADDRESS
+#define RESET_VECTOR_ADDRESS CONFIG_RESET_VECTOR_ADDRESS
+#else
#define RESET_VECTOR_ADDRESS 0xfffffffc
#endif