summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2006-04-27 10:15:16 -0500
committerJon Loeliger <jdl@freescale.com>2006-04-27 10:15:16 -0500
commit5c9efb36a6b5431423f52888a0e3b4b515fe7eca (patch)
treeb4e456a06357346267f16a636af658cc85bf5b64 /board
parenta2320a6bf8113a09544c42d160d10ac69d049a03 (diff)
Cleanup whitespaces and style issues.
Removed //-style comments. Use 80-column lines. Remove trailing whitespace. Remove dead code and debug cruft.
Diffstat (limited to 'board')
-rw-r--r--board/mpc8641hpcn/mpc8641hpcn.c33
-rw-r--r--board/mpc8641hpcn/oftree.dts2
2 files changed, 13 insertions, 22 deletions
diff --git a/board/mpc8641hpcn/mpc8641hpcn.c b/board/mpc8641hpcn/mpc8641hpcn.c
index cdfce6c1fd..ace6d47fde 100644
--- a/board/mpc8641hpcn/mpc8641hpcn.c
+++ b/board/mpc8641hpcn/mpc8641hpcn.c
@@ -57,9 +57,6 @@ int checkboard (void)
#ifdef CONFIG_PCI
- /* Sri: Note that at this point we will only test on PCI1
- */
-
volatile immap_t *immap = (immap_t *) CFG_CCSRBAR;
volatile ccsr_gur_t *gur = &immap->im_gur;
volatile ccsr_pex_t *pex1 = &immap->im_pex1;
@@ -70,13 +67,16 @@ int checkboard (void)
uint pex1_agent = (host1_agent == 0) || (host1_agent == 1);
- if ((io_sel==2 || io_sel==3 || io_sel==5 || io_sel==6 || io_sel==7 || io_sel==0xF ) && !(devdisr & MPC86xx_DEVDISR_PCIEX1)){
- debug ("PCI-EXPRESS 1: %s \n",
- pex1_agent ? "Agent" : "Host");
+ if ((io_sel==2 || io_sel==3 || io_sel==5 \
+ || io_sel==6 || io_sel==7 || io_sel==0xF)
+ && !(devdisr & MPC86xx_DEVDISR_PCIEX1)){
+ debug ("PCI-EXPRESS 1: %s \n",
+ pex1_agent ? "Agent" : "Host");
debug("0x%08x=0x%08x ", &pex1->pme_msg_det,pex1->pme_msg_det);
if (pex1->pme_msg_det) {
pex1->pme_msg_det = 0xffffffff;
- debug (" with errors. Clearing. Now 0x%08x",pex1->pme_msg_det);
+ debug (" with errors. Clearing. Now 0x%08x",
+ pex1->pme_msg_det);
}
debug ("\n");
} else {
@@ -120,15 +120,6 @@ initdram(int board_type)
ddr_enable_ecc(dram_size);
#endif
- /*
- * Initialize SDRAM. Currently HPCN doesn't have
- * SDRAM but we'll leave this here for now
- * in case someone changes their mind
- */
-#if !defined(CONFIG_MPC8641HPCN)
- // sdram_init();
-#endif
-
puts(" DDR: ");
return dram_size;
}
@@ -163,7 +154,7 @@ local_bus_init(void)
}
#if defined(CFG_DRAM_TEST)
-int testdram (void)
+int testdram(void)
{
uint *pstart = (uint *) CFG_MEMTEST_START;
uint *pend = (uint *) CFG_MEMTEST_END;
@@ -198,10 +189,10 @@ int testdram (void)
#if !defined(CONFIG_SPD_EEPROM)
-/*************************************************************************
- * fixed sdram init -- doesn't use serial presence detect.
- ************************************************************************/
-long int fixed_sdram (void)
+/*
+ * Fixed sdram init -- doesn't use serial presence detect.
+ */
+long int fixed_sdram(void)
{
#if !defined(CFG_RAMBOOT)
volatile immap_t *immap = (immap_t *)CFG_IMMR;
diff --git a/board/mpc8641hpcn/oftree.dts b/board/mpc8641hpcn/oftree.dts
index 6c32ade0ca..8e38047e72 100644
--- a/board/mpc8641hpcn/oftree.dts
+++ b/board/mpc8641hpcn/oftree.dts
@@ -1,5 +1,5 @@
/*
- * MPC8641 HPCn Device Tree Source
+ * MPC8641 HPCN Device Tree Source
*
* Copyright 2006 Freescale Semiconductor Inc.
*