projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.denx.de/u-boot-usb into next
[oweals/u-boot.git]
/
board
/
bmw
/
early_init.S
diff --git
a/board/bmw/early_init.S
b/board/bmw/early_init.S
index 57a06a91f6f438a213f9e5108346f77e9c38b163..63c29d500fe5d0d53080e9080cf189c51bc6dd17 100644
(file)
--- a/
board/bmw/early_init.S
+++ b/
board/bmw/early_init.S
@@
-86,10
+86,10
@@
iommu_setup:
/*
* Set up I/D BAT0
*/
/*
* Set up I/D BAT0
*/
- lis r4, C
FG
_DBAT0L@h
- ori r4, r4, C
FG
_DBAT0L@l
- lis r3, C
FG
_DBAT0U@h
- ori r3, r3, C
FG
_DBAT0U@l
+ lis r4, C
ONFIG_SYS
_DBAT0L@h
+ ori r4, r4, C
ONFIG_SYS
_DBAT0L@l
+ lis r3, C
ONFIG_SYS
_DBAT0U@h
+ ori r3, r3, C
ONFIG_SYS
_DBAT0U@l
mtdbat0l(r4)
isync
mtdbat0l(r4)
isync
@@
-97,10
+97,10
@@
iommu_setup:
isync
sync
isync
sync
- lis r4, C
FG
_IBAT0L@h
- ori r4, r4, C
FG
_IBAT0L@l
- lis r3, C
FG
_IBAT0U@h
- ori r3, r3, C
FG
_IBAT0U@l
+ lis r4, C
ONFIG_SYS
_IBAT0L@h
+ ori r4, r4, C
ONFIG_SYS
_IBAT0L@l
+ lis r3, C
ONFIG_SYS
_IBAT0U@h
+ ori r3, r3, C
ONFIG_SYS
_IBAT0U@l
isync
mtibat0l(r4)
isync
mtibat0l(r4)
@@
-111,10
+111,10
@@
iommu_setup:
/*
* Set up I/D BAT1
*/
/*
* Set up I/D BAT1
*/
- lis r4, C
FG
_IBAT1L@h
- ori r4, r4, C
FG
_IBAT1L@l
- lis r3, C
FG
_IBAT1U@h
- ori r3, r3, C
FG
_IBAT1U@l
+ lis r4, C
ONFIG_SYS
_IBAT1L@h
+ ori r4, r4, C
ONFIG_SYS
_IBAT1L@l
+ lis r3, C
ONFIG_SYS
_IBAT1U@h
+ ori r3, r3, C
ONFIG_SYS
_IBAT1U@l
isync
mtibat1l(r4)
isync
mtibat1l(r4)
@@
-130,10
+130,10
@@
iommu_setup:
/*
* Set up I/D BAT2
*/
/*
* Set up I/D BAT2
*/
- lis r4, C
FG
_IBAT2L@h
- ori r4, r4, C
FG
_IBAT2L@l
- lis r3, C
FG
_IBAT2U@h
- ori r3, r3, C
FG
_IBAT2U@l
+ lis r4, C
ONFIG_SYS
_IBAT2L@h
+ ori r4, r4, C
ONFIG_SYS
_IBAT2L@l
+ lis r3, C
ONFIG_SYS
_IBAT2U@h
+ ori r3, r3, C
ONFIG_SYS
_IBAT2U@l
isync
mtibat2l(r4)
isync
mtibat2l(r4)
@@
-149,10
+149,10
@@
iommu_setup:
/*
* Setup I/D BAT3
*/
/*
* Setup I/D BAT3
*/
- lis r4, C
FG
_IBAT3L@h
- ori r4, r4, C
FG
_IBAT3L@l
- lis r3, C
FG
_IBAT3U@h
- ori r3, r3, C
FG
_IBAT3U@l
+ lis r4, C
ONFIG_SYS
_IBAT3L@h
+ ori r4, r4, C
ONFIG_SYS
_IBAT3L@l
+ lis r3, C
ONFIG_SYS
_IBAT3U@h
+ ori r3, r3, C
ONFIG_SYS
_IBAT3U@l
isync
mtibat3l(r4)
isync
mtibat3l(r4)
@@
-466,7
+466,7
@@
X4_KAHLUA_START:
LOADPTR (r3, EUMBBAR)
stwbrx r3,0,r5
LOADPTR (r3, EUMBBAR)
stwbrx r3,0,r5
- LOADPTR (r4, C
FG
_EUMB_ADDR)
+ LOADPTR (r4, C
ONFIG_SYS
_EUMB_ADDR)
stwbrx r4,0,r6
L1not8245:
stwbrx r4,0,r6
L1not8245: