summaryrefslogtreecommitdiff
path: root/cleopatre/Makefile
diff options
context:
space:
mode:
authorsave2009-11-26 18:30:05 +0000
committersave2009-11-26 18:30:05 +0000
commit38d5f2412d140ffe779fd2e031846be28dbc4c4b (patch)
treedad6e6e64544630f95e9e9a04f11f3f20c683986 /cleopatre/Makefile
parente1a1d22c6670fc5a9026875842b8338b5f1aefea (diff)
cleo/{tools/userfs,}: rename userfs into flashfs + add a NOPRUNE for init.d
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@6483 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cleopatre/Makefile')
-rw-r--r--cleopatre/Makefile20
1 files changed, 10 insertions, 10 deletions
diff --git a/cleopatre/Makefile b/cleopatre/Makefile
index fca8d912aa..c3239f24d3 100644
--- a/cleopatre/Makefile
+++ b/cleopatre/Makefile
@@ -7,15 +7,15 @@ FCM3_UNUSE=buildroot/target/device/Spidcom/arizona \
u-boot-1.1.6/cpu/spc300-fcm3 \
u-boot-1.1.6/include/asm-arm/arch-spc300-fcm3 \
linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-arizona.c
-USERFS_UNUSE=tools/userfs/image/etc/init.d/S50plctest \
- tools/userfs/image/etc/plcdrv.conf
-AV_UNUSE=devkit Makefile application/onlined $(FCM3_UNUSE) $(USERFS_UNUSE)
-EOC_UNUSE=devkit Makefile $(FCM3_UNUSE) $(USERFS_UNUSE)
+FLASHFS_UNUSE=tools/flashfs/image/etc/init.d/S50plctest \
+ tools/flashfs/image/etc/plcdrv.conf
+AV_UNUSE=devkit Makefile application/onlined $(FCM3_UNUSE) $(FLASHFS_UNUSE)
+EOC_UNUSE=devkit Makefile $(FCM3_UNUSE) $(FLASHFS_UNUSE)
AV_PLC_BINS= plcd plcdrv cesar-plc
EOC_PLC_BINS=plcd plcdrv cesar-eoc-master cesar-eoc-slave
-GEN_BINS=uboot linux userfs
+GEN_BINS=uboot linux flashfs
##################################################################
@@ -44,8 +44,8 @@ BUILDROOT_GIT_PATH=$(CURDIR)/buildroot
BUILDROOT_PATH=$(BUNDLE_COMPILE_PATH)/buildroot
UBOOT_NAME=u-boot.bin
UBOOT_PATH=$(BUNDLE_COMPILE_PATH)/u-boot-$(UBOOT_VERSION)
-USERFS_NAME=flashfs.jffs2
-USERFS_PATH=$(BUNDLE_COMPILE_PATH)/tools/userfs
+FLASHFS_NAME=flashfs.jffs2
+FLASHFS_PATH=$(BUNDLE_COMPILE_PATH)/tools/flashfs
##################################################################
@@ -150,7 +150,7 @@ linux:
cp $(BUILDROOT_PATH)/binaries/"$$BOARD"/linux-kernel-$(LINUX_VERSION)-arm $(BUNDLE_GENBIN_PATH)/$(LINUX_NAME)-"$$BOARD"; \
done
-userfs:
- $(Q)$(MAKE) -C $(USERFS_PATH)
- $(Q)cp $(USERFS_PATH)/flashfs.jffs2 $(BUNDLE_GENBIN_PATH)/$(USERFS_NAME)
+flashfs:
+ $(Q)$(MAKE) -C $(FLASHFS_PATH)
+ $(Q)cp $(FLASHFS_PATH)/flashfs.jffs2 $(BUNDLE_GENBIN_PATH)/$(FLASHFS_NAME)