diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-09-01 00:16:29 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-09-01 00:16:29 +0200 |
| commit | e99e9575bbeba1b7c48e046547cae065ec0071de (patch) | |
| tree | c08553c4d06725bd6013a46068df0059c5b49a00 /fs/ext2 | |
| parent | a13b2d937941f6b525abfcfad96c034f94421188 (diff) | |
| parent | 08ab4e1780fa63c88dd5a5ab52f4ff4ed1ee1878 (diff) | |
| download | u-boot-imx-e99e9575bbeba1b7c48e046547cae065ec0071de.zip u-boot-imx-e99e9575bbeba1b7c48e046547cae065ec0071de.tar.gz u-boot-imx-e99e9575bbeba1b7c48e046547cae065ec0071de.tar.bz2 | |
Merge branch 'Makefile' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'fs/ext2')
| -rw-r--r-- | fs/ext2/Makefile | 6 | ||||
| -rw-r--r-- | fs/ext2/dev.c | 3 | ||||
| -rw-r--r-- | fs/ext2/ext2fs.c | 4 |
3 files changed, 3 insertions, 10 deletions
diff --git a/fs/ext2/Makefile b/fs/ext2/Makefile index 8313cdc..712e348 100644 --- a/fs/ext2/Makefile +++ b/fs/ext2/Makefile @@ -30,10 +30,10 @@ include $(TOPDIR)/config.mk LIB = $(obj)libext2fs.a AOBJS = -COBJS = ext2fs.o dev.o +COBJS-$(CONFIG_CMD_EXT2) := ext2fs.o dev.o -SRCS := $(AOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS)) +SRCS := $(AOBJS:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS-y)) #CPPFLAGS += diff --git a/fs/ext2/dev.c b/fs/ext2/dev.c index 1728b34..3b49650 100644 --- a/fs/ext2/dev.c +++ b/fs/ext2/dev.c @@ -25,8 +25,6 @@ #include <common.h> -#if defined(CONFIG_CMD_EXT2) - #include <config.h> #include <ext2fs.h> @@ -139,4 +137,3 @@ int ext2fs_devread (int sector, int byte_offset, int byte_len, char *buf) { } return (1); } -#endif diff --git a/fs/ext2/ext2fs.c b/fs/ext2/ext2fs.c index 7833551..436f4a4 100644 --- a/fs/ext2/ext2fs.c +++ b/fs/ext2/ext2fs.c @@ -24,8 +24,6 @@ */ #include <common.h> - -#if defined(CONFIG_CMD_EXT2) #include <ext2fs.h> #include <malloc.h> #include <asm/byteorder.h> @@ -874,5 +872,3 @@ fail: ext2fs_root = NULL; return (0); } - -#endif |