fs: Kconfig: Add a separate option for FS_CRAMFS

Rather than using CMD_CRAMFS for both the filesystem and its command, we
should have a separate option for each. This allows us to enable CRAMFS
support without the command, if desired, which reduces U-Boot's size
slightly.

Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: imply FS_CRAMFS for keymile]
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
index 8aa54281bee6311b46c9c91be9031dfbb2e75841..4a7e36e8fa4b904fb454ffe0b83f03f66e103a6a 100644 (file)
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
@@ -35,6 +35,7 @@ config TARGET_KM_KIRKWOOD
        bool "KM_KIRKWOOD Board"
        select BOARD_LATE_INIT
        imply CMD_CRAMFS
+       imply FS_CRAMFS
 
 config TARGET_NET2BIG_V2
        bool "LaCie 2Big Network v2 NAS Board"

diff --git a/arch/powerpc/cpu/mpc8260/Kconfig b/arch/powerpc/cpu/mpc8260/Kconfig
index 1a5ea73552ea9d731678f83c81e1cdd1d8383653..47bae55b9dbbfedefa00d2820c8d80b5df8e315e 100644 (file)
--- a/arch/powerpc/cpu/mpc8260/Kconfig
+++ b/arch/powerpc/cpu/mpc8260/Kconfig
@@ -11,6 +11,7 @@ choice
 config TARGET_KM82XX
        bool "Support km82xx"
        imply CMD_CRAMFS
+       imply FS_CRAMFS
 
 endchoice
 

diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index 4890e137704638a900419cf25798379a84b52723..7ebc27cd28a6971b4df54e0f3764c6da4eecf8ce 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -65,14 +65,17 @@ config TARGET_IDS8313
 config TARGET_KM8360
        bool "Support km8360"
        imply CMD_CRAMFS
+       imply FS_CRAMFS
 
 config TARGET_SUVD3
        bool "Support suvd3"
        imply CMD_CRAMFS
+       imply FS_CRAMFS
 
 config TARGET_TUXX1
        bool "Support tuxx1"
        imply CMD_CRAMFS
+       imply FS_CRAMFS
 
 config TARGET_TQM834X
        bool "Support TQM834x"

diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index 48896331284e6c8c9cf6916d732142c9f3bb3516..31c09649946baf46b2dd5aea9c0d944a852cff0a 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -322,6 +322,7 @@ config TARGET_KMP204X
        select ARCH_P2041
        select PHYS_64BIT
        imply CMD_CRAMFS
+       imply FS_CRAMFS
 
 config TARGET_XPEDITE520X
        bool "Support xpedite520x"

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 4145fcf056ca456ae0ac686519c4fac1311b8efc..54513988e89a5d86441139f50964cbf76a4bd8bb 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -901,6 +901,7 @@ config CMD_CBFS
 
 config CMD_CRAMFS
        bool "Enable the 'cramfs' command"
+       depends on FS_CRAMFS
        help
          This provides commands for dealing with CRAMFS (Compressed ROM
          filesystem). CRAMFS is useful when space is tight since files are

diff --git a/configs/UCP1020_SPIFLASH_defconfig b/configs/UCP1020_SPIFLASH_defconfig
index 4e5e0c16b8e7bdd7cce2141116e2c62d33183dec..2b3e4bd042c8938f480c41bd391c5431154c84e1 100644 (file)
--- a/configs/UCP1020_SPIFLASH_defconfig
+++ b/configs/UCP1020_SPIFLASH_defconfig
@@ -34,4 +34,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_FS_CRAMFS=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/UCP1020_defconfig b/configs/UCP1020_defconfig
index ae7cb256116c103826a3c9c33af11c3acb6b29cf..df0f8cc5f7bd8c81484caa05bd33877acba6be8e 100644 (file)
--- a/configs/UCP1020_defconfig
+++ b/configs/UCP1020_defconfig
@@ -34,4 +34,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_FS_CRAMFS=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index d6966d32c4276e94735413232ab6b349d3a0c6b8..7db9807e61120b2c80cab4a7921ea403cd7c52fe 100644 (file)
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -169,6 +169,7 @@ CONFIG_CONSOLE_TRUETYPE=y
 CONFIG_CONSOLE_TRUETYPE_CANTORAONE=y
 CONFIG_VIDEO_SANDBOX_SDL=y
 CONFIG_FS_CBFS=y
+CONFIG_FS_CRAMFS=y
 CONFIG_CMD_DHRYSTONE=y
 CONFIG_TPM=y
 CONFIG_LZ4=y

diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig
index 06ca3c652bcc6fac55eaf17cec4aea50aa7a3b44..d051fde990ff2670c77a6191259af9fc1dc59f0d 100644 (file)
--- a/configs/sandbox_noblk_defconfig
+++ b/configs/sandbox_noblk_defconfig
@@ -171,6 +171,7 @@ CONFIG_CONSOLE_TRUETYPE=y
 CONFIG_CONSOLE_TRUETYPE_CANTORAONE=y
 CONFIG_VIDEO_SANDBOX_SDL=y
 CONFIG_FS_CBFS=y
+CONFIG_FS_CRAMFS=y
 CONFIG_CMD_DHRYSTONE=y
 CONFIG_TPM=y
 CONFIG_LZ4=y

diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig
index a8ddb99c095df5b0871daae516f981152d73e025..ef41fce104ac597e0409dc3e1de96ba0b137af0e 100644 (file)
--- a/configs/sandbox_spl_defconfig
+++ b/configs/sandbox_spl_defconfig
@@ -175,6 +175,7 @@ CONFIG_CONSOLE_TRUETYPE=y
 CONFIG_CONSOLE_TRUETYPE_CANTORAONE=y
 CONFIG_VIDEO_SANDBOX_SDL=y
 CONFIG_FS_CBFS=y
+CONFIG_FS_CRAMFS=y
 CONFIG_CMD_DHRYSTONE=y
 CONFIG_TPM=y
 CONFIG_LZ4=y

diff --git a/fs/cramfs/Kconfig b/fs/cramfs/Kconfig
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..6c9f63d6fa78cfacb9836013018fee8e2b62b2c2 100644 (file)
--- a/fs/cramfs/Kconfig
+++ b/fs/cramfs/Kconfig
@@ -0,0 +1,7 @@
+config FS_CRAMFS
+       bool "Enable CRAMFS filesystem support"
+       help
+         This provides support for reading images from CRAMFS (Compressed ROM
+         filesystem). CRAMFS is useful when space is tight since files are
+         compressed. You can also enable CMD_CRAMFS to get command-line
+         access.