diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-07-27 21:58:33 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-07-27 21:58:33 +0200 |
| commit | 058158ab9fa697dfcc9c53aa5fc521ba9c9842bf (patch) | |
| tree | 3c6186020f565f37fb7f75968d588556edead801 /common | |
| parent | 9d6769235a7827ff3208c8c5245e18fc06d5d008 (diff) | |
| parent | 17c29f5e41a2e69e85f04d8bbdda3254cd51a961 (diff) | |
| download | barebox-058158ab9fa697dfcc9c53aa5fc521ba9c9842bf.tar.gz barebox-058158ab9fa697dfcc9c53aa5fc521ba9c9842bf.tar.xz | |
Merge branch 'for-next/kvx'
Diffstat (limited to 'common')
| -rw-r--r-- | common/Kconfig | 1 | ||||
| -rw-r--r-- | common/bootm.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/common/Kconfig b/common/Kconfig index f260291d15..b59dc39d4c 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -39,7 +39,6 @@ config BLOCK_WRITE config ELF bool "ELF Support" if COMPILE_TEST - depends on MIPS || COMPILE_TEST config FILETYPE bool diff --git a/common/bootm.c b/common/bootm.c index 4110d8d6ef..bea73fac36 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -510,7 +510,7 @@ static int bootm_open_os_uimage(struct image_data *data) uimage_print_contents(data->os); - if (data->os->header.ih_arch != IH_ARCH) { + if (IH_ARCH == IH_ARCH_INVALID || data->os->header.ih_arch != IH_ARCH) { printf("Unsupported Architecture 0x%x\n", data->os->header.ih_arch); return -EINVAL; |