diff --git a/c/src/ChangeLog b/c/src/ChangeLog index a79bc9d669..e4170a367c 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,10 @@ +2009-12-08 Joel Sherrill + + * libchip/network/dec21140.c, libchip/network/elnk.c, + libchip/network/if_dc.c: Ensure PCI drivers are built on all + supported configurations. PowerPC conditionals were not current and + code was not being built on supported BSPs. + 2009-11-23 Joel Sherrill * libchip/network/smc91111.c: Formatting. diff --git a/c/src/libchip/network/dec21140.c b/c/src/libchip/network/dec21140.c index 9cb0cd3e04..6432304b01 100644 --- a/c/src/libchip/network/dec21140.c +++ b/c/src/libchip/network/dec21140.c @@ -49,17 +49,18 @@ #define DEC21140_SUPPORTED #define PCI_DRAM_OFFSET 0 #endif -#if defined(__PPC__) && (defined(mpc604) || defined(mpc750) || defined(ppc603e)) +#if defined(__PPC__) #define DEC21140_SUPPORTED #endif +#include +#include + #if !defined(PCI_DRAM_OFFSET) #undef DEC21140_SUPPORTED #endif #if defined(DEC21140_SUPPORTED) -#include -#include #if defined(__PPC__) #include diff --git a/c/src/libchip/network/elnk.c b/c/src/libchip/network/elnk.c index b3fd3a4c80..9f68c80f61 100644 --- a/c/src/libchip/network/elnk.c +++ b/c/src/libchip/network/elnk.c @@ -75,10 +75,13 @@ #define PCI_DRAM_OFFSET 0 #endif -#if defined(__PPC__) && (defined(mpc604) || defined(mpc750) || defined(ppc603e)) +#if defined(__PPC__) #define ELNK_SUPPORTED #endif +#include +#include + #if !defined(PCI_DRAM_OFFSET) #undef ELNK_SUPPORTED #endif @@ -87,8 +90,6 @@ #if defined(ELNK_SUPPORTED) -#include -#include #if defined(__PPC__) #include diff --git a/c/src/libchip/network/if_dc.c b/c/src/libchip/network/if_dc.c index bdd1d8874f..b99e2967e8 100644 --- a/c/src/libchip/network/if_dc.c +++ b/c/src/libchip/network/if_dc.c @@ -108,16 +108,19 @@ #define DRIVER_SUPPORTED #endif -#if defined(__PPC__) && (defined(mpc604) || defined(mpc750) || defined(ppc603e)) +#if defined(__PPC__) #define DRIVER_SUPPORTED #warning The if_dc driver is untested on the PPC platform !!! #endif +#include +#include + +#if !defined(PCI_DRAM_OFFSET) + #undef DRIVER_SUPPORTED +#endif #if defined(DRIVER_SUPPORTED) /* this covers the file "globally"... */ -#include -#include -#include #include #include