mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-21 06:31:31 +00:00
Merge branch 'master' of git://git.denx.de/u-boot-i2c; branch 'master' of git://git.denx.de/u-boot-nds32
This commit is contained in:
commit
45fe3809b9
3 changed files with 16 additions and 12 deletions
|
@ -400,7 +400,7 @@ end_flush_dcache:
|
||||||
! FIXME: Other way to get PC?
|
! FIXME: Other way to get PC?
|
||||||
! FIXME: Update according to the newest spec!!
|
! FIXME: Update according to the newest spec!!
|
||||||
1:
|
1:
|
||||||
la $r28, 1
|
li $r28, 1
|
||||||
push $r28
|
push $r28
|
||||||
mfsr $r28, PSW ! $PSW
|
mfsr $r28, PSW ! $PSW
|
||||||
push $r28
|
push $r28
|
||||||
|
|
|
@ -23,20 +23,20 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
.macro write32, addr, data
|
.macro write32, addr, data
|
||||||
li $r4, addr
|
li $r4, \addr
|
||||||
li $r5, data
|
li $r5, \data
|
||||||
swi $r5, [$r4]
|
swi $r5, [$r4]
|
||||||
.endm
|
.endm
|
||||||
|
|
||||||
.macro write16, addr, data
|
.macro write16, addr, data
|
||||||
li $r4, addr
|
li $r4, \addr
|
||||||
li $r5, data
|
li $r5, \data
|
||||||
shi $r5, [$r4]
|
shi $r5, [$r4]
|
||||||
.endm
|
.endm
|
||||||
|
|
||||||
.macro write8, addr, data
|
.macro write8, addr, data
|
||||||
li $r4, addr
|
li $r4, \addr
|
||||||
li $r5, data
|
li $r5, \data
|
||||||
sbi $r5, [$r4]
|
sbi $r5, [$r4]
|
||||||
.endm
|
.endm
|
||||||
|
|
||||||
|
@ -46,17 +46,17 @@
|
||||||
* Note: Instruction 'ori' supports immediate value up to 15 bits.
|
* Note: Instruction 'ori' supports immediate value up to 15 bits.
|
||||||
*/
|
*/
|
||||||
.macro setbf32, addr, data
|
.macro setbf32, addr, data
|
||||||
li $r4, addr
|
li $r4, \addr
|
||||||
lwi $r5, [$r4]
|
lwi $r5, [$r4]
|
||||||
li $r6, data
|
li $r6, \data
|
||||||
or $r5, $r5, $r6
|
or $r5, $r5, $r6
|
||||||
swi $r5, [$r4]
|
swi $r5, [$r4]
|
||||||
.endm
|
.endm
|
||||||
|
|
||||||
.macro setbf15, addr, data
|
.macro setbf15, addr, data
|
||||||
li $r4, addr
|
li $r4, \addr
|
||||||
lwi $r5, [$r4]
|
lwi $r5, [$r4]
|
||||||
ori $r5, $r5, data
|
ori $r5, $r5, \data
|
||||||
swi $r5, [$r4]
|
swi $r5, [$r4]
|
||||||
.endm
|
.endm
|
||||||
|
|
||||||
|
@ -69,7 +69,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
.macro wait_timer, time
|
.macro wait_timer, time
|
||||||
li $r4, time
|
li $r4, \time
|
||||||
1:
|
1:
|
||||||
nop
|
nop
|
||||||
addi $r4, $r4, -1
|
addi $r4, $r4, -1
|
||||||
|
|
|
@ -33,7 +33,11 @@ typedef int __kernel_pid_t;
|
||||||
typedef unsigned short __kernel_ipc_pid_t;
|
typedef unsigned short __kernel_ipc_pid_t;
|
||||||
typedef unsigned short __kernel_uid_t;
|
typedef unsigned short __kernel_uid_t;
|
||||||
typedef unsigned short __kernel_gid_t;
|
typedef unsigned short __kernel_gid_t;
|
||||||
|
#ifdef __GNUC__
|
||||||
|
typedef __SIZE_TYPE__ __kernel_size_t;
|
||||||
|
#else
|
||||||
typedef unsigned int __kernel_size_t;
|
typedef unsigned int __kernel_size_t;
|
||||||
|
#endif
|
||||||
typedef int __kernel_ssize_t;
|
typedef int __kernel_ssize_t;
|
||||||
typedef int __kernel_ptrdiff_t;
|
typedef int __kernel_ptrdiff_t;
|
||||||
typedef long __kernel_time_t;
|
typedef long __kernel_time_t;
|
||||||
|
|
Loading…
Add table
Reference in a new issue