Emulation/switch-linux
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-linux.git synced 2025-05-04 02:34:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[ARM] 4518/1: S3C: Rename watchdog configuration options

Browse source 
Rename the S3C24XX configuration options for the watchdog
boot controls for moving to the arch/arm/plat-s3c moves.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Ben Dooks 2007-07-22 16:16:51 +01:00 • committed by Russell King
parent 1197b4cd50
commit a45f82616e
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/configs/s3c2410_defconfig
View file

@ -138,8 +138,8 @@ CONFIG_ARCH_S3C2410=y
CONFIG_PLAT_S3C24XX=y CONFIG_PLAT_S3C24XX=y
CONFIG_CPU_S3C244X=y CONFIG_CPU_S3C244X=y
CONFIG_PM_SIMTEC=y CONFIG_PM_SIMTEC=y
# CONFIG_S3C2410_BOOT_WATCHDOG is not set # CONFIG_S3C_BOOT_WATCHDOG is not set
# CONFIG_S3C2410_BOOT_ERROR_RESET is not set # CONFIG_S3C_BOOT_ERROR_RESET is not set
# CONFIG_S3C2410_PM_DEBUG is not set # CONFIG_S3C2410_PM_DEBUG is not set
# CONFIG_S3C2410_PM_CHECK is not set # CONFIG_S3C2410_PM_CHECK is not set
CONFIG_S3C_LOWLEVEL_UART_PORT=0 CONFIG_S3C_LOWLEVEL_UART_PORT=0

8
arch/arm/plat-s3c/Kconfig
View file

@ -42,16 +42,16 @@ config CPU_LLSERIAL_S3C2440
comment "Boot options" comment "Boot options"
config S3C2410_BOOT_WATCHDOG config S3C_BOOT_WATCHDOG
bool "S3C2410 Initialisation watchdog" bool "S3C Initialisation watchdog"
depends on PLAT_S3C && S3C2410_WATCHDOG depends on PLAT_S3C && S3C2410_WATCHDOG
help help
Say y to enable the watchdog during the kernel decompression Say y to enable the watchdog during the kernel decompression
stage. If the kernel fails to uncompress, then the watchdog stage. If the kernel fails to uncompress, then the watchdog
will trigger a reset and the system should restart. will trigger a reset and the system should restart.
config S3C2410_BOOT_ERROR_RESET config S3C_BOOT_ERROR_RESET
bool "S3C2410 Reboot on decompression error" bool "S3C Reboot on decompression error"
depends on PLAT_S3C depends on PLAT_S3C
help help
Say y here to use the watchdog to reset the system if the Say y here to use the watchdog to reset the system if the

6
include/asm-arm/plat-s3c/uncompress.h
View file

@ -92,13 +92,13 @@ static inline void flush(void)
#define __raw_writel(d,ad) do { *((volatile unsigned int *)(ad)) = (d); } while(0) #define __raw_writel(d,ad) do { *((volatile unsigned int *)(ad)) = (d); } while(0)
/* CONFIG_S3C2410_BOOT_WATCHDOG /* CONFIG_S3C_BOOT_WATCHDOG
* *
* Simple boot-time watchdog setup, to reboot the system if there is * Simple boot-time watchdog setup, to reboot the system if there is
* any problem with the boot process * any problem with the boot process
*/ */
#ifdef CONFIG_S3C2410_BOOT_WATCHDOG #ifdef CONFIG_S3C_BOOT_WATCHDOG
#define WDOG_COUNT (0xff00) #define WDOG_COUNT (0xff00)
@ -119,7 +119,7 @@ static void arch_decomp_wdog_start(void)
#define arch_decomp_wdog() #define arch_decomp_wdog()
#endif #endif
#ifdef CONFIG_S3C2410_BOOT_ERROR_RESET #ifdef CONFIG_S3C_BOOT_ERROR_RESET
static void arch_decomp_error(const char *x) static void arch_decomp_error(const char *x)
{ {