summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/imx.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2019-08-19 14:58:17 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2019-08-19 15:40:45 +0200
commit66f5e31b788991ac53cafb62a4307da6734db07d (patch)
tree90c8c9a085cb711151411d4734019ea36a2726b7 /arch/arm/mach-imx/imx.c
parentffb0344b7410dddea0c7804e1a9797a802736c69 (diff)
downloadbarebox-66f5e31b788991ac53cafb62a4307da6734db07d.tar.gz
barebox-66f5e31b788991ac53cafb62a4307da6734db07d.tar.xz
ARM: i.MX: Do not hang() on unknown SoCs
The generic DT image built with CONFIG_ARCH_IMX has nothing really i.MX specific except that it has support for i.MX features. The DT image could be started with a non i.MX device tree which works as expected. imx_init() panics though when started with a non i.MX device tree. Remove the hang() so that we can just continue. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/imx.c')
-rw-r--r--arch/arm/mach-imx/imx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/imx.c b/arch/arm/mach-imx/imx.c
index 63914d306e..ad9b3c4d3e 100644
--- a/arch/arm/mach-imx/imx.c
+++ b/arch/arm/mach-imx/imx.c
@@ -95,7 +95,7 @@ static int imx_init(void)
if (root) {
__imx_cpu_type = imx_soc_from_dt();
if (!__imx_cpu_type)
- hang();
+ return 0;
}
if (cpu_is_mx1())