From 0f6a89c788daf92c873a4455d18939a38821c034 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 9 Jul 2012 15:26:16 +0800 Subject: [PATCH 1/4] linux-sysmocom: Build the kernel with MMC support, package the modules Autoload mmc_block and the davinci_mmc module. This will load the mmc_core module as another dependency. --- recipes-bsp/linux/files/sysmobts-v2/defconfig | 51 ++++++++++++++++--- recipes-bsp/linux/linux-sysmocom_git.bb | 4 +- 2 files changed, 48 insertions(+), 7 deletions(-) diff --git a/recipes-bsp/linux/files/sysmobts-v2/defconfig b/recipes-bsp/linux/files/sysmobts-v2/defconfig index 93fa160f68..4ca8232052 100644 --- a/recipes-bsp/linux/files/sysmobts-v2/defconfig +++ b/recipes-bsp/linux/files/sysmobts-v2/defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.2.14 Kernel Configuration +# Linux/arm 3.2.19 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -880,6 +880,7 @@ CONFIG_EEPROM_AT24=y # CONFIG_EEPROM_LEGACY is not set # CONFIG_EEPROM_MAX6875 is not set # CONFIG_EEPROM_93CX6 is not set +# CONFIG_IWMC3200TOP is not set # # Texas Instruments shared transport line discipline @@ -1346,7 +1347,28 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_SOUND is not set # CONFIG_HID_SUPPORT is not set # CONFIG_USB_SUPPORT is not set -# CONFIG_MMC is not set +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set +# CONFIG_MMC_CLKGATE is not set + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_BOUNCE=y +# CONFIG_SDIO_UART is not set +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +# CONFIG_MMC_SDHCI is not set +# CONFIG_MMC_SDHCI_PXAV3 is not set +# CONFIG_MMC_SDHCI_PXAV2 is not set +CONFIG_MMC_DAVINCI=m +# CONFIG_MMC_DW is not set # CONFIG_MEMSTICK is not set CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y @@ -1420,8 +1442,22 @@ CONFIG_IOMMU_SUPPORT=y # File systems # # CONFIG_EXT2_FS is not set -# CONFIG_EXT3_FS is not set -# CONFIG_EXT4_FS is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_DEFAULTS_TO_ORDERED=y +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +CONFIG_EXT4_FS=m +CONFIG_EXT4_USE_FOR_EXT23=y +CONFIG_EXT4_FS_XATTR=y +# CONFIG_EXT4_FS_POSIX_ACL is not set +# CONFIG_EXT4_FS_SECURITY is not set +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_JBD2=m +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=m # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_XFS_FS is not set @@ -1454,8 +1490,11 @@ CONFIG_AUTOFS4_FS=y # # DOS/FAT/NT Filesystems # -# CONFIG_MSDOS_FS is not set -# CONFIG_VFAT_FS is not set +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # CONFIG_NTFS_FS is not set # diff --git a/recipes-bsp/linux/linux-sysmocom_git.bb b/recipes-bsp/linux/linux-sysmocom_git.bb index f7bb6233bb..a05bbef949 100644 --- a/recipes-bsp/linux/linux-sysmocom_git.bb +++ b/recipes-bsp/linux/linux-sysmocom_git.bb @@ -12,7 +12,7 @@ BTS_FIRMWARE_NAME_sysmobts-v2 = "sysmobts-v2" SRCREV = "561f53aa574a18a061c5130e0be0f3622ddbc037" -PR = "r19" +PR = "r23" PV = "${LINUX_VERSION}+git${SRCPV}" SRC_URI = "git://git@git.sysmocom.de/sysmo-bts/linux.git;protocol=ssh;branch=v3.2 \ @@ -34,10 +34,12 @@ do_configure() { } # autoload defaults (alphabetically sorted) +module_autoload_davinci_mmc = "davinci_mmc" module_autoload_davinci_wdt = "davinci_wdt" module_autoload_dspdl_dm644x = "dspdl_dm644x" module_autoload_fpgadl_par = "fpgadl_par" module_autoload_leds-gpio = "leds-gpio" +module_autoload_mmc_block = "mmc_block" module_autoload_msgqueue = "msgqueue" module_autoload_rtfifo = "rtfifo" From 9257e4b8a13b35966fe2a7e450f9a7f8ddc88e1f Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 9 Jul 2012 15:28:37 +0800 Subject: [PATCH 2/4] femtobts-api: Force an upgrade due some local modifications for supporting RevB hardware --- recipes-sysmobts/femtobts-api/femtobts-api_git.bb | 2 +- recipes-sysmobts/firmware/sysmobts-firmware_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-sysmobts/femtobts-api/femtobts-api_git.bb b/recipes-sysmobts/femtobts-api/femtobts-api_git.bb index f6ed59c83c..d7773860fc 100644 --- a/recipes-sysmobts/femtobts-api/femtobts-api_git.bb +++ b/recipes-sysmobts/femtobts-api/femtobts-api_git.bb @@ -5,7 +5,7 @@ LICENSE = "CLOSED" SRC_URI = "git://git@git.sysmocom.de/sysmo-bts/femtobts-firmware.git;protocol=ssh;branch=master" SRCREV = "6656cf9df31adb0d5514689db6f00119c237dea0" PV = "2.4+git${SRCPV}" -PR = "r5" +PR = "r6" S = "${WORKDIR}/git" diff --git a/recipes-sysmobts/firmware/sysmobts-firmware_git.bb b/recipes-sysmobts/firmware/sysmobts-firmware_git.bb index 0d8a7a1649..a00b4a3efa 100644 --- a/recipes-sysmobts/firmware/sysmobts-firmware_git.bb +++ b/recipes-sysmobts/firmware/sysmobts-firmware_git.bb @@ -8,7 +8,7 @@ SRCREV = "6656cf9df31adb0d5514689db6f00119c237dea0" S = "${WORKDIR}/git" PV = "1.0+git${SRCPV}" -PR = "r5" +PR = "r6" do_compile() { : From e6ec2228da78b4438c78868cb77ec772b847ed31 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 9 Jul 2012 10:25:00 +0200 Subject: [PATCH 3/4] osmo-bts: Upgrade the osmo-bts version for various bugfixes This is fixing the GSMTAP debug support and permanent paging. --- recipes-sysmobts/osmo-bts/osmo-bts_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb index fa81dfaeb1..2c7d1d78e3 100644 --- a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb +++ b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb @@ -4,10 +4,10 @@ LIC_FILES_CHKSUM="file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=master;name=osmobts;destsuffix=git \ git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc" -SRCREV_osmobts = "ad3e31dc4b9ee1063d9e633ca884315b5a5c9710" -SRCREV_openbsc = "46cb8514a5a60459214ddee776b37a422abb625e" +SRCREV_osmobts = "b19592f7134baeae1541e55b6efead887739291d" +SRCREV_openbsc = "019f913ca383bda9256e273c06327041b1761330" PV = "0.0+git${SRCPV}" -PR = "r16" +PR = "r19" S = "${WORKDIR}/git" SRCREV_FORMAT = "openbsc-rosmobts" From e568fa2c271a13144811c62fedc72977df8ad9e8 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 9 Jul 2012 10:28:22 +0200 Subject: [PATCH 4/4] osmo-bts: The start script is using nice, depend on coreutils for that Our version of busybox does not provide the nice command, use the fullblown coreutils instead. --- recipes-sysmobts/osmo-bts/osmo-bts_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb index 2c7d1d78e3..df080643e1 100644 --- a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb +++ b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb @@ -7,11 +7,12 @@ SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=master;name=os SRCREV_osmobts = "b19592f7134baeae1541e55b6efead887739291d" SRCREV_openbsc = "019f913ca383bda9256e273c06327041b1761330" PV = "0.0+git${SRCPV}" -PR = "r19" +PR = "r20" S = "${WORKDIR}/git" SRCREV_FORMAT = "openbsc-rosmobts" DEPENDS = "libosmocore libosmo-abis femtobts-api" +RDEPENDS_${PN} += "coreutils" EXTRA_OECONF += "--enable-sysmocom-bts"