summaryrefslogtreecommitdiff
path: root/target/linux/config
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/config')
-rw-r--r--target/linux/config/Config.in.block4
-rw-r--r--target/linux/config/Config.in.fs9
-rw-r--r--target/linux/config/Config.in.microblaze4
3 files changed, 15 insertions, 2 deletions
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index bbd9ce745..fb5bf080f 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -28,6 +28,9 @@ config ADK_KERNEL_SCSI
config ADK_KERNEL_BLK_DEV_SD
boolean
+config ADK_KERNEL_BLK_DEV_SR
+ boolean
+
config ADK_KERNEL_ISCSI_TCP
boolean
@@ -324,6 +327,7 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_SD
config ADK_KPACKAGE_KMOD_BLK_DEV_SR
prompt "kmod-scsi-cdrom................... SCSI CDROM support"
depends on !ADK_KERNEL_SCSI
+ depends on !ADK_KERNEL_BLK_DEV_SR
depends on ADK_KPACKAGE_KMOD_SCSI
tristate
help
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index ab048805e..10b2d7e1b 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -172,7 +172,8 @@ config ADK_KPACKAGE_KMOD_VFAT_FS
prompt "kmod-vfat-fs...................... VFAT filesystem support"
tristate
select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
- select ADK_KPACKAGE_KMOD_NLS_UTF8
+ select ADK_KPACKAGE_KMOD_NLS_CODEPAGE_850
+ select ADK_KPACKAGE_KMOD_NLS_ISO8859_1
select ADK_KERNEL_BLOCK
default y if ADK_TARGET_WITH_MMC
default n
@@ -227,7 +228,11 @@ config ADK_KPACKAGE_KMOD_FUSE_FS
fuse-utils.
config ADK_KERNEL_JOLIET
- bool
+ boolean
+ default n
+
+config ADK_KERNEL_ISO9660_FS
+ boolean
default n
config ADK_KPACKAGE_KMOD_ISO9660_FS
diff --git a/target/linux/config/Config.in.microblaze b/target/linux/config/Config.in.microblaze
new file mode 100644
index 000000000..5a6764250
--- /dev/null
+++ b/target/linux/config/Config.in.microblaze
@@ -0,0 +1,4 @@
+config ADK_KERNEL_OPT_LIB_ASM
+ default y if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE
+ default n
+ boolean