Merge remote-tracking branch 'u-boot-ti/master'

[karo-tx-uboot.git] / common / cmd_cramfs.c

diff --git a/common/cmd_cramfs.c b/common/cmd_cramfs.c
index 8c86dc5bf1a3df285a89170cd1963a043bb159d6..e7f496e4eacc2956bac5965e3a5696343632c0b7 100644 (file)
--- a/common/cmd_cramfs.c
+++ b/common/cmd_cramfs.c
@@ -43,7 +43,13 @@
 #endif
 
 #ifdef CONFIG_CRAMFS_CMDLINE
-flash_info_t flash_info[1];
+#include <flash.h>
+
+#ifdef CONFIG_SYS_NO_FLASH
+# define OFFSET_ADJUSTMENT     0
+#else
+# define OFFSET_ADJUSTMENT     (flash_info[id.num].start[0])
+#endif
 
 #ifndef CONFIG_CMD_JFFS2
 #include <linux/stat.h>
@@ -119,7 +125,7 @@ int do_cramfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        dev.id = &id;
        part.dev = &dev;
        /* fake the address offset */
-       part.offset = addr - flash_info[id.num].start[0];
+       part.offset = addr - OFFSET_ADJUSTMENT;
 
        /* pre-set Boot file name */
        if ((filename = getenv("bootfile")) == NULL) {
@@ -182,7 +188,7 @@ int do_cramfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        dev.id = &id;
        part.dev = &dev;
        /* fake the address offset */
-       part.offset = addr - flash_info[id.num].start[0];
+       part.offset = addr - OFFSET_ADJUSTMENT;
 
        if (argc == 2)
                filename = argv[1];