diff options
-rw-r--r-- | mk/image.mk | 3 | ||||
-rw-r--r-- | mk/modules.mk | 1 | ||||
-rw-r--r-- | package/e2fsprogs/Makefile | 11 | ||||
-rw-r--r-- | package/mtd/Makefile | 2 | ||||
-rw-r--r-- | target/foxboard/Makefile | 2 | ||||
-rw-r--r-- | target/foxboard/tools/mkfimage/mkfimage.c | 2 | ||||
-rw-r--r-- | target/linux/config/Config.in.fs | 6 | ||||
-rw-r--r-- | target/linux/config/Config.in.fsnet | 2 | ||||
-rw-r--r-- | target/linux/config/Config.in.nls | 76 | ||||
-rw-r--r-- | target/linux/config/Config.in.usb | 3 |
10 files changed, 55 insertions, 53 deletions
diff --git a/mk/image.mk b/mk/image.mk index c6f5ce266..a2a6bb176 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -71,9 +71,6 @@ ${BIN_DIR}/${ROOTFSSQUASHFS}: ${TARGET_DIR} cat ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel \ ${BUILD_DIR}/root.squashfs > \ ${BUILD_DIR}/${ROOTFSSQUASHFS} - # padding of images is required, foxboard only? - #dd if=${BUILD_DIR}/${ROOTFSSQUASHFS} of=${BIN_DIR}/${ROOTFSSQUASHFS} \ - bs=4063232 conv=sync $(MAKE_TRACE) imageclean: rm -f $(BIN_DIR)/$(ADK_TARGET)-* ${BUILD_DIR}/$(ADK_TARGET)-* diff --git a/mk/modules.mk b/mk/modules.mk index f1760baa8..734fd4435 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -568,6 +568,7 @@ $(eval $(call KMOD_template,BLK_DEV_NBD,blk-dev-nbd,\ $(eval $(call KMOD_template,SCSI,scsi,\ $(MODULES_DIR)/kernel/drivers/scsi/scsi_wait_scan \ + $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod \ ,20)) $(eval $(call KMOD_template,BLK_DEV_SD,blk-dev-sd,\ diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 96ec1ce99..436bd3a13 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -5,10 +5,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= e2fsprogs PKG_VERSION:= 1.41.9 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 52f60a9e19a02f142f5546f1b5681927 PKG_DESCR:= Ext2/3/4 filesystem utilities PKG_SECTION:= admin +PKG_DEPENDS:= libcom-err libuuid libblkid libpthread PKG_URL:= http://e2fsprogs.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/} @@ -24,10 +25,10 @@ PKG_SECTION_SS:= libs include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,E2FSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_UUID},${PKG_SECTION_UUID})) -$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_COM_ERR},${PKG_SECTION_COM_ERR})) -$(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_SS},${PKG_SECTION_SS})) -$(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_BLKID},${PKG_SECTION_BLKID})) +$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_UUID},${PKG_SECTION_UUID})) +$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_COM_ERR},${PKG_SECTION_COM_ERR})) +$(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_SS},${PKG_SECTION_SS})) +$(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_BLKID},${PKG_SECTION_BLKID})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --enable-elf-shlibs \ diff --git a/package/mtd/Makefile b/package/mtd/Makefile index a04bd4693..92acee50f 100644 --- a/package/mtd/Makefile +++ b/package/mtd/Makefile @@ -18,6 +18,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MTD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +PKGDFLT_MTD= y + BUILD_STYLE:= manual INSTALL_STYLE:= manual diff --git a/target/foxboard/Makefile b/target/foxboard/Makefile index ffa6f4152..a21647355 100644 --- a/target/foxboard/Makefile +++ b/target/foxboard/Makefile @@ -12,7 +12,7 @@ $(TOOLS_BUILD_DIR): tools-compile: $(TOOLS_BUILD_DIR) $(MAKE) -C tools/mkfimage - $(MAKE) -C tools/e100boot prepare compile install $(MAKE_TRACE) + $(MAKE) -C tools/e100boot prepare compile install $(MAKE) -C ../tools/squashfs prepare compile install $(INSTALL_BIN) tools/boot_linux $(BIN_DIR)/ diff --git a/target/foxboard/tools/mkfimage/mkfimage.c b/target/foxboard/tools/mkfimage/mkfimage.c index 6904170cf..b1897fbd7 100644 --- a/target/foxboard/tools/mkfimage/mkfimage.c +++ b/target/foxboard/tools/mkfimage/mkfimage.c @@ -37,7 +37,7 @@ int main(int argc, char **argv){ for(loop = 0; loop < (64 * 1024) - sizeof(magic_str); loop++){ if(buffer[loop] == magic_str[0]){ if((magic = strstr(&buffer[loop], magic_str))){ - printf("Magic at 0x%.08X %p %p\n", magic - buffer, magic, buffer); + //printf("Magic at 0x%.08X %p %p\n", magic - buffer, magic, buffer); printf("Found Magic %X%X%X%X\n", buffer[loop + strlen(magic_str)], buffer[loop + strlen(magic_str) + 2], diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index 8631b486e..f075c4749 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -83,7 +83,7 @@ config ADK_KPACKAGE_KMOD_EXT4_FS config ADK_KPACKAGE_KMOD_HFSPLUS_FS prompt "kmod-fs-hfsplus................... HFS+ filesystem support" tristate - select ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS select ADK_KPACKAGE_KMOD_NLS_UTF8 default n help @@ -101,7 +101,7 @@ source "package/ntfs-3g/Config.in" config ADK_KPACKAGE_KMOD_NTFS_FS prompt "kmod-fs-ntfs...................... NTFS file system support" tristate - select ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS default n help NTFS is the file system of Microsoft Windows NT, 2000, XP and 2003. @@ -133,7 +133,7 @@ config ADK_KERNEL_FAT_FS config ADK_KPACKAGE_KMOD_VFAT_FS prompt "kmod-fs-vfat...................... VFAT filesystem support" select ADK_KERNEL_FAT_FS - select ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS select ADK_KPACKAGE_KMOD_NLS_CODEPAGE_850 select ADK_KPACKAGE_KMOD_NLS_ISO8859_1 tristate diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet index 78c21d52c..71236c47f 100644 --- a/target/linux/config/Config.in.fsnet +++ b/target/linux/config/Config.in.fsnet @@ -1,6 +1,6 @@ config ADK_KPACKAGE_KMOD_CIFS prompt "kmod-fs-cifs...................... CIFS support" - select ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS tristate default n help diff --git a/target/linux/config/Config.in.nls b/target/linux/config/Config.in.nls index 6933bad20..517f5b5f9 100644 --- a/target/linux/config/Config.in.nls +++ b/target/linux/config/Config.in.nls @@ -23,7 +23,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_437 prompt "kmod-nls-codepage-437........... Codepage 437 (United States, Canada)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored @@ -38,7 +38,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_737 prompt "kmod-nls-codepage-737........... Codepage 737 (Greek)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored @@ -53,7 +53,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_775 prompt "kmod-nls-codepage-775........... Codepage 775 (Baltic Rim)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored @@ -69,7 +69,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_850 prompt "kmod-nls-codepage-850........... Codepage 850 (Western European Languages)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -86,7 +86,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_852 prompt "kmod-nls-codepage-852........... Codepage 852 (Eastern European Languages)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -104,7 +104,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_855 prompt "kmod-nls-codepage-855........... Codepage 855 (Cyrillic)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -118,7 +118,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_857 prompt "kmod-nls-codepage-857........... Codepage 857 (Turkish)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -132,7 +132,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_860 prompt "kmod-nls-codepage-860........... Codepage 860 (Portuguese)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -146,7 +146,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_861 prompt "kmod-nls-codepage-861........... Codepage 861 (Icelandic)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -160,7 +160,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_862 prompt "kmod-nls-codepage-862........... Codepage 862 (Hebrew)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -174,7 +174,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_863 prompt "kmod-nls-codepage-863........... Codepage 863 (French Canadian)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -189,7 +189,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_864 prompt "kmod-nls-codepage-864........... Codepage 864 (Arabic)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -203,7 +203,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_865 prompt "kmod-nls-codepage-865........... Codepage 865 (Norwegian, Danish)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -218,7 +218,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_866 prompt "kmod-nls-codepage-866........... Codepage 866 (Cyrillic/Russian)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -233,7 +233,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_869 prompt "kmod-nls-codepage-869........... Codepage 869 (Greek)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -247,7 +247,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_874 prompt "kmod-nls-codepage-874........... Codepage 874 (Thai)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -261,7 +261,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_932 prompt "kmod-nls-codepage-932........... Codepage 932 (Japanese)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -277,7 +277,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_936 prompt "kmod-nls-codepage-936........... Codepage 936 (Simplified Chinese)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -292,7 +292,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_949 prompt "kmod-nls-codepage-949........... Codepage 949 (Korean)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -306,7 +306,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_950 prompt "kmod-nls-codepage-950........... Codepage 950 (Traditional Chinese)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -321,7 +321,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_1250 prompt "kmod-nls-codepage-1250.......... Codepage 1250 (Slavic/Central European)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CDROMs @@ -335,7 +335,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_1251 prompt "kmod-nls-codepage-1251.......... Codepage 1251 (Bulgarian, Belarusian)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -350,7 +350,7 @@ config ADK_KPACKAGE_KMOD_NLS_ASCII prompt "kmod-nls-ascii.................. ASCII (United States)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help An ASCII NLS module is needed if you want to override the DEFAULT NLS with this very basic charset and don't want any @@ -360,7 +360,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_1 prompt "kmod-nls-iso8859-1.............. NLS ISO 8859-1 (Latin-1; Western European Languages)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -375,7 +375,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_2 prompt "kmod-nls-iso8859-2.............. NLS ISO 8859-2 (Latin-2; Central European Languages)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -389,7 +389,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_3 prompt "kmod-nls-iso8859-3.............. NLS ISO 8859-3 (Latin-3; Esperanto, Galician, Maltese, Turkish)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -402,7 +402,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_4 prompt "kmod-nls-iso8859-4.............. NLS ISO 8859-4 (Latin-4; old Baltic charset)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -415,7 +415,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_5 prompt "kmod-nls-iso8859-5.............. NLS ISO 8859-5 (Cyrillic)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -429,7 +429,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_6 prompt "kmod-nls-iso8859-6.............. NLS ISO 8859-6 (Arabic)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -441,7 +441,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_7 prompt "kmod-nls-iso8859-7.............. NLS ISO 8859-7 (Greek)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -453,7 +453,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_8 prompt "kmod-nls-iso8859-8.............. NLS ISO 8859-8 (Hebrew)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -465,7 +465,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_9 prompt "kmod-nls-iso8859-9.............. NLS ISO 8859-9 (Latin-5; Turkish)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -478,7 +478,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_13 prompt "kmod-nls-iso8859-13............. NLS ISO 8859-13 (Latin-7; Baltic Rim)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -491,7 +491,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_14 prompt "kmod-nls-iso8859-14............. NLS ISO 8859-14 (Latin-8; Celtic)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -505,7 +505,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_15 prompt "kmod-nls-iso8859-15............. NLS ISO 8859-15 (Latin-9; Western European Languages with Euro)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -524,7 +524,7 @@ config ADK_KPACKAGE_KMOD_NLS_KOI8_R prompt "kmod-nls-koi8-r................. NLS KOI8-R (Cryllic for Russian and Bulgarian" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -536,7 +536,7 @@ config ADK_KPACKAGE_KMOD_NLS_KOI8_U prompt "kmod-nls-koi8-u................. NLS KOI8-U (Cyrillic for Russian, Bulgarian and Ukrainian" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -548,7 +548,7 @@ config ADK_KPACKAGE_KMOD_NLS_UTF8 prompt "kmod-nls-utf8................... NLS UTF8" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index f66fbeee0..57b2a649f 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -15,8 +15,9 @@ config ADK_KERNEL_USB_SERIAL config ADK_KPACKAGE_KMOD_USB prompt "kmod-usb-core..................... USB support" tristate - default y if ADK_LINUX_X86_ALIX1C || ADK_LINUX_CRIS_FOXBOARD + default y if ADK_LINUX_X86_ALIX1C default n + depends on !ADK_LINUX_CRIS_FOXBOARD select ADK_KERNEL_NLS select ADK_KERNEL_USB_DEVICEFS help |