diff options
author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-25 15:47:54 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-25 15:47:54 +0000 |
commit | 85e3e7265be8389f65c52f4585ad9b4667c96dc2 (patch) | |
tree | b10bfe0154668dbf0a322f7a379bab1f549da6db /meta/packages/uboot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch | |
parent | c6422207156a33edaf2d8dd72a37ef2d7ce7e966 (diff) | |
download | openembedded-core-85e3e7265be8389f65c52f4585ad9b4667c96dc2.tar.gz openembedded-core-85e3e7265be8389f65c52f4585ad9b4667c96dc2.tar.bz2 openembedded-core-85e3e7265be8389f65c52f4585ad9b4667c96dc2.tar.xz openembedded-core-85e3e7265be8389f65c52f4585ad9b4667c96dc2.zip |
u-boot-mkimage-native: use 1.3.2 version instead of Openmoko patched version
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4114 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/uboot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch')
-rw-r--r-- | meta/packages/uboot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/meta/packages/uboot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch b/meta/packages/uboot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch deleted file mode 100644 index 349b83697..000000000 --- a/meta/packages/uboot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch +++ /dev/null @@ -1,41 +0,0 @@ -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); - |