diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-04-08 00:23:11 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-04-08 00:23:11 +0200 |
| commit | 797131c12595b3d0e2964b706006938c822ee874 (patch) | |
| tree | 30df95c60094be128b37c392f6c031f536027e47 /cpu/mpc85xx/start.S | |
| parent | 92abce8731750e92d9b5adf2e506fdb50eff59bc (diff) | |
| parent | 933419096e857275b8b01f1ae577162231b143ff (diff) | |
| download | u-boot-imx-797131c12595b3d0e2964b706006938c822ee874.zip u-boot-imx-797131c12595b3d0e2964b706006938c822ee874.tar.gz u-boot-imx-797131c12595b3d0e2964b706006938c822ee874.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'cpu/mpc85xx/start.S')
| -rw-r--r-- | cpu/mpc85xx/start.S | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/cpu/mpc85xx/start.S b/cpu/mpc85xx/start.S index af18c1c..b3cb56a 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 @@ -208,13 +208,21 @@ _start_e500: #ifndef CONFIG_E500MC li r0,(HID1_ASTME|HID1_ABE)@l /* Addr streaming & broadcast */ + mfspr r3,PVR + andi. r3,r3, 0xff + cmpwi r3,0x50@l /* if we are rev 5.0 or greater set MBDD */ + blt 1f + /* Set MBDD bit also */ + ori r0, r0, HID1_MBDD@l +1: mtspr HID1,r0 #endif /* 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) |