diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-10-21 23:35:12 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-10-21 23:35:12 +0200 |
| commit | 1b81f017b04b5a176f5f9230ec979f0f3c55ba5b (patch) | |
| tree | e13192c738bcb50238f6a60ef0448b1e2eec516a /common/fdt_support.c | |
| parent | d639a8ccb0aa3c8c9d4ba0b642951f5534dcbdf1 (diff) | |
| parent | 3a8653b3ac11b5ee56ce2b8f795826b8bf01eff2 (diff) | |
| download | u-boot-imx-1b81f017b04b5a176f5f9230ec979f0f3c55ba5b.zip u-boot-imx-1b81f017b04b5a176f5f9230ec979f0f3c55ba5b.tar.gz u-boot-imx-1b81f017b04b5a176f5f9230ec979f0f3c55ba5b.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/master
* 'master' of /home/wd/git/u-boot/master:
cosmetic: Fixup fixup_silent_linux() for checkpatch
Correct dependency rule to fix SPL build
Move timestamp and version files into 'generated' subdir
sandbox: Makefile changes to build sandbox architecture
Add generic gpio.h in asm-generic
Adjust dependency rules to permit per-file flags
sandbox: Use uintptr_t for 32/64-bit compatibility
sandbox: Add basic config file
sandbox: Add serial uart
sandbox: Add main program
sandbox: Add OS dependent layer
sandbox: Force command sections to be 4-byte aligned
sandbox: Disable standalone/API support
sandbox: Disable built-in malloc
sandbox: Add bootm support
sandbox: Add board info for architecture
sandbox: Add sandbox board
sandbox: Add architecture lib files
sandbox: Add cpu files
sandbox: Add compiler defines to support a 64-bit x86_64 platform
sandbox: Add architecture image support
Fix use of int as pointer in image.c
sandbox: Add architecture header files
arm: ca9x4_ct_vxp: enable PXE BOOTP options support
arm: ca9x4_ct_vxp: enable pxe command support
Convert ca9x4_ct_vxp to standard env variables
net: bootp: add PXE/RFC 4578 DHCP options support
Add pxe command
lib: add uuid_str_to_bin for use with bootp and PXE uuid
README: document standard image variables
Replace space and tab checks with isblank
cosmetic: remove unneeded curly braces
Add isblank
common: add run_command2 for running simple or hush commands
common, menu: use abortboot for menu timeout
Add generic, reusable menu code
DM9000:Add a byte swap macro for dm9000 io operation.
kw_gpio: fix error in kw_gpio_direction_input
Blackfin: bfin_spi: fix build error when DEBUG is defined
Blackfin: define CONFIG_SYS_CACHELINE_SIZE
video: Moving mx3fb.c to CONFIG_VIDEO
mx31: make HSP clock for mx3fb driver available
MX5: Make IPU display output and pixel format configurable
VIDEO: MX5: export pix format
VIDEO: MX5: Switch MX5 to CONFIG_VIDEO
video: update the Freescale DIU driver to use linux/fb.h
powerpc: cpm2 boards: update fcc register logic
Diffstat (limited to 'common/fdt_support.c')
| -rw-r--r-- | common/fdt_support.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/fdt_support.c b/common/fdt_support.c index abf6d53..e0d3fe3 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -495,7 +495,7 @@ int fdt_resize(void *blob) total = fdt_num_mem_rsv(blob); for (i = 0; i < total; i++) { fdt_get_mem_rsv(blob, i, &addr, &size); - if (addr == (uint64_t)(u32)blob) { + if (addr == (uintptr_t)blob) { fdt_del_mem_rsv(blob, i); break; } @@ -511,14 +511,14 @@ int fdt_resize(void *blob) fdt_size_dt_strings(blob) + 5 * sizeof(struct fdt_reserve_entry); /* Make it so the fdt ends on a page boundary */ - actualsize = ALIGN(actualsize + ((uint)blob & 0xfff), 0x1000); - actualsize = actualsize - ((uint)blob & 0xfff); + actualsize = ALIGN(actualsize + ((uintptr_t)blob & 0xfff), 0x1000); + actualsize = actualsize - ((uintptr_t)blob & 0xfff); /* Change the fdt header to reflect the correct size */ fdt_set_totalsize(blob, actualsize); /* Add the new reservation */ - ret = fdt_add_mem_rsv(blob, (uint)blob, actualsize); + ret = fdt_add_mem_rsv(blob, (uintptr_t)blob, actualsize); if (ret < 0) return ret; |