[FIX] Microblaze ML401 - repare FLASH handling

[u-boot] / common / env_common.c

diff --git a/common/env_common.c b/common/env_common.c
index 6e193cf0515faf2825dbf873d00a73f8c4c4cafd..a49481244e2f7ae3c64c1829201161edee3436a1 100644 (file)
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -30,13 +30,6 @@
 #include <linux/stddef.h>
 #include <malloc.h>
 
-#ifdef CONFIG_SHOW_BOOT_PROGRESS
-# include <status_led.h>
-# define SHOW_BOOT_PROGRESS(arg)       show_boot_progress(arg)
-#else
-# define SHOW_BOOT_PROGRESS(arg)
-#endif
-
 DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_AMIGAONEG3SE
@@ -222,14 +215,6 @@ void env_relocate (void)
        DEBUGF ("%s[%d] malloced ENV at %p\n", __FUNCTION__,__LINE__,env_ptr);
 #endif
 
-#ifdef CONFIG_MICROBLAZE
-       /*
-        * FIXME MALLOC error for Microblaze - error malloc return
-        * bad value. Correct value is CFG_MONITOR_BASE - CFG_MALLOC_LEN.
-        */
-       env_ptr = (env_t *)CFG_MONITOR_BASE;
-       DEBUGF ("%s[%d] malloced ENV at %p\n", __FUNCTION__,__LINE__,env_ptr);
-#endif
        /*
         * After relocation to RAM, we can always use the "memory" functions
         */
@@ -240,7 +225,7 @@ void env_relocate (void)
                puts ("Using default environment\n\n");
 #else
                puts ("*** Warning - bad CRC, using default environment\n\n");
-               SHOW_BOOT_PROGRESS (-1);
+               show_boot_progress (-60);
 #endif
 
                if (sizeof(default_environment) > ENV_SIZE)