Merge commit 'e568fa2c271a13144811c62fedc72977df8ad9e8' into edison
This commit is contained in:
commit
4d8fef32c9
|
@ -1,6 +1,6 @@
|
||||||
#
|
#
|
||||||
# Automatically generated file; DO NOT EDIT.
|
# Automatically generated file; DO NOT EDIT.
|
||||||
# Linux/arm 3.2.14 Kernel Configuration
|
# Linux/arm 3.2.19 Kernel Configuration
|
||||||
#
|
#
|
||||||
CONFIG_ARM=y
|
CONFIG_ARM=y
|
||||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
||||||
|
@ -880,6 +880,7 @@ CONFIG_EEPROM_AT24=y
|
||||||
# CONFIG_EEPROM_LEGACY is not set
|
# CONFIG_EEPROM_LEGACY is not set
|
||||||
# CONFIG_EEPROM_MAX6875 is not set
|
# CONFIG_EEPROM_MAX6875 is not set
|
||||||
# CONFIG_EEPROM_93CX6 is not set
|
# CONFIG_EEPROM_93CX6 is not set
|
||||||
|
# CONFIG_IWMC3200TOP is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# Texas Instruments shared transport line discipline
|
# Texas Instruments shared transport line discipline
|
||||||
|
@ -1346,7 +1347,28 @@ CONFIG_DUMMY_CONSOLE=y
|
||||||
# CONFIG_SOUND is not set
|
# CONFIG_SOUND is not set
|
||||||
# CONFIG_HID_SUPPORT is not set
|
# CONFIG_HID_SUPPORT is not set
|
||||||
# CONFIG_USB_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_MEMSTICK is not set
|
||||||
CONFIG_NEW_LEDS=y
|
CONFIG_NEW_LEDS=y
|
||||||
CONFIG_LEDS_CLASS=y
|
CONFIG_LEDS_CLASS=y
|
||||||
|
@ -1420,8 +1442,22 @@ CONFIG_IOMMU_SUPPORT=y
|
||||||
# File systems
|
# File systems
|
||||||
#
|
#
|
||||||
# CONFIG_EXT2_FS is not set
|
# CONFIG_EXT2_FS is not set
|
||||||
# CONFIG_EXT3_FS is not set
|
CONFIG_EXT3_FS=m
|
||||||
# CONFIG_EXT4_FS is not set
|
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_REISERFS_FS is not set
|
||||||
# CONFIG_JFS_FS is not set
|
# CONFIG_JFS_FS is not set
|
||||||
# CONFIG_XFS_FS is not set
|
# CONFIG_XFS_FS is not set
|
||||||
|
@ -1454,8 +1490,11 @@ CONFIG_AUTOFS4_FS=y
|
||||||
#
|
#
|
||||||
# DOS/FAT/NT Filesystems
|
# DOS/FAT/NT Filesystems
|
||||||
#
|
#
|
||||||
# CONFIG_MSDOS_FS is not set
|
CONFIG_FAT_FS=m
|
||||||
# CONFIG_VFAT_FS is not set
|
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
|
# CONFIG_NTFS_FS is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
|
@ -12,7 +12,7 @@ BTS_FIRMWARE_NAME_sysmobts-v2 = "sysmobts-v2"
|
||||||
|
|
||||||
SRCREV = "561f53aa574a18a061c5130e0be0f3622ddbc037"
|
SRCREV = "561f53aa574a18a061c5130e0be0f3622ddbc037"
|
||||||
|
|
||||||
PR = "r19"
|
PR = "r23"
|
||||||
PV = "${LINUX_VERSION}+git${SRCPV}"
|
PV = "${LINUX_VERSION}+git${SRCPV}"
|
||||||
|
|
||||||
SRC_URI = "git://git@git.sysmocom.de/sysmo-bts/linux.git;protocol=ssh;branch=v3.2 \
|
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)
|
# autoload defaults (alphabetically sorted)
|
||||||
|
module_autoload_davinci_mmc = "davinci_mmc"
|
||||||
module_autoload_davinci_wdt = "davinci_wdt"
|
module_autoload_davinci_wdt = "davinci_wdt"
|
||||||
module_autoload_dspdl_dm644x = "dspdl_dm644x"
|
module_autoload_dspdl_dm644x = "dspdl_dm644x"
|
||||||
module_autoload_fpgadl_par = "fpgadl_par"
|
module_autoload_fpgadl_par = "fpgadl_par"
|
||||||
module_autoload_leds-gpio = "leds-gpio"
|
module_autoload_leds-gpio = "leds-gpio"
|
||||||
|
module_autoload_mmc_block = "mmc_block"
|
||||||
module_autoload_msgqueue = "msgqueue"
|
module_autoload_msgqueue = "msgqueue"
|
||||||
module_autoload_rtfifo = "rtfifo"
|
module_autoload_rtfifo = "rtfifo"
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ LICENSE = "CLOSED"
|
||||||
SRC_URI = "git://git@git.sysmocom.de/sysmo-bts/femtobts-firmware.git;protocol=ssh;branch=master"
|
SRC_URI = "git://git@git.sysmocom.de/sysmo-bts/femtobts-firmware.git;protocol=ssh;branch=master"
|
||||||
SRCREV = "6656cf9df31adb0d5514689db6f00119c237dea0"
|
SRCREV = "6656cf9df31adb0d5514689db6f00119c237dea0"
|
||||||
PV = "2.4+git${SRCPV}"
|
PV = "2.4+git${SRCPV}"
|
||||||
PR = "r5"
|
PR = "r6"
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ SRCREV = "6656cf9df31adb0d5514689db6f00119c237dea0"
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
PV = "1.0+git${SRCPV}"
|
PV = "1.0+git${SRCPV}"
|
||||||
PR = "r5"
|
PR = "r6"
|
||||||
|
|
||||||
do_compile() {
|
do_compile() {
|
||||||
:
|
:
|
||||||
|
|
|
@ -4,14 +4,15 @@ LIC_FILES_CHKSUM="file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
|
||||||
|
|
||||||
SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=master;name=osmobts;destsuffix=git \
|
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"
|
git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc"
|
||||||
SRCREV_osmobts = "ad3e31dc4b9ee1063d9e633ca884315b5a5c9710"
|
SRCREV_osmobts = "b19592f7134baeae1541e55b6efead887739291d"
|
||||||
SRCREV_openbsc = "46cb8514a5a60459214ddee776b37a422abb625e"
|
SRCREV_openbsc = "019f913ca383bda9256e273c06327041b1761330"
|
||||||
PV = "0.0+git${SRCPV}"
|
PV = "0.0+git${SRCPV}"
|
||||||
PR = "r16"
|
PR = "r20"
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
SRCREV_FORMAT = "openbsc-rosmobts"
|
SRCREV_FORMAT = "openbsc-rosmobts"
|
||||||
DEPENDS = "libosmocore libosmo-abis femtobts-api"
|
DEPENDS = "libosmocore libosmo-abis femtobts-api"
|
||||||
|
RDEPENDS_${PN} += "coreutils"
|
||||||
|
|
||||||
EXTRA_OECONF += "--enable-sysmocom-bts"
|
EXTRA_OECONF += "--enable-sysmocom-bts"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue