public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 1/4] powerpc/83xx/km: update SDRAM parameters for km8321 boards
@ 2011-12-14 15:21 Holger Brunck
  2011-12-14 15:21 ` [U-Boot] [PATCH 2/4] powerpc/83xx/km: remove obsolete defines for tuda1 Holger Brunck
                   ` (4 more replies)
  0 siblings, 5 replies; 9+ messages in thread
From: Holger Brunck @ 2011-12-14 15:21 UTC (permalink / raw)
  To: u-boot

From: Marco Schmid <marco.schmid@keymile.com>

Measurements during HW basic test showed, that the SDRAM timing
has to be optimized. This patch adapted these timings accordingly.

Signed-off-by: Marco Schmid <marco.schmid@keymile.com>
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Kim Phillips <kim.phillips@freescale.com>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>
---
 include/configs/km/km8321-common.h |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/include/configs/km/km8321-common.h b/include/configs/km/km8321-common.h
index 902ae26..580b72f 100644
--- a/include/configs/km/km8321-common.h
+++ b/include/configs/km/km8321-common.h
@@ -70,7 +70,8 @@
 #define CONFIG_SYS_DDR_CS0_BNDS		0x0000007f
 #define CONFIG_SYS_DDR_SDRAM_CFG	(SDRAM_CFG_SDRAM_TYPE_DDR2 | \
 					 SDRAM_CFG_32_BE | \
-					 SDRAM_CFG_SREN)
+					 SDRAM_CFG_SREN | \
+					 SDRAM_CFG_HSE)
 
 #define CONFIG_SYS_DDR_SDRAM_CFG2	0x00401000
 #define CONFIG_SYS_DDR_CLK_CNTL		(DDR_SDRAM_CLK_CNTL_CLK_ADJUST_05)
@@ -82,7 +83,7 @@
 					 CSCONFIG_ROW_BIT_13 | \
 					 CSCONFIG_COL_BIT_10)
 
-#define CONFIG_SYS_DDR_MODE	0x47860252
+#define CONFIG_SYS_DDR_MODE	0x47860242
 #define CONFIG_SYS_DDR_MODE2	0x8080c000
 
 #define CONFIG_SYS_DDR_TIMING_0	((2 << TIMING_CFG0_MRS_CYC_SHIFT) | \
@@ -94,20 +95,20 @@
 				 (0 << TIMING_CFG0_WRT_SHIFT) | \
 				 (0 << TIMING_CFG0_RWT_SHIFT))
 
-#define CONFIG_SYS_DDR_TIMING_1	((TIMING_CFG1_CASLAT_50) | \
+#define CONFIG_SYS_DDR_TIMING_1	((TIMING_CFG1_CASLAT_40) | \
 				 (2 << TIMING_CFG1_WRTORD_SHIFT) | \
 				 (2 << TIMING_CFG1_ACTTOACT_SHIFT) | \
-				 (2 << TIMING_CFG1_WRREC_SHIFT) | \
-				 (6 << TIMING_CFG1_REFREC_SHIFT) | \
-				 (2 << TIMING_CFG1_ACTTORW_SHIFT) | \
-				 (6 << TIMING_CFG1_ACTTOPRE_SHIFT) | \
-				 (2 << TIMING_CFG1_PRETOACT_SHIFT))
+				 (3 << TIMING_CFG1_WRREC_SHIFT) | \
+				 (7 << TIMING_CFG1_REFREC_SHIFT) | \
+				 (3 << TIMING_CFG1_ACTTORW_SHIFT) | \
+				 (7 << TIMING_CFG1_ACTTOPRE_SHIFT) | \
+				 (3 << TIMING_CFG1_PRETOACT_SHIFT))
 
 #define CONFIG_SYS_DDR_TIMING_2	((8 << TIMING_CFG2_FOUR_ACT_SHIFT) | \
 				 (3 << TIMING_CFG2_CKE_PLS_SHIFT) | \
 				 (2 << TIMING_CFG2_WR_DATA_DELAY_SHIFT) | \
 				 (2 << TIMING_CFG2_RD_TO_PRE_SHIFT) | \
-				 (4 << TIMING_CFG2_WR_LAT_DELAY_SHIFT) | \
+				 (3 << TIMING_CFG2_WR_LAT_DELAY_SHIFT) | \
 				 (0 << TIMING_CFG2_ADD_LAT_SHIFT) | \
 				 (5 << TIMING_CFG2_CPO_SHIFT))
 
@@ -122,7 +123,10 @@
 /*
  * Local Bus Configuration & Clock Setup
  */
-#define CONFIG_SYS_LCRR		(LCRR_DBYP | LCRR_EADC_1 | LCRR_CLKDIV_2)
+#define CONFIG_SYS_LCRR_DBYP	0x80000000
+#define CONFIG_SYS_LCRR_EADC	0x00010000
+#define CONFIG_SYS_LCRR_CLKDIV	0x00000002
+
 #define CONFIG_SYS_LBC_LBCR	0x00000000
 
 /*
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 2/4] powerpc/83xx/km: remove obsolete defines for tuda1
  2011-12-14 15:21 [U-Boot] [PATCH 1/4] powerpc/83xx/km: update SDRAM parameters for km8321 boards Holger Brunck
@ 2011-12-14 15:21 ` Holger Brunck
  2011-12-15  6:27   ` Heiko Schocher
  2011-12-14 15:21 ` [U-Boot] [PATCH 3/4] powerpc/83xx/km: merge tuxa and tuda1 boards to tuxx1 Holger Brunck
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 9+ messages in thread
From: Holger Brunck @ 2011-12-14 15:21 UTC (permalink / raw)
  To: u-boot

CONFIG_SYS_LCRR is unused and CONFIG_SYS_LBC_LBCR is already
defined in the common header file, so remove them.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Kim Phillips <kim.phillips@freescale.com>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>
---
 include/configs/tuda1.h |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/include/configs/tuda1.h b/include/configs/tuda1.h
index 577bbd0..2581d8a 100644
--- a/include/configs/tuda1.h
+++ b/include/configs/tuda1.h
@@ -41,12 +41,6 @@
 #define	CONFIG_SYS_APP2_SIZE	256 /* Megabytes */
 
 /*
- * Local Bus Configuration & Clock Setup
- */
-#define CONFIG_SYS_LCRR		(LCRR_DBYP | LCRR_EADC_1 | LCRR_CLKDIV_2)
-#define CONFIG_SYS_LBC_LBCR	0x00000000
-
-/*
  * Init Local Bus Memory Controller:
  *
  * Bank Bus     Machine PortSz  Size  Device
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 3/4] powerpc/83xx/km: merge tuxa and tuda1 boards to tuxx1
  2011-12-14 15:21 [U-Boot] [PATCH 1/4] powerpc/83xx/km: update SDRAM parameters for km8321 boards Holger Brunck
  2011-12-14 15:21 ` [U-Boot] [PATCH 2/4] powerpc/83xx/km: remove obsolete defines for tuda1 Holger Brunck
@ 2011-12-14 15:21 ` Holger Brunck
  2011-12-15  6:29   ` Heiko Schocher
  2011-12-14 15:21 ` [U-Boot] [PATCH 4/4] powerpc/83xx/km: add support for 8321 based tuge1 board Holger Brunck
                   ` (2 subsequent siblings)
  4 siblings, 1 reply; 9+ messages in thread
From: Holger Brunck @ 2011-12-14 15:21 UTC (permalink / raw)
  To: u-boot

These boards are from a u-boot point of view identical. So collect
the two headerfiles to one, to decrease maintenance.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Kim Phillips <kim.phillips@freescale.com>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Heiko Schocher <hs@denx.de>
---
 MAINTAINERS                          |    5 +-
 boards.cfg                           |    3 +-
 include/configs/tuxa1.h              |  123 ----------------------------------
 include/configs/{tuda1.h => tuxx1.h} |   23 +++---
 4 files changed, 16 insertions(+), 138 deletions(-)
 delete mode 100644 include/configs/tuxa1.h
 rename include/configs/{tuda1.h => tuxx1.h} (84%)

diff --git a/MAINTAINERS b/MAINTAINERS
index a56ca10..f111226 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -436,11 +436,12 @@ Heiko Schocher <hs@denx.de>
 	municse		MPC5200
 	sc3		PPC405GP
 	suvd3		MPC8321
-	tuda1		MPC8321
-	tuxa1		MPC8321
 	uc101		MPC5200
 	ve8313		MPC8313
 
+Holger Brunck <holger.brunck@keymile.com>
+	tuxx1		MPC8321
+
 Peter De Schrijver <p2@mind.be>
 
 	ML2		PPC4xx
diff --git a/boards.cfg b/boards.cfg
index 1e5b3e0..93577d1 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -590,8 +590,7 @@ MPC837XERDB                  powerpc     mpc83xx     mpc837xerdb         freesca
 kmeter1                      powerpc     mpc83xx     km83xx              keymile
 kmsupx5                      powerpc     mpc83xx     km83xx              keymile
 suvd3                        powerpc     mpc83xx     km83xx              keymile
-tuda1                        powerpc     mpc83xx     km83xx              keymile
-tuxa1                        powerpc     mpc83xx     km83xx              keymile
+tuxx1                        powerpc     mpc83xx     km83xx              keymile
 MERGERBOX                    powerpc     mpc83xx     mergerbox           matrix_vision
 MVBLM7                       powerpc     mpc83xx     mvblm7              matrix_vision
 SIMPC8313_LP                 powerpc     mpc83xx     simpc8313           sheldon        -           SIMPC8313:NAND_LP
diff --git a/include/configs/tuxa1.h b/include/configs/tuxa1.h
deleted file mode 100644
index 2d9af3f..0000000
--- a/include/configs/tuxa1.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (C) 2006 Freescale Semiconductor, Inc.
- *                    Dave Liu <daveliu@freescale.com>
- *
- * Copyright (C) 2007 Logic Product Development, Inc.
- *                    Peter Barada <peterb@logicpd.com>
- *
- * Copyright (C) 2007 MontaVista Software, Inc.
- *                    Anton Vorontsov <avorontsov@ru.mvista.com>
- *
- * (C) Copyright 2008
- * Heiko Schocher, DENX Software Engineering, hs at denx.de.
- *
- * (C) Copyright 2010
- * Yan Bin, Lukas Roggli, KEYMILE Ltd, lukas.roggli at keymile.com
- *
- * 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.
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-/*
- * High Level Configuration Options
- */
-#define CONFIG_TUXA1		/* TUXA1 board specific */
-#define CONFIG_HOSTNAME		tuxa1
-#define CONFIG_KM_BOARD_NAME   "tuxa1"
-
-#define	CONFIG_SYS_TEXT_BASE	0xF0000000
-
-/* include common defines/options for all 8321 Keymile boards */
-#include "km/km8321-common.h"
-
-#define	CONFIG_SYS_LPXF_BASE		0xA0000000    /* LPXF */
-#define	CONFIG_SYS_LPXF_SIZE		256 /* Megabytes */
-#define	CONFIG_SYS_PINC2_BASE		0xB0000000    /* PINC2 */
-#define	CONFIG_SYS_PINC2_SIZE		256 /* Megabytes */
-
-/*
- * Init Local Bus Memory Controller:
- *
- * Bank Bus     Machine PortSz  Size  Device
- * ---- ---     ------- ------  -----  ------
- *  2   Local   GPCM    8 bit  256MB	LPXF
- *  3   Local   GPCM    8 bit  256MB	PINC2
- *
- */
-
-/*
- * LPXF on the local bus CS2
- * Window base at flash base
- * Window size: 256 MB
- */
-#define CONFIG_SYS_LBLAWBAR2_PRELIM	CONFIG_SYS_LPXF_BASE
-#define CONFIG_SYS_LBLAWAR2_PRELIM	(LBLAWAR_EN | LBLAWAR_256MB)
-
-#define CONFIG_SYS_BR2_PRELIM       (CONFIG_SYS_LPXF_BASE | \
-				BR_PS_8 | \
-				BR_MS_GPCM | \
-				BR_V)
-
-#define CONFIG_SYS_OR2_PRELIM	(MEG_TO_AM(CONFIG_SYS_LPXF_SIZE) | \
-				 OR_GPCM_CSNT | \
-				 OR_GPCM_ACS_DIV4 | \
-				 OR_GPCM_SCY_2 | \
-				 OR_GPCM_TRLX_SET | \
-				 OR_GPCM_EHTR_CLEAR | \
-				 OR_GPCM_EAD)
-/*
- * PINC2 on the local bus CS3
- * Access window base at PINC2 base
- * Window size: 256 MB
- */
-#define CONFIG_SYS_LBLAWBAR3_PRELIM	CONFIG_SYS_PINC2_BASE
-#define CONFIG_SYS_LBLAWAR3_PRELIM	(LBLAWAR_EN | LBLAWAR_256MB)
-
-#define CONFIG_SYS_BR3_PRELIM	(CONFIG_SYS_PINC2_BASE | \
-				 BR_PS_8 | \
-				 BR_MS_GPCM | \
-				 BR_V)
-
-#define CONFIG_SYS_OR3_PRELIM	(MEG_TO_AM(CONFIG_SYS_PINC2_SIZE) | \
-				 OR_GPCM_CSNT | \
-				 OR_GPCM_ACS_DIV2 | \
-				 OR_GPCM_SCY_2 | \
-				 OR_GPCM_TRLX_SET | \
-				 OR_GPCM_EHTR_CLEAR)
-
-#define CONFIG_SYS_MAMR		(MxMR_GPL_x4DIS | \
-				 0x0000c000 | \
-				 MxMR_WLFx_2X)
-
-/*
- * MMU Setup
- */
-/* LPXF:  icache cacheable, but dcache-inhibit and guarded */
-#define CONFIG_SYS_IBAT5L	(CONFIG_SYS_LPXF_BASE | BATL_PP_RW | \
-				 BATL_MEMCOHERENCE)
-#define CONFIG_SYS_IBAT5U	(CONFIG_SYS_LPXF_BASE | BATU_BL_256M | \
-				 BATU_VS | BATU_VP)
-#define CONFIG_SYS_DBAT5L	(CONFIG_SYS_LPXF_BASE | BATL_PP_RW | \
-				 BATL_CACHEINHIBIT | BATL_GUARDEDSTORAGE)
-#define CONFIG_SYS_DBAT5U	CONFIG_SYS_IBAT5U
-
-/* PINC2:  icache cacheable, but dcache-inhibit and guarded */
-#define CONFIG_SYS_IBAT6L	(CONFIG_SYS_PINC2_BASE | BATL_PP_RW | \
-				 BATL_MEMCOHERENCE)
-#define CONFIG_SYS_IBAT6U	(CONFIG_SYS_PINC2_BASE | BATU_BL_256M | \
-				 BATU_VS | BATU_VP)
-#define CONFIG_SYS_DBAT6L	(CONFIG_SYS_PINC2_BASE | BATL_PP_RW | \
-				 BATL_CACHEINHIBIT | BATL_GUARDEDSTORAGE)
-#define CONFIG_SYS_DBAT6U	CONFIG_SYS_IBAT6U
-
-#define CONFIG_SYS_IBAT7L	(0)
-#define CONFIG_SYS_IBAT7U	(0)
-#define CONFIG_SYS_DBAT7L	CONFIG_SYS_IBAT7L
-#define CONFIG_SYS_DBAT7U	CONFIG_SYS_IBAT7U
-
-#endif /* __CONFIG_H */
diff --git a/include/configs/tuda1.h b/include/configs/tuxx1.h
similarity index 84%
rename from include/configs/tuda1.h
rename to include/configs/tuxx1.h
index 2581d8a..b07f6b3 100644
--- a/include/configs/tuda1.h
+++ b/include/configs/tuxx1.h
@@ -13,6 +13,7 @@
  *
  * (C) Copyright 2010-2011
  * Lukas Roggli, KEYMILE Ltd, lukas.roggli at keymile.com
+ * Holger Brunck,  Keymile GmbH, holger.bruncl at keymile.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -26,9 +27,9 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_TUDA1		/* TUDA1 board specific */
-#define CONFIG_HOSTNAME		tuda1
-#define CONFIG_KM_BOARD_NAME   "tuda1"
+#define CONFIG_TUXXX		/* TUXX1 board specific */
+#define CONFIG_HOSTNAME		tuxx1
+#define CONFIG_KM_BOARD_NAME   "tuxx1"
 
 #define	CONFIG_SYS_TEXT_BASE	0xF0000000
 
@@ -43,15 +44,15 @@
 /*
  * Init Local Bus Memory Controller:
  *
- * Bank Bus     Machine PortSz  Size  Device
- * ---- ---     ------- ------  -----  ------
- *  2   Local   GPCM    8 bit  256MB	PAXG
- *  3   Local   GPCM    8 bit  256MB	PINC3
+ * Bank Bus     Machine PortSz  Size  Device on TUDA1  TUXA1
+ * ---- ---     ------- ------  -----  ---------------------
+ *  2   Local   GPCM    8 bit  256MB	         PAXG  LPXF
+ *  3   Local   GPCM    8 bit  256MB	         PINC3 PINC2
  *
  */
 
 /*
- * PAXG on the local bus CS2
+ * Configuration for C2 on the local bus
  */
 /* Window base at flash base */
 #define CONFIG_SYS_LBLAWBAR2_PRELIM	CONFIG_SYS_APP1_BASE
@@ -71,7 +72,7 @@
 				 OR_GPCM_EHTR_CLEAR | \
 				 OR_GPCM_EAD)
 /*
- * PINC3 on the local bus CS3
+ * Configuration for C3 on the local bus
  */
 /* Access window base at PINC3 base */
 #define CONFIG_SYS_LBLAWBAR3_PRELIM	CONFIG_SYS_APP2_BASE
@@ -97,7 +98,7 @@
 /*
  * MMU Setup
  */
-/* PAXG:  icache cacheable, but dcache-inhibit and guarded */
+/* APP1: icache cacheable, but dcache-inhibit and guarded */
 #define CONFIG_SYS_IBAT5L	(CONFIG_SYS_APP1_BASE | \
 				 BATL_PP_RW | \
 				 BATL_MEMCOHERENCE)
@@ -112,7 +113,7 @@
 				 BATL_GUARDEDSTORAGE)
 #define CONFIG_SYS_DBAT5U	CONFIG_SYS_IBAT5U
 
-/* PINC3:  icache cacheable, but dcache-inhibit and guarded */
+/* APP2:  icache cacheable, but dcache-inhibit and guarded */
 #define CONFIG_SYS_IBAT6L	(CONFIG_SYS_APP2_BASE | \
 				 BATL_PP_RW | \
 				 BATL_MEMCOHERENCE)
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 4/4] powerpc/83xx/km: add support for 8321 based tuge1 board
  2011-12-14 15:21 [U-Boot] [PATCH 1/4] powerpc/83xx/km: update SDRAM parameters for km8321 boards Holger Brunck
  2011-12-14 15:21 ` [U-Boot] [PATCH 2/4] powerpc/83xx/km: remove obsolete defines for tuda1 Holger Brunck
  2011-12-14 15:21 ` [U-Boot] [PATCH 3/4] powerpc/83xx/km: merge tuxa and tuda1 boards to tuxx1 Holger Brunck
@ 2011-12-14 15:21 ` Holger Brunck
  2011-12-15  6:30   ` Heiko Schocher
  2011-12-15  6:27 ` [U-Boot] [PATCH 1/4] powerpc/83xx/km: update SDRAM parameters for km8321 boards Heiko Schocher
  2012-01-10  2:14 ` Kim Phillips
  4 siblings, 1 reply; 9+ messages in thread
From: Holger Brunck @ 2011-12-14 15:21 UTC (permalink / raw)
  To: u-boot

This board is similar to our tuxx1 target. But on this board there
is only one application specific chip select configured.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Kim Phillips <kim.phillips@freescale.com>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Heiko Schocher <hs@denx.de>
---
 MAINTAINERS             |    1 +
 boards.cfg              |    1 +
 include/configs/tuxx1.h |   24 +++++++++++++++++++-----
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index f111226..f97bbf6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -440,6 +440,7 @@ Heiko Schocher <hs@denx.de>
 	ve8313		MPC8313
 
 Holger Brunck <holger.brunck@keymile.com>
+	tuge1		MPC8321
 	tuxx1		MPC8321
 
 Peter De Schrijver <p2@mind.be>
diff --git a/boards.cfg b/boards.cfg
index 93577d1..b108dd0 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -590,6 +590,7 @@ MPC837XERDB                  powerpc     mpc83xx     mpc837xerdb         freesca
 kmeter1                      powerpc     mpc83xx     km83xx              keymile
 kmsupx5                      powerpc     mpc83xx     km83xx              keymile
 suvd3                        powerpc     mpc83xx     km83xx              keymile
+tuge1                        powerpc     mpc83xx     km83xx              keymile        -           tuxx1:KM_DISABLE_APP2
 tuxx1                        powerpc     mpc83xx     km83xx              keymile
 MERGERBOX                    powerpc     mpc83xx     mergerbox           matrix_vision
 MVBLM7                       powerpc     mpc83xx     mvblm7              matrix_vision
diff --git a/include/configs/tuxx1.h b/include/configs/tuxx1.h
index b07f6b3..f6d2b17 100644
--- a/include/configs/tuxx1.h
+++ b/include/configs/tuxx1.h
@@ -27,9 +27,13 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_TUXXX		/* TUXX1 board specific */
+#define CONFIG_TUXXX		/* TUXX1 board (tuxa1/tuda1) specific */
 #define CONFIG_HOSTNAME		tuxx1
+#ifdef CONFIG_KM_DISABLE_APP2
+#define CONFIG_KM_BOARD_NAME   "tuge1"
+#else
 #define CONFIG_KM_BOARD_NAME   "tuxx1"
+#endif
 
 #define	CONFIG_SYS_TEXT_BASE	0xF0000000
 
@@ -38,16 +42,18 @@
 
 #define CONFIG_SYS_APP1_BASE	0xA0000000    /* PAXG */
 #define	CONFIG_SYS_APP1_SIZE	256 /* Megabytes */
+#ifndef CONFIG_KM_DISABLE_APP2
 #define CONFIG_SYS_APP2_BASE	0xB0000000    /* PINC3 */
 #define	CONFIG_SYS_APP2_SIZE	256 /* Megabytes */
+#endif
 
 /*
  * Init Local Bus Memory Controller:
  *
- * Bank Bus     Machine PortSz  Size  Device on TUDA1  TUXA1
- * ---- ---     ------- ------  -----  ---------------------
- *  2   Local   GPCM    8 bit  256MB	         PAXG  LPXF
- *  3   Local   GPCM    8 bit  256MB	         PINC3 PINC2
+ * Bank Bus     Machine PortSz  Size  Device on TUDA1  TUXA1  TUGE1
+ * ---- ---     ------- ------  -----  ----------------------------
+ *  2   Local   GPCM    8 bit  256MB	         PAXG  LPXF   PAXI
+ *  3   Local   GPCM    8 bit  256MB	         PINC3 PINC2  unused
  *
  */
 
@@ -71,6 +77,7 @@
 				 OR_GPCM_TRLX_SET | \
 				 OR_GPCM_EHTR_CLEAR | \
 				 OR_GPCM_EAD)
+#ifndef CONFIG_KM_DISABLE_APP2
 /*
  * Configuration for C3 on the local bus
  */
@@ -94,6 +101,7 @@
 #define CONFIG_SYS_MAMR		(MxMR_GPL_x4DIS | \
 				 0x0000c000 | \
 				 MxMR_WLFx_2X)
+#endif
 
 /*
  * MMU Setup
@@ -113,6 +121,11 @@
 				 BATL_GUARDEDSTORAGE)
 #define CONFIG_SYS_DBAT5U	CONFIG_SYS_IBAT5U
 
+#ifdef CONFIG_KM_DISABLE_APP2
+#define CONFIG_SYS_IBAT6L	(0)
+#define CONFIG_SYS_IBAT6U	(0)
+#define CONFIG_SYS_DBAT6L	CONFIG_SYS_IBAT6L
+#else
 /* APP2:  icache cacheable, but dcache-inhibit and guarded */
 #define CONFIG_SYS_IBAT6L	(CONFIG_SYS_APP2_BASE | \
 				 BATL_PP_RW | \
@@ -125,6 +138,7 @@
 				 BATL_PP_RW | \
 				 BATL_CACHEINHIBIT | \
 				 BATL_GUARDEDSTORAGE)
+#endif
 #define CONFIG_SYS_DBAT6U	CONFIG_SYS_IBAT6U
 
 #define CONFIG_SYS_IBAT7L	(0)
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 1/4] powerpc/83xx/km: update SDRAM parameters for km8321 boards
  2011-12-14 15:21 [U-Boot] [PATCH 1/4] powerpc/83xx/km: update SDRAM parameters for km8321 boards Holger Brunck
                   ` (2 preceding siblings ...)
  2011-12-14 15:21 ` [U-Boot] [PATCH 4/4] powerpc/83xx/km: add support for 8321 based tuge1 board Holger Brunck
@ 2011-12-15  6:27 ` Heiko Schocher
  2012-01-10  2:14 ` Kim Phillips
  4 siblings, 0 replies; 9+ messages in thread
From: Heiko Schocher @ 2011-12-15  6:27 UTC (permalink / raw)
  To: u-boot

Hello Holger,

Holger Brunck wrote:
> From: Marco Schmid <marco.schmid@keymile.com>
> 
> Measurements during HW basic test showed, that the SDRAM timing
> has to be optimized. This patch adapted these timings accordingly.
> 
> Signed-off-by: Marco Schmid <marco.schmid@keymile.com>
> Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
> cc: Kim Phillips <kim.phillips@freescale.com>
> cc: Valentin Longchamp <valentin.longchamp@keymile.com>
> ---
>  include/configs/km/km8321-common.h |   24 ++++++++++++++----------
>  1 files changed, 14 insertions(+), 10 deletions(-)

Acked-by: Heiko Schocher <hs@denx.de>

bye,
Heiko
-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 2/4] powerpc/83xx/km: remove obsolete defines for tuda1
  2011-12-14 15:21 ` [U-Boot] [PATCH 2/4] powerpc/83xx/km: remove obsolete defines for tuda1 Holger Brunck
@ 2011-12-15  6:27   ` Heiko Schocher
  0 siblings, 0 replies; 9+ messages in thread
From: Heiko Schocher @ 2011-12-15  6:27 UTC (permalink / raw)
  To: u-boot

Hello Holger,

Holger Brunck wrote:
> CONFIG_SYS_LCRR is unused and CONFIG_SYS_LBC_LBCR is already
> defined in the common header file, so remove them.
> 
> Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
> cc: Kim Phillips <kim.phillips@freescale.com>
> cc: Valentin Longchamp <valentin.longchamp@keymile.com>
> ---
>  include/configs/tuda1.h |    6 ------
>  1 files changed, 0 insertions(+), 6 deletions(-)

Acked-by: Heiko Schocher <hs@denx.de>

bye,
Heiko
-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 3/4] powerpc/83xx/km: merge tuxa and tuda1 boards to tuxx1
  2011-12-14 15:21 ` [U-Boot] [PATCH 3/4] powerpc/83xx/km: merge tuxa and tuda1 boards to tuxx1 Holger Brunck
@ 2011-12-15  6:29   ` Heiko Schocher
  0 siblings, 0 replies; 9+ messages in thread
From: Heiko Schocher @ 2011-12-15  6:29 UTC (permalink / raw)
  To: u-boot

Hello Holger,

Holger Brunck wrote:
> These boards are from a u-boot point of view identical. So collect
> the two headerfiles to one, to decrease maintenance.
> 
> Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
> cc: Kim Phillips <kim.phillips@freescale.com>
> cc: Valentin Longchamp <valentin.longchamp@keymile.com>
> cc: Heiko Schocher <hs@denx.de>
> ---
>  MAINTAINERS                          |    5 +-
>  boards.cfg                           |    3 +-
>  include/configs/tuxa1.h              |  123 ----------------------------------
>  include/configs/{tuda1.h => tuxx1.h} |   23 +++---
>  4 files changed, 16 insertions(+), 138 deletions(-)
>  delete mode 100644 include/configs/tuxa1.h
>  rename include/configs/{tuda1.h => tuxx1.h} (84%)

Acked-by: Heiko Schocher <hs@denx.de>

bye,
Heiko
-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 4/4] powerpc/83xx/km: add support for 8321 based tuge1 board
  2011-12-14 15:21 ` [U-Boot] [PATCH 4/4] powerpc/83xx/km: add support for 8321 based tuge1 board Holger Brunck
@ 2011-12-15  6:30   ` Heiko Schocher
  0 siblings, 0 replies; 9+ messages in thread
From: Heiko Schocher @ 2011-12-15  6:30 UTC (permalink / raw)
  To: u-boot

Hello Holger,

Holger Brunck wrote:
> This board is similar to our tuxx1 target. But on this board there
> is only one application specific chip select configured.
> 
> Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
> cc: Kim Phillips <kim.phillips@freescale.com>
> cc: Valentin Longchamp <valentin.longchamp@keymile.com>
> cc: Heiko Schocher <hs@denx.de>
> ---
>  MAINTAINERS             |    1 +
>  boards.cfg              |    1 +
>  include/configs/tuxx1.h |   24 +++++++++++++++++++-----
>  3 files changed, 21 insertions(+), 5 deletions(-)

Acked-by: Heiko Schocher <hs@denx.de>

bye,
Heiko
-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 1/4] powerpc/83xx/km: update SDRAM parameters for km8321 boards
  2011-12-14 15:21 [U-Boot] [PATCH 1/4] powerpc/83xx/km: update SDRAM parameters for km8321 boards Holger Brunck
                   ` (3 preceding siblings ...)
  2011-12-15  6:27 ` [U-Boot] [PATCH 1/4] powerpc/83xx/km: update SDRAM parameters for km8321 boards Heiko Schocher
@ 2012-01-10  2:14 ` Kim Phillips
  4 siblings, 0 replies; 9+ messages in thread
From: Kim Phillips @ 2012-01-10  2:14 UTC (permalink / raw)
  To: u-boot

On Wed, 14 Dec 2011 16:21:42 +0100
Holger Brunck <holger.brunck@keymile.com> wrote:

> From: Marco Schmid <marco.schmid@keymile.com>
> 
> Measurements during HW basic test showed, that the SDRAM timing
> has to be optimized. This patch adapted these timings accordingly.
> 
> Signed-off-by: Marco Schmid <marco.schmid@keymile.com>
> Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
> cc: Kim Phillips <kim.phillips@freescale.com>
> cc: Valentin Longchamp <valentin.longchamp@keymile.com>
> ---

applied 1-4 out of 4 patches to mpc83xx.

Thanks,

Kim

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2012-01-10  2:14 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-14 15:21 [U-Boot] [PATCH 1/4] powerpc/83xx/km: update SDRAM parameters for km8321 boards Holger Brunck
2011-12-14 15:21 ` [U-Boot] [PATCH 2/4] powerpc/83xx/km: remove obsolete defines for tuda1 Holger Brunck
2011-12-15  6:27   ` Heiko Schocher
2011-12-14 15:21 ` [U-Boot] [PATCH 3/4] powerpc/83xx/km: merge tuxa and tuda1 boards to tuxx1 Holger Brunck
2011-12-15  6:29   ` Heiko Schocher
2011-12-14 15:21 ` [U-Boot] [PATCH 4/4] powerpc/83xx/km: add support for 8321 based tuge1 board Holger Brunck
2011-12-15  6:30   ` Heiko Schocher
2011-12-15  6:27 ` [U-Boot] [PATCH 1/4] powerpc/83xx/km: update SDRAM parameters for km8321 boards Heiko Schocher
2012-01-10  2:14 ` Kim Phillips

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox