diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-04-04 20:09:58 +0900 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-05-12 15:19:45 -0400 |
| commit | 8e2615752ee6d5daf8ce2e1e599a0512750f24b9 (patch) | |
| tree | 41ee1ead95b1cafc60195a05e916c9398743d72e /board | |
| parent | 3e41c54ad8099951d57c3c5a0f5ebc6e8becf70c (diff) | |
| download | blackbird-obmc-uboot-8e2615752ee6d5daf8ce2e1e599a0512750f24b9.tar.gz blackbird-obmc-uboot-8e2615752ee6d5daf8ce2e1e599a0512750f24b9.zip | |
bd_info: remove bi_barudrate member from struct bd_info
gd->bd->bi_baudrate is a copy of gd->baudrate.
Since baudrate is a common feature for all architectures,
keep gd->baudrate only.
It is true that bi_baudrate was passed to the kernel in that structure
but it was a long time ago.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Tom Rini <trini@ti.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Heiko Schocher <hs@denx.de>
Acked-by: Michal Simek <monstr@monstr.eu> (For microblaze)
Diffstat (limited to 'board')
| -rw-r--r-- | board/muas3001/muas3001.c | 4 | ||||
| -rw-r--r-- | board/mvblue/mvblue.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/board/muas3001/muas3001.c b/board/muas3001/muas3001.c index 42b0a035c7..08eb5e8290 100644 --- a/board/muas3001/muas3001.c +++ b/board/muas3001/muas3001.c @@ -286,6 +286,8 @@ int board_early_init_r (void) } #if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) +DECLARE_GLOBAL_DATA_PTR; + /* * update "memory" property in the blob */ @@ -314,7 +316,7 @@ void ft_blob_update (void *blob, bd_t *bd) /* baudrate */ nodeoffset = fdt_path_offset (blob, "/soc/cpm/serial"); if (nodeoffset >= 0) { - speed = cpu_to_be32 (bd->bi_baudrate); + speed = cpu_to_be32 (gd->baudrate); ret = fdt_setprop (blob, nodeoffset, "current-speed", &speed, sizeof (unsigned long)); if (ret < 0) diff --git a/board/mvblue/mvblue.c b/board/mvblue/mvblue.c index 69abb06251..63503e89da 100644 --- a/board/mvblue/mvblue.c +++ b/board/mvblue/mvblue.c @@ -58,7 +58,6 @@ int checkboard (void) u32 BoardType = get_BoardType (); char *BoardName[2] = { "mvBlueBOX", "mvBlueLYNX" }; char *p; - bd_t *bd = gd->bd; hw_watchdog_reset (); @@ -71,8 +70,8 @@ int checkboard (void) if ((p = getenv ("console_nr")) != NULL) { unsigned long con_nr = simple_strtoul (p, NULL, 10) & 3; - bd->bi_baudrate &= ~3; - bd->bi_baudrate |= con_nr & 3; + gd->baudrate &= ~3; + gd->baudrate |= con_nr & 3; } return 0; } |
