diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2015-11-10 09:01:42 -0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-25 07:48:14 +0000 |
commit | aebd1a87bbf960e69301bd29137aabb5dfab05fc (patch) | |
tree | 8cb518b966f6c9a4c3c4789d2deecf8e28514365 /meta/recipes-bsp/u-boot/u-boot/0002-image.c-Fix-non-Android-booting-with-ramdisk-and-or-.patch | |
parent | 273eee7a3614caea17c5bc93b720353641293cf7 (diff) | |
download | openembedded-core-contrib-aebd1a87bbf960e69301bd29137aabb5dfab05fc.tar.gz |
u-boot: Update to 2015.10 release
The U-Boot 2015.10 has been released at October 20th 2015. This also
removes the GCC workaround, for the inline behavior, as this version
properlu supports the GCC 5.2 as compiler.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
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, 36 insertions, 0 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 new file mode 100644 index 0000000000..0d1a714f4c --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot/0002-image.c-Fix-non-Android-booting-with-ramdisk-and-or-.patch @@ -0,0 +1,36 @@ +From 0a8c59720155c30f01d4cd1c53da3647a3f4decd Mon Sep 17 00:00:00 2001 +From: Tom Rini <trini@konsulko.com> +Date: Tue, 27 Oct 2015 19:04:40 -0400 +Subject: [PATCH 2/6] image.c: Fix non-Android booting with ramdisk and/or + device tree +Organization: O.S. Systems Software LTDA. + +In 1fec3c5 I added a check that if we had an Android image we default to +trying the kernel address for a ramdisk. However when we don't have an +Android image buf is NULL and we oops here. Ensure that we have 'buf' +to check first. + +Upstream-Status: Backport [2016.01] + +Reported-by: elipe Balbi <balbi@ti.com> +Signed-off-by: Tom Rini <trini@konsulko.com> +--- + common/image.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common/image.c b/common/image.c +index e607109..85c4f39 100644 +--- a/common/image.c ++++ b/common/image.c +@@ -913,7 +913,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images, + * Look for an Android boot image. + */ + buf = map_sysmem(images->os.start, 0); +- if (genimg_get_format(buf) == IMAGE_FORMAT_ANDROID) ++ if (buf && genimg_get_format(buf) == IMAGE_FORMAT_ANDROID) + select = argv[0]; + #endif + +-- +2.6.2 + |