mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
[ARM] 4518/1: S3C: Rename watchdog configuration options
Rename the S3C24XX configuration options for the watchdog boot controls for moving to the arch/arm/plat-s3c moves. Signed-off-by: Ben Dooks <[email protected]> Signed-off-by: Russell King <[email protected]>
This commit is contained in:
parent
1197b4cd50
commit
a45f82616e
3 changed files with 9 additions and 9 deletions
|
|
@ -138,8 +138,8 @@ CONFIG_ARCH_S3C2410=y
|
|||
CONFIG_PLAT_S3C24XX=y
|
||||
CONFIG_CPU_S3C244X=y
|
||||
CONFIG_PM_SIMTEC=y
|
||||
# CONFIG_S3C2410_BOOT_WATCHDOG is not set
|
||||
# CONFIG_S3C2410_BOOT_ERROR_RESET is not set
|
||||
# CONFIG_S3C_BOOT_WATCHDOG is not set
|
||||
# CONFIG_S3C_BOOT_ERROR_RESET is not set
|
||||
# CONFIG_S3C2410_PM_DEBUG is not set
|
||||
# CONFIG_S3C2410_PM_CHECK is not set
|
||||
CONFIG_S3C_LOWLEVEL_UART_PORT=0
|
||||
|
|
|
|||
|
|
@ -42,16 +42,16 @@ config CPU_LLSERIAL_S3C2440
|
|||
|
||||
comment "Boot options"
|
||||
|
||||
config S3C2410_BOOT_WATCHDOG
|
||||
bool "S3C2410 Initialisation watchdog"
|
||||
config S3C_BOOT_WATCHDOG
|
||||
bool "S3C Initialisation watchdog"
|
||||
depends on PLAT_S3C && S3C2410_WATCHDOG
|
||||
help
|
||||
Say y to enable the watchdog during the kernel decompression
|
||||
stage. If the kernel fails to uncompress, then the watchdog
|
||||
will trigger a reset and the system should restart.
|
||||
|
||||
config S3C2410_BOOT_ERROR_RESET
|
||||
bool "S3C2410 Reboot on decompression error"
|
||||
config S3C_BOOT_ERROR_RESET
|
||||
bool "S3C Reboot on decompression error"
|
||||
depends on PLAT_S3C
|
||||
help
|
||||
Say y here to use the watchdog to reset the system if the
|
||||
|
|
|
|||
Loading…
Reference in a new issue