sbc8548: update PCI/PCI-e support code

[u-boot] / board / logodl / logodl.c

diff --git a/board/logodl/logodl.c b/board/logodl/logodl.c
index a46452c4e60139099bcefac94e8a70c8084991c3..c57210a95f38b00474d8aaa23914c3ffcd0788ab 100644 (file)
--- a/board/logodl/logodl.c
+++ b/board/logodl/logodl.c
@@ -1,7 +1,7 @@
 /*
  * (C) 2002 Kyle Harris <kharris@nexus-tech.net>, Nexus Technologies, Inc.
  * (C) 2002 Marius Groeger <mgroeger@sysgo.de>, Sysgo GmbH
- * (C) 2003 Robert Schwebel <r.schwebel@pengutronix.de>, Pengutronix 
+ * (C) 2003 Robert Schwebel <r.schwebel@pengutronix.de>, Pengutronix
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -25,6 +25,8 @@
 #include <common.h>
 #include <asm/arch/pxa-regs.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 /**
  * board_init: - setup some data structures
  *
@@ -33,8 +35,6 @@
 
 int board_init (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        /* memory and cpu-speed are setup before relocation */
        /* so we do _nothing_ here */
 
@@ -57,16 +57,14 @@ int board_init (void)
 
 int dram_init (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
        gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
 
-        return 0;
+       return 0;
 }
 
 
-/** 
+/**
  * logodl_set_led: - switch LEDs on or off
  *
  * @param led:   LED to switch (0,1)
@@ -77,23 +75,23 @@ void logodl_set_led(int led, int state)
 {
        switch(led) {
 
-       case 0: 
-               if (state==1) { 
-                       CFG_LED_A_CR = CFG_LED_A_BIT;
+       case 0:
+               if (state==1) {
+                       CONFIG_SYS_LED_A_CR = CONFIG_SYS_LED_A_BIT;
                } else if (state==0) {
-                       CFG_LED_A_SR = CFG_LED_A_BIT;
+                       CONFIG_SYS_LED_A_SR = CONFIG_SYS_LED_A_BIT;
                }
                break;
 
-       case 1: 
+       case 1:
                if (state==1) {
-                       CFG_LED_B_CR = CFG_LED_B_BIT;
+                       CONFIG_SYS_LED_B_CR = CONFIG_SYS_LED_B_BIT;
                } else if (state==0) {
-                       CFG_LED_B_SR = CFG_LED_B_BIT;
+                       CONFIG_SYS_LED_B_SR = CONFIG_SYS_LED_B_BIT;
                }
                break;
        }
-       
+
        return;
 }
 
@@ -101,14 +99,15 @@ void logodl_set_led(int led, int state)
 /**
  * show_boot_progress: - indicate state of the boot process
  *
- * @param status: Status number - see README for details. 
+ * @param status: Status number - see README for details.
  *
- * The LOGOTRONIC does only have 2 LEDs, so we switch them on at the most 
+ * The LOGOTRONIC does only have 2 LEDs, so we switch them on at the most
  * important states (1, 5, 15).
  */
 
 void show_boot_progress (int status)
 {
+       if (status < -32) status = -1;  /* let things compatible */
        /*
          switch(status) {
          case  1: logodl_set_led(0,1); break;