zmx25: Remove dram_init_banksize()

PATCH New Fabio Estevam 3 participants 11 messages Sep 23, 2011 – Sep 25, 2011

lore

Share & tools

lore

Fabio Estevam

author

2011-09-23 12:50 UTC #0 lore raw

PATCH 1/4 zmx25: Remove dram_init_banksize()

As only one RAM bank is used we can rely on the code from arch/arm/lib/board.c

Cc Matthias Weisser <[email protected]>

Signed-off-by Fabio Estevam <[email protected]>

---
 board/syteco/zmx25/zmx25.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

board/syteco/zmx25/zmx25.c +0 -6

index 893adc6..a49d831 100644
@@ -188,9 +188,3 @@ int dram_init(void)
 				PHYS_SDRAM_SIZE);
 	return 0;
 }
-
-void dram_init_banksize(void)
-{
-	gd->bd->bi_dram[0].start = PHYS_SDRAM;
-	gd->bd->bi_dram[0].size = gd->ram_size;
-}

Signature · 1 line

1.6.0.4

Fabio Estevam

author

2011-09-23 12:50 UTC #1 lore raw

PATCH 2/4 zmx25: Place machine ID into board config

Let common code set the machine ID.

Cc Matthias Weisser <[email protected]>

Signed-off-by Fabio Estevam <[email protected]>

---
 board/syteco/zmx25/zmx25.c |    2 --
 include/configs/zmx25.h    |    1 +
 2 files changed, 1 insertions(+), 2 deletions(-)

board/syteco/zmx25/zmx25.c +0 -2

index a49d831..a89ee1a 100644
@@ -117,8 +117,6 @@ int board_init()
 	writel(input_select1, &inputselect->i2c3_ipp_sda_in);	/* I2C3 SDA */
 	writel(input_select2, &inputselect->i2c3_ipp_scl_in);	/* I2C3 SCL */
 
-	/* board id for linux */
-	gd->bd->bi_arch_number = MACH_TYPE_ZMX25;
 	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
 	return 0;

include/configs/zmx25.h +1 -0

index 0c217b8..70c85ac 100644
@@ -34,6 +34,7 @@
 
 #define CONFIG_DISPLAY_CPUINFO
 
+#define CONFIG_MACH_TYPE	MACH_TYPE_ZMX25
 /*
  * Environment settings
  */

Signature · 1 line

1.6.0.4

Fabio Estevam

author

2011-09-23 12:50 UTC #2 lore raw

PATCH 3/4 vision2: Place machine ID into board config

Let common code set the machine ID.

Cc Stefano Babic <[email protected]>

Signed-off-by Fabio Estevam <[email protected]>

---
 board/ttcontrol/vision2/vision2.c |    1 -
 include/configs/vision2.h         |    2 ++
 2 files changed, 2 insertions(+), 1 deletions(-)

board/ttcontrol/vision2/vision2.c +0 -1

index 17a2558..ebca7b6 100644
@@ -653,7 +653,6 @@ void lcd_enable(void)
 
 int board_init(void)
 {
-	gd->bd->bi_arch_number = MACH_TYPE_TTC_VISION2;	/* board id for linux */
 	/* address of boot parameters */
 	gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;

include/configs/vision2.h +2 -0

index b5c7357..16881a9 100644
@@ -41,6 +41,8 @@
 #define CONFIG_INITRD_TAG
 #define BOARD_LATE_INIT
 
+#define CONFIG_MACH_TYPE	MACH_TYPE_TTC_VISION2
+
 /*
  * Size of malloc() pool
  */

Signature · 1 line

1.6.0.4

Fabio Estevam

author

2011-09-23 12:50 UTC #3 lore raw

PATCH 4/4 efikamx: Place machine ID into board config

Let common code set the machine ID.

Cc Marek Vasut <[email protected]>

Signed-off-by Fabio Estevam <[email protected]>

---
 board/efikamx/efikamx.c   |    1 -
 include/configs/efikamx.h |    2 ++
 2 files changed, 2 insertions(+), 1 deletions(-)

board/efikamx/efikamx.c +0 -1

index 5be1f6c..be2a9a1 100644
@@ -607,7 +607,6 @@ int board_early_init_f(void)
 
 int board_init(void)
 {
-	gd->bd->bi_arch_number = MACH_TYPE_MX51_EFIKAMX;
 	gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
 
 	return 0;

include/configs/efikamx.h +2 -0

index fdd0a14..0b5d2dc 100644
@@ -40,6 +40,8 @@
 
 #define CONFIG_SYS_TEXT_BASE		0x97800000
 
+#define CONFIG_MACH_TYPE	MACH_TYPE_MX51_EFIKAMX
+
 /*
  * Bootloader Components Configuration
  */

Signature · 1 line

1.6.0.4

Marek Vasut

2011-09-23 13:36 UTC #4 lore raw

PATCH 4/4 efikamx: Place machine ID into board config

Quoted 2 lines · Fabio Estevam

Let common code set the machine ID.

This will need rework ... stefano, can we get the efikasb stuff mainline so Fabio can rework this ?

Cheers

Quoted 32 lines

Cc Marek Vasut <[email protected]>

Signed-off-by Fabio Estevam <[email protected]>

---
 board/efikamx/efikamx.c   |    1 -
 include/configs/efikamx.h |    2 ++
 2 files changed, 2 insertions(+), 1 deletions(-)

board/efikamx/efikamx.c +0 -1

index 5be1f6c..be2a9a1 100644
@@ -607,7 +607,6 @@ int board_early_init_f(void)
 
 int board_init(void)
 {
-	gd->bd->bi_arch_number = MACH_TYPE_MX51_EFIKAMX;
 	gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
 
 	return 0;

include/configs/efikamx.h +2 -0

index fdd0a14..0b5d2dc 100644
@@ -40,6 +40,8 @@
 
 #define CONFIG_SYS_TEXT_BASE		0x97800000
 
+#define CONFIG_MACH_TYPE	MACH_TYPE_MX51_EFIKAMX
+
 /*
  * Bootloader Components Configuration
  */

Stefano Babic

2011-09-23 14:17 UTC #5 lore raw

PATCH 4/4 efikamx: Place machine ID into board config

Quoted 6 lines · Marek Vasut

Quoted 2 lines · Fabio Estevam
Let common code set the machine ID.
This will need rework ... stefano, can we get the efikasb stuff mainline so Fabio can rework this ?

No..it is not a good idea to push a patch that is already required to be changed.

As this patch addresses a comment in the EfikaMX/SB patchset, the best way is to fix this issue directly in that patchset.

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

Marek Vasut

2011-09-24 23:26 UTC #6 lore raw

PATCH 4/4 efikamx: Place machine ID into board config

Quoted 4 lines · Stefano Babic

Quoted 3 lines · Marek Vasut
Quoted 1 line · Fabio Estevam
Let common code set the machine ID.

Quoted 8 lines

Quoted 2 lines
This will need rework ... stefano, can we get the efikasb stuff mainline so Fabio can rework this ?
No..it is not a good idea to push a patch that is already required to be changed.
As this patch addresses a comment in the EfikaMX/SB patchset, the best way is to fix this issue directly in that patchset.

I also added that machine_is_() things so we'll have that all. Eventually, I plan to add MX/SB runtime detection, but that's not in place so far.

Quoted 3 lines

Best regards,
Stefano Babic

stefano babic

2011-09-25 09:43 UTC #7 lore raw

PATCH 4/4 efikamx: Place machine ID into board config

Am 25/09/2011 01:26, schrieb Marek Vasut:

Quoted 8 lines · Stefano Babic

Quoted 7 lines · Marek Vasut
Quoted 5 lines · Fabio Estevam
Quoted 1 line
Let common code set the machine ID.
This will need rework ... stefano, can we get the efikasb stuff mainline so Fabio can rework this ?

Quoted 8 lines

Quoted 5 lines
No..it is not a good idea to push a patch that is already required to be changed.
As this patch addresses a comment in the EfikaMX/SB patchset, the best way is to fix this issue directly in that patchset.
I also added that machine_is_() things so we'll have that all. Eventually, I plan to add MX/SB runtime detection, but that's not in place so far.

Ok . So I will take patches 1..3 of this patchset, and you take care of Eifika board.

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

Marek Vasut

2011-09-25 10:04 UTC #8 lore raw

PATCH 4/4 efikamx: Place machine ID into board config

Quoted 15 lines · stefano babic

Am 25/09/2011 01:26, schrieb Marek Vasut:
Quoted 14 lines · Stefano Babic
Quoted 12 lines · Marek Vasut
Quoted 5 lines · Fabio Estevam
Quoted 1 line
Let common code set the machine ID.
This will need rework ... stefano, can we get the efikasb stuff mainline so Fabio can rework this ?
No..it is not a good idea to push a patch that is already required to be changed.
As this patch addresses a comment in the EfikaMX/SB patchset, the best way is to fix this issue directly in that patchset.

Quoted 6 lines

Quoted 3 lines
I also added that machine_is_() things so we'll have that all. Eventually, I plan to add MX/SB runtime detection, but that's not in place so far.
Ok . So I will take patches 1..3 of this patchset, and you take care of Eifika board.

I'm all for it.

Quoted 3 lines

Best regards,
Stefano Babic

stefano babic

2011-09-24 06:39 UTC #9 lore raw

PATCH 3/4 vision2: Place machine ID into board config

In reply to Fabio Estevam

Am 23/09/2011 14:50, schrieb Fabio Estevam:

Quoted 26 lines

Let common code set the machine ID.

Cc Stefano Babic <[email protected]>

Signed-off-by Fabio Estevam <[email protected]>

---
 board/ttcontrol/vision2/vision2.c |    1 -
 include/configs/vision2.h         |    2 ++
 2 files changed, 2 insertions(+), 1 deletions(-)

board/ttcontrol/vision2/vision2.c +0 -1

index 17a2558..ebca7b6 100644
@@ -653,7 +653,6 @@ void lcd_enable(void)
 
 int board_init(void)
 {
-	gd->bd->bi_arch_number = MACH_TYPE_TTC_VISION2;	/* board id for linux */
 	/* address of boot parameters */
 	gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;

include/configs/vision2.h +0 -0

index b5c7357..16881a9 100644

include/configs/vision2.h line 48

Quoted 8 lines

include/configs/vision2.h +2 -0

@@ -41,6 +41,8 @@
 #define CONFIG_INITRD_TAG
 #define BOARD_LATE_INIT
 
+#define CONFIG_MACH_TYPE	MACH_TYPE_TTC_VISION2
+
 /*
  * Size of malloc() pool
  */

Acked-by Stefano Babic <[email protected]>

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

Stefano Babic

2011-09-25 15:58 UTC #10 lore raw

PATCH 1/4 zmx25: Remove dram_init_banksize()

In reply to Fabio Estevam

Quoted 13 lines · Fabio Estevam

As only one RAM bank is used we can rely on the code from arch/arm/lib/board.c
Cc Matthias Weisser <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>
---
 board/syteco/zmx25/zmx25.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
board/syteco/zmx25/zmx25.c +0 -0
index 893adc6..a49d831 100644

board/syteco/zmx25/zmx25.c int dram_init(void) · line 196

Quoted 9 lines

board/syteco/zmx25/zmx25.c +0 -6

@@ -188,9 +188,3 @@ int dram_init(void)
 				PHYS_SDRAM_SIZE);
 	return 0;
 }
-
-void dram_init_banksize(void)
-{
-	gd->bd->bi_dram[0].start = PHYS_SDRAM;
-	gd->bd->bi_dram[0].size = gd->ram_size;
-}

Acked-by Stefano Babic <[email protected]>

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================