diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2015-03-22 17:08:59 -0500 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-04-18 11:11:09 -0600 |
| commit | 0eb25b619699270a8af95c2f76791fd6c4b52972 (patch) | |
| tree | bb85868e6f9403bb59928feccb08662553e93c25 /include/common.h | |
| parent | eb374221ecac57a85009b801110249e5a0d09ad1 (diff) | |
| download | talos-obmc-uboot-0eb25b619699270a8af95c2f76791fd6c4b52972.tar.gz talos-obmc-uboot-0eb25b619699270a8af95c2f76791fd6c4b52972.zip | |
common: Make sure arch-specific map_sysmem() is defined
In the case where the arch defines a custom map_sysmem(), make sure that
including just mapmem.h is sufficient to have these functions as they
are when the arch does not override it.
Also split the non-arch specific functions out of common.h
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include/common.h')
| -rw-r--r-- | include/common.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/include/common.h b/include/common.h index 9c0f1ba811..932b2fc4f1 100644 --- a/include/common.h +++ b/include/common.h @@ -858,23 +858,6 @@ int cpu_disable(int nr); int cpu_release(int nr, int argc, char * const argv[]); #endif -/* Define a null map_sysmem() if the architecture doesn't use it */ -# ifndef CONFIG_ARCH_MAP_SYSMEM -static inline void *map_sysmem(phys_addr_t paddr, unsigned long len) -{ - return (void *)(uintptr_t)paddr; -} - -static inline void unmap_sysmem(const void *vaddr) -{ -} - -static inline phys_addr_t map_to_sysmem(const void *ptr) -{ - return (phys_addr_t)(uintptr_t)ptr; -} -# endif - #endif /* __ASSEMBLY__ */ #ifdef CONFIG_PPC |
