leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc, 8xx: move get_immr() into C

Browse Source 
Avoid unnecessary assembly functions when they can easily be written
in C.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
This commit is contained in:
Christophe Leroy
2017-07-13 15:10:02 +02:00
committed by Tom Rini
parent 1e7cefef58
commit 7fd697fd54
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
arch/powerpc/cpu/mpc8xx/start.S
View File

@@ -305,21 +305,6 @@ int_return:
SYNC SYNC
rfi rfi
/*
* unsigned int get_immr (unsigned int mask)
*
* return (mask ? (IMMR & mask) : IMMR);
*/
.globl get_immr
get_immr:
mr r4,r3 /* save mask */
mfspr r3, IMMR /* IMMR */
cmpwi 0,r4,0 /* mask != 0 ? */
beq 4f
and r3,r3,r4 /* IMMR & mask */
4:
blr
.globl get_pvr .globl get_pvr
get_pvr: get_pvr:
mfspr r3, PVR mfspr r3, PVR

9
arch/powerpc/include/asm/ppc.h
View File

@@ -38,8 +38,15 @@
#include <asm/arch/immap_lsch2.h> #include <asm/arch/immap_lsch2.h>
#endif #endif
#include <asm/processor.h>
#if defined(CONFIG_8xx) #if defined(CONFIG_8xx)
uint get_immr(uint); static inline uint get_immr(uint mask)
{
uint immr = mfspr(SPRN_IMMR);
return mask ? (immr & mask) : immr;
}
#endif #endif
uint get_pvr(void); uint get_pvr(void);
uint get_svr(void); uint get_svr(void);