blob: 349b83697ea1363ce35d3c22da821638f7a1a5b8 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
Fix building with CRAMFS but not JFFS2 support
Signed-off-by: Harald Welte <laforge@openmoko.org>
Index: u-boot/fs/cramfs/cramfs.c
===================================================================
--- u-boot.orig/fs/cramfs/cramfs.c 2007-02-17 11:46:26.000000000 +0100
+++ u-boot/fs/cramfs/cramfs.c 2007-02-17 11:54:36.000000000 +0100
@@ -27,7 +27,7 @@
#include <common.h>
#include <malloc.h>
-#if (CONFIG_COMMANDS & CFG_CMD_JFFS2)
+#if (CONFIG_COMMANDS & CFG_CMD_CRAMFS)
#include <asm/byteorder.h>
#include <linux/stat.h>
Index: u-boot/common/cmd_jffs2.c
===================================================================
--- u-boot.orig/common/cmd_jffs2.c 2007-02-17 11:47:51.000000000 +0100
+++ u-boot/common/cmd_jffs2.c 2007-02-17 14:08:25.000000000 +0100
@@ -170,10 +170,19 @@
static struct mtd_device *current_dev = NULL;
static u8 current_partnum = 0;
+#ifdef CFG_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);
|
