Fix boot on some devices like the BBone due to a bad check if Android isn't on the image
This commit is contained in:
parent
9f8349bb5c
commit
aa65ef6d71
@ -0,0 +1,33 @@
|
||||
From c139b5ff0999ec3d44a02ebdb623a92e5782e53e Mon Sep 17 00:00:00 2001
|
||||
From: Tom Rini <trini@konsulko.com>
|
||||
Date: Tue, 27 Oct 2015 19:04:40 -0400
|
||||
Subject: [PATCH 365/447] image.c: Fix non-Android booting with ramdisk and/or
|
||||
device tree
|
||||
|
||||
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.
|
||||
|
||||
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.5.0
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
Name: uboot-tools
|
||||
Version: 2015.10
|
||||
Release: 1%{?candidate:.%{candidate}}%{?dist}
|
||||
Release: 2%{?candidate:.%{candidate}}%{?dist}
|
||||
Summary: U-Boot utilities
|
||||
|
||||
Group: Development/Tools
|
||||
@ -17,6 +17,7 @@ Patch3: 0003-Switch-omap4-boards-to-use-config_distro_defaults-an.patch
|
||||
Patch4: 0004-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
|
||||
Patch5: 0005-port-utilite-to-distro-generic-boot-commands.patch
|
||||
Patch6: fix-beaglex15-usb-xhci.patch
|
||||
Patch7: 0001-image.c-Fix-non-Android-booting-with-ramdisk-and-or-.patch
|
||||
|
||||
BuildRequires: bc
|
||||
BuildRequires: dtc
|
||||
@ -166,6 +167,9 @@ install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir}
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Nov 2 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.10-2
|
||||
- Fix boot on some devices
|
||||
|
||||
* Tue Oct 20 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.10-1
|
||||
- Update to 2015.10 GA
|
||||
- Enable BeagleBoard X-15
|
||||
|
Loading…
Reference in New Issue
Block a user