diff options
| author | Tom Rini <trini@ti.com> | 2014-03-04 18:13:06 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-03-04 18:13:06 -0500 |
| commit | 32907339c2f533f1d59362c6100c6a0eeeca4837 (patch) | |
| tree | 58ab07d7cc7212ad2c7cd71c21cd66152d85cec4 | |
| parent | 50a91dacb04053426497adca67901b54f92fae48 (diff) | |
| parent | b2099d16dc90fc94f050dfc9391c645c83d06cb8 (diff) | |
| download | u-boot-imx-32907339c2f533f1d59362c6100c6a0eeeca4837.zip u-boot-imx-32907339c2f533f1d59362c6100c6a0eeeca4837.tar.gz u-boot-imx-32907339c2f533f1d59362c6100c6a0eeeca4837.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mips
| -rw-r--r-- | arch/mips/include/asm/types.h | 23 | ||||
| -rw-r--r-- | doc/README.malta | 2 |
2 files changed, 4 insertions, 21 deletions
diff --git a/arch/mips/include/asm/types.h b/arch/mips/include/asm/types.h index d4bb859..aebafdb 100644 --- a/arch/mips/include/asm/types.h +++ b/arch/mips/include/asm/types.h @@ -27,18 +27,12 @@ typedef unsigned short __u16; typedef __signed__ int __s32; typedef unsigned int __u32; -#if (_MIPS_SZLONG == 64) - -typedef __signed__ long __s64; -typedef unsigned long __u64; - -#else - #if defined(__GNUC__) __extension__ typedef __signed__ long long __s64; __extension__ typedef unsigned long long __u64; -#endif - +#else +typedef __signed__ long long __s64; +typedef unsigned long long __u64; #endif #endif /* __ASSEMBLY__ */ @@ -61,19 +55,8 @@ typedef unsigned short u16; typedef __signed int s32; 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 unsigned long long u64; -#endif - -#endif #if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \ || defined(CONFIG_64BIT) diff --git a/doc/README.malta b/doc/README.malta index a495d02..c8db8a0 100644 --- a/doc/README.malta +++ b/doc/README.malta @@ -9,7 +9,7 @@ How to flash using a MIPS Navigator Probe: - 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 flash-boot /path/to/u-boot/u-boot.bin |