summaryrefslogtreecommitdiff
path: root/fs/ext2
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-08-31 04:24:56 +0200
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-08-31 04:24:56 +0200
commit08ab4e1780fa63c88dd5a5ab52f4ff4ed1ee1878 (patch)
tree0b8d061f6fd4b7ad68b94e509e644e5456a44613 /fs/ext2
parentc1de7a6daf9c657484e1c6d433f01fccd49a7f48 (diff)
downloadu-boot-imx-08ab4e1780fa63c88dd5a5ab52f4ff4ed1ee1878.zip
u-boot-imx-08ab4e1780fa63c88dd5a5ab52f4ff4ed1ee1878.tar.gz
u-boot-imx-08ab4e1780fa63c88dd5a5ab52f4ff4ed1ee1878.tar.bz2
fs: Move conditional compilation to Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'fs/ext2')
-rw-r--r--fs/ext2/Makefile6
-rw-r--r--fs/ext2/dev.c3
-rw-r--r--fs/ext2/ext2fs.c4
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