diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-23 09:01:34 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-23 09:01:34 +0100 |
commit | 4d356d886b6c895112b920541ce1e063e7b68ee5 (patch) | |
tree | 2c62f4a08b9e6dc911446ae636279c4900fa0f9f /target/linux | |
parent | 57709533db2c49e29acdb5a3aa20de1920fd87a8 (diff) | |
parent | 6647520d52d800175545414c027d75ac39c07ecc (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux')
-rw-r--r-- | target/linux/config/Config.in.flash | 4 | ||||
-rw-r--r-- | target/linux/config/Config.in.fs | 18 |
2 files changed, 17 insertions, 5 deletions
diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash index d8f4faf0f..03976a6d7 100644 --- a/target/linux/config/Config.in.flash +++ b/target/linux/config/Config.in.flash @@ -145,6 +145,6 @@ config ADK_TARGET_MTD config ADK_TARGET_MTD_SIZE int - default "33554432" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE - default "33554432" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL + default "16777216" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 + default "33554432" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 default "0" diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index a41a40263..3cb0517ac 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -11,9 +11,6 @@ config ADK_KERNEL_EXPORTFS boolean default y -config ADK_KERNEL_JFFS2_FS - boolean - config ADK_KERNEL_YAFFS_FS tristate @@ -51,6 +48,21 @@ config ADK_KERNEL_SQUASHFS_XZ boolean default n +config ADK_KERNEL_JFFS2_COMPRESSION_OPTIONS + boolean + default n + +config ADK_KERNEL_JFFS2_ZLIB + boolean + default n + +config ADK_KERNEL_JFFS2_FS + prompt "jffs2............................. JFFS2 filesystem" + select ADK_KERNEL_MISC_FILESYSTEMS + select ADK_KERNEL_JFFS2_COMPRESSION_OPTIONS + select ADK_KERNEL_JFFS2_ZLIB + boolean + config ADK_KERNEL_SQUASHFS prompt "squashfs.......................... SquashFS filesystem" boolean |