diff options
| author | Tom Rini <trini@konsulko.com> | 2017-08-17 01:07:20 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-17 01:12:00 +0300 |
| commit | 470135be276b2d92c6da464c68839202d4ff0d08 (patch) | |
| tree | 4d9370edd492c43f4409ee8716b8fe9264366516 /arch/arm/mach-imx/mx7/soc.c | |
| parent | 390194d43fa4478ddb638164ddb114c979f3e57a (diff) | |
| parent | e872f27a020f353dd334fc025999466adf5ae18c (diff) | |
| download | u-boot-470135be276b2d92c6da464c68839202d4ff0d08.tar.xz | |
Merge git://www.denx.de/git/u-boot-imx
Update pfla02 for setenv changes and PHYLIB/etc migration to Kconfig.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/mach-imx/mx7/soc.c')
| -rw-r--r-- | arch/arm/mach-imx/mx7/soc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c index 7152c847d0..87bf105f38 100644 --- a/arch/arm/mach-imx/mx7/soc.c +++ b/arch/arm/mach-imx/mx7/soc.c @@ -31,7 +31,7 @@ U_BOOT_DEVICE(imx7_thermal) = { }; #endif -#ifdef CONFIG_IMX_RDC +#if CONFIG_IS_ENABLED(IMX_RDC) /* * In current design, if any peripheral was assigned to both A7 and M4, * it will receive ipg_stop or ipg_wait when any of the 2 platforms enter @@ -245,8 +245,9 @@ int arch_cpu_init(void) mxs_dma_init(); #endif - if (IS_ENABLED(CONFIG_IMX_RDC)) - isolate_resource(); +#if CONFIG_IS_ENABLED(IMX_RDC) + isolate_resource(); +#endif return 0; } |