Fixed bamboo port to enable running without DDR-DIMM (bamboo has also 64MB onboard...

Patch by Stefan Roese, 24 Aug 2005

diff --git a/CHANGELOG b/CHANGELOG
index e6a58b4fc0705da0e661898af2e5178202888ca3..85e7dffd2f6e3e74a60ea3d2a3c30dab17b9bd09 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,10 @@
 Changes for U-Boot 1.1.4:
 ======================================================================
 
+* Fixed bamboo port to enable running without DDR-DIMM (bamboo has also
+  64MB onboard DDR)
+  Patch by Stefan Roese, 24 Aug 2005
+
 * Merged 405gp_enet.c and 440gx_enet.c to generic 4xx_enet.c
   now handling all 4xx cpu's
   Patch by Stefan Roese, 16 Aug 2005

diff --git a/cpu/ppc4xx/spd_sdram.c b/cpu/ppc4xx/spd_sdram.c
index a8cfcd4e75888129f2f1555bdd1e1aaa7cd85299..3b7125dc577147b19c996f17c7c4bd83fd5283a0 100644 (file)
--- a/cpu/ppc4xx/spd_sdram.c
+++ b/cpu/ppc4xx/spd_sdram.c
@@ -849,10 +849,12 @@ void get_spd_info(unsigned long*   dimm_populated,
                }
        }
 
+#ifndef CONFIG_BAMBOO /* bamboo has onboard DDR _and_ DDR DIMM's */
        if (dimm_found == FALSE) {
                printf("ERROR - No memory installed. Install a DDR-SDRAM DIMM.\n\n");
                hang();
        }
+#endif /* CONFIG_BAMBOO */
 }
 
 void check_mem_type(unsigned long*   dimm_populated,