diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-12-05 02:11:59 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-12-05 02:11:59 +0100 |
| commit | 2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70 (patch) | |
| tree | e19b3def6c8f41f56cdb5e8b71aa53d8f72f5812 /board/keymile/mgcoge | |
| parent | cd514aeb996e2f7aefbe1f78481965d9d074aed4 (diff) | |
| parent | f68ab43de67f59925542efb6bcec30f4a84fe695 (diff) | |
| download | u-boot-imx-2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70.zip u-boot-imx-2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70.tar.gz u-boot-imx-2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70.tar.bz2 | |
Merge branch 'master' into next
Conflicts:
board/esd/plu405/plu405.c
drivers/rtc/ftrtc010.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/keymile/mgcoge')
| -rw-r--r-- | board/keymile/mgcoge/mgcoge.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/board/keymile/mgcoge/mgcoge.c b/board/keymile/mgcoge/mgcoge.c index b16a01c..932a805 100644 --- a/board/keymile/mgcoge/mgcoge.c +++ b/board/keymile/mgcoge/mgcoge.c @@ -312,11 +312,10 @@ int hush_init_var (void) #if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) /* - * update "memory" property in the blob + * update "flash" property in the blob */ void ft_blob_update (void *blob, bd_t *bd) { - ulong memory_data[2] = {0}; ulong *flash_data = NULL; ulong flash_reg[6] = {0}; flash_info_t *info; @@ -324,11 +323,6 @@ void ft_blob_update (void *blob, bd_t *bd) int size; int i = 0; - memory_data[0] = cpu_to_be32 (bd->bi_memstart); - memory_data[1] = cpu_to_be32 (bd->bi_memsize); - fdt_set_node_and_value (blob, "/memory", "reg", memory_data, - sizeof (memory_data)); - len = fdt_get_node_and_value (blob, "/localbus", "ranges", (void *)&flash_data); |