Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a45f8261 authored by Ben Dooks's avatar Ben Dooks Committed by Russell King
Browse files

[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: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 1197b4cd

arch/arm/configs/s3c2410_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -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

arch/arm/plat-s3c/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -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

include/asm-arm/plat-s3c/uncompress.h

+3 −3
Original line number Diff line number Diff line
@@ -92,13 +92,13 @@ static inline void flush(void) 


#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

 * any problem with the boot process

*/



#ifdef CONFIG_S3C2410_BOOT_WATCHDOG

#ifdef CONFIG_S3C_BOOT_WATCHDOG



#define WDOG_COUNT (0xff00)
@@ -119,7 +119,7 @@ static void arch_decomp_wdog_start(void) 
#define arch_decomp_wdog()

#endif



#ifdef CONFIG_S3C2410_BOOT_ERROR_RESET

#ifdef CONFIG_S3C_BOOT_ERROR_RESET



static void arch_decomp_error(const char *x)

{