diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2010-03-29 13:50:31 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2010-04-07 00:08:17 -0500 |
| commit | 69bcf5bc80a47acbd62b8cfff932cb12d47997d7 (patch) | |
| tree | 0bf35a0046f842a40d1b5cb3ddb8317ccbae1146 | |
| parent | 22c9de064a218ae617bfeea35d2164532df91597 (diff) | |
| download | olio-uboot-2014.01-69bcf5bc80a47acbd62b8cfff932cb12d47997d7.tar.xz olio-uboot-2014.01-69bcf5bc80a47acbd62b8cfff932cb12d47997d7.zip | |
85xx: Add defines for BUCSR bits to make code more readable
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| -rw-r--r-- | cpu/mpc85xx/release.S | 5 | ||||
| -rw-r--r-- | cpu/mpc85xx/start.S | 7 | ||||
| -rw-r--r-- | include/asm-ppc/processor.h | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/cpu/mpc85xx/release.S b/cpu/mpc85xx/release.S index dab784efa..69fce927a 100644 --- a/cpu/mpc85xx/release.S +++ b/cpu/mpc85xx/release.S @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Freescale Semiconductor, Inc. + * Copyright 2008-2010 Freescale Semiconductor, Inc. * Kumar Gala <kumar.gala@freescale.com> * * See file CREDITS for list of people who contributed to this @@ -61,7 +61,8 @@ __secondary_start_page: #endif /* Enable branch prediction */ - li r3,0x201 + lis r3,BUCSR_ENABLE@h + ori r3,r3,BUCSR_ENABLE@l mtspr SPRN_BUCSR,r3 /* Ensure TB is 0 */ diff --git a/cpu/mpc85xx/start.S b/cpu/mpc85xx/start.S index af18c1c8e..52ea9b341 100644 --- a/cpu/mpc85xx/start.S +++ b/cpu/mpc85xx/start.S @@ -1,5 +1,5 @@ /* - * Copyright 2004, 2007-2009 Freescale Semiconductor, Inc. + * Copyright 2004, 2007-2010 Freescale Semiconductor, Inc. * Copyright (C) 2003 Motorola,Inc. * * See file CREDITS for list of people who contributed to this @@ -213,8 +213,9 @@ _start_e500: /* Enable Branch Prediction */ #if defined(CONFIG_BTB) - li r0,0x201 /* BBFI = 1, BPEN = 1 */ - mtspr BUCSR,r0 + lis r0,BUCSR_ENABLE@h + ori r0,r0,BUCSR_ENABLE@l + mtspr SPRN_BUCSR,r0 #endif #if defined(CONFIG_SYS_INIT_DBCR) diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h index 9b3d616a6..4134f189a 100644 --- a/include/asm-ppc/processor.h +++ b/include/asm-ppc/processor.h @@ -533,6 +533,9 @@ #define SPRN_MCSRR0 0x23a /* Machine Check Save and Restore Register 0 */ #define SPRN_MCSRR1 0x23b /* Machine Check Save and Restore Register 1 */ #define SPRN_BUCSR 0x3f5 /* Branch Control and Status Register */ +#define BUCSR_BBFI 0x00000200 /* Branch buffer flash invalidate */ +#define BUCSR_BPEN 0x00000001 /* Branch prediction enable */ +#define BUCSR_ENABLE (BUCSR_BBFI|BUCSR_BPEN) #define SPRN_BBEAR 0x201 /* Branch Buffer Entry Address Register */ #define SPRN_BBTAR 0x202 /* Branch Buffer Target Address Register */ #define SPRN_PID1 0x279 /* Process ID Register 1 */ |