diff mbox

[U-Boot,v3,4/6] sandbox: bootm: Don't fail the architecture check

Message ID 1413774684-29350-5-git-send-email-sjg@chromium.org
State Accepted
Delegated to: Simon Glass
Headers show

Commit Message

Simon Glass Oct. 20, 2014, 3:11 a.m. UTC
Since sandbox is used for testing, it should be able to 'boot' an image
from any archhitecture. This allows us to test an image by loading it in
sandbox.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

Changes in v3:
- Move sandbox bootm change into a separate patch

Changes in v2: None

 common/image-fit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Simon Glass Oct. 22, 2014, 2:58 p.m. UTC | #1
On 19 October 2014 21:11, Simon Glass <sjg@chromium.org> wrote:
> Since sandbox is used for testing, it should be able to 'boot' an image
> from any archhitecture. This allows us to test an image by loading it in
> sandbox.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>

Applied to u-boot-x86/master
diff mbox

Patch

diff --git a/common/image-fit.c b/common/image-fit.c
index 255c4ca..2b9e71a 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -1591,7 +1591,7 @@  int fit_image_load(bootm_headers_t *images, ulong addr,
 	}
 
 	bootstage_mark(bootstage_id + BOOTSTAGE_SUB_CHECK_ARCH);
-#ifndef USE_HOSTCC
+#if !defined(USE_HOSTCC) && !defined(CONFIG_SANDBOX)
 	if (!fit_image_check_target_arch(fit, noffset)) {
 		puts("Unsupported Architecture\n");
 		bootstage_error(bootstage_id + BOOTSTAGE_SUB_CHECK_ARCH);