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 /include | |
| 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 'include')
| -rw-r--r-- | include/common.h | 2 | ||||
| -rw-r--r-- | include/configs/sandbox.h | 1 | ||||
| -rw-r--r-- | include/os.h | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/include/common.h b/include/common.h index 409515f..8ca67f6 100644 --- a/include/common.h +++ b/include/common.h @@ -923,7 +923,7 @@ static inline void unmap_sysmem(const void *vaddr) { } -static inline phys_addr_t map_to_sysmem(void *ptr) +static inline phys_addr_t map_to_sysmem(const void *ptr) { return (phys_addr_t)(uintptr_t)ptr; } diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 0884ad3..a4edc62 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -75,7 +75,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x00000000 #define CONFIG_SYS_MEMTEST_START 0x00100000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x1000) -#define CONFIG_PHYS_64BIT #define CONFIG_SYS_FDT_LOAD_ADDR 0x1000000 /* Size of our emulated memory */ diff --git a/include/os.h b/include/os.h index 8665f70..950433d 100644 --- a/include/os.h +++ b/include/os.h @@ -11,6 +11,8 @@ #ifndef __OS_H__ #define __OS_H__ +#include <linux/types.h> + struct sandbox_state; /** @@ -116,7 +118,7 @@ void os_usleep(unsigned long usec); * * \return A monotonic increasing time scaled in nano seconds */ -u64 os_get_nsec(void); +uint64_t os_get_nsec(void); /** * Parse arguments and update sandbox state. |