diff options
author | Marek Vasut <marex@denx.de> | 2016-01-14 04:17:12 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-18 11:47:04 +0000 |
commit | 5abb69126ce1c0ebcde16271fa5c732e5a1c946d (patch) | |
tree | cf20e8477af0dbe34a8799852cacc906638a498a /meta/recipes-bsp/u-boot/u-boot/0003-common-board_f-enable-setup_board_part1-for-MIPS.patch | |
parent | e9280d13a88701500ffdcb9ba51abeb5c322ca0d (diff) | |
download | poky-5abb69126ce1c0ebcde16271fa5c732e5a1c946d.tar.gz |
u-boot: Update to 2016.01 release
Upgrade U-Boot to latest version and drop upstreamed patches.
(From OE-Core rev: fd0a8923638217dfa0a61ee63f2013229429808c)
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Ross Burton <ross.burton@intel.com>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/u-boot/u-boot/0003-common-board_f-enable-setup_board_part1-for-MIPS.patch')
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot/0003-common-board_f-enable-setup_board_part1-for-MIPS.patch | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot/0003-common-board_f-enable-setup_board_part1-for-MIPS.patch b/meta/recipes-bsp/u-boot/u-boot/0003-common-board_f-enable-setup_board_part1-for-MIPS.patch deleted file mode 100644 index 45d20b8a4b..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot/0003-common-board_f-enable-setup_board_part1-for-MIPS.patch +++ /dev/null | |||
@@ -1,59 +0,0 @@ | |||
1 | From e5ebba40a3b8a1405e48d49dc873ffe2fa1963a1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> | ||
3 | Date: Sun, 1 Nov 2015 17:36:13 +0100 | ||
4 | Subject: [PATCH 3/6] common/board_f: enable setup_board_part1() for MIPS | ||
5 | Organization: O.S. Systems Software LTDA. | ||
6 | |||
7 | The variables bd_t:bi_memstart and bd_t:bi_memsize have to be | ||
8 | initialized also on MIPS. Otherwise LMB and cmd_bdinfo do not | ||
9 | correctly work. This currently breaks the booting of FIT images | ||
10 | on MIPS. Enable the board_init_f hook setup_board_part1() | ||
11 | for MIPS to fix this. | ||
12 | |||
13 | Upstream-Status: Backport [2016.01] | ||
14 | |||
15 | Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> | ||
16 | Reviewed-by: Tom Rini <trini@konsulko.com> | ||
17 | Reviewed-by: Simon Glass <sjg@chromium.org> | ||
18 | --- | ||
19 | common/board_f.c | 8 ++++++-- | ||
20 | 1 file changed, 6 insertions(+), 2 deletions(-) | ||
21 | |||
22 | diff --git a/common/board_f.c b/common/board_f.c | ||
23 | index 613332e..33cc5c0 100644 | ||
24 | --- a/common/board_f.c | ||
25 | +++ b/common/board_f.c | ||
26 | @@ -551,7 +551,7 @@ static int display_new_sp(void) | ||
27 | return 0; | ||
28 | } | ||
29 | |||
30 | -#if defined(CONFIG_PPC) || defined(CONFIG_M68K) | ||
31 | +#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_MIPS) | ||
32 | static int setup_board_part1(void) | ||
33 | { | ||
34 | bd_t *bd = gd->bd; | ||
35 | @@ -580,7 +580,9 @@ static int setup_board_part1(void) | ||
36 | |||
37 | return 0; | ||
38 | } | ||
39 | +#endif | ||
40 | |||
41 | +#if defined(CONFIG_PPC) || defined(CONFIG_M68K) | ||
42 | static int setup_board_part2(void) | ||
43 | { | ||
44 | bd_t *bd = gd->bd; | ||
45 | @@ -933,8 +935,10 @@ static init_fnc_t init_sequence_f[] = { | ||
46 | reserve_stacks, | ||
47 | setup_dram_config, | ||
48 | show_dram_config, | ||
49 | -#if defined(CONFIG_PPC) || defined(CONFIG_M68K) | ||
50 | +#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_MIPS) | ||
51 | setup_board_part1, | ||
52 | +#endif | ||
53 | +#if defined(CONFIG_PPC) || defined(CONFIG_M68K) | ||
54 | INIT_FUNC_WATCHDOG_RESET | ||
55 | setup_board_part2, | ||
56 | #endif | ||
57 | -- | ||
58 | 2.6.2 | ||
59 | |||