Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fs: Move conditional compilation to Makefile

Browse Source 
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
master
Jean-Christophe PLAGNIOL-VILLARD 17 years ago
parent c1de7a6daf
commit 08ab4e1780
30 changed files with 32 additions and 109 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      fs/Makefile
  2. 7
      fs/cramfs/Makefile
  3. 5
      fs/cramfs/cramfs.c
  4. 4
      fs/cramfs/uncompress.c
  5. 6
      fs/ext2/Makefile
  6. 3
      fs/ext2/dev.c
  7. 4
      fs/ext2/ext2fs.c
  8. 6
      fs/fat/Makefile
  9. 4
      fs/fat/fat.c
  10. 4
      fs/fat/file.c
  11. 6
      fs/fdos/Makefile
  12. 5
      fs/fdos/dev.c
  13. 4
      fs/fdos/fat.c
  14. 5
      fs/fdos/fdos.c
  15. 4
      fs/fdos/fs.c
  16. 3
      fs/fdos/subdir.c
  17. 5
      fs/fdos/vfat.c
  18. 8
      fs/jffs2/Makefile
  19. 3
      fs/jffs2/compr_lzari.c
  20. 4
      fs/jffs2/compr_lzo.c
  21. 4
      fs/jffs2/compr_rtime.c
  22. 4
      fs/jffs2/compr_rubin.c
  23. 4
      fs/jffs2/compr_zlib.c
  24. 5
      fs/jffs2/jffs2_1pass.c
  25. 2
      fs/jffs2/jffs2_nand_1pass.c
  26. 5
      fs/jffs2/mini_inflate.c
  27. 6
      fs/reiserfs/Makefile
  28. 4
      fs/reiserfs/dev.c
  29. 3
      fs/reiserfs/mode_string.c
  30. 4
      fs/reiserfs/reiserfs.c

10
fs/Makefile
Unescape View File

@ -22,7 +22,15 @@
# #
# #
SUBDIRS := jffs2 cramfs fdos fat reiserfs ext2 yaffs2 subdirs-$(CONFIG_CMD_CRAMFS) := cramfs
subdirs-$(CONFIG_CMD_EXT2) += ext2
subdirs-$(CONFIG_CMD_FAT) += fat
subdirs-$(CONFIG_CMD_FDOS) += fdos
subdirs-$(CONFIG_CMD_JFFS2) += jffs2
subdirs-$(CONFIG_CMD_REISER) += reiserfs
subdirs-$(CONFIG_YAFFS2) += yaffs2
SUBDIRS := $(subdirs-y)
$(obj).depend all: $(obj).depend all:
@for dir in $(SUBDIRS) ; do \ @for dir in $(SUBDIRS) ; do \

7
fs/cramfs/Makefile
Unescape View File

@ -26,10 +26,11 @@ include $(TOPDIR)/config.mk
LIB = $(obj)libcramfs.a LIB = $(obj)libcramfs.a
AOBJS = AOBJS =
COBJS = cramfs.o uncompress.o COBJS-$(CONFIG_CMD_CRAMFS) := cramfs.o
COBJS-$(CONFIG_CMD_CRAMFS) += uncompress.o
SRCS := $(AOBJS:.o=.S) $(COBJS:.o=.c) SRCS := $(AOBJS:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS)) OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS-y))
#CPPFLAGS += #CPPFLAGS +=

5
fs/cramfs/cramfs.c
Unescape View File

@ -26,9 +26,6 @@
#include <common.h> #include <common.h>
#include <malloc.h> #include <malloc.h>
#if defined(CONFIG_CMD_CRAMFS)
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <linux/stat.h> #include <linux/stat.h>
#include <jffs2/jffs2.h> #include <jffs2/jffs2.h>
@ -343,5 +340,3 @@ int cramfs_check (struct part_info *info)
} }
return 1; return 1;
} }
#endif /* CFG_FS_CRAMFS */

4
fs/cramfs/uncompress.c
Unescape View File

@ -25,8 +25,6 @@
#include <watchdog.h> #include <watchdog.h>
#include <zlib.h> #include <zlib.h>
#if defined(CONFIG_CMD_CRAMFS)
static z_stream stream; static z_stream stream;
void *zalloc(void *, unsigned, unsigned); void *zalloc(void *, unsigned, unsigned);
@ -86,5 +84,3 @@ int cramfs_uncompress_exit (void)
inflateEnd (&stream); inflateEnd (&stream);
return 0; return 0;
} }
#endif /* CFG_FS_CRAMFS */

6
fs/ext2/Makefile
Unescape View File

@ -30,10 +30,10 @@ include $(TOPDIR)/config.mk
LIB = $(obj)libext2fs.a LIB = $(obj)libext2fs.a
AOBJS = AOBJS =
COBJS = ext2fs.o dev.o COBJS-$(CONFIG_CMD_EXT2) := ext2fs.o dev.o
SRCS := $(AOBJS:.o=.S) $(COBJS:.o=.c) SRCS := $(AOBJS:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS)) OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS-y))
#CPPFLAGS += #CPPFLAGS +=

3
fs/ext2/dev.c
Unescape View File

@ -25,8 +25,6 @@
#include <common.h> #include <common.h>
#if defined(CONFIG_CMD_EXT2)
#include <config.h> #include <config.h>
#include <ext2fs.h> #include <ext2fs.h>
@ -139,4 +137,3 @@ int ext2fs_devread (int sector, int byte_offset, int byte_len, char *buf) {
} }
return (1); return (1);
} }
#endif

4
fs/ext2/ext2fs.c
Unescape View File

@ -24,8 +24,6 @@
*/ */
#include <common.h> #include <common.h>
#if defined(CONFIG_CMD_EXT2)
#include <ext2fs.h> #include <ext2fs.h>
#include <malloc.h> #include <malloc.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
@ -874,5 +872,3 @@ fail:
ext2fs_root = NULL; ext2fs_root = NULL;
return (0); return (0);
} }
#endif

6
fs/fat/Makefile
Unescape View File

@ -24,10 +24,10 @@ include $(TOPDIR)/config.mk
LIB = $(obj)libfat.a LIB = $(obj)libfat.a
AOBJS = AOBJS =
COBJS = fat.o file.o COBJS-$(CONFIG_CMD_FAT) := fat.o file.o
SRCS := $(AOBJS:.o=.S) $(COBJS:.o=.c) SRCS := $(AOBJS:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS)) OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS-y))
all: $(LIB) $(AOBJS) all: $(LIB) $(AOBJS)

4
fs/fat/fat.c
Unescape View File

@ -31,8 +31,6 @@
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <part.h> #include <part.h>
#if defined(CONFIG_CMD_FAT)
/* /*
* Convert a string to lowercase. * Convert a string to lowercase.
*/ */
@ -1024,5 +1022,3 @@ file_fat_read(const char *filename, void *buffer, unsigned long maxsize)
printf("reading %s\n",filename); printf("reading %s\n",filename);
return do_fat_read(filename, buffer, maxsize, LS_NO); return do_fat_read(filename, buffer, maxsize, LS_NO);
} }
#endif

4
fs/fat/file.c
Unescape View File

@ -32,8 +32,6 @@
#include <linux/stat.h> #include <linux/stat.h>
#include <linux/time.h> #include <linux/time.h>
#if defined(CONFIG_CMD_FAT)
/* Supported filesystems */ /* Supported filesystems */
static const struct filesystem filesystems[] = { static const struct filesystem filesystems[] = {
{ file_fat_detectfs, file_fat_ls, file_fat_read, "FAT" }, { file_fat_detectfs, file_fat_ls, file_fat_read, "FAT" },
@ -204,5 +202,3 @@ file_read(const char *filename, void *buffer, unsigned long maxsize)
return filesystems[current_filesystem].read(arg, buffer, maxsize); return filesystems[current_filesystem].read(arg, buffer, maxsize);
} }
#endif

6
fs/fdos/Makefile
Unescape View File

@ -31,10 +31,10 @@ include $(TOPDIR)/config.mk
LIB = $(obj)libfdos.a LIB = $(obj)libfdos.a
AOBJS = AOBJS =
COBJS = fat.o vfat.o dev.o fdos.o fs.o subdir.o COBJS-$(CONFIG_CMD_FDOS) := fat.o vfat.o dev.o fdos.o fs.o subdir.o
SRCS := $(AOBJS:.o=.S) $(COBJS:.o=.c) SRCS := $(AOBJS:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS)) OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS-y))
#CPPFLAGS += #CPPFLAGS +=

5
fs/fdos/dev.c
Unescape View File

@ -28,8 +28,6 @@
#include "dos.h" #include "dos.h"
#include "fdos.h" #include "fdos.h"
#if defined(CONFIG_CMD_FDOS)
#define NB_HEADS 2 #define NB_HEADS 2
#define NB_TRACKS 80 #define NB_TRACKS 80
#define NB_SECTORS 18 #define NB_SECTORS 18
@ -190,6 +188,3 @@ int check_dev (BootSector_t *boot, Fs_t *fs)
return (0); return (0);
} }
#endif

4
fs/fdos/fat.c
Unescape View File

@ -26,8 +26,6 @@
#include <config.h> #include <config.h>
#include <malloc.h> #include <malloc.h>
#if defined(CONFIG_CMD_FDOS)
#include "dos.h" #include "dos.h"
#include "fdos.h" #include "fdos.h"
@ -138,5 +136,3 @@ int read_fat (BootSector_t *boot, Fs_t *fs)
} }
return (0); return (0);
} }
#endif

5
fs/fdos/fdos.c
Unescape View File

@ -24,9 +24,8 @@
#include <common.h> #include <common.h>
#include <config.h> #include <config.h>
#if defined(CONFIG_CMD_FDOS)
#include <malloc.h> #include <malloc.h>
#include "dos.h" #include "dos.h"
#include "fdos.h" #include "fdos.h"
@ -171,5 +170,3 @@ int dos_dir (void)
free (name); free (name);
return (0); return (0);
} }
#endif

4
fs/fdos/fs.c
Unescape View File

@ -26,8 +26,6 @@
#include <config.h> #include <config.h>
#include <malloc.h> #include <malloc.h>
#if defined(CONFIG_CMD_FDOS)
#include "dos.h" #include "dos.h"
#include "fdos.h" #include "fdos.h"
@ -114,5 +112,3 @@ int fs_init (Fs_t *fs)
free (boot); free (boot);
return (0); return (0);
} }
#endif

3
fs/fdos/subdir.c
Unescape View File

@ -26,8 +26,6 @@
#include <config.h> #include <config.h>
#include <malloc.h> #include <malloc.h>
#if defined(CONFIG_CMD_FDOS)
#include "dos.h" #include "dos.h"
#include "fdos.h" #include "fdos.h"
@ -345,4 +343,3 @@ int read_file (Fs_t *fs,
} }
return (read); return (read);
} }
#endif

5
fs/fdos/vfat.c
Unescape View File

@ -24,8 +24,6 @@
#include <common.h> #include <common.h>
#include <config.h> #include <config.h>
#if defined(CONFIG_CMD_FDOS)
#include <linux/ctype.h> #include <linux/ctype.h>
#include "dos.h" #include "dos.h"
@ -352,6 +350,3 @@ static char *conv_name (char *name, char *ext, char Case, char *ans)
} }
return (ans); return (ans);
} }
#endif

8
fs/jffs2/Makefile
Unescape View File

@ -26,13 +26,15 @@ include $(TOPDIR)/config.mk
LIB = $(obj)libjffs2.a LIB = $(obj)libjffs2.a
AOBJS = AOBJS =
COBJS-y += jffs2_1pass.o ifdef CONFIG_CMD_JFFS2
COBJS-$(CONFIG_JFFS2_LZO_LZARI) += compr_lzari.o
COBJS-$(CONFIG_JFFS2_LZO_LZARI) += compr_lzo.o
COBJS-y += compr_rtime.o COBJS-y += compr_rtime.o
COBJS-y += compr_rubin.o COBJS-y += compr_rubin.o
COBJS-y += compr_zlib.o COBJS-y += compr_zlib.o
COBJS-y += jffs2_1pass.o
COBJS-y += mini_inflate.o COBJS-y += mini_inflate.o
COBJS-y += compr_lzo.o endif
COBJS-y += compr_lzari.o
COBJS := $(COBJS-y) COBJS := $(COBJS-y)
SRCS := $(AOBJS:.o=.S) $(COBJS:.o=.c) SRCS := $(AOBJS:.o=.S) $(COBJS:.o=.c)

3
fs/jffs2/compr_lzari.c
Unescape View File

@ -50,8 +50,6 @@ All rights reserved. Permission granted for non-commercial use.
#include <config.h> #include <config.h>
#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_LZO_LZARI)
#include <linux/stddef.h> #include <linux/stddef.h>
#include <jffs2/jffs2.h> #include <jffs2/jffs2.h>
@ -259,4 +257,3 @@ int lzari_decompress(unsigned char *data_in, unsigned char *cpage_out,
{ {
return Decode(data_in, cpage_out, srclen, destlen); return Decode(data_in, cpage_out, srclen, destlen);
} }
#endif

4
fs/jffs2/compr_lzo.c
Unescape View File

@ -67,8 +67,6 @@
#include <config.h> #include <config.h>
#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_LZO_LZARI)
#include <linux/stddef.h> #include <linux/stddef.h>
#include <jffs2/jffs2.h> #include <jffs2/jffs2.h>
#include <jffs2/compr_rubin.h> #include <jffs2/compr_rubin.h>
@ -401,5 +399,3 @@ int lzo_decompress(unsigned char *data_in, unsigned char *cpage_out,
lzo_uint outlen = destlen; lzo_uint outlen = destlen;
return lzo1x_decompress (data_in, srclen, cpage_out, &outlen, NULL); return lzo1x_decompress (data_in, srclen, cpage_out, &outlen, NULL);
} }
#endif

4
fs/jffs2/compr_rtime.c
Unescape View File

@ -46,8 +46,6 @@
*/ */
#include <config.h> #include <config.h>
#if defined(CONFIG_CMD_JFFS2)
#include <jffs2/jffs2.h> #include <jffs2/jffs2.h>
void rtime_decompress(unsigned char *data_in, unsigned char *cpage_out, void rtime_decompress(unsigned char *data_in, unsigned char *cpage_out,
@ -87,5 +85,3 @@ void rtime_decompress(unsigned char *data_in, unsigned char *cpage_out,
} }
} }
} }
#endif

4
fs/jffs2/compr_rubin.c
Unescape View File

@ -39,8 +39,6 @@
*/ */
#include <config.h> #include <config.h>
#if defined(CONFIG_CMD_JFFS2)
#include <jffs2/jffs2.h> #include <jffs2/jffs2.h>
#include <jffs2/compr_rubin.h> #include <jffs2/compr_rubin.h>
@ -122,5 +120,3 @@ void dynrubin_decompress(unsigned char *data_in, unsigned char *cpage_out,
rubin_do_decompress(bits, data_in+8, cpage_out, dstlen); rubin_do_decompress(bits, data_in+8, cpage_out, dstlen);
} }
#endif

4
fs/jffs2/compr_zlib.c
Unescape View File

@ -37,8 +37,6 @@
#include <common.h> #include <common.h>
#include <config.h> #include <config.h>
#if defined(CONFIG_CMD_JFFS2)
#include <jffs2/jffs2.h> #include <jffs2/jffs2.h>
#include <jffs2/mini_inflate.h> #include <jffs2/mini_inflate.h>
@ -48,5 +46,3 @@ long zlib_decompress(unsigned char *data_in, unsigned char *cpage_out,
return (decompress_block(cpage_out, data_in + 2, (void *) ldr_memcpy)); return (decompress_block(cpage_out, data_in + 2, (void *) ldr_memcpy));
} }
#endif

5
fs/jffs2/jffs2_1pass.c
Unescape View File

@ -117,9 +117,6 @@
#include <linux/stat.h> #include <linux/stat.h>
#include <linux/time.h> #include <linux/time.h>
#include <watchdog.h> #include <watchdog.h>
#if defined(CONFIG_CMD_JFFS2)
#include <jffs2/jffs2.h> #include <jffs2/jffs2.h>
#include <jffs2/jffs2_1pass.h> #include <jffs2/jffs2_1pass.h>
@ -1394,5 +1391,3 @@ jffs2_1pass_info(struct part_info * part)
} }
return 1; return 1;
} }
#endif

2
fs/jffs2/jffs2_nand_1pass.c
Unescape View File

@ -1,6 +1,6 @@
#include <common.h> #include <common.h>
#if !defined(CONFIG_NAND_LEGACY) && defined(CONFIG_CMD_JFFS2) #if !defined(CONFIG_NAND_LEGACY)
#include <malloc.h> #include <malloc.h>
#include <linux/stat.h> #include <linux/stat.h>

5
fs/jffs2/mini_inflate.c
Unescape View File

@ -24,9 +24,6 @@
*/ */
#include <config.h> #include <config.h>
#if defined(CONFIG_CMD_JFFS2)
#include <jffs2/mini_inflate.h> #include <jffs2/mini_inflate.h>
/* The order that the code lengths in section 3.2.7 are in */ /* The order that the code lengths in section 3.2.7 are in */
@ -392,5 +389,3 @@ long decompress_block(unsigned char *dest, unsigned char *source,
#endif #endif
return stream.error ? -stream.error : stream.decoded; return stream.error ? -stream.error : stream.decoded;
} }
#endif

6
fs/reiserfs/Makefile
Unescape View File

@ -30,10 +30,10 @@ include $(TOPDIR)/config.mk
LIB = $(obj)libreiserfs.a LIB = $(obj)libreiserfs.a
AOBJS = AOBJS =
COBJS = reiserfs.o dev.o mode_string.o COBJS-$(CONFIG_CMD_REISER) := reiserfs.o dev.o mode_string.o
SRCS := $(AOBJS:.o=.S) $(COBJS:.o=.c) SRCS := $(AOBJS:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS)) OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS-y))
#CPPFLAGS += #CPPFLAGS +=

4
fs/reiserfs/dev.c
Unescape View File

@ -19,8 +19,6 @@
#include <common.h> #include <common.h>
#if defined(CONFIG_CMD_REISER)
#include <config.h> #include <config.h>
#include <reiserfs.h> #include <reiserfs.h>
@ -119,5 +117,3 @@ int reiserfs_devread (int sector, int byte_offset, int byte_len, char *buf)
return 1; return 1;
} }
#endif

3
fs/reiserfs/mode_string.c
Unescape View File

@ -25,7 +25,6 @@
#include <common.h> #include <common.h>
#if defined(CONFIG_CMD_REISER)
#include <linux/stat.h> #include <linux/stat.h>
#if ( S_ISUID != 04000 ) || ( S_ISGID != 02000 ) || ( S_ISVTX != 01000 ) \ #if ( S_ISUID != 04000 ) || ( S_ISGID != 02000 ) || ( S_ISVTX != 01000 ) \
@ -137,5 +136,3 @@ const char *bb_mode_string(int mode)
} }
#endif #endif
#endif

4
fs/reiserfs/reiserfs.c
Unescape View File

@ -29,8 +29,6 @@
*/ */
#include <common.h> #include <common.h>
#if defined(CONFIG_CMD_REISER)
#include <malloc.h> #include <malloc.h>
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/time.h> #include <linux/time.h>
@ -982,5 +980,3 @@ reiserfs_open (char *filename)
} }
return filemax; return filemax;
} }
#endif

Write Preview
Loading…
Cancel
Save