summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG3
-rw-r--r--lib_arm/board.c4
2 files changed, 7 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 0c4407c..2e0a957 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
Changes since U-Boot 1.1.4:
======================================================================
+* Make CFG_NO_FLASH work on ARM systems
+ Patch by Markus Klotzbuecher, 27 Feb 2006
+
* Update mcc200 config: Disable PCI and DoC, use 133 MHz IPB clock,
use hush shell.
diff --git a/lib_arm/board.c b/lib_arm/board.c
index 3048cbe..f7ee9ee 100644
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -178,11 +178,13 @@ static int display_dram_config (void)
return (0);
}
+#ifndef CFG_NO_FLASH
static void display_flash_config (ulong size)
{
puts ("Flash: ");
print_size (size, "\n");
}
+#endif /* CFG_NO_FLASH */
/*
@@ -260,9 +262,11 @@ void start_armboot (void)
}
}
+#ifndef CFG_NO_FLASH
/* configure available FLASH banks */
size = flash_init ();
display_flash_config (size);
+#endif /* CFG_NO_FLASH */
#ifdef CONFIG_VFD
# ifndef PAGE_SIZE