diff --git a/CHANGELOG b/CHANGELOG
index 0c4407c9af9584ef044bef042447953f19db867f..2e0a957a665be5fe4e9781b4ef4b98963e72ffc2 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 3048cbe4084ba3cc226f1537151a0fcf5dbc865e..f7ee9ee70825eba923118ab6be2505980144bb56 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