diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-10-03 05:36:52 -0400 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-11-26 05:09:19 -0500 |
| commit | f3bd09e3dba76e76bec7e79a442f37b0762f4fa1 (patch) | |
| tree | 8254a0e282fb7b5afd45e42ac5052e8954b3de12 /arch | |
| parent | 7678e77d2a2fb2dd74a27b8283e030c580294a62 (diff) | |
m68k/UAPI: Move HP300 model definitions to <asm/bootinfo-hp300.h>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68k/include/asm/hp300hw.h | 20 | ||||
| -rw-r--r-- | arch/m68k/include/uapi/asm/bootinfo-hp300.h | 25 |
2 files changed, 27 insertions, 18 deletions
diff --git a/arch/m68k/include/asm/hp300hw.h b/arch/m68k/include/asm/hp300hw.h index d998ea67c19c..64f5271dd7be 100644 --- a/arch/m68k/include/asm/hp300hw.h +++ b/arch/m68k/include/asm/hp300hw.h | |||
| @@ -1,25 +1,9 @@ | |||
| 1 | #ifndef _M68K_HP300HW_H | 1 | #ifndef _M68K_HP300HW_H |
| 2 | #define _M68K_HP300HW_H | 2 | #define _M68K_HP300HW_H |
| 3 | 3 | ||
| 4 | extern unsigned long hp300_model; | 4 | #include <asm/bootinfo-hp300.h> |
| 5 | 5 | ||
| 6 | /* This information was taken from NetBSD */ | ||
| 7 | #define HP_320 (0) /* 16MHz 68020+HP MMU+16K external cache */ | ||
| 8 | #define HP_330 (1) /* 16MHz 68020+68851 MMU */ | ||
| 9 | #define HP_340 (2) /* 16MHz 68030 */ | ||
| 10 | #define HP_345 (3) /* 50MHz 68030+32K external cache */ | ||
| 11 | #define HP_350 (4) /* 25MHz 68020+HP MMU+32K external cache */ | ||
| 12 | #define HP_360 (5) /* 25MHz 68030 */ | ||
| 13 | #define HP_370 (6) /* 33MHz 68030+64K external cache */ | ||
| 14 | #define HP_375 (7) /* 50MHz 68030+32K external cache */ | ||
| 15 | #define HP_380 (8) /* 25MHz 68040 */ | ||
| 16 | #define HP_385 (9) /* 33MHz 68040 */ | ||
| 17 | 6 | ||
| 18 | #define HP_400 (10) /* 50MHz 68030+32K external cache */ | 7 | extern unsigned long hp300_model; |
| 19 | #define HP_425T (11) /* 25MHz 68040 - model 425t */ | ||
| 20 | #define HP_425S (12) /* 25MHz 68040 - model 425s */ | ||
| 21 | #define HP_425E (13) /* 25MHz 68040 - model 425e */ | ||
| 22 | #define HP_433T (14) /* 33MHz 68040 - model 433t */ | ||
| 23 | #define HP_433S (15) /* 33MHz 68040 - model 433s */ | ||
| 24 | 8 | ||
| 25 | #endif /* _M68K_HP300HW_H */ | 9 | #endif /* _M68K_HP300HW_H */ |
diff --git a/arch/m68k/include/uapi/asm/bootinfo-hp300.h b/arch/m68k/include/uapi/asm/bootinfo-hp300.h index e7ed19cdafe5..08530e12d4c3 100644 --- a/arch/m68k/include/uapi/asm/bootinfo-hp300.h +++ b/arch/m68k/include/uapi/asm/bootinfo-hp300.h | |||
| @@ -16,6 +16,31 @@ | |||
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | /* | 18 | /* |
| 19 | * HP9000/300 and /400 models (BI_HP300_MODEL) | ||
| 20 | * | ||
| 21 | * This information was taken from NetBSD | ||
| 22 | */ | ||
| 23 | |||
| 24 | #define HP_320 0 /* 16MHz 68020+HP MMU+16K external cache */ | ||
| 25 | #define HP_330 1 /* 16MHz 68020+68851 MMU */ | ||
| 26 | #define HP_340 2 /* 16MHz 68030 */ | ||
| 27 | #define HP_345 3 /* 50MHz 68030+32K external cache */ | ||
| 28 | #define HP_350 4 /* 25MHz 68020+HP MMU+32K external cache */ | ||
| 29 | #define HP_360 5 /* 25MHz 68030 */ | ||
| 30 | #define HP_370 6 /* 33MHz 68030+64K external cache */ | ||
| 31 | #define HP_375 7 /* 50MHz 68030+32K external cache */ | ||
| 32 | #define HP_380 8 /* 25MHz 68040 */ | ||
| 33 | #define HP_385 9 /* 33MHz 68040 */ | ||
| 34 | |||
| 35 | #define HP_400 10 /* 50MHz 68030+32K external cache */ | ||
| 36 | #define HP_425T 11 /* 25MHz 68040 - model 425t */ | ||
| 37 | #define HP_425S 12 /* 25MHz 68040 - model 425s */ | ||
| 38 | #define HP_425E 13 /* 25MHz 68040 - model 425e */ | ||
| 39 | #define HP_433T 14 /* 33MHz 68040 - model 433t */ | ||
| 40 | #define HP_433S 15 /* 33MHz 68040 - model 433s */ | ||
| 41 | |||
| 42 | |||
| 43 | /* | ||
| 19 | * Latest HP9000/300 bootinfo version | 44 | * Latest HP9000/300 bootinfo version |
| 20 | */ | 45 | */ |
| 21 | 46 | ||