diff mbox

[U-Boot,1/6] powerpc/83xx/km: use tuxx1.h for kmsupx5 target

Message ID 1332333767-17581-2-git-send-email-holger.brunck@keymile.com
State Accepted
Commit 7f4bd9a6864a05acf8186c742ea3e52f8cb0b9e3
Delegated to: Kim Phillips
Headers show

Commit Message

Holger Brunck March 21, 2012, 12:42 p.m. UTC 
This additional header is unneeded, we can use the tuxx1.h for this
target.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Kim Phillips <kim.phillips@freescale.com>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Gerlando Falauto <gerlando.falauto@keymile.com>
cc: Heiko Schocher <hs@denx.de>
---
 boards.cfg                |    8 ++--
 include/configs/kmsupx5.h |   91 ---------------------------------------------
 include/configs/tuxx1.h   |   22 ++++++----
 3 files changed, 17 insertions(+), 104 deletions(-)
 delete mode 100644 include/configs/kmsupx5.h

Comments

Holger Brunck June 14, 2012, 10:55 a.m. UTC | #1 
Hi Kim,

On 03/21/2012 01:42 PM, Holger Brunck wrote:
> This additional header is unneeded, we can use the tuxx1.h for this
> target.
> 
> Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
> cc: Kim Phillips <kim.phillips@freescale.com>
> cc: Valentin Longchamp <valentin.longchamp@keymile.com>
> cc: Gerlando Falauto <gerlando.falauto@keymile.com>
> cc: Heiko Schocher <hs@denx.de>
> ---

when do you find the time to pick up these two patch series or is something
missing? :

http://lists.denx.de/pipermail/u-boot/2012-March/120694.html
http://lists.denx.de/pipermail/u-boot/2012-May/123755.html

Thanks in advance!

Best regards
Holger
Kim Phillips June 15, 2012, 9:48 p.m. UTC | #2 
On Thu, 14 Jun 2012 12:55:34 +0200
Holger Brunck <holger.brunck@keymile.com> wrote:

> Hi Kim,
> 
> On 03/21/2012 01:42 PM, Holger Brunck wrote:
> > This additional header is unneeded, we can use the tuxx1.h for this
> > target.
> > 
> > Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
> > cc: Kim Phillips <kim.phillips@freescale.com>
> > cc: Valentin Longchamp <valentin.longchamp@keymile.com>
> > cc: Gerlando Falauto <gerlando.falauto@keymile.com>
> > cc: Heiko Schocher <hs@denx.de>
> > ---
> 
> when do you find the time to pick up these two patch series or is something
> missing? :

applied 6 out of 6 patches.

Sorry for the delay.

Kim
diff mbox

Patch

diff --git a/boards.cfg b/boards.cfg
index 28cc345..f7ec9a3 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -608,15 +608,15 @@  MPC837XEMDS                  powerpc     mpc83xx     mpc837xemds         freesca
 MPC837XEMDS_HOST             powerpc     mpc83xx     mpc837xemds         freescale      -           MPC837XEMDS:PCI
 MPC837XERDB                  powerpc     mpc83xx     mpc837xerdb         freescale
 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
 SIMPC8313_LP                 powerpc     mpc83xx     simpc8313           sheldon        -           SIMPC8313:NAND_LP
 SIMPC8313_SP                 powerpc     mpc83xx     simpc8313           sheldon        -           SIMPC8313:NAND_SP
 TQM834x                      powerpc     mpc83xx     tqm834x             tqc
+suvd3                        powerpc     mpc83xx     km83xx              keymile
+tuge1                        powerpc     mpc83xx     km83xx              keymile        -           tuxx1:KM_DISABLE_APP2,TUGE1
+tuxx1                        powerpc     mpc83xx     km83xx              keymile
+kmsupx5                      powerpc     mpc83xx     km83xx              keymile        -           tuxx1:KM_DISABLE_APP2,KMSUPX5
 sbc8540                      powerpc     mpc85xx     sbc8560             -              -           SBC8540
 sbc8540_33                   powerpc     mpc85xx     sbc8560             -              -           SBC8540
 sbc8540_66                   powerpc     mpc85xx     sbc8560             -              -           SBC8540
diff --git a/include/configs/kmsupx5.h b/include/configs/kmsupx5.h
deleted file mode 100644
index b0dd88c..0000000
--- a/include/configs/kmsupx5.h
+++ /dev/null
@@ -1,91 +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@denx.de.
- *
- * (C) Copyright 2010
- * Lukas Roggli, KEYMILE Ltd, lukas.roggli@keymile.com
- *
- * (C) Copyright 2010-2011
- * Thomas Reufer, KEYMILE Ltd, thomas.reufer@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_KMSUPX5		1 /* Keymile PBEC8321 board specific */
-#define CONFIG_HOSTNAME		supx5
-#define CONFIG_KM_BOARD_NAME	"supx5"
-
-#define	CONFIG_SYS_TEXT_BASE	0xF0000000
-
-/* include common defines/options for all 8321 Keymile boards */
-#include "km/km8321-common.h"
-
-/*
- * Init Local Bus Memory Controller:
- *
- * Bank Bus     Machine PortSz  Size  Device
- * ---- ---     ------- ------  -----  ------
- *  2   Local   GPCM    8 bit  256MB	LPXF
- *  3   Local   not used
- *
- */
-
-/*
- * LPXF on the local bus CS2
- * Window base at flash base
- * Window size: 256 MB
- */
-
-#define	CONFIG_SYS_LPXF_BASE		0xA0000000    /* LPXF */
-#define	CONFIG_SYS_LPXF_SIZE		256 /* Megabytes */
-
-#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)
-
-/* 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
-
-/* Bank 3 not used */
-#define CONFIG_SYS_IBAT6L       (0)
-#define CONFIG_SYS_IBAT6U       (0)
-#define CONFIG_SYS_DBAT6L       CONFIG_SYS_IBAT6L
-#define CONFIG_SYS_DBAT6U       CONFIG_SYS_IBAT6U
-
-#endif /* __CONFIG_H */
diff --git a/include/configs/tuxx1.h b/include/configs/tuxx1.h
index f6d2b17..90d2e61 100644
--- a/include/configs/tuxx1.h
+++ b/include/configs/tuxx1.h
@@ -11,7 +11,7 @@ 
  * (C) Copyright 2008
  * Heiko Schocher, DENX Software Engineering, hs@denx.de.
  *
- * (C) Copyright 2010-2011
+ * (C) Copyright 2010-2012
  * Lukas Roggli, KEYMILE Ltd, lukas.roggli@keymile.com
  * Holger Brunck,  Keymile GmbH, holger.bruncl@keymile.com
  *
@@ -27,12 +27,16 @@ 
 /*
  * High Level Configuration Options
  */
+#ifdef CONFIG_KMSUPX5
+#define CONFIG_KM_BOARD_NAME	"kmsupx5"
+#define CONFIG_HOSTNAME		kmsupx5
+#elif defined CONFIG_TUGE1
+#define CONFIG_KM_BOARD_NAME	"tuge1"
+#define CONFIG_HOSTNAME		tuge1
+#else
 #define CONFIG_TUXXX		/* TUXX1 board (tuxa1/tuda1) specific */
+#define CONFIG_KM_BOARD_NAME	"tuxx1"
 #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
@@ -50,10 +54,10 @@ 
 /*
  * Init Local Bus Memory Controller:
  *
- * 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
+ * Bank Bus     Machine PortSz  Size  Device on TUDA1  TUXA1  TUGE1   KMSUPX4
+ * ---- ---     ------- ------  -----  ---------------------------------------
+ *  2   Local   GPCM    8 bit  256MB	         PAXG  LPXF   PAXI     LPXF
+ *  3   Local   GPCM    8 bit  256MB	         PINC3 PINC2  unused   unused
  *
  */