Index: sys/arm/mv/mv_localbus.c =================================================================== --- sys/arm/mv/mv_localbus.c +++ sys/arm/mv/mv_localbus.c @@ -163,7 +163,7 @@ fdt_localbus_reg_decode(phandle_t node, struct localbus_softc *sc, struct localbus_devinfo *di) { - u_long start, end, count; + rman_res_t start, end, count; pcell_t *reg, *regptr; pcell_t addr_cells, size_cells; int tuple_size, tuples; Index: sys/arm/mv/mv_machdep.c =================================================================== --- sys/arm/mv/mv_machdep.c +++ sys/arm/mv/mv_machdep.c @@ -85,7 +85,7 @@ int mpp[MPP_PIN_MAX]; uint32_t ctrl_val, ctrl_offset; pcell_t reg[4]; - u_long start, size; + rman_res_t start, size; phandle_t node; pcell_t pin_cells, *pinmap_ptr, pin_count; ssize_t len; Index: sys/dev/fdt/fdt_common.h =================================================================== --- sys/dev/fdt/fdt_common.h +++ sys/dev/fdt/fdt_common.h @@ -82,7 +82,7 @@ int fdt_addrsize_cells(phandle_t, int *, int *); u_long fdt_data_get(void *, int); -int fdt_data_to_res(pcell_t *, int, int, u_long *, u_long *); +int fdt_data_to_res(pcell_t *, int, int, rman_res_t *, rman_res_t *); phandle_t fdt_find_compatible(phandle_t, const char *, int); phandle_t fdt_depth_search_compatible(phandle_t, const char *, int); int fdt_get_mem_regions(struct mem_region *, int *, uint64_t *); Index: sys/dev/fdt/fdt_common.c =================================================================== --- sys/dev/fdt/fdt_common.c +++ sys/dev/fdt/fdt_common.c @@ -430,8 +430,8 @@ } int -fdt_data_to_res(pcell_t *data, int addr_cells, int size_cells, u_long *start, - u_long *count) +fdt_data_to_res(pcell_t *data, int addr_cells, int size_cells, + rman_res_t *start, rman_res_t *count) { /* Address portion. */ @@ -473,7 +473,7 @@ int fdt_reg_to_rl(phandle_t node, struct resource_list *rl) { - u_long end, count, start; + rman_res_t end, count, start; pcell_t *reg, *regptr; pcell_t addr_cells, size_cells; int tuple_size, tuples; @@ -595,6 +595,7 @@ uint32_t memory_size; int addr_cells, size_cells; int i, max_size, res_len, rv, tuple_size, tuples; + rman_res_t start, size; max_size = sizeof(reserve); root = OF_finddevice("/"); @@ -632,7 +633,9 @@ for (i = 0; i < tuples; i++) { rv = fdt_data_to_res(reservep, addr_cells, size_cells, - (u_long *)&mr[i].mr_start, (u_long *)&mr[i].mr_size); + &start, &size); + mr[i].mr_start = start; + mr[i].mr_size = size; if (rv != 0) goto out; @@ -655,6 +658,7 @@ uint64_t memory_size; int addr_cells, size_cells; int i, max_size, reg_len, rv, tuple_size, tuples; + rman_res_t start, size; max_size = sizeof(reg); memory = OF_finddevice("/memory"); @@ -690,11 +694,14 @@ for (i = 0; i < tuples; i++) { rv = fdt_data_to_res(regp, addr_cells, size_cells, - (u_long *)&mr[i].mr_start, (u_long *)&mr[i].mr_size); + &start, &size); if (rv != 0) goto out; + mr[i].mr_start = start; + mr[i].mr_size = size; + regp += addr_cells + size_cells; memory_size += mr[i].mr_size; } @@ -734,4 +741,4 @@ if (OF_getprop(chosen, "bootargs", bootargs, max_size) == -1) return (ENXIO); return (0); -} \ No newline at end of file +} Index: sys/powerpc/mpc85xx/lbc.c =================================================================== --- sys/powerpc/mpc85xx/lbc.c +++ sys/powerpc/mpc85xx/lbc.c @@ -362,7 +362,7 @@ fdt_lbc_reg_decode(phandle_t node, struct lbc_softc *sc, struct lbc_devinfo *di) { - u_long start, end, count; + rman_res_t start, end, count; pcell_t *reg, *regptr; pcell_t addr_cells, size_cells; int tuple_size, tuples;