diff mbox

[U-Boot,08/30] powerpc/km82xx: rename mgcoge2ne to mgcoge3ne board support

Message ID c5ba4fd44d7260d169b924ddda97c4a4c7460dd5.1302272395.git.valentin.longchamp@keymile.com
State Changes Requested
Delegated to: Wolfgang Denk
Headers show

Commit Message

Valentin Longchamp April 8, 2011, 2:23 p.m. UTC 
From: Holger Brunck <holger.brunck@keymile.com>

This patch rename mgcoge2ne board support to mgcoge3ne.
The board is similar to mgcoge. The difference is that
a NUMONYX flash is used and a larger SDRAM (256MB).
Also introduce CONFIG_KM_82XX to collect ppc82xx common
settings.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Acked-by: Heiko Schocher <hs@denx.de>
cc: Wolfgang Denk <wd@denx.de>
cc: Detlev Zundel <dzu@denx.de>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>
Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
---
 MAINTAINERS                                  |    2 +-
 board/keymile/common/common.c                |    6 +-
 board/keymile/common/common.h                |    1 +
 board/keymile/km82xx/km82xx.c                |   27 ++++++++++++
 boards.cfg                                   |    2 +-
 include/configs/mgcoge.h                     |    1 +
 include/configs/{mgcoge2ne.h => mgcoge3ne.h} |   58 +++++++++++++++-----------
 7 files changed, 67 insertions(+), 30 deletions(-)
 rename include/configs/{mgcoge2ne.h => mgcoge3ne.h} (65%)

Comments

Wolfgang Denk April 30, 2011, 8:05 a.m. UTC | #1 
Dear Valentin Longchamp,

In message <c5ba4fd44d7260d169b924ddda97c4a4c7460dd5.1302272395.git.valentin.longchamp@keymile.com> you wrote:
> From: Holger Brunck <holger.brunck@keymile.com>
> 
> This patch rename mgcoge2ne board support to mgcoge3ne.
> The board is similar to mgcoge. The difference is that
> a NUMONYX flash is used and a larger SDRAM (256MB).
> Also introduce CONFIG_KM_82XX to collect ppc82xx common
> settings.

I understand this is just a rename, but I want to ask anyway: if flash
type and RAM size are the only differences, then why do we need two
separate board definitions here?

Would not even the same U-Boot binary image run on both boards?  These
flashes are CFI compatible, so the CFI driver would work on both, and
RAM size autodetection has been available in U-Boot forever.

In worst case, we coul differentiate boards by an additional #define,
which means we only need a single line entry in boards.cfg.

Why do we need to support two board entries?

Best regards,

Wolfgang Denk
Holger Brunck May 2, 2011, 8:20 a.m. UTC | #2 
Hello,

On 04/30/2011 10:05 AM, Wolfgang Denk wrote:
> Dear Valentin Longchamp,
> 
> In message <c5ba4fd44d7260d169b924ddda97c4a4c7460dd5.1302272395.git.valentin.longchamp@keymile.com> you wrote:
>> From: Holger Brunck <holger.brunck@keymile.com>
>>
>> This patch rename mgcoge2ne board support to mgcoge3ne.
>> The board is similar to mgcoge. The difference is that
>> a NUMONYX flash is used and a larger SDRAM (256MB).
>> Also introduce CONFIG_KM_82XX to collect ppc82xx common
>> settings.
> 
> I understand this is just a rename, but I want to ask anyway: if flash
> type and RAM size are the only differences, then why do we need two
> separate board definitions here?
> 
> Would not even the same U-Boot binary image run on both boards?  These
> flashes are CFI compatible, so the CFI driver would work on both, and
> RAM size autodetection has been available in U-Boot forever.
> 
> In worst case, we coul differentiate boards by an additional #define,
> which means we only need a single line entry in boards.cfg.
> 
> Why do we need to support two board entries?
> 

the SDRAM configuration is different to mgcoge. And the CFI flash on mgcoge has
a dual die in a single chip and therefore e.g.CONFIG_SYS_MAX_FLASH_BANKS is
different to mgcoge3ne.

Additionaly some functional differences are part of the board support, this is
added later on. E.g. mgcoge3ne is part of mgcoge3 which has two processors
deployed and there are some connections between the processors via GPIOs which
are not present on mgcoge. So in my opinion an additional board suport is
reasonable in this case.

Best regards
Holger Brunck
Wolfgang Denk May 2, 2011, 8:42 a.m. UTC | #3 
Dear Holger Brunck,

In message <4DBE6962.1010609@keymile.com> you wrote:
>
> the SDRAM configuration is different to mgcoge. And the CFI flash on mgcoge has
> a dual die in a single chip and therefore e.g.CONFIG_SYS_MAX_FLASH_BANKS is
> different to mgcoge3ne.

OK, but these can trivially be handled within one set of board files.

> Additionaly some functional differences are part of the board support, this is
> added later on. E.g. mgcoge3ne is part of mgcoge3 which has two processors
> deployed and there are some connections between the processors via GPIOs which
> are not present on mgcoge. So in my opinion an additional board suport is
> reasonable in this case.

Well, it's your board and you have to maintain it in the long run, but
I'm not convinced that this is a wise decision.

Best regards,

Wolfgang Denk
Holger Brunck May 2, 2011, 9:22 a.m. UTC | #4 
On 05/02/2011 10:42 AM, Wolfgang Denk wrote:
> Dear Holger Brunck,
> 
> In message <4DBE6962.1010609@keymile.com> you wrote:
>>
>> the SDRAM configuration is different to mgcoge. And the CFI flash on mgcoge has
>> a dual die in a single chip and therefore e.g.CONFIG_SYS_MAX_FLASH_BANKS is
>> different to mgcoge3ne.
> 
> OK, but these can trivially be handled within one set of board files.
> 

with a lot of #ifdef MGCOGE3NE in one config file or do I misunderstand something?

>> Additionaly some functional differences are part of the board support, this is
>> added later on. E.g. mgcoge3ne is part of mgcoge3 which has two processors
>> deployed and there are some connections between the processors via GPIOs which
>> are not present on mgcoge. So in my opinion an additional board suport is
>> reasonable in this case.
> 
> Well, it's your board and you have to maintain it in the long run, but
> I'm not convinced that this is a wise decision.
> 

So your proposal would be to do something like
mgcoge  powerpc   mpc8260     km82xx  keymile - mgcoge3ne:MGCOGE3NE,...
in boards.cfg and only one config file for both boards?

Best regards
Holger Brunck
Wolfgang Denk May 10, 2011, 8:45 p.m. UTC | #5 
Dear Holger Brunck,

In message <4DBE77C1.7020806@keymile.com> you wrote:
>
> >> the SDRAM configuration is different to mgcoge. And the CFI flash on mgcoge has
> >> a dual die in a single chip and therefore e.g.CONFIG_SYS_MAX_FLASH_BANKS is
> >> different to mgcoge3ne.
> > 
> > OK, but these can trivially be handled within one set of board files.
> 
> with a lot of #ifdef MGCOGE3NE in one config file or do I misunderstand something?

Well, I would expect to have one #ifdef for the SDRAM configuration,
and another one for CONFIG_SYS_MAX_FLASH_BANKS - both in the common
board config file.

> So your proposal would be to do something like
> mgcoge  powerpc   mpc8260     km82xx  keymile - mgcoge3ne:MGCOGE3NE,...
> in boards.cfg and only one config file for both boards?

Yes.

Best regards,

Wolfgang Denk
diff mbox

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index 9586bcb..37e03c9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -429,7 +429,7 @@  Heiko Schocher <hs@denx.de>
 	kmeter1		MPC8360
 	kmsupx5		MPC8321
 	mgcoge		MPC8247
-	mgcoge2ne	MPC8247
+	mgcoge3ne	MPC8247
 	mgcoge2un	ARM926EJS (Kirkwood SoC)
 	mucmc52		MPC5200
 	muas3001	MPC8270
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c
index b113c0a..3a7980d 100644
--- a/board/keymile/common/common.c
+++ b/board/keymile/common/common.c
@@ -22,7 +22,7 @@ 
  */
 
 #include <common.h>
-#if defined(CONFIG_MGCOGE) || defined(CONFIG_MGCOGE2NE)
+#if defined(CONFIG_KM82XX)
 #include <mpc8260.h>
 #endif
 #include <ioports.h>
@@ -398,10 +398,10 @@  int ivm_read_eeprom(void)
 #define DELAY_ABORT_SEQ		62  /* @200kHz 9 clocks = 44us, 62us is ok */
 #define DELAY_HALF_PERIOD	(500 / (CONFIG_SYS_I2C_SPEED / 1000))
 
-#if defined(CONFIG_MGCOGE) || defined(CONFIG_MGCOGE2NE)
+#if defined(CONFIG_KM_82XX)
 #define SDA_MASK	0x00010000
 #define SCL_MASK	0x00020000
-static void set_pin(int state, unsigned long mask)
+void set_pin(int state, unsigned long mask)
 {
 	ioport_t *iop = ioport_addr((immap_t *)CONFIG_SYS_IMMR, 3);
 
diff --git a/board/keymile/common/common.h b/board/keymile/common/common.h
index 6ce992a..cee24d4 100644
--- a/board/keymile/common/common.h
+++ b/board/keymile/common/common.h
@@ -124,6 +124,7 @@  struct bfticu_iomap {
 
 int ethernet_present(void);
 int ivm_read_eeprom(void);
+void set_pin(int state, unsigned long mask);
 
 int set_km_env(void);
 int fdt_set_node_and_value(void *blob,
diff --git a/board/keymile/km82xx/km82xx.c b/board/keymile/km82xx/km82xx.c
index 3db3c7b..5dc7ffa 100644
--- a/board/keymile/km82xx/km82xx.c
+++ b/board/keymile/km82xx/km82xx.c
@@ -287,6 +287,8 @@  int checkboard(void)
 {
 #if defined(CONFIG_MGCOGE)
 	puts("Board: Keymile mgcoge");
+#elif defined(CONFIG_MGCOGE3NE)
+	puts("Board: Keymile mgcoge3ne");
 #else
 	puts("Board: Keymile mgcoge2ne");
 #endif
@@ -296,6 +298,28 @@  int checkboard(void)
 	return 0;
 }
 
+#ifdef CONFIG_MGCOGE3NE
+/*
+ * For mgcoge3ne boards, the mgcoge3un control is controlled from
+ * a GPIO line on the PPC CPU. If bobcatreset is set the line
+ * will toggle once what forces the mgocge3un part to restart
+ * immediately.
+ */
+void handle_mgcoge3un_reset(void)
+{
+	char *bobcatreset = getenv("bobcatreset");
+	if (bobcatreset) {
+		if (strcmp(bobcatreset, "true") == 0) {
+			puts("Forcing bobcat reset\n");
+			set_pin(0, 0x00000004);	/* clear PD29 to reset arm */
+			udelay(1000);
+			set_pin(1, 0x00000004);
+		} else
+			set_pin(1, 0x00000004);	/* set PD29 to not reset arm */
+	}
+}
+#endif
+
 /*
  * Early board initalization.
  */
@@ -311,6 +335,9 @@  int board_early_init_r(void)
 	out_8(&base->oprtl, (H_OPORTS_SCC4_ENA | H_OPORTS_SCC4_FD_ENA |
 		H_OPORTS_FCC1_PW_DWN));
 
+#ifdef CONFIG_MGCOGE3NE
+	handle_mgcoge3un_reset();
+#endif
 	return 0;
 }
 
diff --git a/boards.cfg b/boards.cfg
index 4c52770..f6105be 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -423,7 +423,7 @@  PQ2FADS-ZU_66MHz_lowboot     powerpc     mpc8260     mpc8260ads          freesca
 PQ2FADS-ZU_lowboot           powerpc     mpc8260     mpc8260ads          freescale      -           MPC8260ADS:ADSTYPE=CONFIG_SYS_PQ2FADS,SYS_TEXT_BASE=0xFF800000
 VoVPN-GW_66MHz               powerpc     mpc8260     vovpn-gw            funkwerk       -           VoVPN-GW:CLKIN_66MHz
 mgcoge                       powerpc     mpc8260     km82xx              keymile
-mgcoge2ne                    powerpc     mpc8260     km82xx              keymile
+mgcoge3ne                    powerpc     mpc8260     km82xx              keymile
 SCM                          powerpc     mpc8260     -                   siemens
 TQM8255_AA                   powerpc     mpc8260     tqm8260             tqc            -           TQM8260:MPC8255,300MHz
 TQM8260_AA                   powerpc     mpc8260     tqm8260             tqc            -           TQM8260:MPC8260,200MHz
diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h
index aed1526..93a6f4a 100644
--- a/include/configs/mgcoge.h
+++ b/include/configs/mgcoge.h
@@ -32,6 +32,7 @@ 
 #define CONFIG_MPC8247
 #define CONFIG_MGCOGE
 #define CONFIG_HOSTNAME		mgcoge
+#define CONFIG_KM_82XX
 
 #define	CONFIG_SYS_TEXT_BASE	0xFE000000
 
diff --git a/include/configs/mgcoge2ne.h b/include/configs/mgcoge3ne.h
similarity index 65%
rename from include/configs/mgcoge2ne.h
rename to include/configs/mgcoge3ne.h
index 2b09b42..3df7ef1 100644
--- a/include/configs/mgcoge2ne.h
+++ b/include/configs/mgcoge3ne.h
@@ -1,5 +1,5 @@ 
 /*
- * (C) Copyright 2007-2010
+ * (C) Copyright 2011
  * Heiko Schocher, DENX Software Engineering, hs@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
@@ -21,16 +21,18 @@ 
  * MA 02111-1307 USA
  */
 
-#ifndef __MGCOGE2NE
-#define __MGCOGE2NE
+#ifndef __MGCOGE3NE
+#define __MGCOGE3NE
 
 /*
  * High Level Configuration Options
  * (easy to change)
  */
+
 #define CONFIG_MPC8247
-#define CONFIG_MGCOGE
-#define CONFIG_HOSTNAME		mgcoge2ne
+#define CONFIG_MGCOGE3NE
+#define CONFIG_HOSTNAME		mgcoge3ne
+#define CONFIG_KM_82XX
 
 #define	CONFIG_SYS_TEXT_BASE	0xFE000000
 
@@ -43,15 +45,20 @@ 
 #define CONFIG_SYS_FLASH_SIZE		32
 #define CONFIG_SYS_FLASH_CFI
 #define CONFIG_FLASH_CFI_DRIVER
-#define CONFIG_SYS_MAX_FLASH_BANKS	3	/* max num of flash banks */
-#define CONFIG_SYS_MAX_FLASH_SECT	512	/*
+#define CONFIG_SYS_MAX_FLASH_BANKS	2	/* max num of flash banks */
+#define CONFIG_SYS_MAX_FLASH_SECT	1024	/*
 						 * max num of sects on one
 						 * chip
 						 */
 
 #define CONFIG_SYS_FLASH_BASE_1	0x50000000
+#ifdef CONFIG_COGE3NE_P1X
 #define CONFIG_SYS_FLASH_SIZE_1	64
-#define CONFIG_SYS_FLASH_SIZE_2	0
+#else
+#define CONFIG_SYS_FLASH_SIZE_1	128
+#endif
+
+#define CONFIG_SYS_FLASH_SIZE_2 0	/* dummy value to calc SYS_OR5 */
 
 #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE, \
 					CONFIG_SYS_FLASH_BASE_1 }
@@ -60,28 +67,29 @@ 
 
 /*
  * Bank 1 - 60x bus SDRAM
- * mgcoge2ne has 128M RAM
+ * mgcoge3ne has 256M.
  */
-#define SDRAM_MAX_SIZE	0x08000000			/* max. 128 MB	*/
-#define CONFIG_SYS_GLOBAL_SDRAM_LIMIT	(256 << 20)	/* less than 256 MB */
+#define SDRAM_MAX_SIZE 0x10000000			/* max. 256 MB	*/
+#define CONFIG_SYS_GLOBAL_SDRAM_LIMIT	(512 << 20)	/* less than 512 MB */
 
 #define CONFIG_SYS_OR1    ((~(CONFIG_SYS_GLOBAL_SDRAM_LIMIT-1) & \
-			 ORxS_SDAM_MSK) |\
-			 ORxS_BPD_8                     |\
-			 ORxS_ROWST_PBI0_A7		|\
-			 ORxS_NUMR_13)
+			ORxS_SDAM_MSK) |\
+			ORxS_BPD_4			|\
+			ORxS_ROWST_PBI1_A4		|\
+			ORxS_NUMR_13)
 
-#define CONFIG_SYS_PSDMR  (PSDMR_SDAM_A14_IS_A5 |\
-			 PSDMR_BSMA_A14_A16           |\
-			 PSDMR_SDA10_PBI0_A9		|\
-			 PSDMR_RFRC_5_CLK               |\
-			 PSDMR_PRETOACT_2W              |\
-			 PSDMR_ACTTORW_2W               |\
-			 PSDMR_LDOTOPRE_1C              |\
-			 PSDMR_WRC_1C                   |\
-			 PSDMR_CL_2)
+#define CONFIG_SYS_PSDMR  (PSDMR_PBI				|\
+			PSDMR_SDAM_A17_IS_A5			|\
+			PSDMR_BSMA_A13_A15			|\
+			PSDMR_SDA10_PBI1_A6			|\
+			PSDMR_RFRC_5_CLK			|\
+			PSDMR_PRETOACT_2W			|\
+			PSDMR_ACTTORW_2W			|\
+			PSDMR_LDOTOPRE_1C			|\
+			PSDMR_WRC_2C				|\
+			PSDMR_CL_2)
 
 /* include further common stuff for all keymile 82xx boards */
 #include "km82xx-common.h"
 
-#endif /* __MGCOGE2NE */
+#endif /* __MGCOGE3NE */