Skip to contentSkip to conversation

Pramfs: Makefile and Kconfig

PATCH In review Marco 3 participants 5 messages Jun 13, 2009 – Jun 14, 2009 VFS

lore
Share & tools
lore

Marco

author
#0 lore raw

PATCH 8/14 Pramfs: Makefile and Kconfig

From: Marco Stornelli <[email protected]>

Makefile and Kconfig.

Signed-off-by Marco Stornelli <[email protected]>

---

fs/Kconfig +2 -1
diff -uprN linux-2.6.30-orig/fs/Kconfig linux-2.6.30/fs/Kconfig
@@ -13,7 +13,7 @@ source "fs/ext4/Kconfig"
 config FS_XIP
 # execute in place
 	bool
-	depends on EXT2_FS_XIP
+	depends on EXT2_FS_XIP || PRAMFS_XIP
 	default y
 
 source "fs/jbd/Kconfig"

@@ -176,6 +176,7 @@ source "fs/romfs/Kconfig"
 source "fs/sysv/Kconfig"
 source "fs/ufs/Kconfig"
 source "fs/exofs/Kconfig"
+source "fs/pramfs/Kconfig"
 
 config NILFS2_FS
 	tristate "NILFS2 file system support (EXPERIMENTAL)"
fs/Makefile +2 -0
diff -uprN linux-2.6.30-orig/fs/Makefile linux-2.6.30/fs/Makefile
@@ -124,3 +124,5 @@ obj-$(CONFIG_OCFS2_FS)		+= ocfs2/
 obj-$(CONFIG_BTRFS_FS)		+= btrfs/
 obj-$(CONFIG_GFS2_FS)           += gfs2/
 obj-$(CONFIG_EXOFS_FS)          += exofs/
+obj-$(CONFIG_PRAMFS)		+= pramfs/
+
fs/pramfs/Kconfig +51 -0

51 lines not on this page · raw message

fs/pramfs/Makefile +13 -0
diff -uprN linux-2.6.30-orig/fs/pramfs/Makefile linux-2.6.30/fs/pramfs/Makefile
@@ -0,0 +1,13 @@
+#
+# Makefile for the linux pram-filesystem routines.
+#
+
+obj-$(CONFIG_PRAMFS) += pramfs.o
+obj-$(CONFIG_TEST_MODULE) += pramfs_test.o
+
+pramfs-objs := balloc.o dir.o file.o inode.o namei.o super.o symlink.o
+
+ifneq ($(CONFIG_PRAMFS_NOWP),y)
+pramfs-objs += wprotect.o
+endif
+pramfs-$(CONFIG_PRAMFS_XIP) += xip.o
#1 lore raw

fs/pramfs/Kconfig line 25

Quoted 7 lines
fs/pramfs/Kconfig +7 -0
+
+config PRAMFS_NOWP
+	bool "Disable PRAMFS write protection"
+	depends on PRAMFS
+	default n
+	help
+	   Say Y here to disable the write protect feature of PRAMFS.

n is default so "default n" is not needed.
If you reverse the logic (and add a default y) then..

fs/pramfs/Makefile line 12

Quoted 3 lines
fs/pramfs/Makefile +3 -0
+ifneq ($(CONFIG_PRAMFS_NOWP),y)
+pramfs-objs += wprotect.o
+endif

This is a trivial:
pramfs-$(PRAMFS_WRITE_PROTECT) += wprotect.o

(I renamed the option to something more descriptive - please do so in the abvoe).

fs/pramfs/Makefile line 8

Quoted 10 lines

+++ linux-2.6.30/fs/pramfs/Makefile 2009-04-19 11:58:51.000000000 +0200

fs/pramfs/Makefile +8 -0
@@ -0,0 +1,13 @@
+#
+# Makefile for the linux pram-filesystem routines.
+#
+
+obj-$(CONFIG_PRAMFS) += pramfs.o
+obj-$(CONFIG_TEST_MODULE) += pramfs_test.o
+
+pramfs-objs := balloc.o dir.o file.o inode.o namei.o super.o symlink.o

Use:
pramfs-y := balloc.o ...

This match usa later in this file.

fs/pramfs/Makefile line 13

Quoted 5 lines
fs/pramfs/Makefile +5 -0
+
+ifneq ($(CONFIG_PRAMFS_NOWP),y)
+pramfs-objs += wprotect.o
+endif
+pramfs-$(CONFIG_PRAMFS_XIP) += xip.o

Sam

author
#2 lore raw
Quoted 35 lines · Sam Ravnborg

fs/pramfs/Kconfig line 25

Quoted 7 lines
fs/pramfs/Kconfig +7 -0
+
+config PRAMFS_NOWP
+	bool "Disable PRAMFS write protection"
+	depends on PRAMFS
+	default n
+	help
+	   Say Y here to disable the write protect feature of PRAMFS.

n is default so "default n" is not needed.
If you reverse the logic (and add a default y) then..

fs/pramfs/Makefile line 12

Quoted 3 lines
fs/pramfs/Makefile +3 -0
+ifneq ($(CONFIG_PRAMFS_NOWP),y)
+pramfs-objs += wprotect.o
+endif

This is a trivial:
pramfs-$(PRAMFS_WRITE_PROTECT) += wprotect.o

(I renamed the option to something more descriptive - please do so in the abvoe).

fs/pramfs/Makefile line 8

Quoted 10 lines

+++ linux-2.6.30/fs/pramfs/Makefile 2009-04-19 11:58:51.000000000 +0200

fs/pramfs/Makefile +8 -0
@@ -0,0 +1,13 @@
+#
+# Makefile for the linux pram-filesystem routines.
+#
+
+obj-$(CONFIG_PRAMFS) += pramfs.o
+obj-$(CONFIG_TEST_MODULE) += pramfs_test.o
+
+pramfs-objs := balloc.o dir.o file.o inode.o namei.o super.o symlink.o

Use:
pramfs-y := balloc.o ...

This match usa later in this file.

Quoted 9 lines

fs/pramfs/Makefile line 13

Quoted 5 lines
fs/pramfs/Makefile +5 -0
+
+ifneq ($(CONFIG_PRAMFS_NOWP),y)
+pramfs-objs += wprotect.o
+endif
+pramfs-$(CONFIG_PRAMFS_XIP) += xip.o

Sam

Ok, thanks.

Marco

#3 lore raw
In reply to Marco
Quoted 7 lines · Marco

From: Marco Stornelli <[email protected]>

Makefile and Kconfig.

Signed-off-by Marco Stornelli <[email protected]>

---

You should move this patch to 11 of 14, as I think that is the point when the filesystem can actually be enabled and function. If this series is only applied up to this patch you can get build failures if you enabled PRAMFS, XIP, or any of the other features. Also breaking out the individual features menuconfig options like XIP, and write protect, etc, into their respective patches would be nice.

Daniel

author
#4 lore raw
Quoted 9 lines · Daniel Walker
Quoted 7 lines · Marco

From: Marco Stornelli <[email protected]>

Makefile and Kconfig.

Signed-off-by Marco Stornelli <[email protected]>

---

Quoted 10 lines

You should move this patch to 11 of 14, as I think that is the point when the filesystem can actually be enabled and function. If this series is only applied up to this patch you can get build failures if you enabled PRAMFS, XIP, or any of the other features. Also breaking out the individual features menuconfig options like XIP, and write protect, etc, into their respective patches would be nice.

Daniel

Ok Daniel thanks for your comments. Actually I split the patches by functionality because I think that for this series it's a little bit complicated to follow a sequence so as not to have building failure but I can try. I think the only part I can split is the XIP. I think there will be a lot of comments so I'll wait for other comments before to re-submit other patches.

Marco