Browse Source

Fix building with CRAMFS but not JFFS2 support

Signed-off-by: Harald Welte <laforge@openmoko.org>
imx_v2009.08_10.04.01
Harald Welte 13 years ago
committed by Wolfgang Denk
parent
commit
f540c42d95
2 changed files with 10 additions and 1 deletions
  1. +9
    -0
      common/cmd_jffs2.c
  2. +1
    -1
      fs/cramfs/cramfs.c

+ 9
- 0
common/cmd_jffs2.c View File

@ -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);


+ 1
- 1
fs/cramfs/cramfs.c View File

@ -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>


Loading…
Cancel
Save