diff options
| author | Stefan Roese <sr@denx.de> | 2015-08-18 09:27:17 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-28 12:33:16 -0400 |
| commit | 2fbdbda1c7c48aa622812054633afc6cdff91eab (patch) | |
| tree | 0664ef6869bc551a9eed337ea97be324dae75a8a /include | |
| parent | 80999a52778ca6cc0452599bdc75ae4b417231be (diff) | |
| download | u-boot-2fbdbda1c7c48aa622812054633afc6cdff91eab.tar.gz | |
arm: spear: Move to common SPL infrastructure
The SPL implementation for SPEAr600 is older than the common SPL
infrastructure. This patch now moves the SPEAr600 SPL over to the
common SPL code.
Tested on the only SPEAr board that currently uses SPL in mainline
U-Boot, the x600.
Signed-off-by: Stefan Roese <sr@denx.de>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Vipin Kumar <vk.vipin@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/x600.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/include/configs/x600.h b/include/configs/x600.h index edb16b1a70..70e633c274 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -2,7 +2,7 @@ * (C) Copyright 2009 * Vipin Kumar, STMicroelectronics, <vipin.kumar@st.com> * - * Copyright (C) 2012 Stefan Roese <sr@denx.de> + * Copyright (C) 2012, 2015 Stefan Roese <sr@denx.de> * * SPDX-License-Identifier: GPL-2.0+ */ @@ -162,7 +162,8 @@ /* Use last 2 lwords in internal SRAM for bootcounter */ #define CONFIG_BOOTCOUNT_LIMIT -#define CONFIG_SYS_BOOTCOUNT_ADDR 0xd2801ff8 +#define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SRAM_BASE + \ + CONFIG_SRAM_SIZE) #define CONFIG_HOSTNAME x600 #define CONFIG_UBI_PART ubi0 @@ -248,8 +249,11 @@ #define PHYS_SDRAM_1_MAXSIZE 0x40000000 #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 -#define CONFIG_SYS_INIT_RAM_ADDR 0xD2800000 -#define CONFIG_SYS_INIT_RAM_SIZE 0x2000 +#define CONFIG_SRAM_BASE 0xd2800000 +/* Preserve the last 2 lwords for the boot-counter */ +#define CONFIG_SRAM_SIZE ((8 << 10) - 0x8) +#define CONFIG_SYS_INIT_RAM_ADDR CONFIG_SRAM_BASE +#define CONFIG_SYS_INIT_RAM_SIZE CONFIG_SRAM_SIZE #define CONFIG_SYS_INIT_SP_OFFSET \ (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) @@ -260,10 +264,13 @@ /* * SPL related defines */ -#define CONFIG_SPL_TEXT_BASE 0xd2800b00 +#define CONFIG_SPL_TEXT_BASE 0xd2800b00 +#define CONFIG_SPL_MAX_SIZE (CONFIG_SRAM_SIZE - 0xb00) #define CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/spear" #define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds" +#define CONFIG_SPL_FRAMEWORK +#define CONFIG_SPL_NOR_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT /* image.c */ #define CONFIG_SPL_LIBGENERIC_SUPPORT /* string.c */ |