diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/image.h | 2 | ||||
| -rw-r--r-- | include/lmb.h | 22 |
2 files changed, 13 insertions, 11 deletions
diff --git a/include/image.h b/include/image.h index 664e51e..46138fa 100644 --- a/include/image.h +++ b/include/image.h @@ -379,7 +379,7 @@ int image_check_dcrc (image_header_t *hdr); #ifndef USE_HOSTCC int getenv_yesno (char *var); ulong getenv_bootm_low(void); -ulong getenv_bootm_size(void); +phys_size_t getenv_bootm_size(void); void memmove_wd (void *to, void *from, size_t len, ulong chunksz); #endif diff --git a/include/lmb.h b/include/lmb.h index cc64cbb..03d7667 100644 --- a/include/lmb.h +++ b/include/lmb.h @@ -17,13 +17,13 @@ #define MAX_LMB_REGIONS 8 struct lmb_property { - ulong base; - ulong size; + phys_addr_t base; + phys_size_t size; }; struct lmb_region { unsigned long cnt; - ulong size; + phys_size_t size; struct lmb_property region[MAX_LMB_REGIONS+1]; }; @@ -35,16 +35,18 @@ struct lmb { extern struct lmb lmb; extern void lmb_init(struct lmb *lmb); -extern long lmb_add(struct lmb *lmb, ulong base, ulong size); -extern long lmb_reserve(struct lmb *lmb, ulong base, ulong size); -extern ulong lmb_alloc(struct lmb *lmb, ulong size, ulong align); -extern ulong lmb_alloc_base(struct lmb *lmb, ulong size, ulong align, ulong max_addr); -extern ulong __lmb_alloc_base(struct lmb *lmb, ulong size, ulong align, ulong max_addr); -extern int lmb_is_reserved(struct lmb *lmb, ulong addr); +extern long lmb_add(struct lmb *lmb, phys_addr_t base, phys_size_t size); +extern long lmb_reserve(struct lmb *lmb, phys_addr_t base, phys_size_t size); +extern phys_addr_t lmb_alloc(struct lmb *lmb, phys_size_t size, ulong align); +extern phys_addr_t lmb_alloc_base(struct lmb *lmb, phys_size_t size, ulong align, + phys_addr_t max_addr); +extern phys_addr_t __lmb_alloc_base(struct lmb *lmb, phys_size_t size, ulong align, + phys_addr_t max_addr); +extern int lmb_is_reserved(struct lmb *lmb, phys_addr_t addr); extern void lmb_dump_all(struct lmb *lmb); -static inline ulong +static inline phys_size_t lmb_size_bytes(struct lmb_region *type, unsigned long region_nr) { return type->region[region_nr].size; |