Browse Source

add partition types, cleanup fsnet

Waldemar Brodkorb 10 years ago
parent
commit
ecbc374476

+ 4 - 0
target/linux/config/Config.in.block

@@ -103,6 +103,9 @@ config ADK_KERNEL_MMC_BCM2835
 config ADK_KERNEL_MMC_BCM2835_DMA
 config ADK_KERNEL_MMC_BCM2835_DMA
 	bool
 	bool
 
 
+config ADK_KERNEL_MMC_BCM2835_SDHOST
+	bool
+
 menu "SATA/PATA devices support"
 menu "SATA/PATA devices support"
 depends on ADK_TARGET_WITH_PATA || ADK_TARGET_WITH_SATA || ADK_TARGET_QEMU || ADK_TARGET_VBOX
 depends on ADK_TARGET_WITH_PATA || ADK_TARGET_WITH_SATA || ADK_TARGET_QEMU || ADK_TARGET_VBOX
 
 
@@ -338,6 +341,7 @@ config ADK_KERNEL_MMC_BCM2835
 	select ADK_KERNEL_MMC_SDHCI
 	select ADK_KERNEL_MMC_SDHCI
 	select ADK_KERNEL_MMC_SDHCI_PLTFM
 	select ADK_KERNEL_MMC_SDHCI_PLTFM
 	select ADK_KERNEL_MMC_BCM2835_DMA
 	select ADK_KERNEL_MMC_BCM2835_DMA
+	select ADK_KERNEL_MMC_BCM2835_SDHOST
 	depends on ADK_TARGET_BOARD_BCM28XX
 	depends on ADK_TARGET_BOARD_BCM28XX
 	default y if ADK_TARGET_BOARD_BCM28XX
 	default y if ADK_TARGET_BOARD_BCM28XX
 	default n
 	default n

+ 1 - 0
target/linux/config/Config.in.fs

@@ -254,6 +254,7 @@ config ADK_KERNEL_INOTIFY_USER
 	  descriptor, which is also select()- and poll()-able.
 	  descriptor, which is also select()- and poll()-able.
 
 
 endmenu
 endmenu
+source target/linux/config/Config.in.part
 source target/linux/config/Config.in.fsnet
 source target/linux/config/Config.in.fsnet
 source target/linux/config/Config.in.nls
 source target/linux/config/Config.in.nls
 source target/linux/config/Config.in.aufs
 source target/linux/config/Config.in.aufs

+ 11 - 29
target/linux/config/Config.in.fsnet

@@ -1,12 +1,10 @@
 menu "Network filesystems"
 menu "Network filesystems"
 
 
 config ADK_KERNEL_FS_POSIX_ACL
 config ADK_KERNEL_FS_POSIX_ACL
-	boolean
+	bool
-	default y
 
 
 config ADK_KERNEL_CIFS
 config ADK_KERNEL_CIFS
-	prompt "CIFS support"
+	tristate "CIFS support"
-	tristate
 	select ADK_KERNEL_NETWORK_FILESYSTEMS
 	select ADK_KERNEL_NETWORK_FILESYSTEMS
 	select ADK_KERNEL_CRYPTO_MD4
 	select ADK_KERNEL_CRYPTO_MD4
         select ADK_KERNEL_CRYPTO_MD5
         select ADK_KERNEL_CRYPTO_MD5
@@ -16,7 +14,6 @@ config ADK_KERNEL_CIFS
         select ADK_KERNEL_CRYPTO_DES
         select ADK_KERNEL_CRYPTO_DES
         select ADK_KERNEL_CRYPTO_SHA256
         select ADK_KERNEL_CRYPTO_SHA256
 	select ADK_KERNEL_NLS_UTF8
 	select ADK_KERNEL_NLS_UTF8
-	default n
 	help
 	help
 	  This is the client VFS module for the Common Internet File System
 	  This is the client VFS module for the Common Internet File System
 	  (CIFS) protocol which is the successor to the Server Message Block 
 	  (CIFS) protocol which is the successor to the Server Message Block 
@@ -41,33 +38,27 @@ config ADK_KERNEL_CIFS
 	  to mount to Samba or Windows from this machine, say Y.
 	  to mount to Samba or Windows from this machine, say Y.
 
 
 config ADK_KERNEL_CODA_FS
 config ADK_KERNEL_CODA_FS
-	prompt "Support for CODA filesystem"
+	tristate "Support for CODA filesystem"
-	tristate
 	select ADK_KERNEL_NETWORK_FILESYSTEMS
 	select ADK_KERNEL_NETWORK_FILESYSTEMS
-	default n
 	help
 	help
 	  This is the kernel part of the client for the CODA filesystem.
 	  This is the kernel part of the client for the CODA filesystem.
 
 
 config ADK_KERNEL_NFS_V3
 config ADK_KERNEL_NFS_V3
-	boolean
+	bool
-	default n
+	select ADK_KERNEL_NETWORK_FILESYSTEMS
 
 
 config ADK_KERNEL_NFS_V4
 config ADK_KERNEL_NFS_V4
-	boolean
+	bool
 	select ADK_KERNEL_NETWORK_FILESYSTEMS
 	select ADK_KERNEL_NETWORK_FILESYSTEMS
-	default y if ADK_PACKAGE_NFS_UTILS_V4
-	default n
 
 
 config ADK_KERNEL_NFS_FS
 config ADK_KERNEL_NFS_FS
-	prompt "NFS client support"
+	tristate "NFS client support"
-	tristate
 	select ADK_KERNEL_NFS_V3
 	select ADK_KERNEL_NFS_V3
 	select ADK_KERNEL_FILE_LOCKING
 	select ADK_KERNEL_FILE_LOCKING
 	select ADK_KERNEL_DNOTIFY
 	select ADK_KERNEL_DNOTIFY
 	select ADK_KERNEL_SUNRPC
 	select ADK_KERNEL_SUNRPC
 	select ADK_KERNEL_LOCKD
 	select ADK_KERNEL_LOCKD
 	select ADK_KERNEL_NETWORK_FILESYSTEMS
 	select ADK_KERNEL_NETWORK_FILESYSTEMS
-	default n
 	help
 	help
 	  If you are connected to some other (usually local) Unix computer
 	  If you are connected to some other (usually local) Unix computer
 	  (using SLIP, PLIP, PPP or Ethernet) and want to mount files residing
 	  (using SLIP, PLIP, PPP or Ethernet) and want to mount files residing
@@ -103,18 +94,16 @@ config ADK_KERNEL_NFS_FS
 	  Kernel modules for NFS client support
 	  Kernel modules for NFS client support
 
 
 config ADK_KERNEL_NFSD_V3
 config ADK_KERNEL_NFSD_V3
-	boolean
+	bool
-	default n
 
 
 config ADK_KERNEL_NFSD_V4
 config ADK_KERNEL_NFSD_V4
-	boolean
+	bool
 	select ADK_KERNEL_SUNRPC_GSS
 	select ADK_KERNEL_SUNRPC_GSS
 	default y if ADK_PACKAGE_NFS_UTILS_V4
 	default y if ADK_PACKAGE_NFS_UTILS_V4
 	default n
 	default n
 
 
 config ADK_KERNEL_NFSD
 config ADK_KERNEL_NFSD
-	prompt "NFS server support"
+	tristate "NFS server support"
-	tristate
 	select ADK_KERNEL_EXPORTFS
 	select ADK_KERNEL_EXPORTFS
 	select ADK_KERNEL_NFSD_V3
 	select ADK_KERNEL_NFSD_V3
 	select ADK_KERNEL_DNOTIFY
 	select ADK_KERNEL_DNOTIFY
@@ -122,7 +111,6 @@ config ADK_KERNEL_NFSD
 	select ADK_KERNEL_SUNRPC
 	select ADK_KERNEL_SUNRPC
 	select ADK_KERNEL_LOCKD
 	select ADK_KERNEL_LOCKD
 	select ADK_KERNEL_NETWORK_FILESYSTEMS
 	select ADK_KERNEL_NETWORK_FILESYSTEMS
-	default n
 	help
 	help
 	  If you want your Linux box to act as an NFS *server*, so that other
 	  If you want your Linux box to act as an NFS *server*, so that other
 	  computers on your local network which support NFS can access certain
 	  computers on your local network which support NFS can access certain
@@ -145,20 +133,16 @@ config ADK_KERNEL_NFSD
 
 
 config ADK_KERNEL_LOCKD
 config ADK_KERNEL_LOCKD
 	tristate
 	tristate
-	default n
 
 
 config ADK_KERNEL_SUNRPC
 config ADK_KERNEL_SUNRPC
 	tristate
 	tristate
-	default n
 
 
 config ADK_KERNEL_SUNRPC_GSS
 config ADK_KERNEL_SUNRPC_GSS
 	tristate
 	tristate
 	select ADK_KERNEL_SUNRPC
 	select ADK_KERNEL_SUNRPC
-	default n
 
 
 config ADK_KERNEL_RPCSEC_GSS_KRB5
 config ADK_KERNEL_RPCSEC_GSS_KRB5
-	prompt "RPC security support"
+	tristate "RPC security support"
-	tristate
 	select ADK_KERNEL_NETWORK_FILESYSTEMS
 	select ADK_KERNEL_NETWORK_FILESYSTEMS
 	select ADK_KERNEL_SUNRPC_GSS
 	select ADK_KERNEL_SUNRPC_GSS
 	select ADK_KERNEL_SUNRPC
 	select ADK_KERNEL_SUNRPC
@@ -172,7 +156,5 @@ config ADK_KERNEL_RPCSEC_GSS_KRB5
 	select ADK_KERNEL_CRYPTO_SHA1
 	select ADK_KERNEL_CRYPTO_SHA1
 	select ADK_KERNEL_CRYPTO_AES
 	select ADK_KERNEL_CRYPTO_AES
 	select ADK_KERNEL_CRYPTO_ARC4
 	select ADK_KERNEL_CRYPTO_ARC4
-	default n
-	help
 
 
 endmenu
 endmenu

+ 11 - 0
target/linux/config/Config.in.part

@@ -0,0 +1,11 @@
+menu "Partition Types"
+
+config ADK_KERNEL_PARTITION_ADVANCED
+	bool
+	default y
+
+config ADK_KERNEL_MSDOS_PARTITION
+	bool
+	default y
+
+endmenu