summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@openmoko.org>2007-12-19 14:09:58 +0100
committerWolfgang Denk <wd@denx.de>2008-01-09 13:04:37 +0100
commitf540c42d9564854b19ce9bbb70affe172529fe70 (patch)
tree28ab15e346f076280780402b011c2e44daa706c0
parent23d0baf967fecdaf1804f045f6339337c5607eec (diff)
downloadtalos-obmc-uboot-f540c42d9564854b19ce9bbb70affe172529fe70.tar.gz
talos-obmc-uboot-f540c42d9564854b19ce9bbb70affe172529fe70.zip
Fix building with CRAMFS but not JFFS2 support
Signed-off-by: Harald Welte <laforge@openmoko.org>
-rw-r--r--common/cmd_jffs2.c9
-rw-r--r--fs/cramfs/cramfs.c2
2 files changed, 10 insertions, 1 deletions
diff --git a/common/cmd_jffs2.c b/common/cmd_jffs2.c
index efe9eb7be4..1b67e73f11 100644
--- a/common/cmd_jffs2.c
+++ b/common/cmd_jffs2.c
@@ -167,10 +167,19 @@ struct list_head devices;
static struct mtd_device *current_dev = NULL;
static u8 current_partnum = 0;
+#if defined(CONFIG_CMD_CRAMFS)
extern int cramfs_check (struct part_info *info);
extern int cramfs_load (char *loadoffset, struct part_info *info, char *filename);
extern int cramfs_ls (struct part_info *info, char *filename);
extern int cramfs_info (struct part_info *info);
+#else
+/* defining empty macros for function names is ugly but avoids ifdef clutter
+ * all over the code */
+#define cramfs_check(x) (0)
+#define cramfs_load(x,y,z) (-1)
+#define cramfs_ls(x,y) (0)
+#define cramfs_info(x) (0)
+#endif
static struct part_info* jffs2_part_info(struct mtd_device *dev, unsigned int part_num);
diff --git a/fs/cramfs/cramfs.c b/fs/cramfs/cramfs.c
index 369d1f1674..e53c783e5a 100644
--- a/fs/cramfs/cramfs.c
+++ b/fs/cramfs/cramfs.c
@@ -27,7 +27,7 @@
#include <common.h>
#include <malloc.h>
-#if defined(CONFIG_CMD_JFFS2)
+#if defined(CONFIG_CMD_CRAMFS)
#include <asm/byteorder.h>
#include <linux/stat.h>
OpenPOWER on IntegriCloud