V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-mips

This commit is contained in:
Tom Rini 2014-03-04 18:13:06 -05:00
parent 50a91dacb0 b2099d16dc
commit 32907339c2
2 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
arch/mips/include/asm/types.h
View File

@ -27,18 +27,12 @@ typedef unsigned short __u16;
typedef __signed__ int __s32; typedef __signed__ int __s32;
typedef unsigned int __u32; typedef unsigned int __u32;
#if (_MIPS_SZLONG == 64)
typedef __signed__ long __s64;
typedef unsigned long __u64;
#else
#if defined(__GNUC__) #if defined(__GNUC__)
__extension__ typedef __signed__ long long __s64; __extension__ typedef __signed__ long long __s64;
__extension__ typedef unsigned long long __u64; __extension__ typedef unsigned long long __u64;
#endif #else
typedef __signed__ long long __s64;
typedef unsigned long long __u64;
#endif #endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
@ -61,19 +55,8 @@ typedef unsigned short u16;
typedef __signed int s32; typedef __signed int s32;
typedef unsigned int u32; typedef unsigned int u32;
#if (_MIPS_SZLONG == 64)
typedef __signed__ long s64;
typedef unsigned long u64;
#else
#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
typedef __signed__ long long s64; typedef __signed__ long long s64;
typedef unsigned long long u64; typedef unsigned long long u64;
#endif
#endif
#if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \ #if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \
|| defined(CONFIG_64BIT) || defined(CONFIG_64BIT)

2
doc/README.malta
View File

@ -9,7 +9,7 @@ How to flash using a MIPS Navigator Probe:
- Within Navigator Console run the following commands: - Within Navigator Console run the following commands:
source /path/to/u-boot/board/malta/flash-malta-boot.tcl source /path/to/u-boot/board/imgtec/malta/flash-malta-boot.tcl
reset reset
flash-boot /path/to/u-boot/u-boot.bin flash-boot /path/to/u-boot/u-boot.bin