Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Introduce phys_size_t and move phys_addr_t into asm/types.h

Browse Source 
Also add CONFIG_PHYS_64BIT on powerpc to deal with 32-bit ppc's
that have larger physical addresses like 44x, 85xx, and 86xx.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
master
Kumar Gala 16 years ago committed by Wolfgang Denk
parent 20a14a42a2
commit e99ccb4881
21 changed files with 40 additions and 22 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      include/asm-arm/io.h
  2. 3
      include/asm-arm/types.h
  3. 2
      include/asm-avr32/io.h
  4. 3
      include/asm-avr32/types.h
  5. 2
      include/asm-blackfin/io.h
  6. 3
      include/asm-blackfin/types.h
  7. 2
      include/asm-i386/io.h
  8. 3
      include/asm-i386/types.h
  9. 2
      include/asm-m68k/io.h
  10. 3
      include/asm-m68k/types.h
  11. 2
      include/asm-microblaze/io.h
  12. 3
      include/asm-microblaze/types.h
  13. 2
      include/asm-mips/io.h
  14. 8
      include/asm-mips/types.h
  15. 2
      include/asm-nios/io.h
  16. 3
      include/asm-nios/types.h
  17. 2
      include/asm-nios2/io.h
  18. 2
      include/asm-ppc/io.h
  19. 8
      include/asm-ppc/types.h
  20. 2
      include/asm-sh/io.h
  21. 3
      include/asm-sh/types.h

2
include/asm-arm/io.h
Unescape View File

@ -38,8 +38,6 @@ static inline void sync(void)
* that can be used to access the memory range with the caching
* properties specified by "flags".
*/
typedef unsigned long phys_addr_t;
#define MAP_NOCACHE (0)
#define MAP_WRCOMBINE (0)
#define MAP_WRBACK (0)

3
include/asm-arm/types.h
Unescape View File

@ -45,6 +45,9 @@ typedef unsigned long long u64;
typedef u32 dma_addr_t;
typedef unsigned long phys_addr_t;
typedef unsigned long phys_size_t;
#endif /* __KERNEL__ */
#endif

2
include/asm-avr32/io.h
Unescape View File

@ -101,8 +101,6 @@ static inline void sync(void)
* This implementation works for memory below 512MiB (flash, etc.) as
* well as above 3.5GiB (internal peripherals.)
*/
typedef unsigned long phys_addr_t;
#define MAP_NOCACHE (0)
#define MAP_WRCOMBINE (1 << 7)
#define MAP_WRBACK (MAP_WRCOMBINE | (1 << 9))

3
include/asm-avr32/types.h
Unescape View File

@ -71,6 +71,9 @@ typedef unsigned long long u64;
typedef u32 dma_addr_t;
typedef unsigned long phys_addr_t;
typedef unsigned long phys_size_t;
#ifdef CONFIG_LBD
typedef u64 sector_t;
#define HAVE_SECTOR_T

2
include/asm-blackfin/io.h
Unescape View File

@ -45,8 +45,6 @@ extern void cf_outb(unsigned char val, volatile unsigned char *addr);
* that can be used to access the memory range with the caching
* properties specified by "flags".
*/
typedef unsigned long phys_addr_t;
#define MAP_NOCACHE (0)
#define MAP_WRCOMBINE (0)
#define MAP_WRBACK (0)

3
include/asm-blackfin/types.h
Unescape View File

@ -78,6 +78,9 @@ typedef unsigned long long u64;
typedef u32 dma_addr_t;
typedef unsigned long phys_addr_t;
typedef unsigned long phys_size_t;
#endif
#endif

2
include/asm-i386/io.h
Unescape View File

@ -210,8 +210,6 @@ static inline void sync(void)
* that can be used to access the memory range with the caching
* properties specified by "flags".
*/
typedef unsigned long phys_addr_t;
#define MAP_NOCACHE (0)
#define MAP_WRCOMBINE (0)
#define MAP_WRBACK (0)

3
include/asm-i386/types.h
Unescape View File

@ -45,6 +45,9 @@ typedef unsigned long long u64;
typedef u32 dma_addr_t;
typedef unsigned long phys_addr_t;
typedef unsigned long phys_size_t;
#endif /* __KERNEL__ */
#endif

2
include/asm-m68k/io.h
Unescape View File

@ -232,8 +232,6 @@ static inline void sync(void)
* that can be used to access the memory range with the caching
* properties specified by "flags".
*/
typedef unsigned long phys_addr_t;
#define MAP_NOCACHE (0)
#define MAP_WRCOMBINE (0)
#define MAP_WRBACK (0)

3
include/asm-m68k/types.h
Unescape View File

@ -44,6 +44,9 @@ typedef unsigned long long u64;
/* DMA addresses are 32-bits wide */
typedef u32 dma_addr_t;
typedef unsigned long phys_addr_t;
typedef unsigned long phys_size_t;
#endif /* __KERNEL__ */
#endif /* __ASSEMBLY__ */

2
include/asm-microblaze/io.h
Unescape View File

@ -134,8 +134,6 @@ static inline void sync(void)
* that can be used to access the memory range with the caching
* properties specified by "flags".
*/
typedef unsigned long phys_addr_t;
#define MAP_NOCACHE (0)
#define MAP_WRCOMBINE (0)
#define MAP_WRBACK (0)

3
include/asm-microblaze/types.h
Unescape View File

@ -52,6 +52,9 @@ typedef unsigned long long u64;
/* Dma addresses are 32-bits wide. */
typedef u32 dma_addr_t;
typedef unsigned long phys_addr_t;
typedef unsigned long phys_size_t;
#endif /* __KERNEL__ */
#endif /* _ASM_TYPES_H */

2
include/asm-mips/io.h
Unescape View File

@ -470,8 +470,6 @@ static inline void sync(void)
* that can be used to access the memory range with the caching
* properties specified by "flags".
*/
typedef unsigned long phys_addr_t;
#define MAP_NOCACHE (0)
#define MAP_WRCOMBINE (0)
#define MAP_WRBACK (0)

8
include/asm-mips/types.h
Unescape View File

@ -78,8 +78,16 @@ typedef unsigned long long u64;
#if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \
|| defined(CONFIG_64BIT)
typedef u64 dma_addr_t;
typedef u64 phys_addr_t;
typedef u64 phys_size_t;
#else
typedef u32 dma_addr_t;
typedef u32 phys_addr_t;
typedef u32 phys_size_t;
#endif
typedef u64 dma64_addr_t;

2
include/asm-nios/io.h
Unescape View File

@ -114,8 +114,6 @@ static inline void sync(void)
* that can be used to access the memory range with the caching
* properties specified by "flags".
*/
typedef unsigned long phys_addr_t;
#define MAP_NOCACHE (0)
#define MAP_WRCOMBINE (0)
#define MAP_WRBACK (0)

3
include/asm-nios/types.h
Unescape View File

@ -52,6 +52,9 @@ typedef unsigned long long u64;
/* Dma addresses are 32-bits wide. */
typedef u32 dma_addr_t;
typedef unsigned long phys_addr_t;
typedef unsigned long phys_size_t;
#endif /* __KERNEL__ */
#endif /* _NIOS_TYPES_H */

2
include/asm-nios2/io.h
Unescape View File

@ -34,8 +34,6 @@ static inline void sync(void)
* that can be used to access the memory range with the caching
* properties specified by "flags".
*/
typedef unsigned long phys_addr_t;
#define MAP_NOCACHE (0)
#define MAP_WRCOMBINE (0)
#define MAP_WRBACK (0)

2
include/asm-ppc/io.h
Unescape View File

@ -243,8 +243,6 @@ extern inline void out_be32(volatile unsigned __iomem *addr, int val)
* that can be used to access the memory range with the caching
* properties specified by "flags".
*/
typedef unsigned long phys_addr_t;
#define MAP_NOCACHE (0)
#define MAP_WRCOMBINE (0)
#define MAP_WRBACK (0)

8
include/asm-ppc/types.h
Unescape View File

@ -44,6 +44,14 @@ typedef unsigned long long u64;
/* DMA addresses are 32-bits wide */
typedef u32 dma_addr_t;
#ifdef CONFIG_PHYS_64BIT
typedef unsigned long long phys_addr_t;
typedef unsigned long long phys_size_t;
#else
typedef unsigned long phys_addr_t;
typedef unsigned long phys_size_t;
#endif
#endif /* __KERNEL__ */
#endif /* __ASSEMBLY__ */

2
include/asm-sh/io.h
Unescape View File

@ -233,8 +233,6 @@ static inline void sync(void)
* that can be used to access the memory range with the caching
* properties specified by "flags".
*/
typedef unsigned long phys_addr_t;
#define MAP_NOCACHE (0)
#define MAP_WRCOMBINE (0)
#define MAP_WRBACK (0)

3
include/asm-sh/types.h
Unescape View File

@ -52,6 +52,9 @@ typedef unsigned long long u64;
typedef u32 dma_addr_t;
typedef unsigned long phys_addr_t;
typedef unsigned long phys_size_t;
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */

Write Preview
Loading…
Cancel
Save