diff options
| author | Tom Rini <trini@ti.com> | 2013-11-25 10:42:53 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-11-25 10:42:53 -0500 |
| commit | 74279d37613cb3081ee1680d67b2aed1f934472a (patch) | |
| tree | 6528e6a0a08a53856c7d31a7eed28dc4d2ec0d21 /arch | |
| parent | 1a1326d2da9b2904bc90fb2990f829cb1ecef312 (diff) | |
| parent | ed072b96efd7a5de51cef01c3d4bed4db0e391f0 (diff) | |
| download | u-boot-imx-74279d37613cb3081ee1680d67b2aed1f934472a.zip u-boot-imx-74279d37613cb3081ee1680d67b2aed1f934472a.tar.gz u-boot-imx-74279d37613cb3081ee1680d67b2aed1f934472a.tar.bz2 | |
Merge branch 'sandbox1' of http://git.denx.de/u-boot-x86
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sandbox/cpu/Makefile | 6 | ||||
| -rw-r--r-- | arch/sandbox/cpu/os.c | 3 | ||||
| -rw-r--r-- | arch/sandbox/include/asm/io.h | 2 | ||||
| -rw-r--r-- | arch/sandbox/include/asm/types.h | 4 |
4 files changed, 9 insertions, 6 deletions
diff --git a/arch/sandbox/cpu/Makefile b/arch/sandbox/cpu/Makefile index 404ff67..58c2537 100644 --- a/arch/sandbox/cpu/Makefile +++ b/arch/sandbox/cpu/Makefile @@ -10,5 +10,7 @@ obj-y := cpu.o os.o start.o state.o # os.c is build in the system environment, so needs standard includes -$(obj)os.o: ALL_CFLAGS := $(filter-out -nostdinc,$(ALL_CFLAGS)) -$(obj).depend.os: CPPFLAGS := $(filter-out -nostdinc,$(CPPFLAGS)) +$(obj)os.o: ALL_CFLAGS := $(BASE_CPPFLAGS) \ + $(patsubst %, -idirafter %, $(BASE_INCLUDE_DIRS)) +$(obj).depend.os: CPPFLAGS := $(BASE_CPPFLAGS) \ + $(patsubst %, -idirafter %, $(BASE_INCLUDE_DIRS)) diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c index c2e5f57..db66fd3 100644 --- a/arch/sandbox/cpu/os.c +++ b/arch/sandbox/cpu/os.c @@ -8,6 +8,7 @@ #include <fcntl.h> #include <getopt.h> #include <stdio.h> +#include <stdint.h> #include <stdlib.h> #include <string.h> #include <termios.h> @@ -136,7 +137,7 @@ void os_usleep(unsigned long usec) usleep(usec); } -u64 __attribute__((no_instrument_function)) os_get_nsec(void) +uint64_t __attribute__((no_instrument_function)) os_get_nsec(void) { #if defined(CLOCK_MONOTONIC) && defined(_POSIX_MONOTONIC_CLOCK) struct timespec tp; diff --git a/arch/sandbox/include/asm/io.h b/arch/sandbox/include/asm/io.h index 9ac6a5f..7956041 100644 --- a/arch/sandbox/include/asm/io.h +++ b/arch/sandbox/include/asm/io.h @@ -38,6 +38,6 @@ static inline void unmap_sysmem(const void *vaddr) } /* Map from a pointer to our RAM buffer */ -phys_addr_t map_to_sysmem(void *ptr); +phys_addr_t map_to_sysmem(const void *ptr); #endif diff --git a/arch/sandbox/include/asm/types.h b/arch/sandbox/include/asm/types.h index 88c84ba..6d3eb1f 100644 --- a/arch/sandbox/include/asm/types.h +++ b/arch/sandbox/include/asm/types.h @@ -48,8 +48,8 @@ typedef unsigned long long u64; #define BITS_PER_LONG CONFIG_SANDBOX_BITS_PER_LONG typedef unsigned long dma_addr_t; -typedef unsigned long phys_addr_t; -typedef unsigned long phys_size_t; +typedef u32 phys_addr_t; +typedef u32 phys_size_t; #endif /* __KERNEL__ */ |