diff options
author | Hirokazu Takata <takata@linux-m32r.org> | 2006-12-08 05:35:57 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:37 -0500 |
commit | d93f7de8c5dfefb030a5e65d0857176879bf78e9 (patch) | |
tree | 17e7f1fbf926ac190943918e780586f709573413 /arch/m32r/boot | |
parent | 6b8bd3f4b2e9d0fbfd0e7d75ba1cdc79c6876ecc (diff) |
[PATCH] m32r: bootloader support for OPSPUT platform
This patch supports "m32r-g00ff" bootloader for an OPSPUT platform.
Applying this patch, it is possible to do ATA-boot from an IDE drive or
HTTP-boot from network by m32r-g00ff.
* arch/m32r/boot/compressed/m32r_sio.c: Fix hangup on OPSPUT at boot.
* arch/m32r/kernel/io_opsput.c: IDE support for OPSPUT.
* arch/m32r/kernel/setup_opsput.c: ditto.
* include/asm-m32r/ide.h: ditto.
Signed-off-by: Kazuhiro Inaoka <inaoka@linux-m32r.org>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/m32r/boot')
-rw-r--r-- | arch/m32r/boot/compressed/m32r_sio.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/m32r/boot/compressed/m32r_sio.c b/arch/m32r/boot/compressed/m32r_sio.c index bce8af5e3bb2..ee3c8be12fa0 100644 --- a/arch/m32r/boot/compressed/m32r_sio.c +++ b/arch/m32r/boot/compressed/m32r_sio.c | |||
@@ -2,6 +2,7 @@ | |||
2 | * arch/m32r/boot/compressed/m32r_sio.c | 2 | * arch/m32r/boot/compressed/m32r_sio.c |
3 | * | 3 | * |
4 | * 2003-02-12: Takeo Takahashi | 4 | * 2003-02-12: Takeo Takahashi |
5 | * 2006-11-30: OPSPUT support by Kazuhiro Inaoka | ||
5 | * | 6 | * |
6 | */ | 7 | */ |
7 | 8 | ||
@@ -16,7 +17,7 @@ static int puts(const char *s) | |||
16 | return 0; | 17 | return 0; |
17 | } | 18 | } |
18 | 19 | ||
19 | #if defined(CONFIG_PLAT_M32700UT_Alpha) || defined(CONFIG_PLAT_M32700UT) | 20 | #if defined(CONFIG_PLAT_M32700UT_Alpha) || defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_OPSPUT) |
20 | #include <asm/m32r.h> | 21 | #include <asm/m32r.h> |
21 | #include <asm/io.h> | 22 | #include <asm/io.h> |
22 | 23 | ||
@@ -31,7 +32,11 @@ static int puts(const char *s) | |||
31 | #define BOOT_SIO0TXB (volatile unsigned short *)(0x02c00000 + 0x2000c) | 32 | #define BOOT_SIO0TXB (volatile unsigned short *)(0x02c00000 + 0x2000c) |
32 | #else | 33 | #else |
33 | #undef PLD_BASE | 34 | #undef PLD_BASE |
35 | #if defined(CONFIG_PLAT_OPSPUT) | ||
36 | #define PLD_BASE 0x1cc00000 | ||
37 | #else | ||
34 | #define PLD_BASE 0xa4c00000 | 38 | #define PLD_BASE 0xa4c00000 |
39 | #endif | ||
35 | #define BOOT_SIO0STS PLD_ESIO0STS | 40 | #define BOOT_SIO0STS PLD_ESIO0STS |
36 | #define BOOT_SIO0TXB PLD_ESIO0TXB | 41 | #define BOOT_SIO0TXB PLD_ESIO0TXB |
37 | #endif | 42 | #endif |