WINBOND_83C553: enable only on boards that actually use it.

So far, only the BAB7xx board would call the initialise_w83c553f()
function for the WINBOND 83C553 chip, even though some other boards
(HIDDEN_DRAGON, Sandpoint8240, Sandpoint8245) enabled it in their
board configuration.  These boards were also missing other config
settings needed for that, which resulted in build errors like this:

drivers/pci/libpci.o:(.got2+0x84): undefined reference to `ide_bus_offset'

Switch arch/powerpc/lib/board.c to call initialise_w83c553f() not on a
per-board base, but when a WINBOND_83C553 in enabled in a
configuration (like BAB7xx), and disable it in the boards that had
this set so far.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Yusdi Santoso <yusdi_santoso@adaptec.com>
Cc: Jim Thompson <jim@musenki.com>
Acked-by: Stefan Roese <sr@denx.de>

diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c
index 2e0749da0a545a3d15300903c9e5def269a8bdac..b21c1d6ff0bbb98498ccf8c3f5924a03edaf6a18 100644 (file)
--- a/arch/powerpc/lib/board.c
+++ b/arch/powerpc/lib/board.c
@@ -694,7 +694,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
         */
        pci_init ();
 #endif
-#if defined(CONFIG_BAB7xx)
+#if defined(CONFIG_WINBOND_83C553)
        /*
         * Initialise the ISA bridge
         */

diff --git a/include/configs/HIDDEN_DRAGON.h b/include/configs/HIDDEN_DRAGON.h
index c684cb847886f6736a76a36a2f85310459c53895..44ae48d60befe5be0d3d26131c6413419c6f8b36 100644 (file)
--- a/include/configs/HIDDEN_DRAGON.h
+++ b/include/configs/HIDDEN_DRAGON.h
@@ -199,7 +199,7 @@
  */
 
 
-#define CONFIG_WINBOND_83C553  1       /*has a winbond bridge                  */
+/* #define CONFIG_WINBOND_83C553       1       / *has a winbond bridge                 */
 #define CONFIG_SYS_USE_WINBOND_IDE     0       /*use winbond 83c553 internal IDE ctrlr */
 #define CONFIG_SYS_WINBOND_ISA_CFG_ADDR    0x80005800  /*pci-isa bridge config addr    */
 #define CONFIG_SYS_WINBOND_IDE_CFG_ADDR    0x80005900  /*ide config addr               */

diff --git a/include/configs/Sandpoint8240.h b/include/configs/Sandpoint8240.h
index f98414160db5e2a483538a83e9916dada74b17ea..74c9ed10c8da1273cffd5ad705c51892574df3ce 100644 (file)
--- a/include/configs/Sandpoint8240.h
+++ b/include/configs/Sandpoint8240.h
@@ -234,7 +234,7 @@
  */
 
 
-#define CONFIG_WINBOND_83C553  1       /*has a winbond bridge                  */
+/* #define CONFIG_WINBOND_83C553       1       / *has a winbond bridge                 */
 #define CONFIG_SYS_USE_WINBOND_IDE     0       /*use winbond 83c553 internal IDE ctrlr */
 #define CONFIG_SYS_WINBOND_ISA_CFG_ADDR    0x80005800  /*pci-isa bridge config addr    */
 #define CONFIG_SYS_WINBOND_IDE_CFG_ADDR    0x80005900  /*ide config addr               */

diff --git a/include/configs/Sandpoint8245.h b/include/configs/Sandpoint8245.h
index b47adcc3a9d54968787248403d5c9918b3d0a970..92b1256a8d595a7f8c4dc26ac2a7c437cf5d32c0 100644 (file)
--- a/include/configs/Sandpoint8245.h
+++ b/include/configs/Sandpoint8245.h
@@ -202,7 +202,7 @@
  */
 
 
-#define CONFIG_WINBOND_83C553  1       /*has a winbond bridge                  */
+/* #define CONFIG_WINBOND_83C553       1       / *has a winbond bridge                 */
 #define CONFIG_SYS_USE_WINBOND_IDE     0       /*use winbond 83c553 internal IDE ctrlr */
 #define CONFIG_SYS_WINBOND_ISA_CFG_ADDR    0x80005800  /*pci-isa bridge config addr    */
 #define CONFIG_SYS_WINBOND_IDE_CFG_ADDR    0x80005900  /*ide config addr               */