diff options
-rw-r--r-- | arch/m32r/boot/compressed/m32r_sio.c | 4 | ||||
-rw-r--r-- | include/asm-m32r/irq.h | 2 | ||||
-rw-r--r-- | include/asm-m32r/m32700ut/m32700ut_pld.h | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/arch/m32r/boot/compressed/m32r_sio.c b/arch/m32r/boot/compressed/m32r_sio.c index ee3c8be12fa0..01d877c6868f 100644 --- a/arch/m32r/boot/compressed/m32r_sio.c +++ b/arch/m32r/boot/compressed/m32r_sio.c | |||
@@ -17,7 +17,7 @@ static int puts(const char *s) | |||
17 | return 0; | 17 | return 0; |
18 | } | 18 | } |
19 | 19 | ||
20 | #if defined(CONFIG_PLAT_M32700UT_Alpha) || defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_OPSPUT) | 20 | #if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_OPSPUT) |
21 | #include <asm/m32r.h> | 21 | #include <asm/m32r.h> |
22 | #include <asm/io.h> | 22 | #include <asm/io.h> |
23 | 23 | ||
@@ -52,7 +52,7 @@ static void putc(char c) | |||
52 | } | 52 | } |
53 | *BOOT_SIO0TXB = c; | 53 | *BOOT_SIO0TXB = c; |
54 | } | 54 | } |
55 | #else /* !(CONFIG_PLAT_M32700UT_Alpha) && !(CONFIG_PLAT_M32700UT) */ | 55 | #else /* !(CONFIG_PLAT_M32700UT) */ |
56 | #if defined(CONFIG_PLAT_MAPPI2) | 56 | #if defined(CONFIG_PLAT_MAPPI2) |
57 | #define SIO0STS (volatile unsigned short *)(0xa0efd000 + 14) | 57 | #define SIO0STS (volatile unsigned short *)(0xa0efd000 + 14) |
58 | #define SIO0TXB (volatile unsigned short *)(0xa0efd000 + 30) | 58 | #define SIO0TXB (volatile unsigned short *)(0xa0efd000 + 30) |
diff --git a/include/asm-m32r/irq.h b/include/asm-m32r/irq.h index 2f93f4743add..242028b4d86a 100644 --- a/include/asm-m32r/irq.h +++ b/include/asm-m32r/irq.h | |||
@@ -3,7 +3,7 @@ | |||
3 | #define _ASM_M32R_IRQ_H | 3 | #define _ASM_M32R_IRQ_H |
4 | 4 | ||
5 | 5 | ||
6 | #if defined(CONFIG_PLAT_M32700UT_Alpha) || defined(CONFIG_PLAT_USRV) | 6 | #if defined(CONFIG_PLAT_USRV) |
7 | /* | 7 | /* |
8 | * IRQ definitions for M32700UT | 8 | * IRQ definitions for M32700UT |
9 | * M32700 Chip: 64 interrupts | 9 | * M32700 Chip: 64 interrupts |
diff --git a/include/asm-m32r/m32700ut/m32700ut_pld.h b/include/asm-m32r/m32700ut/m32700ut_pld.h index d39121279a1a..57623beb44cb 100644 --- a/include/asm-m32r/m32700ut/m32700ut_pld.h +++ b/include/asm-m32r/m32700ut/m32700ut_pld.h | |||
@@ -13,9 +13,7 @@ | |||
13 | * this archive for more details. | 13 | * this archive for more details. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #if defined(CONFIG_PLAT_M32700UT_Alpha) | 16 | #if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_USRV) |
17 | #define PLD_PLAT_BASE 0x08c00000 | ||
18 | #elif defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_USRV) | ||
19 | #define PLD_PLAT_BASE 0x04c00000 | 17 | #define PLD_PLAT_BASE 0x04c00000 |
20 | #else | 18 | #else |
21 | #error "no platform configuration" | 19 | #error "no platform configuration" |