From 205b60bb367cc792eb972f711f6ecd1d62902d08 Mon Sep 17 00:00:00 2001
From: Henning Heinold <henning@itconsulting-heinold.de>
Date: Tue, 3 Jun 2014 16:41:00 +0200
Subject: [PATCH 1/2] sysmocom-bsc: build nls support into the kernel

* to be able to mount vfat formatted
  usbsticks we need the nls subsystem

* providing nls as modules is a bad idea because
  you need to add them at image creation

* better include them into the kernel,
  like the kernel for bts and bts-2050 does
---
 .../linux-sysmocom/sysmocom-bsc/defconfig     | 49 +++++++++----------
 recipes-bsp/linux/linux-sysmocom_git.bb       |  2 +-
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/recipes-bsp/linux/linux-sysmocom/sysmocom-bsc/defconfig b/recipes-bsp/linux/linux-sysmocom/sysmocom-bsc/defconfig
index dc9ff0b..dd01c2b 100644
--- a/recipes-bsp/linux/linux-sysmocom/sysmocom-bsc/defconfig
+++ b/recipes-bsp/linux/linux-sysmocom/sysmocom-bsc/defconfig
@@ -107,7 +107,6 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
 # RCU Subsystem
 #
 CONFIG_TREE_PREEMPT_RCU=y
-# CONFIG_TINY_PREEMPT_RCU is not set
 CONFIG_PREEMPT_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_FANOUT=32
@@ -2917,31 +2916,31 @@ CONFIG_CIFS_DEBUG=y
 # CONFIG_AFS_FS is not set
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="iso8859-1"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
 CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+CONFIG_NLS_CODEPAGE_864=y
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_ISO8859_2=m
 CONFIG_NLS_ISO8859_3=m
 CONFIG_NLS_ISO8859_4=m
diff --git a/recipes-bsp/linux/linux-sysmocom_git.bb b/recipes-bsp/linux/linux-sysmocom_git.bb
index d46569d..53a5a35 100644
--- a/recipes-bsp/linux/linux-sysmocom_git.bb
+++ b/recipes-bsp/linux/linux-sysmocom_git.bb
@@ -16,7 +16,7 @@ BTS_FIRMWARE_NAME_sysmobts-2050 = "sysmobts-v2"
 
 SRCREV = "63f1162771d2ac5581e73cc4912dc1dd0b2279e6"
 
-PR = "r34"
+PR = "r35"
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
 SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=v3.10 \

From 32746ad2ebafe956b6d1bba2fa78d348752e1a59 Mon Sep 17 00:00:00 2001
From: Henning Heinold <henning@itconsulting-heinold.de>
Date: Tue, 3 Jun 2014 16:46:18 +0200
Subject: [PATCH 2/2] bts-images: Remove the nls modules

The nls support to mount fat/vfat filesystems should be enabled
in all sysmocomkernel images.

Fixes: SYS#371
---
 recipes-apps/images/sysmocom-bsc-image.bb        | 1 -
 yocto-dora/core-image-minimal-initramfs.bbappend | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/recipes-apps/images/sysmocom-bsc-image.bb b/recipes-apps/images/sysmocom-bsc-image.bb
index cad29c0..6e74f85 100644
--- a/recipes-apps/images/sysmocom-bsc-image.bb
+++ b/recipes-apps/images/sysmocom-bsc-image.bb
@@ -1,6 +1,5 @@
 require sysmocom-image.inc
 
-IMAGE_INSTALL += "kernel-module-nls-iso8859-1 kernel-module-nls-cp437"
 IMAGE_LINGUAS = " "
 
 # This variant of the image will run osmo-bts and osmo-bsc
diff --git a/yocto-dora/core-image-minimal-initramfs.bbappend b/yocto-dora/core-image-minimal-initramfs.bbappend
index 6d8febe..09b1baa 100644
--- a/yocto-dora/core-image-minimal-initramfs.bbappend
+++ b/yocto-dora/core-image-minimal-initramfs.bbappend
@@ -1,2 +1,2 @@
-# add needed modules for vfat and e2fsprogs for resize2fs
-IMAGE_INSTALL_append = " kernel-module-nls-iso8859-1 kernel-module-nls-cp437 e2fsprogs "
+# add e2fsprogs for resize2fs need for bts installation
+IMAGE_INSTALL_append = " e2fsprogs "