diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-01-25 21:13:04 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-01-25 21:13:04 +0100 |
| commit | 5aebe3b07254d9ec8f7ae23a4525a6c535a7f858 (patch) | |
| tree | 398660b7a43c39cee91c51e54678eab46aa7103d /arch/powerpc/cpu/mpc85xx/u-boot.lds | |
| parent | d6a5e6d531e357dd8016141f73d370d02886a7eb (diff) | |
| parent | 92966835e96af324fed574815036e481be807d04 (diff) | |
| download | u-boot-imx-5aebe3b07254d9ec8f7ae23a4525a6c535a7f858.zip u-boot-imx-5aebe3b07254d9ec8f7ae23a4525a6c535a7f858.tar.gz u-boot-imx-5aebe3b07254d9ec8f7ae23a4525a6c535a7f858.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/u-boot.lds')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/u-boot.lds | 8 |
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 |