NLS_UTF8:

* NLS/UTF-8 is built into the kernel since 05.2x (except for IKS layout), consider this while offering the corresponding Freetz menuconfig option * refs #2464, closes #2729 git-svn-id: file:///var/svn/freetz/trunk@13070 149334a1-2f27-0410-a3b9-fc62619ac1e6
olistudent · Apr 21, 2015 · fd3cbfe · fd3cbfe
1 parent 9ac6bf5
commit fd3cbfe
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 4 deletions.
diff --git a/config/avm/features.in b/config/avm/features.in
@@ -405,6 +405,20 @@ config FREETZ_AVM_HAS_EXT4_BUILTIN
 	help
 		Select this if the original firmware has support for ext4 filesystem built into the kernel.
 
+config FREETZ_AVM_HAS_NLS_UTF8_BUILTIN
+	bool "UTF-8 support built into the kernel"	if FREETZ_TYPE_CUSTOM
+	default y	if FREETZ_AVM_VERSION_05_2X_MIN \
+			&& ( \
+			FREETZ_KERNEL_LAYOUT_AR9  || \
+			FREETZ_KERNEL_LAYOUT_AR10 || \
+			FREETZ_KERNEL_LAYOUT_UR8  || \
+			FREETZ_KERNEL_LAYOUT_VR9     \
+			)
+	# disabled in AVM's kernel .config's for IKS
+	default n
+	help
+		Select this if the original firmware has NLS/UTF-8 support built into the kernel.
+
 config FREETZ_AVM_HAS_ISOFS
 	bool "isofs.ko"		if FREETZ_TYPE_CUSTOM
 	default y		if \

diff --git a/config/ui/modules.in b/config/ui/modules.in
@@ -370,7 +370,7 @@ config FREETZ_MODULE_hfs
 
 config FREETZ_MODULE_hfsplus
 	bool "hfsplus.ko"
-	select FREETZ_MODULE_nls_utf8
+	select FREETZ_MODULE_nls_utf8 if !FREETZ_AVM_HAS_NLS_UTF8_BUILTIN
 	default n
 
 config FREETZ_MODULE_fuse
@@ -443,6 +443,7 @@ config FREETZ_MODULE_nls_iso8859_1
 
 config FREETZ_MODULE_nls_utf8
 	bool "nls_utf8.ko"
+	depends on !FREETZ_AVM_HAS_NLS_UTF8_BUILTIN # && any kernel version
 	default n
 
 config FREETZ_MODULE_reiserfs

diff --git a/make/linux/configs/avm2freetz.sh b/make/linux/configs/avm2freetz.sh
@@ -44,7 +44,9 @@ fs_related() {
 	| \
 	m_if_disabled CONFIG_CIFS \
 	| \
-	m_if_disabled CONFIG_HFS_FS CONFIG_HFSPLUS_FS
+	m_if_disabled CONFIG_HFS_FS CONFIG_HFSPLUS_FS \
+	| \
+	m_if_disabled CONFIG_NLS_UTF8
 }
 
 block_related() {

diff --git a/make/linux/configs/freetz/config-ohio-04.80 b/make/linux/configs/freetz/config-ohio-04.80
@@ -1312,7 +1312,7 @@ CONFIG_NLS_ISO8859_1=m
 CONFIG_NLS_ISO8859_15=m
 # CONFIG_NLS_KOI8_R is not set
 # CONFIG_NLS_KOI8_U is not set
-CONFIG_NLS_UTF8=y
+CONFIG_NLS_UTF8=m
 
 #
 # Kernel hacking

diff --git a/make/linux/configs/freetz/config-ohio-04.87 b/make/linux/configs/freetz/config-ohio-04.87
@@ -1310,7 +1310,7 @@ CONFIG_NLS_ISO8859_1=m
 CONFIG_NLS_ISO8859_15=m
 # CONFIG_NLS_KOI8_R is not set
 # CONFIG_NLS_KOI8_U is not set
-CONFIG_NLS_UTF8=y
+CONFIG_NLS_UTF8=m
 
 #
 # Kernel hacking