diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-09-12 07:53:12 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-09-12 07:53:12 +0200 |
| commit | d11999163ba62a239022d7ba98bc524730575db8 (patch) | |
| tree | 3fa5bdd53229e77a9b2cac82e118cb91afe616d7 /arch/arm/mach-imx | |
| parent | d8af9462c9040c2e222d90a6003581abc8fb040e (diff) | |
| parent | b9014db5661d5a447f2d2d7717ad9be839d5e741 (diff) | |
| download | barebox-d11999163ba62a239022d7ba98bc524730575db8.tar.gz barebox-d11999163ba62a239022d7ba98bc524730575db8.tar.xz | |
Merge branch 'for-next/qemu'
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/imx.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/include/mach/generic.h | 9 |
2 files changed, 10 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()) diff --git a/arch/arm/mach-imx/include/mach/generic.h b/arch/arm/mach-imx/include/mach/generic.h index ac066e3f17..5102c34e4c 100644 --- a/arch/arm/mach-imx/include/mach/generic.h +++ b/arch/arm/mach-imx/include/mach/generic.h @@ -223,6 +223,15 @@ extern unsigned int __imx_cpu_type; # define cpu_is_vf610() (0) #endif +#ifdef CONFIG_BOARD_ARM_GENERIC_DT +# ifdef imx_cpu_type +# undef imx_cpu_type +# define imx_cpu_type __imx_cpu_type +# else +# define imx_cpu_type 0 +# endif +#endif + #define cpu_is_mx23() (0) #define cpu_is_mx28() (0) |