From d920f497705564ba800ca91e8c2105164178699c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= Date: Tue, 16 Jun 2015 11:13:46 +0200 Subject: [PATCH] fdt_support: use generic types to fix compile errors in host tools --- include/fdt_support.h | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/include/fdt_support.h b/include/fdt_support.h index 1f19fe4c96..2309f75583 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -12,16 +12,16 @@ #include -u32 fdt_getprop_u32_default_node(const void *fdt, int off, int cell, - const char *prop, const u32 dflt); -u32 fdt_getprop_u32_default(const void *fdt, const char *path, - const char *prop, const u32 dflt); +uint32_t fdt_getprop_u32_default_node(const void *fdt, int off, int cell, + const char *prop, const uint32_t dflt); +uint32_t fdt_getprop_u32_default(const void *fdt, const char *path, + const char *prop, const uint32_t dflt); int fdt_chosen(void *fdt); int fdt_initrd(void *fdt, ulong initrd_start, ulong initrd_end); void do_fixup_by_path(void *fdt, const char *path, const char *prop, const void *val, int len, int create); void do_fixup_by_path_u32(void *fdt, const char *path, const char *prop, - u32 val, int create); + uint32_t val, int create); static inline void do_fixup_by_path_string(void *fdt, const char *path, const char *prop, const char *status) @@ -35,18 +35,19 @@ void do_fixup_by_prop(void *fdt, int create); void do_fixup_by_prop_u32(void *fdt, const char *pname, const void *pval, int plen, - const char *prop, u32 val, int create); + const char *prop, uint32_t val, int create); void do_fixup_by_compat(void *fdt, const char *compat, const char *prop, const void *val, int len, int create); void do_fixup_by_compat_u32(void *fdt, const char *compat, - const char *prop, u32 val, int create); -int fdt_fixup_memory(void *blob, u64 start, u64 size); -int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], int banks); + const char *prop, uint32_t val, int create); +int fdt_fixup_memory(void *blob, uint64_t start, uint64_t size); +int fdt_fixup_memory_banks(void *blob, uint64_t start[], uint64_t size[], int banks); void fdt_fixup_ethernet(void *fdt); int fdt_find_and_setprop(void *fdt, const char *node, const char *prop, const void *val, int len, int create); void fdt_fixup_qe_firmware(void *fdt); +#if defined(__UBOOT__) #if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB) void fdt_fixup_dr_usb(void *blob, bd_t *bd); #else @@ -108,7 +109,7 @@ int fdt_fixup_nor_flash_size(void *blob); void fdt_fixup_mtdparts(void *fdt, void *node_info, int node_info_size); void fdt_del_node_and_alias(void *blob, const char *alias); -u64 fdt_translate_address(void *blob, int node_offset, const __be32 *in_addr); +uint64_t fdt_translate_address(void *blob, int node_offset, const __be32 *in_addr); int fdt_node_offset_by_compat_reg(void *blob, const char *compat, phys_addr_t compat_off); int fdt_alloc_phandle(void *blob); @@ -117,10 +118,11 @@ unsigned int fdt_create_phandle(void *fdt, int nodeoffset); int fdt_add_edid(void *blob, const char *compat, unsigned char *buf); int fdt_verify_alias_address(void *fdt, int anode, const char *alias, - u64 addr); -u64 fdt_get_base_address(void *fdt, int node); + uint64_t addr); +uint64_t fdt_get_base_address(void *fdt, int node); int fdt_read_range(void *fdt, int node, int n, uint64_t *child_addr, uint64_t *addr, uint64_t *len); +#endif /* __UBOOT__ */ enum fdt_status { FDT_STATUS_OKAY, @@ -159,11 +161,14 @@ static inline int fdt_status_fail_by_alias(void *fdt, const char *alias) } /* Helper to read a big number; size is in cells (not bytes) */ -static inline u64 of_read_number(const fdt32_t *cell, int size) +static inline uint64_t of_read_number(const fdt32_t *cell, int size) { - u64 r = 0; - while (size--) - r = (r << 32) | fdt32_to_cpu(*(cell++)); + uint64_t r = 0; + + while (size--) { + r = (r << 32) | fdt32_to_cpu(*cell); + cell++; + } return r; } @@ -172,8 +177,8 @@ void of_bus_default_count_cells(void *blob, int parentoffset, int ft_verify_fdt(void *fdt); int arch_fixup_memory_node(void *blob); -int fdt_setup_simplefb_node(void *fdt, int node, u64 base_address, u32 width, - u32 height, u32 stride, const char *format); +int fdt_setup_simplefb_node(void *fdt, int node, uint64_t base_address, uint32_t width, + uint32_t height, uint32_t stride, const char *format); #endif /* ifdef CONFIG_OF_LIBFDT */ -- 2.39.2