linux-sysmocom: Build the watchdog into the kernel

We want to enable the watchdog in the bootloader already and
for this to be failsafe we need to have a kernel that can boot
and get ethernet without any additional modules. Now systemd
would not be able to trigger the watchdog and the system would
reboot within 60 seconds. I am not sure how the kernel upgrade
will go and we need to try this.

Related: SYS#374
neels/inmarsat
Holger Hans Peter Freyther 8 years ago
parent dff7d234e3
commit 29294fa7d1
  1. 1
      conf/machine/include/sysmobts.inc
  2. 2
      recipes-bsp/linux/files/sysmobts-v1/defconfig
  3. 2
      recipes-bsp/linux/files/sysmobts-v2/defconfig
  4. 3
      recipes-bsp/linux/linux-sysmocom_3.2.bb
  5. 5
      recipes-bsp/linux/linux-sysmocom_git.bb

@ -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 \

@ -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

@ -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

@ -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"

@ -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"

Loading…
Cancel
Save