diff options
author | Joel Schopp <jschopp@austin.ibm.com> | 2008-06-18 16:23:23 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-06-30 21:28:00 -0400 |
commit | 0cb99013775f75a7b2cc72a26f48827601cf7cee (patch) | |
tree | 28757c7158128ad8912a873a3f96aa0b5a83bd24 | |
parent | 635f5a6354eaf2cf7d72116086175b82b12ac80a (diff) |
powerpc: Tell firmware we support architecture V2.06
Add the bits to the architecture-vec so that ibm,client-architecture
lets the firmware know we support the 2.06 architecture.
Signed-off-by: Joel Schopp <jschopp@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r-- | arch/powerpc/kernel/prom_init.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 7585ed181ff8..1ea8c8d3ce89 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c | |||
@@ -620,6 +620,7 @@ static void __init early_cmdline_parse(void) | |||
620 | #define OV1_PPC_2_03 0x10 /* set if we support PowerPC 2.03 */ | 620 | #define OV1_PPC_2_03 0x10 /* set if we support PowerPC 2.03 */ |
621 | #define OV1_PPC_2_04 0x08 /* set if we support PowerPC 2.04 */ | 621 | #define OV1_PPC_2_04 0x08 /* set if we support PowerPC 2.04 */ |
622 | #define OV1_PPC_2_05 0x04 /* set if we support PowerPC 2.05 */ | 622 | #define OV1_PPC_2_05 0x04 /* set if we support PowerPC 2.05 */ |
623 | #define OV1_PPC_2_06 0x02 /* set if we support PowerPC 2.06 */ | ||
623 | 624 | ||
624 | /* Option vector 2: Open Firmware options supported */ | 625 | /* Option vector 2: Open Firmware options supported */ |
625 | #define OV2_REAL_MODE 0x20 /* set if we want OF in real mode */ | 626 | #define OV2_REAL_MODE 0x20 /* set if we want OF in real mode */ |
@@ -651,6 +652,7 @@ static unsigned char ibm_architecture_vec[] = { | |||
651 | W(0xfffe0000), W(0x003a0000), /* POWER5/POWER5+ */ | 652 | W(0xfffe0000), W(0x003a0000), /* POWER5/POWER5+ */ |
652 | W(0xffff0000), W(0x003e0000), /* POWER6 */ | 653 | W(0xffff0000), W(0x003e0000), /* POWER6 */ |
653 | W(0xffff0000), W(0x003f0000), /* POWER7 */ | 654 | W(0xffff0000), W(0x003f0000), /* POWER7 */ |
655 | W(0xffffffff), W(0x0f000003), /* all 2.06-compliant */ | ||
654 | W(0xffffffff), W(0x0f000002), /* all 2.05-compliant */ | 656 | W(0xffffffff), W(0x0f000002), /* all 2.05-compliant */ |
655 | W(0xfffffffe), W(0x0f000001), /* all 2.04-compliant and earlier */ | 657 | W(0xfffffffe), W(0x0f000001), /* all 2.04-compliant and earlier */ |
656 | 5 - 1, /* 5 option vectors */ | 658 | 5 - 1, /* 5 option vectors */ |
@@ -659,7 +661,7 @@ static unsigned char ibm_architecture_vec[] = { | |||
659 | 3 - 2, /* length */ | 661 | 3 - 2, /* length */ |
660 | 0, /* don't ignore, don't halt */ | 662 | 0, /* don't ignore, don't halt */ |
661 | OV1_PPC_2_00 | OV1_PPC_2_01 | OV1_PPC_2_02 | OV1_PPC_2_03 | | 663 | OV1_PPC_2_00 | OV1_PPC_2_01 | OV1_PPC_2_02 | OV1_PPC_2_03 | |
662 | OV1_PPC_2_04 | OV1_PPC_2_05, | 664 | OV1_PPC_2_04 | OV1_PPC_2_05 | OV1_PPC_2_06, |
663 | 665 | ||
664 | /* option vector 2: Open Firmware options supported */ | 666 | /* option vector 2: Open Firmware options supported */ |
665 | 34 - 2, /* length */ | 667 | 34 - 2, /* length */ |