diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-06-08 23:29:04 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-06-08 23:29:04 +0200 |
| commit | 9571865e0d32b1bcf8a6625497d1cd5d4bbad354 (patch) | |
| tree | 314afe1d1b53adbca24e6c3a9cf2c45741cdb4ba /include/configs | |
| parent | ba5c1228463c19395d1cf4b88d4bae7171fe6d98 (diff) | |
| parent | 84b80856387a72c38586075c9a6795e4face7693 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
* 'master' of git://git.denx.de/u-boot-arm:
SMDK6400: fix the compiler error
imx27lite: Remove local config.mk
mx31ads: Fix environment location on flash
imx31_litekit: Remove local config.mk
mx31litekit: Fix boot with the new relocation scheme.
mx31ads: Use the new relocation scheme
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/imx27lite-common.h | 2 | ||||
| -rw-r--r-- | include/configs/imx31_litekit.h | 3 | ||||
| -rw-r--r-- | include/configs/mx31ads.h | 21 |
3 files changed, 19 insertions, 7 deletions
diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index bc1fa00ef..8d93277c2 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -34,6 +34,8 @@ #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_CPUINFO +#define CONFIG_SYS_TEXT_BASE 0xc0000000 + #define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_INITRD_TAG 1 diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h index 9405f562c..1131db0a5 100644 --- a/include/configs/imx31_litekit.h +++ b/include/configs/imx31_litekit.h @@ -39,6 +39,8 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_SYS_TEXT_BASE 0xa0000000 + /* Temporarily disabled */ #if 0 #define CONFIG_OF_LIBFDT 1 @@ -145,6 +147,7 @@ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 CSD0_BASE #define PHYS_SDRAM_1_SIZE (128 * 1024 * 1024) +#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_SYS_SDRAM_BASE CSD0_BASE #define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h index 5ea59b4ab..3c61911b0 100644 --- a/include/configs/mx31ads.h +++ b/include/configs/mx31ads.h @@ -33,6 +33,8 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_SYS_TEXT_BASE 0xA0000000 + /* * Disabled for now due to build problems under Debian and a significant increase * in the final file size: 144260 vs. 109536 Bytes. @@ -160,6 +162,15 @@ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 CSD0_BASE #define PHYS_SDRAM_1_SIZE (128 * 1024 * 1024) +#define CONFIG_BOARD_EARLY_INIT_F + +#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 +#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR +#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE +#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - \ + GENERATED_GBL_DATA_SIZE) +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_GBL_DATA_OFFSET) /*----------------------------------------------------------------------- * FLASH and environment organization @@ -171,18 +182,14 @@ #define CONFIG_SYS_MONITOR_LEN (256 * 1024) /* Reserve 256KiB */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CONFIG_ENV_SECT_SIZE (32 * 1024) +#define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE +#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) /* Address and size of Redundant Environment Sector */ -#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE -/* S29WS256N NOR flash has 4 32KiB small sectors at the beginning and at the end. - * The rest of 32MiB is in 128KiB big sectors. U-Boot occupies the low 4 sectors, - * if we put environment next to it, we will have to occupy 128KiB for it. - * Putting it at the top of flash we use only 32KiB. */ -#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_ENV_SECT_SIZE) /*----------------------------------------------------------------------- * CFI FLASH driver setup |