Patchwork [U-Boot] spear: fix build errors for spear3xx/spear600 platforms

login
register
mail settings
Submitter Shiraz Hashim
Date June 12, 2011, 7:32 a.m.
Message ID <1307863977-4002-1-git-send-email-shiraz.hashim@st.com>
Download mbox | patch
Permalink /patch/100069/
State Accepted
Commit a39fcfb24be1520859af038971f1eb1b5e06e927
Delegated to: Albert ARIBAUD
Headers show

Comments

Shiraz Hashim - June 12, 2011, 7:32 a.m.
Signed-off-by: Shiraz Hashim <shiraz.hashim@st.com>
---
Only build tested.

 board/spear/common/spr_misc.c  |   10 +++++++---
 include/configs/spear-common.h |   12 ++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)
Albert ARIBAUD - July 16, 2011, 10:45 a.m.
Hi all,

Le 12/06/2011 09:32, Shiraz Hashim a écrit :
> Signed-off-by: Shiraz Hashim<shiraz.hashim@st.com>
> ---
> Only build tested.
>
>   board/spear/common/spr_misc.c  |   10 +++++++---
>   include/configs/spear-common.h |   12 ++++++++++++
>   2 files changed, 19 insertions(+), 3 deletions(-)

Cc:ing the MAINTAINERS' official spear maintainer, Vipin Kumar.

Is this Ok? If so I can pull this in u-boot-arm/master.

Amicalement,
Albert ARIBAUD - Aug. 4, 2011, 9:17 a.m.
On 16/07/2011 12:45, Albert ARIBAUD wrote:
> Hi all,
>
> Le 12/06/2011 09:32, Shiraz Hashim a écrit :
>> Signed-off-by: Shiraz Hashim<shiraz.hashim@st.com>
>> ---
>> Only build tested.
>>
>>    board/spear/common/spr_misc.c  |   10 +++++++---
>>    include/configs/spear-common.h |   12 ++++++++++++
>>    2 files changed, 19 insertions(+), 3 deletions(-)
>
> Cc:ing the MAINTAINERS' official spear maintainer, Vipin Kumar.

Hmm... I had actually not CC:ed Vipin. Doing it now.

> Is this Ok? If so I can pull this in u-boot-arm/master.
>
> Amicalement,

Amicalement,
Vipin Kumar - Aug. 4, 2011, 10:50 a.m.
Hello Albert,

On 8/4/2011 2:47 PM, Albert ARIBAUD wrote:
> On 16/07/2011 12:45, Albert ARIBAUD wrote:
>> Hi all,
>>
>> Le 12/06/2011 09:32, Shiraz Hashim a écrit :
>>> Signed-off-by: Shiraz Hashim<shiraz.hashim@st.com>
>>> ---
>>> Only build tested.
>>>
>>>    board/spear/common/spr_misc.c  |   10 +++++++---
>>>    include/configs/spear-common.h |   12 ++++++++++++
>>>    2 files changed, 19 insertions(+), 3 deletions(-)
>>
>> Cc:ing the MAINTAINERS' official spear maintainer, Vipin Kumar.
> 
> Hmm... I had actually not CC:ed Vipin. Doing it now.
> 
>> Is this Ok? If so I can pull this in u-boot-arm/master.

Sorry for responding late. I have tested the patch.

Acked-by: Vipin Kumar <vipin.kumar@st.com>
Albert ARIBAUD - Aug. 4, 2011, 11:52 a.m.
Hi Shiraz,

On 12/06/2011 09:32, Shiraz Hashim wrote:
> Signed-off-by: Shiraz Hashim<shiraz.hashim@st.com>
> ---
> Only build tested.
>
>   board/spear/common/spr_misc.c  |   10 +++++++---
>   include/configs/spear-common.h |   12 ++++++++++++
>   2 files changed, 19 insertions(+), 3 deletions(-)
>
> diff --git a/board/spear/common/spr_misc.c b/board/spear/common/spr_misc.c
> index 0562222..0812c20 100644
> --- a/board/spear/common/spr_misc.c
> +++ b/board/spear/common/spr_misc.c
> @@ -46,9 +46,7 @@ int dram_init(void)
>   	struct xloader_table_1_2 *table_1_2;
>   	struct chip_data *chip =&chip_data;
>
> -	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
> -	gd->bd->bi_dram[0].size = get_ram_size(PHYS_SDRAM_1,
> -					       PHYS_SDRAM_1_MAXSIZE);
> +	gd->ram_size = get_ram_size(PHYS_SDRAM_1, PHYS_SDRAM_1_MAXSIZE);
>
>   	if (XLOADER_TABLE_VERSION_1_1 == xloader_tb->table_version) {
>   		table_1_1 =&xloader_tb->table.table_1_1;
> @@ -66,6 +64,12 @@ int dram_init(void)
>   	return 0;
>   }
>
> +void dram_init_banksize(void)
> +{
> +	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
> +	gd->bd->bi_dram[0].size = gd->ram_size;
> +}
> +
>   int misc_init_r(void)
>   {
>   #if defined(CONFIG_CMD_NET)
> diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
> index 4e5bdea..55d19b5 100644
> --- a/include/configs/spear-common.h
> +++ b/include/configs/spear-common.h
> @@ -86,6 +86,8 @@
>   #define CONFIG_SYS_LOADS_BAUD_CHANGE
>
>   /* NAND FLASH Configuration */
> +#define CONFIG_MTD_DEVICE
> +#define CONFIG_MTD_PARTITIONS
>   #define CONFIG_NAND_SPEAR			1
>   #define CONFIG_SYS_MAX_NAND_DEVICE		1
>   #define CONFIG_MTD_NAND_VERIFY_WRITE		1
> @@ -209,4 +211,14 @@
>   #define PHYS_SDRAM_1				0x00000000
>   #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_SYS_INIT_SP_OFFSET		\
> +	(CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
> +
> +#define CONFIG_SYS_INIT_SP_ADDR			\
> +	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
> +
>   #endif

Applied to u-boot-arm/master, thanks!

Amicalement,

Patch

diff --git a/board/spear/common/spr_misc.c b/board/spear/common/spr_misc.c
index 0562222..0812c20 100644
--- a/board/spear/common/spr_misc.c
+++ b/board/spear/common/spr_misc.c
@@ -46,9 +46,7 @@  int dram_init(void)
 	struct xloader_table_1_2 *table_1_2;
 	struct chip_data *chip = &chip_data;
 
-	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
-	gd->bd->bi_dram[0].size = get_ram_size(PHYS_SDRAM_1,
-					       PHYS_SDRAM_1_MAXSIZE);
+	gd->ram_size = get_ram_size(PHYS_SDRAM_1, PHYS_SDRAM_1_MAXSIZE);
 
 	if (XLOADER_TABLE_VERSION_1_1 == xloader_tb->table_version) {
 		table_1_1 = &xloader_tb->table.table_1_1;
@@ -66,6 +64,12 @@  int dram_init(void)
 	return 0;
 }
 
+void dram_init_banksize(void)
+{
+	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
+	gd->bd->bi_dram[0].size = gd->ram_size;
+}
+
 int misc_init_r(void)
 {
 #if defined(CONFIG_CMD_NET)
diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index 4e5bdea..55d19b5 100644
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -86,6 +86,8 @@ 
 #define CONFIG_SYS_LOADS_BAUD_CHANGE
 
 /* NAND FLASH Configuration */
+#define CONFIG_MTD_DEVICE
+#define CONFIG_MTD_PARTITIONS
 #define CONFIG_NAND_SPEAR			1
 #define CONFIG_SYS_MAX_NAND_DEVICE		1
 #define CONFIG_MTD_NAND_VERIFY_WRITE		1
@@ -209,4 +211,14 @@ 
 #define PHYS_SDRAM_1				0x00000000
 #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_SYS_INIT_SP_OFFSET		\
+	(CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
+
+#define CONFIG_SYS_INIT_SP_ADDR			\
+	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
+
 #endif