summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClement Leger <cleger@kalray.eu>2020-06-30 22:43:59 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2020-07-01 07:23:14 +0200
commit887b3c358aaf493dae0c2efcddc686bd6cf180f5 (patch)
tree87f6bb2972451df24a689ec6ab707ee8f8e9e910
parent27b482a47a2383291289adfb1cb6acf69f4de6ff (diff)
downloadbarebox-887b3c358aaf493dae0c2efcddc686bd6cf180f5.tar.gz
barebox-887b3c358aaf493dae0c2efcddc686bd6cf180f5.tar.xz
common: bootm: allow building with an undefined IH_ARCH
Some architectures might not want to support uImage. To do so, allow IH_ARCH to be let undefined which will make it possible to compile boot support. Signed-off-by: Clement Leger <cleger@kalray.eu> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--common/bootm.c2
-rw-r--r--include/image.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/common/bootm.c b/common/bootm.c
index 8fec1ee34d..4012561a73 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -505,7 +505,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;
diff --git a/include/image.h b/include/image.h
index 88b628bc75..0a7832f139 100644
--- a/include/image.h
+++ b/include/image.h
@@ -101,6 +101,8 @@
#define IH_ARCH IH_ARCH_AVR32
#elif defined(CONFIG_LINUX)
#define IH_ARCH IH_ARCH_LINUX
+#else
+#define IH_ARCH IH_ARCH_INVALID
#endif
/*