leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: mvebu: turris_omnia: move ATSHA204A from defconfig to Kconfig

Browse Source 
This driver is required for Turris Omnia to read ethernet addresses.
Move the dependency from turris_omnia_defconfig to Kconfig.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Marek Behún 2019-05-02 16:53:32 +02:00 committed by Stefan Roese
parent b4b6a4e4ec
commit 6b26f3e312
3 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-mvebu/Kconfig
View File

@ -121,6 +121,7 @@ config TARGET_TURRIS_OMNIA
select I2C_MUX_PCA954x select I2C_MUX_PCA954x
select SPL_I2C_MUX select SPL_I2C_MUX
select SYS_I2C_MVTWSI select SYS_I2C_MVTWSI
select ATSHA204A
config TARGET_TURRIS_MOX config TARGET_TURRIS_MOX
bool "Support Turris Mox" bool "Support Turris Mox"

11
board/CZ.NIC/turris_omnia/turris_omnia.c
View File

@ -18,10 +18,7 @@
#include <dm/uclass.h> #include <dm/uclass.h>
#include <fdt_support.h> #include <fdt_support.h>
#include <time.h> #include <time.h>
#ifdef CONFIG_ATSHA204A
# include <atsha204a-i2c.h> # include <atsha204a-i2c.h>
#endif
#ifdef CONFIG_WDT_ORION #ifdef CONFIG_WDT_ORION
# include <wdt.h> # include <wdt.h>
@ -388,7 +385,6 @@ int board_late_init(void)
return 0; return 0;
} }
#ifdef CONFIG_ATSHA204A
static struct udevice *get_atsha204a_dev(void) static struct udevice *get_atsha204a_dev(void)
{ {
static struct udevice *dev; static struct udevice *dev;
@ -403,14 +399,12 @@ static struct udevice *get_atsha204a_dev(void)
return dev; return dev;
} }
#endif
int checkboard(void) int checkboard(void)
{ {
u32 version_num, serial_num; u32 version_num, serial_num;
int err = 1; int err = 1;
#ifdef CONFIG_ATSHA204A
struct udevice *dev = get_atsha204a_dev(); struct udevice *dev = get_atsha204a_dev();
if (dev) { if (dev) {
@ -434,8 +428,6 @@ int checkboard(void)
} }
out: out:
#endif
if (err) if (err)
printf("Board: Turris Omnia (ver N/A). SN: N/A\n"); printf("Board: Turris Omnia (ver N/A). SN: N/A\n");
else else
@ -458,7 +450,6 @@ static void increment_mac(u8 *mac)
int misc_init_r(void) int misc_init_r(void)
{ {
#ifdef CONFIG_ATSHA204A
int err; int err;
struct udevice *dev = get_atsha204a_dev(); struct udevice *dev = get_atsha204a_dev();
u8 mac0[4], mac1[4], mac[6]; u8 mac0[4], mac1[4], mac[6];
@ -503,8 +494,6 @@ int misc_init_r(void)
eth_env_set_enetaddr("eth2addr", mac); eth_env_set_enetaddr("eth2addr", mac);
out: out:
#endif
return 0; return 0;
} }

1
configs/turris_omnia_defconfig
View File

@ -48,7 +48,6 @@ CONFIG_AHCI_MVEBU=y
CONFIG_SATA=y CONFIG_SATA=y
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_SCSI_AHCI=y CONFIG_SCSI_AHCI=y
CONFIG_ATSHA204A=y
CONFIG_DM_MMC=y CONFIG_DM_MMC=y
CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_MV=y CONFIG_MMC_SDHCI_MV=y