diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-12-28 13:10:28 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-12-28 13:10:28 +0000 |
| commit | be3e650d031916b132b4cef9d19e7844cca3440b (patch) | |
| tree | 96dea5f2866a9c43bee966b9d01753467f19a9a3 /packages/u-boot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch | |
| parent | 518fac47b16e548ace1e23d1bc6f4a38b44670bb (diff) | |
rename uboot directory for more consistency
Diffstat (limited to 'packages/u-boot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch')
| -rw-r--r-- | packages/u-boot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch new file mode 100644 index 0000000000..349b83697e --- /dev/null +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch @@ -0,0 +1,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); + |