diff options
| author | Stefan Roese <sr@denx.de> | 2008-01-13 15:04:37 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-01-13 15:04:37 +0100 |
| commit | 8d79953d03e6c5b24215609997dafe4daa623cd6 (patch) | |
| tree | cb9a4246cde2d32fa600461da008c7d59b57cf4b /common/cmd_jffs2.c | |
| parent | 47cc23cbe9a669c510183f4f049bf703ef445f3b (diff) | |
| parent | 2b2f43ed6a30ece77f76191c845ac95267daa31a (diff) | |
| download | u-boot-imx-8d79953d03e6c5b24215609997dafe4daa623cd6.zip u-boot-imx-8d79953d03e6c5b24215609997dafe4daa623cd6.tar.gz u-boot-imx-8d79953d03e6c5b24215609997dafe4daa623cd6.tar.bz2 | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
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); |