Skip to contentSkip to conversation

spear: fix build errors for spear3xx/spear600 platforms

PATCH New Shiraz Hashim 3 participants 5 messages Jun 12, 2011 – Aug 4, 2011

lore
Share & tools
lore

Shiraz Hashim

author
#0 lore raw

PATCH 1/1 spear: fix build errors for spear3xx/spear600 platforms

Signed-off-by Shiraz Hashim <[email protected]>

---
Only build tested.

 board/spear/common/spr_misc.c  |   10 +++++++---
 include/configs/spear-common.h |   12 ++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)
board/spear/common/spr_misc.c +7 -3
index 0562222..0812c20 100644
@@ -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)
include/configs/spear-common.h +12 -0
index 4e5bdea..55d19b5 100644
@@ -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
Signature · 1 line
1.7.2.2
#1 lore raw

PATCH 1/1 spear: fix build errors for spear3xx/spear600 platforms

Hi all,

Le 12/06/2011 09:32, Shiraz Hashim a ?crit :

Quoted 7 lines
Signed-off-by Shiraz Hashim<[email protected]>

---
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,

Signature · 1 line
Albert.
#2 lore raw

PATCH 1/1 spear: fix build errors for spear3xx/spear600 platforms

Quoted 7 lines · Albert ARIBAUD

Hi all,

Le 12/06/2011 09:32, Shiraz Hashim a ?crit :

Quoted 4 lines
Signed-off-by Shiraz Hashim<[email protected]>

---
Only build tested.

Quoted 5 lines
Quoted 3 lines
   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.

Quoted 3 lines

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

Amicalement,

Amicalement,

Signature · 1 line
Albert.
#3 lore raw

PATCH 1/1 spear: fix build errors for spear3xx/spear600 platforms

Hello Albert,

Quoted 8 lines · Albert ARIBAUD
Quoted 7 lines · Albert ARIBAUD

Hi all,

Le 12/06/2011 09:32, Shiraz Hashim a ?crit :

Quoted 4 lines
Signed-off-by Shiraz Hashim<[email protected]>

---
Only build tested.

Quoted 9 lines
Quoted 5 lines
Quoted 3 lines
   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.

Quoted 1 line

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 <[email protected]>
#4 lore raw

PATCH 1/1 spear: fix build errors for spear3xx/spear600 platforms

In reply to Shiraz Hashim

Hi Shiraz,

Quoted 54 lines · Shiraz Hashim
Signed-off-by Shiraz Hashim<[email protected]>

---
Only build tested.

  board/spear/common/spr_misc.c  |   10 +++++++---
  include/configs/spear-common.h |   12 ++++++++++++
  2 files changed, 19 insertions(+), 3 deletions(-)
board/spear/common/spr_misc.c +7 -3
index 0562222..0812c20 100644
@@ -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)
include/configs/spear-common.h +3 -0
index 4e5bdea..55d19b5 100644
@@ -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

include/configs/spear-common.h line 224

Quoted 10 lines
include/configs/spear-common.h +9 -0
+#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,

Signature · 1 line
Albert.