diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/config/Config.in | 17 | ||||
| -rw-r--r-- | target/linux/config/Config.in.flash | 4 | ||||
| -rw-r--r-- | target/linux/config/Config.in.fs | 18 | ||||
| -rw-r--r-- | target/microblaze/sys-available/qemu-microblaze | 1 | ||||
| -rw-r--r-- | target/microblaze/sys-available/qemu-microblazeel | 1 |
5 files changed, 30 insertions, 11 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index 6125a2c81..84f19adec 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -218,12 +218,12 @@ choice prompt "Qemu MICROBLAZE Emulation" depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE || ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL -config ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 - boolean "Xilinx ml605" - config ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 boolean "Xilinx Spartan S3ADSP1800" +config ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 + boolean "Xilinx ml605" + endchoice choice @@ -254,6 +254,8 @@ choice prompt "Qemu Emulation with permanent storage device (disk/flash)" depends on ADK_HARDWARE_QEMU default ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_ROOTFS_ARCHIVE +default ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_ROOTFS_SQUASHFS +default ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_ROOTFS_JFFS2 config ADK_TARGET_QEMU_WITHOUT_BLOCK boolean "disabled" @@ -261,12 +263,14 @@ config ADK_TARGET_QEMU_WITHOUT_BLOCK config ADK_TARGET_QEMU_WITH_BLOCK boolean "enabled" select ADK_KERNEL_SCSI_SYM53C8XX_2 if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB - select ADK_KERNEL_MTD_M25P80 if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 + select ADK_KERNEL_MTD_M25P80 if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 || ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 select ADK_KERNEL_ATA_PIIX if ADK_LINUX_MIPS || ADK_TARGET_SYSTEM_QEMU_I686 || ADK_TARGET_SYSTEM_QEMU_X86_64 select ADK_KERNEL_PATA_MACIO if ADK_TARGET_SYSTEM_QEMU_PPC select ADK_KERNEL_SCSI_IBMVSCSI if ADK_TARGET_SYSTEM_QEMU_PPC64 select ADK_KERNEL_SCSI_SUNESP if ADK_TARGET_SYSTEM_QEMU_SPARC select ADK_KERNEL_PATA_PLATFORM if ADK_LINUX_SH + select ADK_HOST_NEED_JFFS2 if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 || ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 + select ADK_HOST_NEED_SQUASHFS if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 || ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 endchoice @@ -773,15 +777,16 @@ config ADK_TARGET_ROOTFS_SQUASHFS bool "Compressed read-only root filesystem (squashfs)" select ADK_KERNEL_SQUASHFS select ADK_HOST_NEED_SQUASHFS + select ADK_TARGET_QEMU_WITH_BLOCK if ADK_HARDWARE_QEMU depends on ADK_TARGET_WITH_MTD help highly compressed read-only filesystem for MTD flash systems. config ADK_TARGET_ROOTFS_JFFS2 bool "Compressed read-write root filesystem (jffs2)" - select ADK_KERNEL_MISC_FILESYSTEMS - select ADK_KERNEL_JFFS2 + select ADK_KERNEL_JFFS2_FS select ADK_HOST_NEED_JFFS2 + select ADK_TARGET_QEMU_WITH_BLOCK if ADK_HARDWARE_QEMU depends on ADK_TARGET_WITH_MTD help compressed read-write filesystem for MTD flash systems. 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 diff --git a/target/microblaze/sys-available/qemu-microblaze b/target/microblaze/sys-available/qemu-microblaze index 63214e39b..ee9cb6a52 100644 --- a/target/microblaze/sys-available/qemu-microblaze +++ b/target/microblaze/sys-available/qemu-microblaze @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_QEMU_MICROBLAZE select ADK_big select ADK_qemu_microblaze select ADK_HARDWARE_QEMU + select ADK_TARGET_WITH_MTD select ADK_TARGET_KERNEL_LINUXBIN help Qemu support for microblaze big endian architecture. diff --git a/target/microblaze/sys-available/qemu-microblazeel b/target/microblaze/sys-available/qemu-microblazeel index a58083770..88c1c25db 100644 --- a/target/microblaze/sys-available/qemu-microblazeel +++ b/target/microblaze/sys-available/qemu-microblazeel @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL select ADK_qemu_microblazeel select ADK_little select ADK_HARDWARE_QEMU + select ADK_TARGET_WITH_MTD select ADK_TARGET_KERNEL_LINUXBIN help Qemu support for microblaze little endian architecture. |