diff mbox series

[U-Boot,u-boot-marvell,v2,05/15] arm: mvebu: turris_omnia: move I2C dependencies to Kconfig

Message ID 20190430014825.30553-6-marek.behun@nic.cz
State Superseded
Delegated to: Stefan Roese
Headers show
Series Fixes for Turris Omnia | expand

Commit Message

Marek Behún April 30, 2019, 1:48 a.m. UTC
The I2C dependencies are defined in include/configs/turris_omnia.h,
because Turris Omnia won't boot correctly without I2C support.

Move these dependencies to Kconfig, so that they are selected if Turris
Omnia is selected as target.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 arch/arm/mach-mvebu/Kconfig    |  5 +++++
 include/configs/turris_omnia.h | 11 -----------
 2 files changed, 5 insertions(+), 11 deletions(-)

Comments

Heiko Schocher April 30, 2019, 4:54 a.m. UTC | #1
Hello Marek,

Am 30.04.2019 um 03:48 schrieb Marek Behún:
> The I2C dependencies are defined in include/configs/turris_omnia.h,
> because Turris Omnia won't boot correctly without I2C support.
> 
> Move these dependencies to Kconfig, so that they are selected if Turris
> Omnia is selected as target.
> 
> Signed-off-by: Marek Behún <marek.behun@nic.cz>
> ---
>   arch/arm/mach-mvebu/Kconfig    |  5 +++++
>   include/configs/turris_omnia.h | 11 -----------
>   2 files changed, 5 insertions(+), 11 deletions(-)

Reviewed-by: Heiko Schocher <hs@denx.de>

bye,
Heiko
Stefan Roese May 2, 2019, 6:03 a.m. UTC | #2
On 30.04.19 03:48, Marek Behún wrote:
> The I2C dependencies are defined in include/configs/turris_omnia.h,
> because Turris Omnia won't boot correctly without I2C support.
> 
> Move these dependencies to Kconfig, so that they are selected if Turris
> Omnia is selected as target.
> 
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan
diff mbox series

Patch

diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index f99bd3bf65..2bf829d10a 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -116,6 +116,11 @@  config TARGET_DB_88F6820_AMC
 config TARGET_TURRIS_OMNIA
 	bool "Support Turris Omnia"
 	select 88F6820
+	select DM_I2C
+	select I2C_MUX
+	select I2C_MUX_PCA954x
+	select SPL_I2C_MUX
+	select SYS_I2C_MVTWSI
 
 config TARGET_TURRIS_MOX
 	bool "Support Turris Mox"
diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h
index 5e692e6829..5a7539c9be 100644
--- a/include/configs/turris_omnia.h
+++ b/include/configs/turris_omnia.h
@@ -18,17 +18,6 @@ 
  */
 #define CONFIG_SYS_TCLK		250000000	/* 250MHz */
 
-/*
- * Commands configuration
- */
-
-/* I2C support */
-#define CONFIG_DM_I2C
-#define CONFIG_I2C_MUX
-#define CONFIG_I2C_MUX_PCA954x
-#define CONFIG_SPL_I2C_MUX
-#define CONFIG_SYS_I2C_MVTWSI
-
 /* USB/EHCI configuration */
 #define CONFIG_EHCI_IS_TDI