diff options
author | Wolfgang Denk <wd@denx.de> | 2008-01-09 21:34:46 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-01-09 21:34:46 +0100 |
commit | 3b93020d74630f0574cbd26d200a82c00dd11eaa (patch) | |
tree | fdf53ce4da01d337ceb71cadf496a9fc8d2fb62c /common/cmd_jffs2.c | |
parent | c83d7ca4dadd44ae430235077f63b64a11f36f6e (diff) | |
parent | 6007f3251c0967adc13f2ed8be1b924ddc30124d (diff) | |
download | u-boot-imx-3b93020d74630f0574cbd26d200a82c00dd11eaa.zip u-boot-imx-3b93020d74630f0574cbd26d200a82c00dd11eaa.tar.gz u-boot-imx-3b93020d74630f0574cbd26d200a82c00dd11eaa.tar.bz2 |
Merge branch 'master' of /home/wd/git/u-boot/master/
Diffstat (limited to 'common/cmd_jffs2.c')
-rw-r--r-- | common/cmd_jffs2.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/common/cmd_jffs2.c b/common/cmd_jffs2.c index efe9eb7..1b67e73 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); |