| Message ID | 1441271540-6765-1-git-send-email-simon.guinot@seagate.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Thu, Sep 03, 2015 at 11:12:20AM +0200, Simon Guinot wrote: > From: Simon Guinot <simon.guinot@sequanux.org> > > On the LaCie boards netspace_max_v2 and net2big_v2, two internal hard > drives are available. Additionally on the d2net_v2 board, an extra hard > drive can be plugged via eSATA. > > This patch updates CONFIG_SYS_IDE_MAXBUS and CONFIG_SYS_IDE_MAXDEVICE > accordingly for this boards. Hi Luka and Prafulla, Please, consider to apply this patch. Thanks, Simon > > Signed-off-by: Simon Guinot <simon.guinot@sequanux.org> > --- > include/configs/lacie_kw.h | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > Changes for v2: > - Restore the undef CONFIG_SYS_IDE_MAXBUS and CONFIG_SYS_IDE_MAXDEVICE. > It is needed to avoid symbol redefinition warnings at build time. > > diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h > index 7f63ae0d2228..7f878b713afa 100644 > --- a/include/configs/lacie_kw.h > +++ b/include/configs/lacie_kw.h > @@ -101,8 +101,6 @@ > #undef CONFIG_SYS_IDE_MAXDEVICE > #undef CONFIG_SYS_PROMPT > #define CONFIG_ENV_SPI_MAX_HZ 20000000 /* 20Mhz */ > -#define CONFIG_SYS_IDE_MAXBUS 1 > -#define CONFIG_SYS_IDE_MAXDEVICE 1 > #if defined(CONFIG_D2NET_V2) > #define CONFIG_SYS_PROMPT "d2v2> " > #elif defined(CONFIG_NET2BIG_V2) > @@ -132,6 +130,11 @@ > #if defined(CONFIG_NETSPACE_MAX_V2) || defined(CONFIG_D2NET_V2) || \ > defined(CONFIG_NET2BIG_V2) > #define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET > +#define CONFIG_SYS_IDE_MAXBUS 2 > +#define CONFIG_SYS_IDE_MAXDEVICE 2 > +#else > +#define CONFIG_SYS_IDE_MAXBUS 1 > +#define CONFIG_SYS_IDE_MAXDEVICE 1 > #endif > #endif /* CONFIG_MVSATA_IDE */ > > -- > 2.1.4
On Thu, Sep 03, 2015 at 11:12:20AM +0200, Simon Guinot wrote: > From: Simon Guinot <simon.guinot@sequanux.org> > > On the LaCie boards netspace_max_v2 and net2big_v2, two internal hard > drives are available. Additionally on the d2net_v2 board, an extra hard > drive can be plugged via eSATA. > > This patch updates CONFIG_SYS_IDE_MAXBUS and CONFIG_SYS_IDE_MAXDEVICE > accordingly for this boards. > > Signed-off-by: Simon Guinot <simon.guinot@sequanux.org> Applied to u-boot/master, thanks!
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index 7f63ae0d2228..7f878b713afa 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -101,8 +101,6 @@ #undef CONFIG_SYS_IDE_MAXDEVICE #undef CONFIG_SYS_PROMPT #define CONFIG_ENV_SPI_MAX_HZ 20000000 /* 20Mhz */ -#define CONFIG_SYS_IDE_MAXBUS 1 -#define CONFIG_SYS_IDE_MAXDEVICE 1 #if defined(CONFIG_D2NET_V2) #define CONFIG_SYS_PROMPT "d2v2> " #elif defined(CONFIG_NET2BIG_V2) @@ -132,6 +130,11 @@ #if defined(CONFIG_NETSPACE_MAX_V2) || defined(CONFIG_D2NET_V2) || \ defined(CONFIG_NET2BIG_V2) #define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET +#define CONFIG_SYS_IDE_MAXBUS 2 +#define CONFIG_SYS_IDE_MAXDEVICE 2 +#else +#define CONFIG_SYS_IDE_MAXBUS 1 +#define CONFIG_SYS_IDE_MAXDEVICE 1 #endif #endif /* CONFIG_MVSATA_IDE */