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/0002-image.c-Fix-non-Android-booting-with-ramdisk-and-or-.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/0002-image.c-Fix-non-Android-booting-with-ramdisk-and-or-.patch')
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot/0002-image.c-Fix-non-Android-booting-with-ramdisk-and-or-.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot/0002-image.c-Fix-non-Android-booting-with-ramdisk-and-or-.patch b/meta/recipes-bsp/u-boot/u-boot/0002-image.c-Fix-non-Android-booting-with-ramdisk-and-or-.patch deleted file mode 100644 index 0d1a714f4c..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot/0002-image.c-Fix-non-Android-booting-with-ramdisk-and-or-.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From 0a8c59720155c30f01d4cd1c53da3647a3f4decd Mon Sep 17 00:00:00 2001 | ||
2 | From: Tom Rini <trini@konsulko.com> | ||
3 | Date: Tue, 27 Oct 2015 19:04:40 -0400 | ||
4 | Subject: [PATCH 2/6] image.c: Fix non-Android booting with ramdisk and/or | ||
5 | device tree | ||
6 | Organization: O.S. Systems Software LTDA. | ||
7 | |||
8 | In 1fec3c5 I added a check that if we had an Android image we default to | ||
9 | trying the kernel address for a ramdisk. However when we don't have an | ||
10 | Android image buf is NULL and we oops here. Ensure that we have 'buf' | ||
11 | to check first. | ||
12 | |||
13 | Upstream-Status: Backport [2016.01] | ||
14 | |||
15 | Reported-by: elipe Balbi <balbi@ti.com> | ||
16 | Signed-off-by: Tom Rini <trini@konsulko.com> | ||
17 | --- | ||
18 | common/image.c | 2 +- | ||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/common/image.c b/common/image.c | ||
22 | index e607109..85c4f39 100644 | ||
23 | --- a/common/image.c | ||
24 | +++ b/common/image.c | ||
25 | @@ -913,7 +913,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images, | ||
26 | * Look for an Android boot image. | ||
27 | */ | ||
28 | buf = map_sysmem(images->os.start, 0); | ||
29 | - if (genimg_get_format(buf) == IMAGE_FORMAT_ANDROID) | ||
30 | + if (buf && genimg_get_format(buf) == IMAGE_FORMAT_ANDROID) | ||
31 | select = argv[0]; | ||
32 | #endif | ||
33 | |||
34 | -- | ||
35 | 2.6.2 | ||
36 | |||