powerpc/83xx/km: add support for kmopti2 board

This board is similar to TUXX1 but it has a different sized second FPGA. Therefore the configuration for the third chipselect is different. Signed-off-by: Holger Brunck <holger.brunck@keymile.com>

powerpc/83xx/km: add support for kmopti2 board
This board is similar to TUXX1 but it has a different sized second FPGA. Therefore the configuration for the third chipselect is different. Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Holger Brunck · Kim Phillips
1 parent 47f53649a2
Showing 2 changed files with 26 additions and 6 deletions Side-by-side Diff
boards.cfg
include/configs/tuxx1.h
@@ -707,6 +707,7 @@
 kmvect1                      powerpc     mpc83xx     km83xx              keymile        -           suvd3:KMVECT1
 tuge1                        powerpc     mpc83xx     km83xx              keymile        -           tuxx1:TUGE1
 tuxx1                        powerpc     mpc83xx     km83xx              keymile        -           tuxx1:TUXX1
+kmopti2                      powerpc     mpc83xx     km83xx              keymile        -           tuxx1:KMOPTI2
 kmsupx5                      powerpc     mpc83xx     km83xx              keymile        -           tuxx1:KMSUPX5
 sbc8548                      powerpc     mpc85xx     sbc8548             -              -           sbc8548
 sbc8548_PCI_33               powerpc     mpc85xx     sbc8548             -              -           sbc8548:PCI,33
@@ -36,6 +36,9 @@
 #elif defined(CONFIG_TUXX1)	/* TUXX1 board (tuxa1/tuda1) specific */
 #define CONFIG_KM_BOARD_NAME	"tuxx1"
 #define CONFIG_HOSTNAME		tuxx1
+#elif defined(CONFIG_KMOPTI2)
+#define CONFIG_KM_BOARD_NAME	"kmopti2"
+#define CONFIG_HOSTNAME		kmopti2
 #else
 #error ("Board not supported")
 #endif
  
  
@@ -47,19 +50,19 @@
  
 #define CONFIG_SYS_APP1_BASE	0xA0000000    /* PAXG */
 #define	CONFIG_SYS_APP1_SIZE	256 /* Megabytes */
-#if defined(CONFIG_TUXX1)
+#if defined(CONFIG_TUXX1) || defined(CONFIG_KMOPTI2)
 #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)
  *
- * 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
- *
  */
  
 /*
@@ -106,6 +109,22 @@
 #define CONFIG_SYS_MAMR		(MxMR_GPL_x4DIS | \
 				 0x0000c000 | \
 				 MxMR_WLFx_2X)
+#endif
+
+#if defined(CONFIG_KMOPTI2)
+/*
+ * Configuration for C3 on the local bus
+ */
+#define CONFIG_SYS_LBLAWBAR3_PRELIM	CONFIG_SYS_APP2_BASE
+#define CONFIG_SYS_LBLAWAR3_PRELIM	(LBLAWAR_EN | LBLAWAR_256MB)
+#define CONFIG_SYS_BR3_PRELIM	(CONFIG_SYS_APP2_BASE | \
+				 BR_PS_16 |		\
+				 BR_MS_GPCM |		\
+				 BR_V)
+#define CONFIG_SYS_OR3_PRELIM	(MEG_TO_AM(CONFIG_SYS_APP2_SIZE) | \
+				 OR_GPCM_SCY_4 | \
+				 OR_GPCM_TRLX_CLEAR | \
+				 OR_GPCM_EHTR_CLEAR)
 #endif
  
 /*
...	...	@@ -707,6 +707,7 @@
707	707	kmvect1 powerpc mpc83xx km83xx keymile - suvd3:KMVECT1
708	708	tuge1 powerpc mpc83xx km83xx keymile - tuxx1:TUGE1
709	709	tuxx1 powerpc mpc83xx km83xx keymile - tuxx1:TUXX1
	710	+kmopti2 powerpc mpc83xx km83xx keymile - tuxx1:KMOPTI2
710	711	kmsupx5 powerpc mpc83xx km83xx keymile - tuxx1:KMSUPX5
711	712	sbc8548 powerpc mpc85xx sbc8548 - - sbc8548
712	713	sbc8548_PCI_33 powerpc mpc85xx sbc8548 - - sbc8548:PCI,33
...	...	@@ -36,6 +36,9 @@
36	36	#elif defined(CONFIG_TUXX1) /* TUXX1 board (tuxa1/tuda1) specific */
37	37	#define CONFIG_KM_BOARD_NAME "tuxx1"
38	38	#define CONFIG_HOSTNAME tuxx1
	39	+#elif defined(CONFIG_KMOPTI2)
	40	+#define CONFIG_KM_BOARD_NAME "kmopti2"
	41	+#define CONFIG_HOSTNAME kmopti2
39	42	#else
40	43	#error ("Board not supported")
41	44	#endif
42	45
43	46
...	...	@@ -47,19 +50,19 @@
47	50
48	51	#define CONFIG_SYS_APP1_BASE 0xA0000000 /* PAXG */
49	52	#define CONFIG_SYS_APP1_SIZE 256 /* Megabytes */
50		-#if defined(CONFIG_TUXX1)
	53	+#if defined(CONFIG_TUXX1) \|\| defined(CONFIG_KMOPTI2)
51	54	#define CONFIG_SYS_APP2_BASE 0xB0000000 /* PINC3 */
52	55	#define CONFIG_SYS_APP2_SIZE 256 /* Megabytes */
53	56	#endif
54	57
55	58	/*
56	59	* Init Local Bus Memory Controller:
	60	+ * Device on
	61	+ * Bank Bus Machine PortSz Size TUDA1 TUXA1 TUGE1 KMSUPX4 KMOPTI2
	62	+ * ---- --- ------- ------ ----- ---------------------------------------
	63	+ * 2 Local GPCM 8 bit 256MB PAXG LPXF PAXI LPXF PAXE
	64	+ * 3 Local GPCM 8 bit 256MB PINC3 PINC2 unused unused OPI2(16 bit)
57	65	*
58		- * Bank Bus Machine PortSz Size Device on TUDA1 TUXA1 TUGE1 KMSUPX4
59		- * ---- --- ------- ------ ----- ---------------------------------------
60		- * 2 Local GPCM 8 bit 256MB PAXG LPXF PAXI LPXF
61		- * 3 Local GPCM 8 bit 256MB PINC3 PINC2 unused unused
62		- *
63	66	*/
64	67
65	68	/*
...	...	@@ -106,6 +109,22 @@
106	109	#define CONFIG_SYS_MAMR (MxMR_GPL_x4DIS \| \
107	110	0x0000c000 \| \
108	111	MxMR_WLFx_2X)
	112	+#endif
	113	+
	114	+#if defined(CONFIG_KMOPTI2)
	115	+/*
	116	+ * Configuration for C3 on the local bus
	117	+ */
	118	+#define CONFIG_SYS_LBLAWBAR3_PRELIM CONFIG_SYS_APP2_BASE
	119	+#define CONFIG_SYS_LBLAWAR3_PRELIM (LBLAWAR_EN \| LBLAWAR_256MB)
	120	+#define CONFIG_SYS_BR3_PRELIM (CONFIG_SYS_APP2_BASE \| \
	121	+ BR_PS_16 \| \
	122	+ BR_MS_GPCM \| \
	123	+ BR_V)
	124	+#define CONFIG_SYS_OR3_PRELIM (MEG_TO_AM(CONFIG_SYS_APP2_SIZE) \| \
	125	+ OR_GPCM_SCY_4 \| \
	126	+ OR_GPCM_TRLX_CLEAR \| \
	127	+ OR_GPCM_EHTR_CLEAR)
109	128	#endif
110	129
111	130	/*