Skip to contentSkip to conversation

mpc512x: Add esd gmbh mecp5123 board support

PATCH New Stefan Roese 2 participants 26 messages Jun 9, 2009 – Jul 13, 2009 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 mpc512x: Add esd gmbh mecp5123 board support

MECP5123 is a MPC5121E based module by esd gmbh.

---
v2:
- Fix indentation problem
- get_ram_size() used
- More documentation added
- Copyright updated
- Too long lines changed
- Removed CONFIG_OF_SUPPORT_OLD_DEVICE_TREES

Wolfgang, I now have to explicit ACK from esd that this board shall use I2C EEPROM as environment storage.

 MAINTAINERS                   |    1 +
 MAKEALL                       |    1 +
 Makefile                      |    3 +
 board/esd/mecp5123/Makefile   |   50 +++++
 board/esd/mecp5123/config.mk  |   23 ++
 board/esd/mecp5123/mecp5123.c |  381 ++++++++++++++++++++++++++++++++++
 include/configs/mecp5123.h    |  458 +++++++++++++++++++++++++++++++++++++++++
 7 files changed, 917 insertions(+), 0 deletions(-)
 create mode 100644 board/esd/mecp5123/Makefile
 create mode 100644 board/esd/mecp5123/config.mk
 create mode 100644 board/esd/mecp5123/mecp5123.c
 create mode 100644 include/configs/mecp5123.h
MAINTAINERS +1 -0
index bba6ce9..1f6008f 100644
@@ -28,6 +28,7 @@ Pantelis Antoniou <[email protected]>
 Reinhard Arlt <[email protected]>
 
 	cpci5200	MPC5200
+	mecp5123	MPC5121
 	mecp5200	MPC5200
 	pf5200		MPC5200
 
MAKEALL +1 -0
index fd31252..f48a08e 100755
@@ -78,6 +78,7 @@ LIST_5xxx="		\
 
 LIST_512x="		\
 	aria		\
+	mecp5123	\
 	mpc5121ads	\
 "
 
Makefile +3 -0
index 034441c..2540f74 100644
@@ -815,6 +815,9 @@ v38b_config: unconfig
 aria_config:	unconfig
 	@$(MKCONFIG) -a aria ppc mpc512x aria davedenx
 
+mecp5123_config:	unconfig
+	@$(MKCONFIG) -a mecp5123 ppc mpc512x mecp5123 esd
+
 mpc5121ads_config \
 mpc5121ads_rev2_config	\
 	: unconfig
board/esd/mecp5123/Makefile new file +50 -0

50 lines not on this page · raw message

board/esd/mecp5123/config.mk new file +23 -0
new file mode 100644
index 0000000..838a018
@@ -0,0 +1,23 @@
+#
+# (C) Copyright 2009 Wolfgang Denk <[email protected]>
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+TEXT_BASE  =   0xFFF00000
board/esd/mecp5123/mecp5123.c new file +381 -0

381 lines not on this page · raw message

include/configs/mecp5123.h new file +458 -0

458 lines not on this page · raw message

Signature · 1 line
1.6.3.2
#1 lore raw

PATCH v2 1/1 mpc512x: Add esd gmbh mecp5123 board support

Dear Stefan Roese,

Quoted 16 lines · In message <[email protected]> you wrote:

MECP5123 is a MPC5121E based module by esd gmbh.

---
v2:
- Fix indentation problem
- get_ram_size() used
- More documentation added
- Copyright updated
- Too long lines changed
- Removed CONFIG_OF_SUPPORT_OLD_DEVICE_TREES

Wolfgang, I now have to explicit ACK from esd that this board shall use I2C EEPROM as environment storage.

Quoted 12 lines
 MAINTAINERS                   |    1 +
 MAKEALL                       |    1 +
 Makefile                      |    3 +
 board/esd/mecp5123/Makefile   |   50 +++++
 board/esd/mecp5123/config.mk  |   23 ++
 board/esd/mecp5123/mecp5123.c |  381 ++++++++++++++++++++++++++++++++++
 include/configs/mecp5123.h    |  458 +++++++++++++++++++++++++++++++++++++++++
 7 files changed, 917 insertions(+), 0 deletions(-)
 create mode 100644 board/esd/mecp5123/Makefile
 create mode 100644 board/esd/mecp5123/config.mk
 create mode 100644 board/esd/mecp5123/mecp5123.c
 create mode 100644 include/configs/mecp5123.h

Applied to u-boot-mpc5xxx repo, thanks.

Best regards,

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
That's the thing about people who think  they  hate  computers.  What
they really hate is lousy programmers.
- Larry Niven and Jerry Pournelle in "Oath of Fealty"
#2 lore raw

PATCH 1/4 MPC512x: enabling NAND support requires CONFIG_SYS_64BIT_VSPRINTF

In reply to Stefan Roese

When enabling NAND support for a board, one must also define CONFIG_SYS_64BIT_VSPRINTF because this is needed in nand_util.c for correct output.

Cc Stefan Roese <[email protected]>
Cc Reinhard Arlt <[email protected]>

---
Hello Mr. Arlt - with Stefan on vacation could you please be so kind and test this on your mecp5123 board? Thanks. -- wd

 include/configs/mecp5123.h   |    2 ++
 include/configs/mpc5121ads.h |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)
include/configs/mecp5123.h +2 -0
index 0831843..ed3e70f 100644
@@ -187,6 +187,8 @@
 #define CONFIG_SYS_MAX_NAND_DEVICE      1
 #define NAND_MAX_CHIPS                  CONFIG_SYS_MAX_NAND_DEVICE
 
+#define	CONFIG_SYS_64BIT_VSPRINTF	/* needed for nand_util.c */
+
 /*
  * Configuration parameters for MPC5121 NAND driver
  */
include/configs/mpc5121ads.h +2 -0
index 45a004e..852d7b1 100644
@@ -211,6 +211,8 @@
 #define NAND_MAX_CHIPS                  CONFIG_SYS_MAX_NAND_DEVICE
 #define CONFIG_SYS_NAND_SELECT_DEVICE	/* driver supports mutipl. chips */
 
+#define	CONFIG_SYS_64BIT_VSPRINTF	/* needed for nand_util.c */
+
 /*
  * Configuration parameters for MPC5121 NAND driver
  */
Signature · 1 line
1.6.0.6
#3 lore raw

PATCH v2 1/10 MPC512x: enabling NAND support requires CONFIG_SYS_64BIT_VSPRINTF

When enabling NAND support for a board, one must also define CONFIG_SYS_64BIT_VSPRINTF because this is needed in nand_util.c for correct output.

Cc Stefan Roese <[email protected]>
Cc Reinhard Arlt <[email protected]>

---
v2: reposted in context with remaining patches of this series;
changed to use common spelling for CPU/board names.

 include/configs/mecp5123.h   |    2 ++
 include/configs/mpc5121ads.h |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)
include/configs/mecp5123.h +2 -0
index 0831843..ed3e70f 100644
@@ -187,6 +187,8 @@
 #define CONFIG_SYS_MAX_NAND_DEVICE      1
 #define NAND_MAX_CHIPS                  CONFIG_SYS_MAX_NAND_DEVICE
 
+#define	CONFIG_SYS_64BIT_VSPRINTF	/* needed for nand_util.c */
+
 /*
  * Configuration parameters for MPC5121 NAND driver
  */
include/configs/mpc5121ads.h +2 -0
index 45a004e..852d7b1 100644
@@ -211,6 +211,8 @@
 #define NAND_MAX_CHIPS                  CONFIG_SYS_MAX_NAND_DEVICE
 #define CONFIG_SYS_NAND_SELECT_DEVICE	/* driver supports mutipl. chips */
 
+#define	CONFIG_SYS_64BIT_VSPRINTF	/* needed for nand_util.c */
+
 /*
  * Configuration parameters for MPC5121 NAND driver
  */
Signature · 1 line
1.6.0.6
#4 lore raw

PATCH v2 1/10 MPC512x: enabling NAND support requires CONFIG_SYS_64BIT_VSPRINTF

Quoted 7 lines · In message <[email protected]> you wrote:

When enabling NAND support for a board, one must also define CONFIG_SYS_64BIT_VSPRINTF because this is needed in nand_util.c for correct output.

Cc Stefan Roese <[email protected]>
Cc Reinhard Arlt <[email protected]>
Quoted 7 lines

---
v2: reposted in context with remaining patches of this series;
changed to use common spelling for CPU/board names.

 include/configs/mecp5123.h   |    2 ++
 include/configs/mpc5121ads.h |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

Applied to u-boot-mpc5xxx repo.

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
1st Old Man:  Gee, its windy today.
2nd Old Man:  No it's not... it's Thursday.
3rd Old Man:  Yeh, me too.  Let's go for a beer.
#5 lore raw

PATCH v2 2/10 MPC512x: Add MSCAN1...4 Clock Control Registers

In reply to Wolfgang Denk
Cc Stefan Roese <[email protected]>
Cc Reinhard Arlt <[email protected]>

---
v2: reposted in context with remaining patches of this series;
changed to use common spelling for CPU/board names.

 include/asm-ppc/immap_512x.h |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
include/asm-ppc/immap_512x.h +5 -4
index 3648a05..24e6c69 100644
@@ -185,10 +185,11 @@ typedef struct clk512x {
 	u8 res0[4];
 	u32 bcr;		/* Bread Crumb Register */
 	u32 pscccr[12];		/* PSC0-11 Clock Control Registers */
-	u32 spccr;		/* SPDIF Clock Control Registers */
-	u32 cccr;		/* CFM Clock Control Registers */
-	u32 dccr;		/* DIU Clock Control Registers */
-	u8 res1[0xa8];
+	u32 spccr;		/* SPDIF Clock Control Register */
+	u32 cccr;		/* CFM Clock Control Register */
+	u32 dccr;		/* DIU Clock Control Register */
+	u32 msccr[4];		/* MSCAN1-4 Clock Control Registers */
+	u8 res1[0x98];
 } clk512x_t;
 
 /* SPMR - System PLL Mode Register */
Signature · 1 line
1.6.0.6
#6 lore raw

PATCH v2 2/10 MPC512x: Add MSCAN1...4 Clock Control Registers

Dear Wolfgang Denk,

Quoted 9 lines · In message <[email protected]> you wrote:
Cc Stefan Roese <[email protected]>
Cc Reinhard Arlt <[email protected]>

---
v2: reposted in context with remaining patches of this series;
changed to use common spelling for CPU/board names.

 include/asm-ppc/immap_512x.h |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

Applied to u-boot-mpc5xxx repo.

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
When all else fails, read the instructions.
#7 lore raw

PATCH v2 3/10 mecp5123: fix build error

In reply to Wolfgang Denk

The mecp5123 board did not compile because the MSCAN Clock Control Registers were missing; these got added, but as an array instead of 4 individual registers. Adapt the code so it builds.

Cc Stefan Roese <[email protected]>
Cc Reinhard Arlt <[email protected]>

---
v2: reposted in context with remaining patches of this series;
changed to use common spelling for CPU/board names.

 board/esd/mecp5123/mecp5123.c |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)
board/esd/mecp5123/mecp5123.c +5 -8
index 909b458..bff96db 100644
@@ -79,6 +79,7 @@ int board_early_init_f(void)
 {
 	volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
 	u32 spridr;
+	int i;
 
 	/*
 	 * Initialize Local Window for NOR FLASH access
@@ -129,14 +130,10 @@ int board_early_init_f(void)
 	/*
 	 * Configure MSCAN clocks
 	 */
-	out_be32(&im->clk.m1ccr, 0x00300000);
-	out_be32(&im->clk.m2ccr, 0x00300000);
-	out_be32(&im->clk.m3ccr, 0x00300000);
-	out_be32(&im->clk.m4ccr, 0x00300000);
-	out_be32(&im->clk.m1ccr, 0x00310000);
-	out_be32(&im->clk.m2ccr, 0x00310000);
-	out_be32(&im->clk.m3ccr, 0x00310000);
-	out_be32(&im->clk.m4ccr, 0x00310000);
+	for (i=0; i<4; ++i) {
+		out_be32(&im->clk.msccr[i], 0x00300000);
+		out_be32(&im->clk.msccr[i], 0x00310000);
+	}
 
 	/*
 	 * Configure GPIO's
Signature · 1 line
1.6.0.6
#8 lore raw

PATCH v2 3/10 mecp5123: fix build error

Dear Wolfgang Denk,

Quoted 7 lines · In message <[email protected]> you wrote:

The mecp5123 board did not compile because the MSCAN Clock Control Registers were missing; these got added, but as an array instead of 4 individual registers. Adapt the code so it builds.

Cc Stefan Roese <[email protected]>
Cc Reinhard Arlt <[email protected]>
Quoted 6 lines

---
v2: reposted in context with remaining patches of this series;
changed to use common spelling for CPU/board names.

 board/esd/mecp5123/mecp5123.c |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

Applied to u-boot-mpc5xxx repo.

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Remember that Beethoven wrote his first symphony in C ...
#9 lore raw

PATCH v2 4/10 MPC512x: factor out common code

In reply to Wolfgang Denk

Now that we have 3 boards for the MPC512x it turns out that they all use the very same fixed_sdram() code.

This patch factors out this common code into cpu/mpc512x/fixed_sdram.c and adds a new header file, include/asm-ppc/mpc512x.h, with some macros, inline functions and prototype definitions specific to MPC512x systems.

Cc Stefan Roese <[email protected]>
Cc Reinhard Arlt <[email protected]>

---
v2: reposted in context with remaining patches of this series;
changed to use common spelling for CPU/board names.

 board/davedenx/aria/aria.c              |  124 +------------------------------
 board/esd/mecp5123/mecp5123.c           |  104 +-------------------------
 board/freescale/mpc5121ads/mpc5121ads.c |  118 ++----------------------------
 cpu/mpc512x/Makefile                    |   10 ++-
 cpu/mpc512x/fixed_sdram.c               |  113 ++++++++++++++++++++++++++++
 include/asm-ppc/mpc512x.h               |   57 ++++++++++++++
 6 files changed, 191 insertions(+), 335 deletions(-)
 create mode 100644 cpu/mpc512x/fixed_sdram.c
 create mode 100644 include/asm-ppc/mpc512x.h
board/davedenx/aria/aria.c +4 -120
index f44c352..9662308 100644
@@ -27,6 +27,7 @@
 #include <command.h>
 #include <asm/io.h>
 #include <asm/processor.h>
+#include <asm/mpc512x.h>
 #include <fdt_support.h>
 #ifdef CONFIG_MISC_INIT_R
 #include <i2c.h>
@@ -34,9 +35,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-extern int mpc5121_diu_init(void);
-extern void ide_set_reset(int idereset);
-
 /* Clocks in use */
 #define SCCR1_CLOCKS_EN	(CLOCK_SCCR1_CFG_EN |				\
 			 CLOCK_SCCR1_LPC_EN |				\
@@ -53,14 +51,9 @@ extern void ide_set_reset(int idereset);
 			 CLOCK_SCCR2_DIU_EN |		\
 			 CLOCK_SCCR2_I2C_EN)
 
-#define CSAW_START(start)	((start) & 0xFFFF0000)
-#define CSAW_STOP(start, size)	(((start) + (size) - 1) >> 16)
-
-long int fixed_sdram(void);
-
 int board_early_init_f(void)
 {
-	volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
+	volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
 	u32 spridr;
 
 	/*
@@ -71,14 +64,7 @@ int board_early_init_f(void)
 		CSAW_STOP(CONFIG_SYS_ARIA_FPGA_BASE, CONFIG_SYS_ARIA_FPGA_SIZE)
 	);
 	out_be32(&im->lpc.cs_cfg[2], CONFIG_SYS_CS2_CFG);
-
-	/*
-	 * According to MPC5121e RM, configuring local access windows should
-	 * be followed by a dummy read of the config register that was
-	 * modified last and an isync
-	 */
-	in_be32(&im->sysconf.lpcs2aw);
-	__asm__ __volatile__ ("isync");
+	sync_law(&im->sysconf.lpcs2aw);
 
 	/*
 	 * Initialize Local Window for the On Board SRAM access
@@ -88,14 +74,7 @@ int board_early_init_f(void)
 		CSAW_STOP(CONFIG_SYS_ARIA_SRAM_BASE, CONFIG_SYS_ARIA_SRAM_SIZE)
 	);
 	out_be32(&im->lpc.cs_cfg[6], CONFIG_SYS_CS6_CFG);
-
-	/*
-	 * According to MPC5121e RM, configuring local access windows should
-	 * be followed by a dummy read of the config register that was
-	 * modified last and an isync
-	 */
-	in_be32(&im->sysconf.lpcs6aw);
-	__asm__ __volatile__ ("isync");
+	sync_law(&im->sysconf.lpcs6aw);
 
 	/*
 	 * Configure Flash Speed
@@ -124,100 +103,6 @@ phys_size_t initdram (int board_type)
 	return fixed_sdram();
 }
 
-/*
- * fixed sdram init:
- * The board doesn't use memory modules that have serial presence
- * detect or similar mechanism for discovery of the DRAM settings
- */
-long int fixed_sdram (void)
-{
-	volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
-	u32 msize = CONFIG_SYS_DDR_SIZE * 1024 * 1024;
-	u32 msize_log2 = __ilog2(msize);
-	u32 i;
-
-	/* Initialize IO Control */
-	out_be32(&im->io_ctrl.io_control_mem, IOCTRL_MUX_DDR);
-
-	/* Initialize DDR Local Window */
-	out_be32(&im->sysconf.ddrlaw.bar, CONFIG_SYS_DDR_BASE & 0xFFFFF000);
-	out_be32(&im->sysconf.ddrlaw.ar, msize_log2 - 1);
-
-	/*
-	 * According to MPC5121e RM, configuring local access windows should
-	 * be followed by a dummy read of the config register that was
-	 * modified last and an isync
-	 */
-	in_be32(&im->sysconf.ddrlaw.ar);
-	__asm__ __volatile__ ("isync");
-
-	/* Enable DDR */
-	out_be32(&im->mddrc.ddr_sys_config, CONFIG_SYS_MDDRC_SYS_CFG_EN);
-
-	/* Initialize DDR Priority Manager */
-	out_be32(&im->mddrc.prioman_config1, CONFIG_SYS_MDDRCGRP_PM_CFG1);
-	out_be32(&im->mddrc.prioman_config2, CONFIG_SYS_MDDRCGRP_PM_CFG2);
-	out_be32(&im->mddrc.hiprio_config, CONFIG_SYS_MDDRCGRP_HIPRIO_CFG);
-	out_be32(&im->mddrc.lut_table0_main_upper, CONFIG_SYS_MDDRCGRP_LUT0_MU);
-	out_be32(&im->mddrc.lut_table0_main_lower, CONFIG_SYS_MDDRCGRP_LUT0_ML);
-	out_be32(&im->mddrc.lut_table1_main_upper, CONFIG_SYS_MDDRCGRP_LUT1_MU);
-	out_be32(&im->mddrc.lut_table1_main_lower, CONFIG_SYS_MDDRCGRP_LUT1_ML);
-	out_be32(&im->mddrc.lut_table2_main_upper, CONFIG_SYS_MDDRCGRP_LUT2_MU);
-	out_be32(&im->mddrc.lut_table2_main_lower, CONFIG_SYS_MDDRCGRP_LUT2_ML);
-	out_be32(&im->mddrc.lut_table3_main_upper, CONFIG_SYS_MDDRCGRP_LUT3_MU);
-	out_be32(&im->mddrc.lut_table3_main_lower, CONFIG_SYS_MDDRCGRP_LUT3_ML);
-	out_be32(&im->mddrc.lut_table4_main_upper, CONFIG_SYS_MDDRCGRP_LUT4_MU);
-	out_be32(&im->mddrc.lut_table4_main_lower, CONFIG_SYS_MDDRCGRP_LUT4_ML);
-	out_be32(&im->mddrc.lut_table0_alternate_upper, CONFIG_SYS_MDDRCGRP_LUT0_AU);
-	out_be32(&im->mddrc.lut_table0_alternate_lower, CONFIG_SYS_MDDRCGRP_LUT0_AL);
-	out_be32(&im->mddrc.lut_table1_alternate_upper, CONFIG_SYS_MDDRCGRP_LUT1_AU);
-	out_be32(&im->mddrc.lut_table1_alternate_lower, CONFIG_SYS_MDDRCGRP_LUT1_AL);
-	out_be32(&im->mddrc.lut_table2_alternate_upper, CONFIG_SYS_MDDRCGRP_LUT2_AU);
-	out_be32(&im->mddrc.lut_table2_alternate_lower, CONFIG_SYS_MDDRCGRP_LUT2_AL);
-	out_be32(&im->mddrc.lut_table3_alternate_upper, CONFIG_SYS_MDDRCGRP_LUT3_AU);
-	out_be32(&im->mddrc.lut_table3_alternate_lower, CONFIG_SYS_MDDRCGRP_LUT3_AL);
-	out_be32(&im->mddrc.lut_table4_alternate_upper, CONFIG_SYS_MDDRCGRP_LUT4_AU);
-	out_be32(&im->mddrc.lut_table4_alternate_lower, CONFIG_SYS_MDDRCGRP_LUT4_AL);
-
-	/* Initialize MDDRC */
-	out_be32(&im->mddrc.ddr_sys_config, CONFIG_SYS_MDDRC_SYS_CFG);
-	out_be32(&im->mddrc.ddr_time_config0, CONFIG_SYS_MDDRC_TIME_CFG0);
-	out_be32(&im->mddrc.ddr_time_config1, CONFIG_SYS_MDDRC_TIME_CFG1);
-	out_be32(&im->mddrc.ddr_time_config2, CONFIG_SYS_MDDRC_TIME_CFG2);
-
-	/* Initialize DDR */
-	for (i = 0; i < 10; i++)
-		out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_NOP);
-
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_PCHG_ALL);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_NOP);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_RFSH);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_NOP);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_RFSH);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_NOP);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_INIT_DEV_OP);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_NOP);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_EM2);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_NOP);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_PCHG_ALL);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_EM2);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_EM3);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_EN_DLL);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_INIT_DEV_OP);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_PCHG_ALL);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_RFSH);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_INIT_DEV_OP);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_OCD_DEFAULT);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_PCHG_ALL);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_NOP);
-
-	/* Start MDDRC */
-	out_be32(&im->mddrc.ddr_time_config0, CONFIG_SYS_MDDRC_TIME_CFG0_RUN);
-	out_be32(&im->mddrc.ddr_sys_config, CONFIG_SYS_MDDRC_SYS_CFG_RUN);
-
-	return msize;
-}
-
 int misc_init_r(void)
 {
 	u32 tmp;
@@ -295,7 +180,6 @@ static  iopin_t ioregs_init[] = {
 	},
 };
 
-
 int checkboard (void)
 {
 	puts("Board: ARIA\n");
board/esd/mecp5123/mecp5123.c +2 -102

128 lines not on this page · raw message

board/freescale/mpc5121ads/mpc5121ads.c +6 -112

159 lines not on this page · raw message

cpu/mpc512x/Makefile +9 -1
index 022c676..427db7a 100644
@@ -27,7 +27,15 @@ $(shell mkdir -p $(OBJTREE)/board/freescale/common)
 LIB	= $(obj)lib$(CPU).a
 
 START	= start.o
-COBJS-y	:= traps.o cpu.o cpu_init.o speed.o interrupts.o serial.o i2c.o iopin.o
+COBJS-y	:= cpu.o
+COBJS-y	+= traps.o
+COBJS-y += cpu_init.o
+COBJS-y += fixed_sdram.o
+COBJS-y += i2c.o
+COBJS-y += interrupts.o
+COBJS-y += iopin.o
+COBJS-y += serial.o
+COBJS-y += speed.o
 COBJS-${CONFIG_FSL_DIU_FB} += diu.o
 COBJS-${CONFIG_FSL_DIU_FB} += ../../board/freescale/common/fsl_diu_fb.o
 COBJS-${CONFIG_FSL_DIU_FB} += ../../board/freescale/common/fsl_logo_bmp.o
cpu/mpc512x/fixed_sdram.c new file +113 -0

113 lines not on this page · raw message

include/asm-ppc/mpc512x.h new file +57 -0

57 lines not on this page · raw message

Signature · 1 line
1.6.0.6
#10 lore raw

PATCH v2 4/10 MPC512x: factor out common code

Dear Wolfgang Denk,

Quoted 15 lines · In message <[email protected]> you wrote:

Now that we have 3 boards for the MPC512x it turns out that they all use the very same fixed_sdram() code.

This patch factors out this common code into cpu/mpc512x/fixed_sdram.c and adds a new header file, include/asm-ppc/mpc512x.h, with some macros, inline functions and prototype definitions specific to MPC512x systems.

Cc Stefan Roese <[email protected]>
Cc Reinhard Arlt <[email protected]>

---
v2: reposted in context with remaining patches of this series;
changed to use common spelling for CPU/board names.

Quoted 9 lines
 board/davedenx/aria/aria.c              |  124 +------------------------------
 board/esd/mecp5123/mecp5123.c           |  104 +-------------------------
 board/freescale/mpc5121ads/mpc5121ads.c |  118 ++----------------------------
 cpu/mpc512x/Makefile                    |   10 ++-
 cpu/mpc512x/fixed_sdram.c               |  113 ++++++++++++++++++++++++++++
 include/asm-ppc/mpc512x.h               |   57 ++++++++++++++
 6 files changed, 191 insertions(+), 335 deletions(-)
 create mode 100644 cpu/mpc512x/fixed_sdram.c
 create mode 100644 include/asm-ppc/mpc512x.h

Applied to u-boot-mpc5xxx repo.

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
A star captain's most solemn oath is that he will give his life, even
his entire crew, rather than violate the Prime Directive.
	-- Kirk, "The Omega Glory", stardate unknown
#11 lore raw

PATCH 5/10 aria: adjust memory controller initialization

In reply to Wolfgang Denk

Needed for Rev. 2 silicon at 400 MHz

---
 include/configs/aria.h |   85 ++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 72 insertions(+), 13 deletions(-)
include/configs/aria.h +72 -13
index 58f67a4..3ae1238 100644
@@ -123,26 +123,83 @@
  *	[09:05]	DRAM tRP:
  *	[04:00] DRAM tRPA
  */
-#define CONFIG_SYS_MDDRC_SYS_CFG	0xF8604A00
-#define CONFIG_SYS_MDDRC_SYS_CFG_RUN	0xE8604A00
-/*#define CONFIG_SYS_MDDRC_TIME_CFG1	0x54EC1168 */
-  #define CONFIG_SYS_MDDRC_TIME_CFG1	0x55D81189
-/*#define CONFIG_SYS_MDDRC_TIME_CFG2	0x35210864 */
-  #define CONFIG_SYS_MDDRC_TIME_CFG2	0x34790863
+#define CONFIG_SYS_MDDRC_SYS_CFG     (	(1 << 31) |	/* RST_B */ \
+					(1 << 30) |	/* CKE */ \
+					(1 << 29) |	/* CLK_ON */ \
+					(1 << 28) |	/* CMD_MODE */ \
+					(4 << 25) |	/* DRAM_ROW_SELECT */ \
+					(3 << 21) |	/* DRAM_BANK_SELECT */ \
+					(0 << 18) |	/* SELF_REF_EN */ \
+					(0 << 17) |	/* 16BIT_MODE */ \
+					(2 << 13) |	/* RDLY */ \
+					(0 << 12) |	/* HALF_DQS_DLY */ \
+					(1 << 11) |	/* QUART_DQS_DLY */ \
+					(2 <<  8) |	/* WDLY */ \
+					(0 <<  7) |	/* EARLY_ODT */ \
+					(1 <<  6) |	/* ON_DIE_TERMINATE */ \
+					(0 <<  5) |	/* FIFO_OV_CLEAR */ \
+					(0 <<  4) |	/* FIFO_UV_CLEAR */ \
+					(0 <<  1) |	/* FIFO_OV_EN */ \
+					(0 <<  0) 	/* FIFO_UV_EN */ \
+				     )
+
+#define CONFIG_SYS_MDDRC_SYS_CFG_RUN	(CONFIG_SYS_MDDRC_SYS_CFG & ~(1 << 28))
+#define CONFIG_SYS_MDDRC_TIME_CFG1	0x55D81189
+#define CONFIG_SYS_MDDRC_TIME_CFG2	0x34790863
 
 #define CONFIG_SYS_MDDRC_SYS_CFG_EN	0xF0000000
 #define CONFIG_SYS_MDDRC_TIME_CFG0	0x00003D2E
-/*#define CONFIG_SYS_MDDRC_TIME_CFG0_RUN	0x06183D2E */
 #define CONFIG_SYS_MDDRC_TIME_CFG0_RUN	0x030C3D2E
 
 #define CONFIG_SYS_MICRON_NOP		0x01380000
 #define CONFIG_SYS_MICRON_PCHG_ALL	0x01100400
-#define CONFIG_SYS_MICRON_EM2		0x01020000
-#define CONFIG_SYS_MICRON_EM3		0x01030000
-#define CONFIG_SYS_MICRON_EN_DLL	0x01010000
+#define CONFIG_SYS_MICRON_EMR	     (	(1 << 24) |	/* CMD_REQ */ \
+					(0 << 22) |	/* DRAM_CS */ \
+					(0 << 21) |	/* DRAM_RAS */ \
+					(0 << 20) |	/* DRAM_CAS */ \
+					(0 << 19) |	/* DRAM_WEB */ \
+					(1 << 16) |	/* DRAM_BS[2:0] */ \
+					(0 << 15) |	/* */ \
+					(0 << 12) |	/* A12->out */ \
+					(0 << 11) |	/* A11->RDQS */ \
+					(0 << 10) |	/* A10->DQS# */ \
+					(0 <<  7) |	/* OCD program */ \
+					(0 <<  6) |	/* Rtt1 */ \
+					(0 <<  3) |	/* posted CAS# */ \
+					(0 <<  2) |	/* Rtt0 */ \
+					(1 <<  1) |	/* ODS */ \
+					(0 <<  0)	/* DLL */ \
+				     )
+#define CONFIG_SYS_MICRON_EMR2		0x01020000
+#define CONFIG_SYS_MICRON_EMR3		0x01030000
 #define CONFIG_SYS_MICRON_RFSH		0x01080000
 #define CONFIG_SYS_MICRON_INIT_DEV_OP	0x01000432
-#define CONFIG_SYS_MICRON_OCD_DEFAULT	0x01010780
+#define CONFIG_SYS_MICRON_EMR_OCD    (	(1 << 24) |	/* CMD_REQ */ \
+					(0 << 22) |	/* DRAM_CS */ \
+					(0 << 21) |	/* DRAM_RAS */ \
+					(0 << 20) |	/* DRAM_CAS */ \
+					(0 << 19) |	/* DRAM_WEB */ \
+					(1 << 16) |	/* DRAM_BS[2:0] */ \
+					(0 << 15) |	/* */ \
+					(0 << 12) |	/* A12->out */ \
+					(0 << 11) |	/* A11->RDQS */ \
+					(1 << 10) |	/* A10->DQS# */ \
+					(7 <<  7) |	/* OCD program */ \
+					(0 <<  6) |	/* Rtt1 */ \
+					(0 <<  3) |	/* posted CAS# */ \
+					(1 <<  2) |	/* Rtt0 */ \
+					(0 <<  1) |	/* ODS (Output Drive Strength) */ \
+					(0 <<  0)	/* DLL */ \
+				     )
+
+/*
+ * Backward compatible definitions,
+ * so we do not have to change cpu/mpc512x/fixed_sdram.c
+ */
+#define	CONFIG_SYS_MICRON_EM2		(CONFIG_SYS_MICRON_EMR2)
+#define CONFIG_SYS_MICRON_EM3		(CONFIG_SYS_MICRON_EMR3)
+#define CONFIG_SYS_MICRON_EN_DLL	(CONFIG_SYS_MICRON_EMR)
+#define CONFIG_SYS_MICRON_OCD_DEFAULT	(CONFIG_SYS_MICRON_EMR_OCD)
 
 /* DDR Priority Manager Configuration */
 #define CONFIG_SYS_MDDRCGRP_PM_CFG1	0x00077777
@@ -187,8 +244,10 @@
 #define CONFIG_SYS_SRAM_BASE		0x30000000
 #define CONFIG_SYS_SRAM_SIZE		0x00020000	/* 128 KB */
 
-#define CONFIG_SYS_ARIA_SRAM_BASE	0x30020000
-#define CONFIG_SYS_ARIA_SRAM_SIZE	0x20000		/* 128 KB */
+/* Make two SRAM regions contiguous */
+#define CONFIG_SYS_ARIA_SRAM_BASE	(CONFIG_SYS_SRAM_BASE + \
+					 CONFIG_SYS_SRAM_SIZE)
+#define CONFIG_SYS_ARIA_SRAM_SIZE	0x00100000	/* reserve 1MB-window */
 
 #define CONFIG_SYS_ARIA_FPGA_BASE	(CONFIG_SYS_ARIA_SRAM_BASE + \
 					 CONFIG_SYS_ARIA_SRAM_SIZE)
Signature · 1 line
1.6.0.6
#12 lore raw

PATCH 5/10 aria: adjust memory controller initialization

Dear Wolfgang Denk,

Quoted 6 lines · In message <[email protected]> you wrote:

Needed for Rev. 2 silicon at 400 MHz

---
 include/configs/aria.h |   85 ++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 72 insertions(+), 13 deletions(-)

Applied to u-boot-mpc5xxx repo.

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
In a survey taken several years ago, all  incoming  freshmen  at  MIT
were  asked  if  they  expected  to graduate in the top half of their
class. Ninety-seven percent responded that they did.
#13 lore raw

PATCH 6/10 mecp5123: cleanup - remove dead code

In reply to Wolfgang Denk

Remove dead code that was obviously a left-over from copy & paste.

Cc Stefan Roese <[email protected]>
Cc Reinhard Arlt <[email protected]>
---
 include/configs/mecp5123.h |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)
include/configs/mecp5123.h +0 -7
index ed3e70f..3f5ad5e 100644
@@ -111,17 +111,10 @@
  *	[09:05]	DRAM tRP:
  *	[04:00] DRAM tRPA
  */
-#ifdef CONFIG_ADS5121_REV2
-#define CONFIG_SYS_MDDRC_SYS_CFG	0xF8604A00
-#define CONFIG_SYS_MDDRC_SYS_CFG_RUN	0xE8604A00
-#define CONFIG_SYS_MDDRC_TIME_CFG1	0x54EC1168
-#define CONFIG_SYS_MDDRC_TIME_CFG2	0x35210864
-#else
 #define CONFIG_SYS_MDDRC_SYS_CFG	 0xFA804A00
 #define CONFIG_SYS_MDDRC_SYS_CFG_RUN	 0xEA804A00
 #define CONFIG_SYS_MDDRC_TIME_CFG1	 0x68EC1168
 #define CONFIG_SYS_MDDRC_TIME_CFG2	 0x34310864
-#endif
 #define CONFIG_SYS_MDDRC_SYS_CFG_EN	0xF0000000
 #define CONFIG_SYS_MDDRC_TIME_CFG0	0x00003D2E
 #define CONFIG_SYS_MDDRC_TIME_CFG0_RUN	0x06183D2E
Signature · 1 line
1.6.0.6
#14 lore raw

PATCH 6/10 mecp5123: cleanup - remove dead code

Dear Wolfgang Denk,

Quoted 8 lines · In message <[email protected]> you wrote:

Remove dead code that was obviously a left-over from copy & paste.

Cc Stefan Roese <[email protected]>
Cc Reinhard Arlt <[email protected]>
---
 include/configs/mecp5123.h |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

Applied to u-boot-mpc5xxx repo.

Best regards,

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
365 Days of drinking Lo-Cal beer.                       = 1 Lite-year
#15 lore raw

PATCH 7/10 MPC512x: fix typo in comment listing the NAND driver name

In reply to Wolfgang Denk
Cc Stefan Roese <[email protected]>
Cc Reinhard Arlt <[email protected]>
---
 include/configs/mecp5123.h   |    2 +-
 include/configs/mpc5121ads.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
include/configs/mecp5123.h +1 -1
index 3f5ad5e..e00859a 100644
@@ -171,7 +171,7 @@
 
 /*
  * NAND FLASH
- * drivers/mtd/nand/mpc5121_mpc.c (rev 2 silicon only)
+ * drivers/mtd/nand/mpc5121_nfc.c (rev 2 silicon only)
  */
 #define CONFIG_CMD_NAND
 #define CONFIG_NAND_MPC5121_NFC
include/configs/mpc5121ads.h +1 -1
index 852d7b1..2ef3ff1 100644
@@ -201,7 +201,7 @@
 
 /*
  * NAND FLASH
- * drivers/mtd/nand/mpc5121_mpc.c (rev 2 silicon only)
+ * drivers/mtd/nand/mpc5121_nfc.c (rev 2 silicon only)
  */
 #define CONFIG_CMD_NAND
 #define CONFIG_NAND_MPC5121_NFC
Signature · 1 line
1.6.0.6
#16 lore raw

PATCH 7/10 MPC512x: fix typo in comment listing the NAND driver name

Dear Wolfgang Denk,

Quoted 7 lines · In message <[email protected]> you wrote:
Cc Stefan Roese <[email protected]>
Cc Reinhard Arlt <[email protected]>
---
 include/configs/mecp5123.h   |    2 +-
 include/configs/mpc5121ads.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Applied to u-boot-mpc5xxx repo.

Wolfgang Denk

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-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
It is dangerous to be sincere unless you are also stupid.
                                                - George Bernard Shaw
#17 lore raw

PATCH 8/10 aria: enable NAND flash support

In reply to Wolfgang Denk
---
 board/davedenx/aria/aria.c |    1 +
 include/configs/aria.h     |   24 +++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletions(-)
board/davedenx/aria/aria.c +1 -0
index 9662308..2064aa2 100644
@@ -42,6 +42,7 @@ DECLARE_GLOBAL_DATA_PTR;
 			 CLOCK_SCCR1_PSCFIFO_EN |			\
 			 CLOCK_SCCR1_DDR_EN |				\
 			 CLOCK_SCCR1_FEC_EN |				\
+			 CLOCK_SCCR1_NFC_EN |				\
 			 CLOCK_SCCR1_PATA_EN |				\
 			 CLOCK_SCCR1_PCI_EN |				\
 			 CLOCK_SCCR1_TPR_EN)
include/configs/aria.h +23 -1
index 3ae1238..fb37472 100644
@@ -241,6 +241,28 @@
 
 #undef CONFIG_SYS_FLASH_CHECKSUM
 
+/*
+ * NAND FLASH support
+ * drivers/mtd/nand/mpc5121_nfc.c (rev 2 silicon only)
+ */
+#define CONFIG_CMD_NAND
+
+#define CONFIG_NAND_MPC5121_NFC
+#define CONFIG_SYS_NAND_BASE		0x40000000
+
+#define CONFIG_SYS_MAX_NAND_DEVICE	1
+#define NAND_MAX_CHIPS			CONFIG_SYS_MAX_NAND_DEVICE
+
+#define CONFIG_SYS_64BIT_VSPRINTF	/* needed for nand_util.c */
+
+/*
+ * Configuration parameters for MPC5121 NAND driver
+ */
+#define CONFIG_FSL_NFC_WIDTH		1
+#define CONFIG_FSL_NFC_WRITE_SIZE	2048
+#define CONFIG_FSL_NFC_SPARE_SIZE	64
+#define CONFIG_FSL_NFC_CHIPS		CONFIG_SYS_MAX_NAND_DEVICE
+
 #define CONFIG_SYS_SRAM_BASE		0x30000000
 #define CONFIG_SYS_SRAM_SIZE		0x00020000	/* 128 KB */
 
@@ -285,7 +307,7 @@
 #define CONFIG_SYS_INIT_SP_OFFSET	CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_MONITOR_BASE		TEXT_BASE
-#define CONFIG_SYS_MONITOR_LEN		(256 * 1024)
+#define CONFIG_SYS_MONITOR_LEN		(384 * 1024)
 
 #ifdef	CONFIG_FSL_DIU_FB
 #define CONFIG_SYS_MALLOC_LEN		(6 * 1024 * 1024)
Signature · 1 line
1.6.0.6
#18 lore raw

PATCH 8/10 aria: enable NAND flash support

Dear Wolfgang Denk,

Quoted 5 lines · In message <[email protected]> you wrote:
---
 board/davedenx/aria/aria.c |    1 +
 include/configs/aria.h     |   24 +++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletions(-)

Applied to u-boot-mpc5xxx repo.

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"...all the  good  computer  designs  are  bootlegged;  the  formally
planned  products,  if  they  are built at all, are dogs!" - David E.
Lundstrom, "A Few Good Men From Univac", MIT Press, 1987
#19 lore raw

PATCH 9/10 aria: add JFFS2 and MTDPARTS support; adjust flash map

In reply to Wolfgang Denk
---
 include/configs/aria.h |   39 ++++++++++++++++++++++++++++++++++-----
 1 files changed, 34 insertions(+), 5 deletions(-)
include/configs/aria.h +34 -5
index fb37472..e7e238d 100644
@@ -245,7 +245,9 @@
  * NAND FLASH support
  * drivers/mtd/nand/mpc5121_nfc.c (rev 2 silicon only)
  */
-#define CONFIG_CMD_NAND
+#define CONFIG_CMD_NAND					/* enable NAND support */
+#define CONFIG_JFFS2_NAND				/* with JFFS2 on it */
+
 
 #define CONFIG_NAND_MPC5121_NFC
 #define CONFIG_SYS_NAND_BASE		0x40000000
@@ -433,6 +435,7 @@
 #undef CONFIG_CMD_FUSE
 #define CONFIG_CMD_I2C
 #undef CONFIG_CMD_IDE
+#define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_NFS
 #define CONFIG_CMD_PING
@@ -442,13 +445,39 @@
 #define CONFIG_CMD_PCI
 #endif
 
-#if defined(CONFIG_CMD_IDE)
+#if defined(CONFIG_CMD_IDE) || defined(CONFIG_CMD_EXT2)
 #define CONFIG_DOS_PARTITION
 #define CONFIG_MAC_PARTITION
 #define CONFIG_ISO_PARTITION
 #endif /* defined(CONFIG_CMD_IDE) */
 
 /*
+ * Dynamic MTD partition support
+ */
+#define CONFIG_CMD_MTDPARTS
+#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */
+#define CONFIG_FLASH_CFI_MTD
+#define MTDIDS_DEFAULT		"nor0=f8000000.flash,nand0=mpc5121.nand"
+
+/*
+ * NOR flash layout:
+ *
+ * F8000000 - FEAFFFFF	107 MiB		User Data
+ * FEB00000 - FFAFFFFF	 16 MiB		Root File System
+ * FFB00000 - FFFEFFFF	  4 MiB		Linux Kernel
+ * FFF00000 - FFFBFFFF	768 KiB		U-Boot (up to 512 KiB) and 2 x * env
+ * FFFC0000 - FFFFFFFF	256 KiB		Device Tree
+ *
+ * NAND flash layout: one big partition
+ */
+#define MTDPARTS_DEFAULT	"mtdparts=f8000000.flash:107m(user),"	\
+						"16m(rootfs),"		\
+						"4m(kernel),"		\
+						"768k(u-boot),"		\
+						"256k(dtb);"		\
+					"mpc5121.nand:-(data)"
+
+/*
  * Watchdog timeout = CONFIG_SYS_WATCHDOG_VALUE * 65536 / IPS clock.
  * For example, when IPS is set to 66MHz and CONFIG_SYS_WATCHDOG_VALUE
  * is set to 0xFFFF, watchdog timeouts after about 64s. For details
@@ -541,9 +570,9 @@
 	"fdt_addr_r=880000\0"						\
 	"ramdisk_addr_r=900000\0"					\
 	"u-boot_addr=FFF00000\0"					\
-	"kernel_addr=FFC40000\0"					\
-	"fdt_addr=FFEC0000\0"						\
-	"ramdisk_addr=FC040000\0"					\
+	"kernel_addr=FFB00000\0"					\
+	"fdt_addr=FFFC0000\0"						\
+	"ramdisk_addr=FEB00000\0"					\
 	"ramdiskfile=aria/uRamdisk\0"				\
 	"u-boot=aria/u-boot.bin\0"					\
 	"fdtfile=aria/aria.dtb\0"					\
Signature · 1 line
1.6.0.6
#20 lore raw

PATCH 9/10 aria: add JFFS2 and MTDPARTS support; adjust flash map

Dear Wolfgang Denk,

Quoted 4 lines · In message <[email protected]> you wrote:
---
 include/configs/aria.h |   39 ++++++++++++++++++++++++++++++++++-----
 1 files changed, 34 insertions(+), 5 deletions(-)

Applied to u-boot-mpc5xxx repo.

Wolfgang Denk

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-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"When people are least sure, they are often most dogmatic."
- John Kenneth Galbraith
#21 lore raw

PATCH 10/10 mpc5121ads: add JFFS2 and MTDPARTS support; adjust flash map

In reply to Wolfgang Denk
---
 include/configs/mpc5121ads.h |   46 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 38 insertions(+), 8 deletions(-)
include/configs/mpc5121ads.h +38 -8
index 2ef3ff1..76f174d 100644
@@ -203,7 +203,8 @@
  * NAND FLASH
  * drivers/mtd/nand/mpc5121_nfc.c (rev 2 silicon only)
  */
-#define CONFIG_CMD_NAND
+#define CONFIG_CMD_NAND					/* enable NAND support */
+#define CONFIG_JFFS2_NAND				/* with JFFS2 on it */
 #define CONFIG_NAND_MPC5121_NFC
 #define CONFIG_SYS_NAND_BASE            0x40000000
 
@@ -367,23 +368,52 @@
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
+#define CONFIG_CMD_EEPROM
+#define CONFIG_CMD_EXT2
 #define CONFIG_CMD_I2C
+#define CONFIG_CMD_IDE
+#define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_NFS
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_DATE
+
 #undef CONFIG_CMD_FUSE
-#define CONFIG_CMD_IDE
-#define CONFIG_CMD_EXT2
 
 #if defined(CONFIG_PCI)
 #define CONFIG_CMD_PCI
 #endif
 
-#if defined(CONFIG_CMD_IDE)
+/*
+ * Dynamic MTD partition support
+ */
+#define CONFIG_CMD_MTDPARTS
+#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */
+#define CONFIG_FLASH_CFI_MTD
+#define MTDIDS_DEFAULT		"nor0=fc000000.flash,nand0=mpc5121.nand"
+
+/*
+ * NOR flash layout:
+ *
+ * FC000000 - FEABFFFF 42.75 MiB	User Data
+ * FEAC0000 - FFABFFFF  16 MiB		Root File System
+ * FFAC0000 - FFEBFFFF   4 MiB		Linux Kernel
+ * FFEC0000 - FFEFFFFF 256 KiB		Device Tree
+ * FFF00000 - FFFFFFFF   1 MiB		U-Boot (up to 512 KiB) and 2 x * env
+ *
+ * NAND flash layout: one big partition
+ */
+#define MTDPARTS_DEFAULT	"mtdparts=fc000000.flash:43776k(user),"	\
+						"16m(rootfs),"		\
+						"4m(kernel),"		\
+						"256k(dtb),"		\
+						"1m(u-boot);"		\
+					"mpc5121.nand:-(data)"
+
+
+#if defined(CONFIG_CMD_IDE) || defined(CONFIG_CMD_EXT2)
 #define CONFIG_DOS_PARTITION
 #define CONFIG_MAC_PARTITION
 #define CONFIG_ISO_PARTITION
@@ -476,9 +506,9 @@
 	"fdt_addr_r=880000\0"						\
 	"ramdisk_addr_r=900000\0"					\
 	"u-boot_addr=FFF00000\0"					\
-	"kernel_addr=FFC40000\0"					\
+	"kernel_addr=FFAC0000\0"					\
 	"fdt_addr=FFEC0000\0"						\
-	"ramdisk_addr=FC040000\0"					\
+	"ramdisk_addr=FEAC0000\0"					\
 	"ramdiskfile=mpc5121ads/uRamdisk\0"				\
 	"u-boot=mpc5121ads/u-boot.bin\0"				\
 	"bootfile=mpc5121ads/uImage\0"					\
Signature · 1 line
1.6.0.6
#22 lore raw

PATCH 10/10 mpc5121ads: add JFFS2 and MTDPARTS support; adjust flash map

Dear Wolfgang Denk,

Quoted 4 lines · In message <[email protected]> you wrote:
---
 include/configs/mpc5121ads.h |   46 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 38 insertions(+), 8 deletions(-)

Applied to u-boot-mpc5xxx repo.

Wolfgang Denk

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-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
A little suffering is good for the soul.
	-- Kirk, "The Corbomite Maneuver", stardate 1514.0
#23 lore raw

PATCH 2/4 immap_512x.h: Add MSCAN1...4 Clock Control Registers

In reply to Stefan Roese
Cc Stefan Roese <[email protected]>
Cc Reinhard Arlt <[email protected]>
---
 include/asm-ppc/immap_512x.h |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
include/asm-ppc/immap_512x.h +5 -4
index 3648a05..24e6c69 100644
@@ -185,10 +185,11 @@ typedef struct clk512x {
 	u8 res0[4];
 	u32 bcr;		/* Bread Crumb Register */
 	u32 pscccr[12];		/* PSC0-11 Clock Control Registers */
-	u32 spccr;		/* SPDIF Clock Control Registers */
-	u32 cccr;		/* CFM Clock Control Registers */
-	u32 dccr;		/* DIU Clock Control Registers */
-	u8 res1[0xa8];
+	u32 spccr;		/* SPDIF Clock Control Register */
+	u32 cccr;		/* CFM Clock Control Register */
+	u32 dccr;		/* DIU Clock Control Register */
+	u32 msccr[4];		/* MSCAN1-4 Clock Control Registers */
+	u8 res1[0x98];
 } clk512x_t;
 
 /* SPMR - System PLL Mode Register */
Signature · 1 line
1.6.0.6
#24 lore raw

PATCH 3/4 mecp5123: fix build error

In reply to Stefan Roese

The mecp5123 board did not compile because the MSCAN Clock Control Registers were missing; these got added, but as an array instead of 4 individual registers. Adapt the code so it builds.

Cc Stefan Roese <[email protected]>
Cc Reinhard Arlt <[email protected]>

---
Hello Mr. Arlt - with Stefan on vacation could you please be so kind and test this on your mecp5123 board? Thanks. -- wd

 board/esd/mecp5123/mecp5123.c |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)
board/esd/mecp5123/mecp5123.c +5 -8
index 909b458..bff96db 100644
@@ -79,6 +79,7 @@ int board_early_init_f(void)
 {
 	volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
 	u32 spridr;
+	int i;
 
 	/*
 	 * Initialize Local Window for NOR FLASH access
@@ -129,14 +130,10 @@ int board_early_init_f(void)
 	/*
 	 * Configure MSCAN clocks
 	 */
-	out_be32(&im->clk.m1ccr, 0x00300000);
-	out_be32(&im->clk.m2ccr, 0x00300000);
-	out_be32(&im->clk.m3ccr, 0x00300000);
-	out_be32(&im->clk.m4ccr, 0x00300000);
-	out_be32(&im->clk.m1ccr, 0x00310000);
-	out_be32(&im->clk.m2ccr, 0x00310000);
-	out_be32(&im->clk.m3ccr, 0x00310000);
-	out_be32(&im->clk.m4ccr, 0x00310000);
+	for (i=0; i<4; ++i) {
+		out_be32(&im->clk.msccr[i], 0x00300000);
+		out_be32(&im->clk.msccr[i], 0x00310000);
+	}
 
 	/*
 	 * Configure GPIO's
Signature · 1 line
1.6.0.6
#25 lore raw

PATCH 4/4 MPC512x: factor out common code

In reply to Stefan Roese

Now that we have 3 boards for the MPC512x it turns out that they all use the very same fixed_sdram() code.

This patch factors out this common code into cpu/mpc512x/fixed_sdram.c and adds a new header file, include/asm-ppc/mpc512x.h, with some macros, inline functions and prototype definitions specific to MPC512x systems.

Cc Stefan Roese <[email protected]>
Cc Reinhard Arlt <[email protected]>

---
Hello Mr. Arlt - with Stefan on vacation could you please be so kind and test this on your mecp5123 board? Thanks. -- wd

 board/davedenx/aria/aria.c              |  124 +------------------------------
 board/esd/mecp5123/mecp5123.c           |  104 +-------------------------
 board/freescale/mpc5121ads/mpc5121ads.c |  118 ++----------------------------
 cpu/mpc512x/Makefile                    |   10 ++-
 cpu/mpc512x/fixed_sdram.c               |  113 ++++++++++++++++++++++++++++
 include/asm-ppc/mpc512x.h               |   57 ++++++++++++++
 6 files changed, 191 insertions(+), 335 deletions(-)
 create mode 100644 cpu/mpc512x/fixed_sdram.c
 create mode 100644 include/asm-ppc/mpc512x.h
board/davedenx/aria/aria.c +4 -120
index f44c352..9662308 100644
@@ -27,6 +27,7 @@
 #include <command.h>
 #include <asm/io.h>
 #include <asm/processor.h>
+#include <asm/mpc512x.h>
 #include <fdt_support.h>
 #ifdef CONFIG_MISC_INIT_R
 #include <i2c.h>
@@ -34,9 +35,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-extern int mpc5121_diu_init(void);
-extern void ide_set_reset(int idereset);
-
 /* Clocks in use */
 #define SCCR1_CLOCKS_EN	(CLOCK_SCCR1_CFG_EN |				\
 			 CLOCK_SCCR1_LPC_EN |				\
@@ -53,14 +51,9 @@ extern void ide_set_reset(int idereset);
 			 CLOCK_SCCR2_DIU_EN |		\
 			 CLOCK_SCCR2_I2C_EN)
 
-#define CSAW_START(start)	((start) & 0xFFFF0000)
-#define CSAW_STOP(start, size)	(((start) + (size) - 1) >> 16)
-
-long int fixed_sdram(void);
-
 int board_early_init_f(void)
 {
-	volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
+	volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
 	u32 spridr;
 
 	/*
@@ -71,14 +64,7 @@ int board_early_init_f(void)
 		CSAW_STOP(CONFIG_SYS_ARIA_FPGA_BASE, CONFIG_SYS_ARIA_FPGA_SIZE)
 	);
 	out_be32(&im->lpc.cs_cfg[2], CONFIG_SYS_CS2_CFG);
-
-	/*
-	 * According to MPC5121e RM, configuring local access windows should
-	 * be followed by a dummy read of the config register that was
-	 * modified last and an isync
-	 */
-	in_be32(&im->sysconf.lpcs2aw);
-	__asm__ __volatile__ ("isync");
+	sync_law(&im->sysconf.lpcs2aw);
 
 	/*
 	 * Initialize Local Window for the On Board SRAM access
@@ -88,14 +74,7 @@ int board_early_init_f(void)
 		CSAW_STOP(CONFIG_SYS_ARIA_SRAM_BASE, CONFIG_SYS_ARIA_SRAM_SIZE)
 	);
 	out_be32(&im->lpc.cs_cfg[6], CONFIG_SYS_CS6_CFG);
-
-	/*
-	 * According to MPC5121e RM, configuring local access windows should
-	 * be followed by a dummy read of the config register that was
-	 * modified last and an isync
-	 */
-	in_be32(&im->sysconf.lpcs6aw);
-	__asm__ __volatile__ ("isync");
+	sync_law(&im->sysconf.lpcs6aw);
 
 	/*
 	 * Configure Flash Speed
@@ -124,100 +103,6 @@ phys_size_t initdram (int board_type)
 	return fixed_sdram();
 }
 
-/*
- * fixed sdram init:
- * The board doesn't use memory modules that have serial presence
- * detect or similar mechanism for discovery of the DRAM settings
- */
-long int fixed_sdram (void)
-{
-	volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
-	u32 msize = CONFIG_SYS_DDR_SIZE * 1024 * 1024;
-	u32 msize_log2 = __ilog2(msize);
-	u32 i;
-
-	/* Initialize IO Control */
-	out_be32(&im->io_ctrl.io_control_mem, IOCTRL_MUX_DDR);
-
-	/* Initialize DDR Local Window */
-	out_be32(&im->sysconf.ddrlaw.bar, CONFIG_SYS_DDR_BASE & 0xFFFFF000);
-	out_be32(&im->sysconf.ddrlaw.ar, msize_log2 - 1);
-
-	/*
-	 * According to MPC5121e RM, configuring local access windows should
-	 * be followed by a dummy read of the config register that was
-	 * modified last and an isync
-	 */
-	in_be32(&im->sysconf.ddrlaw.ar);
-	__asm__ __volatile__ ("isync");
-
-	/* Enable DDR */
-	out_be32(&im->mddrc.ddr_sys_config, CONFIG_SYS_MDDRC_SYS_CFG_EN);
-
-	/* Initialize DDR Priority Manager */
-	out_be32(&im->mddrc.prioman_config1, CONFIG_SYS_MDDRCGRP_PM_CFG1);
-	out_be32(&im->mddrc.prioman_config2, CONFIG_SYS_MDDRCGRP_PM_CFG2);
-	out_be32(&im->mddrc.hiprio_config, CONFIG_SYS_MDDRCGRP_HIPRIO_CFG);
-	out_be32(&im->mddrc.lut_table0_main_upper, CONFIG_SYS_MDDRCGRP_LUT0_MU);
-	out_be32(&im->mddrc.lut_table0_main_lower, CONFIG_SYS_MDDRCGRP_LUT0_ML);
-	out_be32(&im->mddrc.lut_table1_main_upper, CONFIG_SYS_MDDRCGRP_LUT1_MU);
-	out_be32(&im->mddrc.lut_table1_main_lower, CONFIG_SYS_MDDRCGRP_LUT1_ML);
-	out_be32(&im->mddrc.lut_table2_main_upper, CONFIG_SYS_MDDRCGRP_LUT2_MU);
-	out_be32(&im->mddrc.lut_table2_main_lower, CONFIG_SYS_MDDRCGRP_LUT2_ML);
-	out_be32(&im->mddrc.lut_table3_main_upper, CONFIG_SYS_MDDRCGRP_LUT3_MU);
-	out_be32(&im->mddrc.lut_table3_main_lower, CONFIG_SYS_MDDRCGRP_LUT3_ML);
-	out_be32(&im->mddrc.lut_table4_main_upper, CONFIG_SYS_MDDRCGRP_LUT4_MU);
-	out_be32(&im->mddrc.lut_table4_main_lower, CONFIG_SYS_MDDRCGRP_LUT4_ML);
-	out_be32(&im->mddrc.lut_table0_alternate_upper, CONFIG_SYS_MDDRCGRP_LUT0_AU);
-	out_be32(&im->mddrc.lut_table0_alternate_lower, CONFIG_SYS_MDDRCGRP_LUT0_AL);
-	out_be32(&im->mddrc.lut_table1_alternate_upper, CONFIG_SYS_MDDRCGRP_LUT1_AU);
-	out_be32(&im->mddrc.lut_table1_alternate_lower, CONFIG_SYS_MDDRCGRP_LUT1_AL);
-	out_be32(&im->mddrc.lut_table2_alternate_upper, CONFIG_SYS_MDDRCGRP_LUT2_AU);
-	out_be32(&im->mddrc.lut_table2_alternate_lower, CONFIG_SYS_MDDRCGRP_LUT2_AL);
-	out_be32(&im->mddrc.lut_table3_alternate_upper, CONFIG_SYS_MDDRCGRP_LUT3_AU);
-	out_be32(&im->mddrc.lut_table3_alternate_lower, CONFIG_SYS_MDDRCGRP_LUT3_AL);
-	out_be32(&im->mddrc.lut_table4_alternate_upper, CONFIG_SYS_MDDRCGRP_LUT4_AU);
-	out_be32(&im->mddrc.lut_table4_alternate_lower, CONFIG_SYS_MDDRCGRP_LUT4_AL);
-
-	/* Initialize MDDRC */
-	out_be32(&im->mddrc.ddr_sys_config, CONFIG_SYS_MDDRC_SYS_CFG);
-	out_be32(&im->mddrc.ddr_time_config0, CONFIG_SYS_MDDRC_TIME_CFG0);
-	out_be32(&im->mddrc.ddr_time_config1, CONFIG_SYS_MDDRC_TIME_CFG1);
-	out_be32(&im->mddrc.ddr_time_config2, CONFIG_SYS_MDDRC_TIME_CFG2);
-
-	/* Initialize DDR */
-	for (i = 0; i < 10; i++)
-		out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_NOP);
-
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_PCHG_ALL);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_NOP);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_RFSH);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_NOP);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_RFSH);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_NOP);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_INIT_DEV_OP);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_NOP);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_EM2);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_NOP);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_PCHG_ALL);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_EM2);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_EM3);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_EN_DLL);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_INIT_DEV_OP);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_PCHG_ALL);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_RFSH);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_INIT_DEV_OP);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_OCD_DEFAULT);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_PCHG_ALL);
-	out_be32(&im->mddrc.ddr_command, CONFIG_SYS_MICRON_NOP);
-
-	/* Start MDDRC */
-	out_be32(&im->mddrc.ddr_time_config0, CONFIG_SYS_MDDRC_TIME_CFG0_RUN);
-	out_be32(&im->mddrc.ddr_sys_config, CONFIG_SYS_MDDRC_SYS_CFG_RUN);
-
-	return msize;
-}
-
 int misc_init_r(void)
 {
 	u32 tmp;
@@ -295,7 +180,6 @@ static  iopin_t ioregs_init[] = {
 	},
 };
 
-
 int checkboard (void)
 {
 	puts("Board: ARIA\n");
board/esd/mecp5123/mecp5123.c +2 -102

128 lines not on this page · raw message

board/freescale/mpc5121ads/mpc5121ads.c +6 -112

159 lines not on this page · raw message

cpu/mpc512x/Makefile +9 -1
index 022c676..427db7a 100644
@@ -27,7 +27,15 @@ $(shell mkdir -p $(OBJTREE)/board/freescale/common)
 LIB	= $(obj)lib$(CPU).a
 
 START	= start.o
-COBJS-y	:= traps.o cpu.o cpu_init.o speed.o interrupts.o serial.o i2c.o iopin.o
+COBJS-y	:= cpu.o
+COBJS-y	+= traps.o
+COBJS-y += cpu_init.o
+COBJS-y += fixed_sdram.o
+COBJS-y += i2c.o
+COBJS-y += interrupts.o
+COBJS-y += iopin.o
+COBJS-y += serial.o
+COBJS-y += speed.o
 COBJS-${CONFIG_FSL_DIU_FB} += diu.o
 COBJS-${CONFIG_FSL_DIU_FB} += ../../board/freescale/common/fsl_diu_fb.o
 COBJS-${CONFIG_FSL_DIU_FB} += ../../board/freescale/common/fsl_logo_bmp.o
cpu/mpc512x/fixed_sdram.c new file +113 -0

113 lines not on this page · raw message

include/asm-ppc/mpc512x.h new file +57 -0

57 lines not on this page · raw message

Signature · 1 line
1.6.0.6