Fix bugs in ARMBoot merge

diff --git a/board/dnp1110/dnp1110.c b/board/dnp1110/dnp1110.c
index 80e707e891c8043e9088a972f4ac9748c6e553f8..d6b181534d9057558ad21a4c064bf2c2a4a9fff6 100644 (file)
--- a/board/dnp1110/dnp1110.c
+++ b/board/dnp1110/dnp1110.c
@@ -54,5 +54,5 @@ int dram_init (void)
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
        gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
 
-       return PHYS_SDRAM_1_SIZE;
+       return (0);
 }

diff --git a/board/ep7312/ep7312.c b/board/ep7312/ep7312.c
index 8191b1242ea69fb5f722426e83037c0cac9cb608..4f9e5aca83ec5e6741f70edccdec18081fba41f8 100644 (file)
--- a/board/ep7312/ep7312.c
+++ b/board/ep7312/ep7312.c
@@ -55,5 +55,5 @@ int dram_init (void)
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
        gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
 
-       return PHYS_SDRAM_1_SIZE;
+       return (0);
 }

diff --git a/board/impa7/impa7.c b/board/impa7/impa7.c
index b95e9109ad0a425a245bec49f4a69013c517f5c6..12eb0db04eb28a5213157bf8d269797744b59fcd 100644 (file)
--- a/board/impa7/impa7.c
+++ b/board/impa7/impa7.c
@@ -57,5 +57,5 @@ int dram_init (void)
        gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
        gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE;
 
-       return PHYS_SDRAM_1_SIZE + PHYS_SDRAM_2_SIZE;
+       return (0);
 }

diff --git a/board/lart/lart.c b/board/lart/lart.c
index a50aa7027a5b7abea92186790c5dc519a0d3a703..20f22ea0aca7594980a190eebc40ef14d5556802 100644 (file)
--- a/board/lart/lart.c
+++ b/board/lart/lart.c
@@ -61,8 +61,5 @@ int dram_init (void)
        bd->bi_dram[3].start = PHYS_SDRAM_4;
        bd->bi_dram[3].size = PHYS_SDRAM_4_SIZE;
 
-       return (PHYS_SDRAM_1_SIZE +
-               PHYS_SDRAM_2_SIZE +
-               PHYS_SDRAM_3_SIZE +
-               PHYS_SDRAM_4_SIZE );
+       return (0);
 }

diff --git a/board/shannon/shannon.c b/board/shannon/shannon.c
index 2dd708f3d6e17fb5620ceb2fbbeb12f81dd6c5ae..a55626d1d3250f63c84f0e990aeff9b2a1359af0 100644 (file)
--- a/board/shannon/shannon.c
+++ b/board/shannon/shannon.c
@@ -99,18 +99,5 @@ int dram_init (void)
        bd->bi_dram[3].size = PHYS_SDRAM_4_SIZE;
 #endif
 
-       return (  0
-#ifdef PHYS_SDRAM_1
-               + PHYS_SDRAM_1_SIZE
-#endif
-#ifdef PHYS_SDRAM_2
-               + PHYS_SDRAM_2_SIZE
-#endif
-#ifdef PHYS_SDRAM_3
-               + PHYS_SDRAM_3_SIZE
-#endif
-#ifdef PHYS_SDRAM_4
-               + PHYS_SDRAM_4_SIZE
-#endif
-               );
+       return (0);
 }

diff --git a/board/smdk2400/flash.c b/board/smdk2400/flash.c
index 61529a344798e88a092b00ffb3cb28e425670c1d..c8d54bb4146f4af721858fee9a76436d8bc99b60 100644 (file)
--- a/board/smdk2400/flash.c
+++ b/board/smdk2400/flash.c
@@ -63,8 +63,7 @@ ulong flash_init(void)
     int i, j;
     ulong size = 0;
 
-    for (i = 0; i < CFG_MAX_FLASH_BANKS; i++)
-    {
+    for (i = 0; i < CFG_MAX_FLASH_BANKS; i++) {
        ulong flashbase = 0;
        flash_info[i].flash_id =
          (INTEL_MANUFACT & FLASH_VENDMASK) |

diff --git a/board/smdk2400/smdk2400.c b/board/smdk2400/smdk2400.c
index deff7a7f6259dc245c2daf86c2b86843d18c3d00..361bf5e0a384fbef347fe45fe4f4a3f20f074fe7 100644 (file)
--- a/board/smdk2400/smdk2400.c
+++ b/board/smdk2400/smdk2400.c
@@ -64,7 +64,7 @@ int board_init (void)
        /* adress of boot parameters */
        gd->bd->bi_boot_params = 0x0C000100;
 
-       return 1;
+       return 0;
 }
 
 int dram_init (void)
@@ -73,5 +73,6 @@ int dram_init (void)
 
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
        gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
-       return PHYS_SDRAM_1_SIZE;
+
+       return 0;
 }

diff --git a/board/smdk2410/smdk2410.c b/board/smdk2410/smdk2410.c
index 9fecce52edc7b53d95cce53ee390f8047d335731..587ed646266caac6c37eda73bd0c838376cc00d0 100644 (file)
--- a/board/smdk2410/smdk2410.c
+++ b/board/smdk2410/smdk2410.c
@@ -116,5 +116,6 @@ int dram_init (void)
 
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
        gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
-       return PHYS_SDRAM_1_SIZE;
+
+       return 0;
 }

diff --git a/lib_arm/board.c b/lib_arm/board.c
index e9d333556347f414f0918596abed8ebd75f9aef0..104fe59bf9fee3fa474cb3edddd4d8d848d522ea 100644 (file)
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -168,6 +168,7 @@ init_fnc_t *init_sequence[] = {
        dram_init,              /* configure available RAM banks */
        display_dram_config,
 
+       NULL,
 };
 
 void start_armboot (void)
@@ -181,10 +182,8 @@ void start_armboot (void)
 
        /* Pointer is writable since we allocated a register for it */
        gd = &gd_data;
-       gd->bd = &bd_data;
-
-       /* initialize internal data strucuture */
        memset (gd, 0, sizeof (gd_t));
+       gd->bd = &bd_data;
        memset (gd->bd, 0, sizeof (bd_t));
 
        for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {