summaryrefslogtreecommitdiff
path: root/src/mainboard/digitallogic/msm586seg
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2010-04-27 06:56:47 +0000
committerStefan Reinauer <stepan@openbios.org>2010-04-27 06:56:47 +0000
commit14e22779625de673569c7b950ecc2753fb915b31 (patch)
tree14a6ed759e116e9e6e9bbd7f499b74b96d6cc072 /src/mainboard/digitallogic/msm586seg
parent0e1e8065e303030c39c3f2c27e5d32ee58a16c66 (diff)
Since some people disapprove of white space cleanups mixed in regular commits
while others dislike them being extra commits, let's clean them up once and for all for the existing code. If it's ugly, let it only be ugly once :-) Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5507 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/digitallogic/msm586seg')
-rw-r--r--src/mainboard/digitallogic/msm586seg/devicetree.cb2
-rw-r--r--src/mainboard/digitallogic/msm586seg/irq_tables.c2
-rw-r--r--src/mainboard/digitallogic/msm586seg/mainboard.c22
-rw-r--r--src/mainboard/digitallogic/msm586seg/romstage.c26
4 files changed, 26 insertions, 26 deletions
diff --git a/src/mainboard/digitallogic/msm586seg/devicetree.cb b/src/mainboard/digitallogic/msm586seg/devicetree.cb
index 05067ca632..1ccf39f5b8 100644
--- a/src/mainboard/digitallogic/msm586seg/devicetree.cb
+++ b/src/mainboard/digitallogic/msm586seg/devicetree.cb
@@ -1,5 +1,5 @@
chip cpu/amd/sc520
- device pci_domain 0 on
+ device pci_domain 0 on
device pci 0.0 on end
device pci 12.0 on end # enet
device pci 14.0 on end # 69000
diff --git a/src/mainboard/digitallogic/msm586seg/irq_tables.c b/src/mainboard/digitallogic/msm586seg/irq_tables.c
index 9b49747ead..22d5820a62 100644
--- a/src/mainboard/digitallogic/msm586seg/irq_tables.c
+++ b/src/mainboard/digitallogic/msm586seg/irq_tables.c
@@ -1,4 +1,4 @@
-/* This file was generated by getpir.c, do not modify!
+/* This file was generated by getpir.c, do not modify!
(but if you do, please run checkpir on it to verify)
* Contains the IRQ Routing Table dumped directly from your memory, which BIOS sets up
*
diff --git a/src/mainboard/digitallogic/msm586seg/mainboard.c b/src/mainboard/digitallogic/msm586seg/mainboard.c
index fefe553de3..2361059a7d 100644
--- a/src/mainboard/digitallogic/msm586seg/mainboard.c
+++ b/src/mainboard/digitallogic/msm586seg/mainboard.c
@@ -14,10 +14,10 @@ static void irqdump(void)
int i;
int irqlist[] = {0xd00, 0xd02, 0xd03, 0xd04, 0xd08, 0xd0a,
0xd14, 0xd18, 0xd1a, 0xd1b, 0xd1c,
- 0xd20, 0xd21, 0xd22, 0xd28, 0xd29,
+ 0xd20, 0xd21, 0xd22, 0xd28, 0xd29,
0xd30, 0xd31, 0xd32, 0xd33,
- 0xd40, 0xd41, 0xd42, 0xd43,0xd44, 0xd45, 0xd46,
- 0xd50, 0xd51, 0xd52, 0xd53,0xd54, 0xd55, 0xd56, 0xd57,0xd58, 0xd59, 0xd5a,
+ 0xd40, 0xd41, 0xd42, 0xd43,0xd44, 0xd45, 0xd46,
+ 0xd50, 0xd51, 0xd52, 0xd53,0xd54, 0xd55, 0xd56, 0xd57,0xd58, 0xd59, 0xd5a,
-1};
mmcr = (void *) 0xfffef000;
@@ -37,7 +37,7 @@ static void enable_dev(struct device *dev)
//volatile struct mmcrpic *pic = MMCRPIC;
volatile struct mmcr *mmcr = MMCRDEFAULT;
- /* msm586seg has this register set to a weird value.
+ /* msm586seg has this register set to a weird value.
* follow the board, not the manual!
*/
@@ -47,7 +47,7 @@ static void enable_dev(struct device *dev)
/* from fuctory bios */
/* NOTE: the following interrupt settings made interrupts work
- * for hard drive, and serial, but not for ethernet
+ * for hard drive, and serial, but not for ethernet
*/
/* just do what they say and nobody gets hurt. */
mmcr->pic.pcicr = 0 ; // M_GINT_MODE | M_S1_MODE | M_S2_MODE;
@@ -78,7 +78,7 @@ static void enable_dev(struct device *dev)
printk(BIOS_ERR, "0xc22 0x%x\n", *(unsigned short *) 0xfffefc22);
/* The following block has NOT proven sufficient to get
- * the VGA hardware to talk to us
+ * the VGA hardware to talk to us
*/
/* let's set some mmcr stuff per the BIOS settings */
mmcr->dbctl.dbctl = 0x10;
@@ -100,20 +100,20 @@ static void enable_dev(struct device *dev)
*/
mmcr->sysmap.adddecctl = 0x10;
- /* VGA now talks to us, so this adddecctl was the trick.
- * still no interrupts from enet.
- * Let's try fixing the piodata stuff, as there may be
+ /* VGA now talks to us, so this adddecctl was the trick.
+ * still no interrupts from enet.
+ * Let's try fixing the piodata stuff, as there may be
* some wire there not documented.
*/
mmcr->pio.data31_16 = 0xffbf;
/* also, our sl?picmode needs to match fuctory bios */
mmcr->pic.sl1picmode = 0x80;
mmcr->pic.sl2picmode = 0x0;
- /* and, finally, they do set gp5imap and we don't.
+ /* and, finally, they do set gp5imap and we don't.
*/
mmcr->pic.gp5imap = 0xd;
/* remaining problem: almost certainly, the irq table is bogus
- * NO SHOCK as it came from fuctory bios.
+ * NO SHOCK as it came from fuctory bios.
* but let's try these 4 changes for now and see what shakes.
*/
/* still not interrupts. */
diff --git a/src/mainboard/digitallogic/msm586seg/romstage.c b/src/mainboard/digitallogic/msm586seg/romstage.c
index 2035993be8..ae964fea93 100644
--- a/src/mainboard/digitallogic/msm586seg/romstage.c
+++ b/src/mainboard/digitallogic/msm586seg/romstage.c
@@ -74,7 +74,7 @@ static inline void irqinit(void){
/* these values taken from the msm board itself.
* and they cause the board to not even come out of calibrating_delay_loop
* if you can believe it. Our problem right now is no IDE or serial interrupts
- * So we'll try to put interrupts in, one at a time. IDE first.
+ * So we'll try to put interrupts in, one at a time. IDE first.
*/
cp = (volatile unsigned char *) 0xfffefd00;
*cp = 0x11;
@@ -179,9 +179,9 @@ static void main(unsigned long bist)
print_err("HI THERE!\n");
// sizemem();
staticmem();
- print_err("c60 is "); print_err_hex16(*(unsigned short *)0xfffefc60);
+ print_err("c60 is "); print_err_hex16(*(unsigned short *)0xfffefc60);
print_err("\n");
-
+
// while(1)
print_err("STATIC MEM DONE\n");
outb(0xee, 0x80);
@@ -198,18 +198,18 @@ static void main(unsigned long bist)
"jnz 1b\n\t"
:
: "a" (0), "D" (0), "c" (1024*1024)
- );
-
-
+ );
+
+
#endif
-
+
#if 0
dump_pci_devices();
#endif
#if 0
dump_pci_device(PCI_DEV(0, 0, 0));
#endif
-
+
#if 0
print_err("RAM CHECK!\n");
// Check 16MB of memory @ 0
@@ -223,10 +223,10 @@ static void main(unsigned long bist)
#if 1
{
volatile unsigned char *src = (unsigned char *) 0x2000000 + 0x60000;
- volatile unsigned char *dst = (unsigned char *) 0x4000;
+ volatile unsigned char *dst = (unsigned char *) 0x4000;
for(i = 0; i < 0x20000; i++) {
/*
- print_err("Set dst "); print_err_hex32((unsigned long) dst);
+ print_err("Set dst "); print_err_hex32((unsigned long) dst);
print_err(" to "); print_err_hex32(*src); print_err("\n");
*/
*dst = *src;
@@ -244,10 +244,10 @@ static void main(unsigned long bist)
"jmp *%%edi\n\t"
:
: "a" (0x4000)
- );
-
+ );
+
print_err("Oh dear, I'm afraid it didn't work...\n");
-
+
while(1);
#endif
}