[U-Boot] [PATCH 2/2] edminiv2: add support for ELF relocations

Heiko Schocher hs at denx.de
Wed Oct 6 07:30:11 CEST 2010


Hello Albert,

Albert Aribaud wrote:
> Signed-off-by: Albert Aribaud <albert.aribaud at free.fr>
> ---
>  board/LaCie/edminiv2/config.mk |    4 ++--
>  include/configs/edminiv2.h     |    7 +++++++
>  2 files changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/board/LaCie/edminiv2/config.mk b/board/LaCie/edminiv2/config.mk
> index 3dec1aa..942c4e5 100644
> --- a/board/LaCie/edminiv2/config.mk
> +++ b/board/LaCie/edminiv2/config.mk
> @@ -23,5 +23,5 @@
>  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
>  # MA 02110-1301 USA
>  #
> -
> -TEXT_BASE = 0x00100000
> +# TEXT_BASE must equal the intended FLASH location of u-boot.
> +TEXT_BASE = 0xfff90000
> \ No newline at end of file
> diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
> index ccfc660..8bcdfcc 100644
> --- a/include/configs/edminiv2.h
> +++ b/include/configs/edminiv2.h
> @@ -223,4 +223,11 @@
>  #define CONFIG_SYS_RESET_ADDRESS	0xffff0000
>  #define CONFIG_SYS_MAXARGS		16
>  
> +/* additions for new relocation code, must be added to all boards */
> +#define CONFIG_RELOC_FIXUP_WORKS

Instead defining this in every board-config.h we should
define it in arch/arm/include/asm/config.h, as it is valid
with this relocation version for every arm board.

Can you add this to your 1/2 patch ?

> +#undef CONFIG_SYS_ARM_WITHOUT_RELOC

We don;t need this undef

> +#define CONFIG_SYS_SDRAM_BASE		0
> +#define CONFIG_SYS_INIT_SP_ADDR	\
> +	(CONFIG_SYS_SDRAM_BASE + 0x1000 - CONFIG_SYS_GBL_DATA_SIZE)
> +
>  #endif /* _CONFIG_EDMINIV2_H */

bye,
Heiko
-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany


More information about the U-Boot mailing list