All of lore.kernel.org
 help / color / mirror / Atom feed
From: Valentin Longchamp <valentin.longchamp@keymile.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 02/17] powerpc/83xx: add support for kmtepr2 board
Date: Fri, 13 Nov 2015 15:59:13 +0100	[thread overview]
Message-ID: <1447426768-23226-3-git-send-email-valentin.longchamp@keymile.com> (raw)
In-Reply-To: <1447426768-23226-1-git-send-email-valentin.longchamp@keymile.com>

From: Christoph Dietrich <christoph.dietrich@keymile.com>

This board is similar to TUXX1, but it has differend FPGAs.

Signed-off-by: Christoph Dietrich <christoph.dietrich@keymile.com>
Signed-off-by: Andreas Huber <andreas.huber@keymile.com>
Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
---

 board/keymile/km83xx/MAINTAINERS |  1 +
 configs/kmtepr2_defconfig        |  4 ++++
 include/configs/tuxx1.h          | 43 +++++++++++++++++++++++++++++++++-------
 3 files changed, 41 insertions(+), 7 deletions(-)
 create mode 100644 configs/kmtepr2_defconfig

diff --git a/board/keymile/km83xx/MAINTAINERS b/board/keymile/km83xx/MAINTAINERS
index 51367b6..58969a2 100644
--- a/board/keymile/km83xx/MAINTAINERS
+++ b/board/keymile/km83xx/MAINTAINERS
@@ -7,6 +7,7 @@ F:	configs/kmcoge5ne_defconfig
 F:	configs/kmeter1_defconfig
 F:	include/configs/tuxx1.h
 F:	configs/kmopti2_defconfig
+F:	configs/kmtepr2_defconfig
 F:	include/configs/suvd3.h
 F:	configs/kmvect1_defconfig
 F:	configs/kmvect1_p1a_defconfig
diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig
new file mode 100644
index 0000000..5cffd53
--- /dev/null
+++ b/configs/kmtepr2_defconfig
@@ -0,0 +1,4 @@
+CONFIG_SYS_EXTRA_OPTIONS="KMTEPR2"
+CONFIG_PPC=y
+CONFIG_MPC83xx=y
+CONFIG_TARGET_TUXX1=y
diff --git a/include/configs/tuxx1.h b/include/configs/tuxx1.h
index 08ead7f..e2ca9e3 100644
--- a/include/configs/tuxx1.h
+++ b/include/configs/tuxx1.h
@@ -36,6 +36,9 @@
 #elif defined(CONFIG_KMOPTI2)
 #define CONFIG_KM_BOARD_NAME	"kmopti2"
 #define CONFIG_HOSTNAME		kmopti2
+#elif defined(CONFIG_KMTEPR2)
+#define CONFIG_KM_BOARD_NAME    "kmtepr2"
+#define CONFIG_HOSTNAME         kmtepr2
 #else
 #error ("Board not supported")
 #endif
@@ -47,21 +50,45 @@
 
 #define CONFIG_SYS_APP1_BASE	0xA0000000    /* PAXG */
 #define	CONFIG_SYS_APP1_SIZE	256 /* Megabytes */
-#if defined(CONFIG_TUXX1) || defined(CONFIG_KMOPTI2)
+#if defined(CONFIG_TUXX1) || defined(CONFIG_KMOPTI2) || defined(CONFIG_KMTEPR2)
 #define CONFIG_SYS_APP2_BASE	0xB0000000    /* PINC3 */
 #define	CONFIG_SYS_APP2_SIZE	256 /* Megabytes */
 #endif
 
 /*
  * Init Local Bus Memory Controller:
- *				      Device on
- * Bank Bus     Machine PortSz  Size  TUDA1  TUXA1  TUGE1  KMSUPX4 KMOPTI2
- * ---- ---     ------- ------  ----- ---------------------------------------
- *  2   Local   GPCM    8 bit  256MB  PAXG  LPXF   PAXI     LPXF   PAXE
- *  3   Local   GPCM    8 bit  256MB  PINC3 PINC2  unused  unused  OPI2(16 bit)
+ *				      Device on board
+ * Bank Bus     Machine PortSz Size   TUDA1  TUXA1  TUGE1   KMSUPX4 KMOPTI2
+ * -----------------------------------------------------------------------------
+ *  2   Local   GPCM    8 bit  256MB  PAXG   LPXF   PAXI    LPXF    PAXE
+ *  3   Local   GPCM    8 bit  256MB  PINC3  PINC2  unused  unused  OPI2(16 bit)
  *
+ *				      Device on board (continued)
+ * Bank Bus     Machine PortSz Size   KMTEPR2
+ * -----------------------------------------------------------------------------
+ *  2   Local   GPCM    8 bit  256MB  NVRAM
+ *  3   Local   GPCM    8 bit  256MB  TEP2 (16 bit)
  */
 
+#if defined(CONFIG_KMTEPRO2)
+/*
+ * Configuration for C2 (NVRAM) on the local bus
+ */
+#define CONFIG_SYS_LBLAWBAR2_PRELIM    CONFIG_SYS_APP1_BASE
+#define CONFIG_SYS_LBLAWAR2_PRELIM     (LBLAWAR_EN | LBLAWAR_256MB)
+#define CONFIG_SYS_BR2_PRELIM  (CONFIG_SYS_APP1_BASE | \
+				BR_PS_8 | \
+				BR_MS_GPCM | \
+				BR_V)
+#define CONFIG_SYS_OR2_PRELIM  (MEG_TO_AM(CONFIG_SYS_APP1_SIZE) | \
+				OR_GPCM_CSNT | \
+				OR_GPCM_ACS_DIV2 | \
+				OR_GPCM_XACS | \
+				OR_GPCM_SCY_2 | \
+				OR_GPCM_TRLX_SET | \
+				OR_GPCM_EHTR_SET | \
+				OR_GPCM_EAD)
+#else
 /*
  * Configuration for C2 on the local bus
  */
@@ -82,6 +109,8 @@
 				 OR_GPCM_TRLX_SET | \
 				 OR_GPCM_EHTR_CLEAR | \
 				 OR_GPCM_EAD)
+#endif
+
 #if defined(CONFIG_TUXX1)
 /*
  * Configuration for C3 on the local bus
@@ -108,7 +137,7 @@
 				 MxMR_WLFx_2X)
 #endif
 
-#if defined(CONFIG_KMOPTI2)
+#if defined(CONFIG_KMOPTI2) || defined(CONFIG_KMTEPR2)
 /*
  * Configuration for C3 on the local bus
  */
-- 
1.8.3.1

  parent reply	other threads:[~2015-11-13 14:59 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-13 14:59 [U-Boot] [PATCH 00/17] km/powerpc: various bugfixes and support for 3 new boards Valentin Longchamp
2015-11-13 14:59 ` [U-Boot] [PATCH 01/17] powerpc/83xx/km: add support for kmvect1 p1a hw version Valentin Longchamp
2015-11-16 10:01   ` Heiko Schocher
2015-11-13 14:59 ` Valentin Longchamp [this message]
2015-11-16 10:01   ` [U-Boot] [PATCH 02/17] powerpc/83xx: add support for kmtepr2 board Heiko Schocher
2015-11-16 12:18   ` Holger Brunck
2015-11-13 14:59 ` [U-Boot] [PATCH 03/17] powerpc/82xx: make set/get_pin for km82xx more flexible Valentin Longchamp
2015-11-16 10:06   ` Heiko Schocher
2015-11-13 14:59 ` [U-Boot] [PATCH 04/17] powerpc/82xx/km: add testpin detection for mgcoge3ne Valentin Longchamp
2015-11-16 10:58   ` Heiko Schocher
2015-11-13 14:59 ` [U-Boot] [PATCH 05/17] km/powerpc: increase space for kernel imange and FDT blob Valentin Longchamp
2015-11-16 10:58   ` Heiko Schocher
2015-11-13 14:59 ` [U-Boot] [PATCH 06/17] km/powerpc: move open firmware defines to km-powerpc.h Valentin Longchamp
2015-11-16 10:59   ` Heiko Schocher
2015-11-13 14:59 ` [U-Boot] [PATCH 07/17] km/powerpc: remove unneeded defines Valentin Longchamp
2015-11-16 11:00   ` Heiko Schocher
2015-11-13 14:59 ` [U-Boot] [PATCH 08/17] km/powerpc82xx: remove unused function Valentin Longchamp
2015-11-16 11:01   ` Heiko Schocher
2015-11-13 14:59 ` [U-Boot] [PATCH 09/17] powerpc/km8321: define CONFIG_SYS_DDRCDR Valentin Longchamp
2015-11-16 11:02   ` Heiko Schocher
2015-11-13 14:59 ` [U-Boot] [PATCH 10/17] powerpc/km8321: set the DDRCDR impedance settings back to half strength Valentin Longchamp
2015-11-16 11:02   ` Heiko Schocher
2015-11-16 12:26   ` Holger Brunck
2015-11-16 13:34     ` Tom Rini
2015-11-16 15:41       ` Valentin Longchamp
2015-11-13 14:59 ` [U-Boot] [PATCH 11/17] powerpc/km8309: define CONFIG_SYS_DDRCDR Valentin Longchamp
2015-11-16 11:03   ` Heiko Schocher
2015-11-13 14:59 ` [U-Boot] [PATCH 12/17] powerpc/km8360: fix the ODT parameters for CS0 Valentin Longchamp
2015-11-16 11:03   ` Heiko Schocher
2015-11-13 14:59 ` [U-Boot] [PATCH 13/17] board/keymile/km82xx: setting dip_switch 3 and 4 will run bootloader Valentin Longchamp
2015-11-16 11:04   ` Heiko Schocher
2015-11-13 14:59 ` [U-Boot] [PATCH 14/17] km83xx: use CONFIG_ENV_ADDR for the newenv env command Valentin Longchamp
2015-11-16 11:05   ` Heiko Schocher
2015-11-13 14:59 ` [U-Boot] [PATCH 15/17] km8309: change the default QE_FW address Valentin Longchamp
2015-11-16 11:05   ` Heiko Schocher
2015-11-13 14:59 ` [U-Boot] [PATCH 16/17] powerpc/83xx: add support for kmtegr1 board Valentin Longchamp
2015-11-16 11:06   ` Heiko Schocher
2015-11-13 14:59 ` [U-Boot] [PATCH 17/17] km/powerpc: fix ft_board_setup prototype for km82xx & km83xx Valentin Longchamp
2015-11-16 11:07   ` Heiko Schocher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1447426768-23226-3-git-send-email-valentin.longchamp@keymile.com \
    --to=valentin.longchamp@keymile.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.