X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=board%2Ftqm8xx%2Ftqm8xx.c;h=017bdf9442a8871ebfa737ff0faa9445c33c5e74;hb=951a954b77ef30df1f5c1b7b9b4312e783b2cbb4;hp=9e9cbd3dfbb413d4d6a65757e5cd51483a9c34ee;hpb=75d1ea7f6aa00c280c495a1ff6502f091c4244fe;p=oweals%2Fu-boot.git

diff --git a/board/tqm8xx/tqm8xx.c b/board/tqm8xx/tqm8xx.c
index 9e9cbd3dfb..017bdf9442 100644
--- a/board/tqm8xx/tqm8xx.c
+++ b/board/tqm8xx/tqm8xx.c
@@ -106,7 +106,7 @@ int checkboard (void)
 {
 	DECLARE_GLOBAL_DATA_PTR;
 
-	unsigned char *s = getenv ("serial#");
+	char *s = getenv ("serial#");
 
 	puts ("Board: ");
 
@@ -215,7 +215,7 @@ long int initdram (int board_type)
 	 *
 	 * try 8 column mode
 	 */
-	size8 = dram_size (CFG_MAMR_8COL, (ulong *) SDRAM_BASE2_PRELIM,
+	size8 = dram_size (CFG_MAMR_8COL, SDRAM_BASE2_PRELIM,
 					   SDRAM_MAX_SIZE);
 	debug ("SDRAM Bank 0 in 8 column mode: %ld MB\n", size8 >> 20);
 
@@ -224,7 +224,7 @@ long int initdram (int board_type)
 	/*
 	 * try 9 column mode
 	 */
-	size9 = dram_size (CFG_MAMR_9COL, (ulong *) SDRAM_BASE2_PRELIM,
+	size9 = dram_size (CFG_MAMR_9COL, SDRAM_BASE2_PRELIM,
 					   SDRAM_MAX_SIZE);
 	debug ("SDRAM Bank 0 in 9 column mode: %ld MB\n", size9 >> 20);
 
@@ -263,7 +263,7 @@ long int initdram (int board_type)
 		 * [9 column SDRAM may also be used in 8 column mode,
 		 *  but then only half the real size will be used.]
 		 */
-		size_b1 = dram_size (memctl->memc_mamr, (ulong *) SDRAM_BASE3_PRELIM,
+		size_b1 = dram_size (memctl->memc_mamr, (long int *)SDRAM_BASE3_PRELIM,
 				     SDRAM_MAX_SIZE);
 		debug ("SDRAM Bank 1: %ld MB\n", size_b1 >> 20);
 	} else {
@@ -425,7 +425,7 @@ static long int dram_size (long int mamr_value, long int *base, long int maxsize
 
 #ifdef CONFIG_PS2MULT
 
-#ifdef CONFIG_BMS2003
+#ifdef CONFIG_HMI10
 #define BASE_BAUD ( 1843200 / 16 )
 struct serial_state rs_table[] = {
 	{ BASE_BAUD, 4,  (void*)0xec140000 },
@@ -441,16 +441,18 @@ int board_early_init_r (void)
 	return (0);
 }
 #endif
-#endif /* CONFIG_BMS2003 */
+#endif /* CONFIG_HMI10 */
 
 #endif /* CONFIG_PS2MULT */
 
-/* ------------------------------------------------------------------------- */
-#ifdef CONFIG_BMS2003
+/* ---------------------------------------------------------------------------- */
+/* HMI10 specific stuff								*/
+/* ---------------------------------------------------------------------------- */
+#ifdef CONFIG_HMI10
 
 int misc_init_r (void)
 {
-#ifdef CONFIG_IDE_LED
+# ifdef CONFIG_IDE_LED
 	volatile immap_t *immap = (immap_t *) CFG_IMMR;
 
 	/* Configure PA15 as output port */
@@ -458,11 +460,11 @@ int misc_init_r (void)
 	immap->im_ioport.iop_paodr |= 0x0001;
 	immap->im_ioport.iop_papar &= ~0x0001;
 	immap->im_ioport.iop_padat &= ~0x0001;	/* turn it off */
-#endif
+# endif
 	return (0);
 }
 
-#ifdef CONFIG_IDE_LED
+# ifdef CONFIG_IDE_LED
 void ide_led (uchar led, uchar status)
 {
 	volatile immap_t *immap = (immap_t *) CFG_IMMR;
@@ -474,7 +476,26 @@ void ide_led (uchar led, uchar status)
 		immap->im_ioport.iop_padat &= ~0x0001;
 	}
 }
-#endif
+# endif
+#endif	/* CONFIG_HMI10 */
+
+/* ---------------------------------------------------------------------------- */
+/* NSCU specific stuff								*/
+/* ---------------------------------------------------------------------------- */
+#ifdef CONFIG_NSCU
+
+int misc_init_r (void)
+{
+	volatile immap_t *immr = (immap_t *) CFG_IMMR;
+
+	/* wake up ethernet module */
+	immr->im_ioport.iop_pcpar &= ~0x0004; /* GPIO pin	*/
+	immr->im_ioport.iop_pcdir |=  0x0004; /* output		*/
+	immr->im_ioport.iop_pcso  &= ~0x0004; /* for clarity	*/
+	immr->im_ioport.iop_pcdat |=  0x0004; /* enable		*/
+
+	return (0);
+}
+#endif	/* CONFIG_NSCU */
 
-#endif /* CONFIG_BMS2003 */
 /* ------------------------------------------------------------------------- */