@@ -16,7 +16,7 @@ static int node_offset(void *fdt, const char *node_path)
}
static int setprop(void *fdt, const char *node_path, const char *property,
- uint32_t *val_array, int size)
+ fdt32_t *val_array, int size)
{
int offset = node_offset(fdt, node_path);
if (offset < 0)
@@ -95,7 +95,7 @@ static void merge_fdt_bootargs(void *fdt, const char *fdt_cmdline)
int atags_to_fdt(void *atag_list, void *fdt, int total_space)
{
struct tag *atag = atag_list;
- uint32_t mem_reg_property[2 * NR_BANKS];
+ fdt32_t mem_reg_property[2 * NR_BANKS];
int memcount = 0;
int ret;
@@ -104,7 +104,7 @@ int atags_to_fdt(void *atag_list, void *fdt, int total_space)
return 1;
/* if we get a DTB here we're done already */
- if (*(u32 *)atag_list == fdt32_to_cpu(FDT_MAGIC))
+ if (*(fdt32_t *)atag_list == cpu_to_fdt32(FDT_MAGIC))
return 0;
/* validate the ATAG */
arch/arm/boot/compressed/atags_to_fdt.c:107:34: warning: cast to restricted __be32 arch/arm/boot/compressed/atags_to_fdt.c:107:34: warning: cast to restricted __be32 arch/arm/boot/compressed/atags_to_fdt.c:107:34: warning: cast to restricted __be32 arch/arm/boot/compressed/atags_to_fdt.c:107:34: warning: cast to restricted __be32 arch/arm/boot/compressed/atags_to_fdt.c:107:34: warning: cast to restricted __be32 arch/arm/boot/compressed/atags_to_fdt.c:107:34: warning: cast to restricted __be32 arch/arm/boot/compressed/atags_to_fdt.c:140:54: warning: incorrect type in assignment (different base types) arch/arm/boot/compressed/atags_to_fdt.c:140:54: expected unsigned int [unsigned] <noident> arch/arm/boot/compressed/atags_to_fdt.c:140:54: got restricted __be32 [usertype] <noident> arch/arm/boot/compressed/atags_to_fdt.c:141:54: warning: incorrect type in assignment (different base types) arch/arm/boot/compressed/atags_to_fdt.c:141:54: expected unsigned int [unsigned] <noident> arch/arm/boot/compressed/atags_to_fdt.c:141:54: got restricted __be32 [usertype] <noident> Signed-off-by: Kim Phillips <kim.phillips@freescale.com> --- arch/arm/boot/compressed/atags_to_fdt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)