diff --git a/common/cmd_boot.c b/common/cmd_boot.c
index e68f16f..9d4f026 100644
--- a/common/cmd_boot.c
+++ b/common/cmd_boot.c
@@ -32,6 +32,23 @@
 DECLARE_GLOBAL_DATA_PTR;
 #endif
 
+static inline void go_setup(int argc, char *argv[])
+{
+#if defined(CONFIG_I386)
+	/*
+	 * x86 does not use a dedicated register to pass the pointer
+	 * to the global_data
+	 */
+	argv[0] = (char *)gd;
+
+#elif defined(CONFIG_BLACKFIN)
+	if (dcache_status ())
+		dcache_disable ();
+	if (icache_status ())
+		icache_disable ();
+#endif
+}
+
 int do_go (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
 	ulong	addr, rc;
@@ -46,25 +63,20 @@
 
 	printf ("## Starting application at 0x%08lX ...\n", addr);
 
+	go_setup(argc, argv);
+
+#if defined(CONFIG_NIOS)
+	/*
+	 * Nios function pointers are address >> 1
+	 */
+	addr >>= 1;
+#endif
+
 	/*
 	 * pass address parameter as argv[0] (aka command name),
 	 * and all remaining args
 	 */
-#if defined(CONFIG_I386)
-	/*
-	 * x86 does not use a dedicated register to pass the pointer
-	 * to the global_data
-	 */
-	argv[0] = (char *)gd;
-#endif
-#if !defined(CONFIG_NIOS)
 	rc = ((ulong (*)(int, char *[]))addr) (--argc, &argv[1]);
-#else
-	/*
-	 * Nios function pointers are address >> 1
-	 */
-	rc = ((ulong (*)(int, char *[]))(addr>>1)) (--argc, &argv[1]);
-#endif
 	if (rc != 0) rcode = 1;
 
 	printf ("## Application terminated, rc = 0x%lX\n", rc);