Skip to contentSkip to conversation

ARM: Kirkwood: fix IDE configuration on LaCie boards

PATCH Superseded Simon Guinot 3 participants 4 messages Sep 2, 2015 – Sep 13, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: Kirkwood: fix IDE configuration on LaCie boards

From: Simon Guinot <[email protected]>

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.

---
 include/configs/lacie_kw.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
include/configs/lacie_kw.h +5 -4
index 7f63ae0d2228..53957acd37d6 100644
@@ -97,12 +97,8 @@
 /* Remove or override few declarations from mv-common.h */
 #undef CONFIG_RBTREE
 #undef CONFIG_ENV_SPI_MAX_HZ
-#undef CONFIG_SYS_IDE_MAXBUS
-#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 +128,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 */
 
Signature · 1 line
2.1.4
#1 lore raw

PATCH v2 1/1 ARM: Kirkwood: fix IDE configuration on LaCie boards

From: Simon Guinot <[email protected]>

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.

---
 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.

include/configs/lacie_kw.h +5 -2
index 7f63ae0d2228..7f878b713afa 100644
@@ -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 */
 
Signature · 1 line
2.1.4
#2 lore raw

PATCH v2 1/1 ARM: Kirkwood: fix IDE configuration on LaCie boards

Quoted 8 lines · Simon Guinot

From: Simon Guinot <[email protected]>

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

Quoted 37 lines
---
 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.

include/configs/lacie_kw.h +5 -2
index 7f63ae0d2228..7f878b713afa 100644
@@ -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 */
 
Signature · 1 line
2.1.4

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150912/48e29cc7/attachment.sig>

#3 lore raw

PATCH v2 1/1 ARM: Kirkwood: fix IDE configuration on LaCie boards

In reply to Simon Guinot
Quoted 10 lines · Simon Guinot

From: Simon Guinot <[email protected]>

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.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150913/954a3663/attachment.sig>