From: Christoph Dietrich christoph.dietrich@keymile.com

This board is similar to TUXX1, but it has a different FPGA connected to chipselect 2. Therefore we need a different configuration for this chipselect.

Signed-off-by: Christoph Dietrich christoph.dietrich@keymile.com Signed-off-by: Holger Brunck holger.brunck@keymile.com cc: Kim Phillips kim.phillips@freescale.com --- boards.cfg | 1 + include/configs/tuxx1.h | 42 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/boards.cfg b/boards.cfg index 1ba2081..7ddf34d 100644 --- a/boards.cfg +++ b/boards.cfg @@ -717,6 +717,7 @@ Active powerpc mpc83xx - keymile km83xx Active powerpc mpc83xx - keymile km83xx kmeter1 km8360:KMETER1 Holger Brunck holger.brunck@keymile.com Active powerpc mpc83xx - keymile km83xx kmopti2 tuxx1:KMOPTI2 Holger Brunck holger.brunck@keymile.com Active powerpc mpc83xx - keymile km83xx kmsupx5 tuxx1:KMSUPX5 Heiko Schocher hs@denx.de +Active powerpc mpc83xx - keymile km83xx kmtepr2 tuxx1:KMTEPR2 Holger Brunck holger.brunck@keymile.com Active powerpc mpc83xx - keymile km83xx kmvect1 suvd3:KMVECT1 Holger Brunck holger.brunck@keymile.com Active powerpc mpc83xx - keymile km83xx suvd3 suvd3:SUVD3 Holger Brunck holger.brunck@keymile.com Active powerpc mpc83xx - keymile km83xx tuge1 tuxx1:TUGE1 Holger Brunck holger.brunck@keymile.com diff --git a/include/configs/tuxx1.h b/include/configs/tuxx1.h index 08ead7f..a2eb82c 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,42 @@

#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: + * Init Local Bus Memory Controller + * All devices use Local bus configuration with 8Bit size and the + * general-purpose chip-select machine (GPCM) otherwise it's + * documented in the table. * 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) - * + * Bank Size TUDA1 TUXA1 TUGE1 KMSUPX4 KMOPTI2 KMTEPR2 + * ---- ----- ------------------------------------------------------- + * 2 256MB PAXG LPXF PAXI LPXF PAXE NVRAM + * 3 256MB PINC3 PINC2 unused unused OPI2(16 bit) 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 +106,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 +134,7 @@ MxMR_WLFx_2X) #endif

-#if defined(CONFIG_KMOPTI2) +#if defined(CONFIG_KMOPTI2) || defined(CONFIG_KMTEPR2) /* * Configuration for C3 on the local bus */