diff options
| author | Tom Rini <trini@konsulko.com> | 2016-11-29 19:42:48 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-11-29 19:42:48 -0500 |
| commit | 6b29a395b62965eef6b5065d3a526a8588a92038 (patch) | |
| tree | d9404d155aa96dd58ff9d02cdb2a30e7136405da /arch/powerpc/cpu/mpc85xx/start.S | |
| parent | dbd5df89d65172f94dec78af809f1e50dbd61fe6 (diff) | |
| parent | e8a390f0189c5868f2fa305004821bcfcd71d32c (diff) | |
| download | u-boot-6b29a395b62965eef6b5065d3a526a8588a92038.tar.gz | |
Merge git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/start.S')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/start.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S index c3e12349f7..932216c237 100644 --- a/arch/powerpc/cpu/mpc85xx/start.S +++ b/arch/powerpc/cpu/mpc85xx/start.S @@ -311,7 +311,7 @@ l2_disabled: #endif mtspr HID0,r0 -#if !defined(CONFIG_E500MC) && !defined(CONFIG_QEMU_E500) +#if !defined(CONFIG_E500MC) && !defined(CONFIG_ARCH_QEMU_E500) li r0,(HID1_ASTME|HID1_ABE)@l /* Addr streaming & broadcast */ mfspr r3,PVR andi. r3,r3, 0xff @@ -345,7 +345,7 @@ l2_disabled: mtspr DBCR0,r0 #endif -#ifdef CONFIG_MPC8569 +#ifdef CONFIG_ARCH_MPC8569 #define CONFIG_SYS_LBC_ADDR (CONFIG_SYS_CCSRBAR_DEFAULT + 0x5000) #define CONFIG_SYS_LBCR_ADDR (CONFIG_SYS_LBC_ADDR + 0xd0) @@ -376,7 +376,7 @@ l2_disabled: tlbivax 0,r4 isync -#endif /* CONFIG_MPC8569 */ +#endif /* CONFIG_ARCH_MPC8569 */ /* * Search for the TLB that covers the code we're executing, and shrink it |