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 f16c05bb656f841efbd9ccec37c114a9bebaf521..c57210a95f38b00474d8aaa23914c3ffcd0788ab 100644 (file)
--- a/board/logodl/logodl.c
+++ b/board/logodl/logodl.c
@@ -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,12 +57,10 @@ 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;
 }
 
 
@@ -79,17 +77,17 @@ void logodl_set_led(int led, int state)
 
        case 0:
                if (state==1) {
-                       CFG_LED_A_CR = CFG_LED_A_BIT;
+                       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:
                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;
        }
@@ -109,6 +107,7 @@ void logodl_set_led(int led, int state)
 
 void show_boot_progress (int status)
 {
+       if (status < -32) status = -1;  /* let things compatible */
        /*
          switch(status) {
          case  1: logodl_set_led(0,1); break;