linux-sysmocom: Re-enable the standard usb modules

Enable the xt-log kernel module and build the wifi drivers
as modules again. We don't need the backports right now.

conf/machine/include/sysmobts.inc

@@ -1,7 +1,7 @@
 TARGET_ARCH = "arm"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-sysmocom"
-PREFERRED_VERSION_linux-sysmocom = "3.10.84+git%"
+PREFERRED_VERSION_linux-sysmocom = "4.1.4+git%"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
 PREFERRED_VERSION_u-boot = "git"
@@ -26,7 +26,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\
 	kernel-module-dspdl-dm644x \
 	kernel-module-fpgadl \
 	kernel-module-fpgadl-par \
-	kernel-module-leds-gpio \
 	kernel-module-msgqueue \
 	kernel-module-nls-ascii \
 	kernel-module-nls-utf8 \

conf/machine/sysmocom-odu.conf

@@ -33,6 +33,7 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048"
 # Go back to prefer our kernel
 PREFERRED_PROVIDER_virtual/kernel = "linux-sysmocom"
 KERNEL_IMAGETYPE = "uImage"
+KERNEL_DEVICETREE = "am335x-sysmocom-odu.dtb"
 
 PREFERRED_PROVIDER_virtual/bootloader = "barebox-sysmocom-odu"
 EXTRA_IMAGEDEPENDS += "barebox-sysmocom-odu"

recipes-bsp/linux/linux-sysmocom_3.2.bb

@@ -42,4 +42,4 @@ module_conf_mISDN_l1loop = "options mISDN_l1loop pri=1 nchannel=20"
 KERNEL_MODULE_PROBECONF_append = "mISDN_l1loop mISDN_dsp"
 KERNEL_MODULE_AUTOLOAD += "mISDN_l1loop mISDN_dsp"
 
-DEFAULT_PREFERENCE = "20"
+DEFAULT_PREFERENCE = "-1"

recipes-bsp/linux/linux-sysmocom_4.1.bb

@@ -0,0 +1,61 @@
+inherit kernel
+require linux-sysmocom.inc
+require recipes-kernel/linux/linux-dtb.inc
+
+DEPENDS += "bc-native"
+
+# ATTENTION: Update linux-backports PR on version change. In Dora the
+# reverse dependency tracking for the kernel doesn't appear to work. So
+# please bump the PR on version changes!
+# at versions changes do not forget to update conf/machine/include/sysmobts.inc too
+LINUX_VERSION ?= "4.1.4"
+LINUX_VERSION_EXTENSION ?= "-sysmocom-${LINUX_KERNEL_TYPE}"
+
+# Overrides for the sysmocom bts v2
+BTS_FIRMWARE_NAME_sysmobts-v2 = "sysmobts-v2"
+
+SRCREV = "bc2a891db1d166bbb97acb68664adf6383900cb5"
+
+PR = "r43"
+PV = "${LINUX_VERSION}+git${SRCPV}"
+
+SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=linux-4.1.4 \
+	   file://defconfig"
+
+S = "${WORKDIR}/git"
+
+COMPATIBLE_MACHINE = "(sysmobts-v2|sysmocom-bsc|sysmocom-bsc|sysmocom-odu)"
+EXTRA_OEMAKE += "KALLSYMS_EXTRA_PASS=1"
+EXTRA_OEMAKE_append_sysmocom-odu = " LOADADDR=0x81000000"
+
+require linux-tools.inc
+
+do_configure() {
+	install -m 0644 ${WORKDIR}/defconfig ${B}/.config
+	oe_runmake -C ${S} O=${B} oldconfig
+}
+
+# autoload defaults (alphabetically sorted)
+module_autoload_davinci_mmc = "davinci_mmc"
+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"
+
+KERNEL_MODULE_PROBECONF_append = "davinci_mmc dspdl_dm644x fpgadl_par leds-gpio mmc_block msgqueue rtfifo"
+KERNEL_MODULE_AUTOLOAD_append = "davinci_mmc dspdl_dm644x fpgadl_par leds-gpio mmc_block msgqueue rtfifo"
+
+# module configs (alphabetically sorted)
+module_conf_dspdl_dm644x = "options dspdl_dm644x fw_name=${BTS_FIRMWARE_NAME}.out debug=0"
+module_conf_fpgadl_par = "options fpgadl_par fw_name=${BTS_FIRMWARE_NAME}.bit"
+module_conf_msgqueue = "options msgqueue fw_name=${BTS_FIRMWARE_NAME}.out"
+module_conf_rtfifo = "options rtfifo fw_name=${BTS_FIRMWARE_NAME}.out"
+
+RDEPENDS_kernel-module-dspdl-dm644x += "sysmobts-firmware"
+RDEPENDS_kernel-module-fpgadl-par += "sysmobts-firmware"
+RDEPENDS_kernel-module-msgqueue += "sysmobts-firmware"
+RDEPENDS_kernel-module-rtfifo += "sysmobts-firmware"
+
+DEFAULT_PREFERENCE = "-1"

recipes-core/images/image-rauc-ubi.bb

@@ -30,6 +30,9 @@ do_fetch() {
 	cp "${DEPLOY_DIR_IMAGE}/uImage-${MACHINE}.bin" "${S}/fs/kernel"
 	cp "${DEPLOY_DIR_IMAGE}/image-rauc-rescue-initramfs-${MACHINE}.cpio.xz" "${S}/fs/initramfs"
 }
+do_fetch_append_sysmocom-odu() {
+	cp "${DEPLOY_DIR_IMAGE}/uImage-am335x-sysmocom-odu.dtb" "${S}/fs/devicetree"
+}
 
 IMAGE_ROOTFS = "${S}/fs"
 IMAGE_NAME = "${PN}-${MACHINE}-${DATETIME}"