From 4ac2e2d69fb028c7bd749a07346820a4fd38f65a Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 5 Jun 2011 06:26:49 +0000 Subject: mx31ads: Use the new relocation scheme This fixes the MX31ADS build by using the new relocation scheme. Signed-off-by: Fabio Estevam Tested-by: Felix Radensky --- include/configs/mx31ads.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'include') diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h index 5ea59b4..6d6c1bd 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 -- cgit v1.1 From 4e37731a27faeba57e4814954544ce18324ae259 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 5 Jun 2011 14:56:02 +0000 Subject: mx31litekit: Fix boot with the new relocation scheme. imx31_litekit has been converted to the new relocation scheme, but it does not boot. Make the boot functional by using board_early_init_f . Signed-off-by: Fabio Estevam Tested-by: Magnus Lilja --- include/configs/imx31_litekit.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h index 9405f56..7ee7076 100644 --- a/include/configs/imx31_litekit.h +++ b/include/configs/imx31_litekit.h @@ -145,6 +145,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 -- cgit v1.1 From ac88e66e14886ab97c25c91b0f3a5350d7c8db65 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 6 Jun 2011 03:13:36 +0000 Subject: imx31_litekit: Remove local config.mk Local board config.mk should be avoided. Place CONFIG_SYS_TEXT_BASE definition into the board config file instead. Signed-off-by: Fabio Estevam Acked-by: Stefano Babic --- include/configs/imx31_litekit.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h index 7ee7076..1131db0 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 -- cgit v1.1 From ba8dcca78dc071fb1f419a920c82c18b10f9eff3 Mon Sep 17 00:00:00 2001 From: Felix Radensky Date: Mon, 6 Jun 2011 05:06:07 +0000 Subject: mx31ads: Fix environment location on flash At the moment u-boot and u-boot environment on flash have overlapping addresses, so each u-boot update erases the environment. Fix this by placing evironment right after u-boot. Also, remove confusing comment about environment location. Signed-off-by: Felix Radensky --- include/configs/mx31ads.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h index 6d6c1bd..3c61911 100644 --- a/include/configs/mx31ads.h +++ b/include/configs/mx31ads.h @@ -182,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 -- cgit v1.1 From 43f13e4ad7b5fb5606d6cf4a902b2ccf9c67277c Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 6 Jun 2011 05:25:20 +0000 Subject: imx27lite: Remove local config.mk Local board config.mk should be avoided. Place CONFIG_SYS_TEXT_BASE definition into the board config file instead. Signed-off-by: Fabio Estevam --- include/configs/imx27lite-common.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index bc1fa00..8d93277 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 -- cgit v1.1