diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2005-11-08 22:43:05 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-11-08 22:43:05 +0000 |
| commit | f8c905d368c757e2c96db293a472a31abcf4b147 (patch) | |
| tree | ff762892db823ec597eba3cd895575c4d09d7762 /arch/arm | |
| parent | 4c18ad20493c9eac6e7d0c2a05156acfc02d9b6b (diff) | |
| download | linux-f8c905d368c757e2c96db293a472a31abcf4b147.tar.gz linux-f8c905d368c757e2c96db293a472a31abcf4b147.tar.bz2 linux-f8c905d368c757e2c96db293a472a31abcf4b147.zip | |
[ARM] 3132/1: S3C2410 - reset on decompression error
Patch from Ben Dooks
Force a watchdog reset if the system fails to
decompress properly.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/compressed/misc.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2410/Kconfig | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c index 50f13eec6cd7..5ab94584baee 100644 --- a/arch/arm/boot/compressed/misc.c +++ b/arch/arm/boot/compressed/misc.c @@ -283,8 +283,14 @@ void flush_window(void) putstr("."); } +#ifndef arch_error +#define arch_error(x) +#endif + static void error(char *x) { + arch_error(x); + putstr("\n\n"); putstr(x); putstr("\n\n -- System halted"); diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig index c796bcdd6158..0b9d7ca49ec1 100644 --- a/arch/arm/mach-s3c2410/Kconfig +++ b/arch/arm/mach-s3c2410/Kconfig @@ -121,6 +121,14 @@ config S3C2410_BOOT_WATCHDOG system resets depends on the value of PCLK. The timeout on an 200MHz s3c2410 should be about 30 seconds. +config S3C2410_BOOT_ERROR_RESET + bool "S3C2410 Reboot on decompression error" + depends on ARCH_S3C2410 + help + Say y here to use the watchdog to reset the system if the + kernel decompressor detects an error during decompression. + + comment "S3C2410 Setup" config S3C2410_DMA |