diff --git a/conf/machine/include/sysmobts.inc b/conf/machine/include/sysmobts.inc index 4de200d..ba7261d 100644 --- a/conf/machine/include/sysmobts.inc +++ b/conf/machine/include/sysmobts.inc @@ -22,7 +22,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\ busybox-ifplugd \ ${@['watchdog', ''][d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd']} \ kernel \ - kernel-module-davinci-wdt \ kernel-module-dspdl \ kernel-module-dspdl-dm644x \ kernel-module-fpgadl \ diff --git a/recipes-bsp/linux/files/sysmobts-v1/defconfig b/recipes-bsp/linux/files/sysmobts-v1/defconfig index d37e617..4fc8450 100644 --- a/recipes-bsp/linux/files/sysmobts-v1/defconfig +++ b/recipes-bsp/linux/files/sysmobts-v1/defconfig @@ -1287,7 +1287,7 @@ CONFIG_WATCHDOG=y # # CONFIG_SOFT_WATCHDOG is not set # CONFIG_DW_WATCHDOG is not set -CONFIG_DAVINCI_WATCHDOG=m +CONFIG_DAVINCI_WATCHDOG=y # CONFIG_MAX63XX_WATCHDOG is not set CONFIG_SSB_POSSIBLE=y diff --git a/recipes-bsp/linux/files/sysmobts-v2/defconfig b/recipes-bsp/linux/files/sysmobts-v2/defconfig index 0e0412b..bbe942c 100644 --- a/recipes-bsp/linux/files/sysmobts-v2/defconfig +++ b/recipes-bsp/linux/files/sysmobts-v2/defconfig @@ -1300,7 +1300,7 @@ CONFIG_WATCHDOG=y # # CONFIG_SOFT_WATCHDOG is not set # CONFIG_DW_WATCHDOG is not set -CONFIG_DAVINCI_WATCHDOG=m +CONFIG_DAVINCI_WATCHDOG=y # CONFIG_MAX63XX_WATCHDOG is not set CONFIG_SSB_POSSIBLE=y diff --git a/recipes-bsp/linux/linux-sysmocom_3.2.bb b/recipes-bsp/linux/linux-sysmocom_3.2.bb index 4dd41f0..80776a7 100644 --- a/recipes-bsp/linux/linux-sysmocom_3.2.bb +++ b/recipes-bsp/linux/linux-sysmocom_3.2.bb @@ -19,7 +19,7 @@ SRCREV_sysmocom-odu = "aadf22be50ac2abb2a9437b9ad3bba4ccdca540b" BRANCH_sysmocom-odu = "sob-odu/linux-3.2.63" LINUX_VERSION_sysmocom-odu = "3.2.63" -PR = "r37" +PR = "r38" PV = "${LINUX_VERSION}+git${SRCPV}" SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=${BRANCH} \ @@ -42,7 +42,6 @@ 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" diff --git a/recipes-bsp/linux/linux-sysmocom_git.bb b/recipes-bsp/linux/linux-sysmocom_git.bb index 77ce7f8..3101ecb 100644 --- a/recipes-bsp/linux/linux-sysmocom_git.bb +++ b/recipes-bsp/linux/linux-sysmocom_git.bb @@ -15,7 +15,7 @@ BTS_FIRMWARE_NAME_sysmobts-v2 = "sysmobts-v2" SRCREV = "9610e792ffde7fb2599d19ca6d2a03230f2043c6" -PR = "r37" +PR = "r38" PV = "${LINUX_VERSION}+git${SRCPV}" SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=linux-3.10.50 \ @@ -41,7 +41,6 @@ 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" @@ -49,7 +48,7 @@ module_autoload_mmc_block = "mmc_block" module_autoload_msgqueue = "msgqueue" module_autoload_rtfifo = "rtfifo" -KERNEL_MODULE_PROBECONF_append = "davinci_mmc davinci_wdt dspdl_dm644x fpgadl_par leds-gpio mmc_block msgqueue rtfifo" +KERNEL_MODULE_PROBECONF_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"