diff options
| author | Florian Fainelli <florian@openwrt.org> | 2007-03-26 07:37:31 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2007-03-26 07:37:31 +0000 |
| commit | e5f693831422495dae93a8c8ebdf8a58b98198d7 (patch) | |
| tree | 26e544c358d35a0894c223562bd42e0c9cf78934 /target/linux/adm5120-2.6/files/drivers/net | |
| parent | 7fb29fc2b9dc1aaad013fe2fe43d448d1862fb4b (diff) | |
| download | upstream-e5f693831422495dae93a8c8ebdf8a58b98198d7.tar.gz upstream-e5f693831422495dae93a8c8ebdf8a58b98198d7.tar.bz2 upstream-e5f693831422495dae93a8c8ebdf8a58b98198d7.zip | |
Rewrite of the bootloader runtime detection (Gabor Juhos)
SVN-Revision: 6713
Diffstat (limited to 'target/linux/adm5120-2.6/files/drivers/net')
| -rw-r--r-- | target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c | 6 | ||||
| -rw-r--r-- | target/linux/adm5120-2.6/files/drivers/net/adm5120sw.h | 10 |
2 files changed, 5 insertions, 11 deletions
diff --git a/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c b/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c index ddb54d4d7d..c75ad4abb0 100644 --- a/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c +++ b/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c @@ -20,6 +20,8 @@ #include <asm/io.h> #include "adm5120sw.h" +#include "adm5120_info.h" + MODULE_AUTHOR("Jeroen Vreeken (pe1rxq@amsat.org)"); MODULE_DESCRIPTION("ADM5120 ethernet switch driver"); MODULE_LICENSE("GPL"); @@ -316,7 +318,7 @@ static int adm5120_sw_set_mac_address(struct net_device *dev, void *p) static int adm5120_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { int err; - struct adm5120_info info; + struct adm5120_sw_info info; struct adm5120_sw *priv = netdev_priv(dev); switch(cmd) { @@ -391,7 +393,7 @@ static int __init adm5120_sw_init(void) if (adm5120_get_reg(ADM5120_CODE) & ADM5120_CODE_PQFP) adm5120_nrdevs = 5; /* CFE based devices only have two enet ports */ - else if (boot_loader_type == CFE) + else if (adm5120_info.boot_loader == BOOT_LOADER_CFE) adm5120_nrdevs = 2; else adm5120_nrdevs = 6; diff --git a/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.h b/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.h index 4ea7a20123..09ef9fe394 100644 --- a/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.h +++ b/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.h @@ -97,18 +97,10 @@ struct adm5120_sw { #define SIOCGMATRIX SIOCDEVPRIVATE+1 #define SIOCGADMINFO SIOCDEVPRIVATE+2 -struct adm5120_info { +struct adm5120_sw_info { u16 magic; u16 ports; u16 vlan; }; -#define UNKNOWN 0 - -#define CFE 1 -#define UBOOT 2 -#define MYLOADER 3 - -/* Type of boot loader, detected by the prom */ -extern boot_loader_type; #endif /* _INCLUDE_ADM5120SW_H_ */ |