diff options
| author | Shivamurthy Shastri <shivamurthy.shastri@linaro.org> | 2015-11-30 19:06:31 +0530 |
|---|---|---|
| committer | Shivamurthy Shastri <shivamurthy.shastri@linaro.org> | 2015-11-30 19:06:31 +0530 |
| commit | 9310d76c6a445024d9fc2b655a97c8bccdfac181 (patch) | |
| tree | 9427be69972cf882523fcffc1d8dda04f3f888e5 | |
| parent | fbfe25529e901412e47ba99275ef092ce82ff368 (diff) | |
Final patch for network booting
Signed-off-by: Shivamurthy Shastri <shivamurthy.shastri@linaro.org>
| -rw-r--r-- | HisiPkg/HiKeyPkg/Drivers/DwUsbHostDxe/DwUsbHostDxe.c | 8 | ||||
| -rw-r--r-- | HisiPkg/HiKeyPkg/HiKey.dsc | 2 | ||||
| -rw-r--r-- | HisiPkg/HiKeyPkg/HiKey.fdf | 2 | ||||
| -rw-r--r-- | OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772.c | 2 | ||||
| -rw-r--r-- | OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772.h | 4 | ||||
| -rw-r--r-- | OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/SimpleNetwork.c | 4 |
6 files changed, 12 insertions, 10 deletions
diff --git a/HisiPkg/HiKeyPkg/Drivers/DwUsbHostDxe/DwUsbHostDxe.c b/HisiPkg/HiKeyPkg/Drivers/DwUsbHostDxe/DwUsbHostDxe.c index 6c301ce6a..201975704 100644 --- a/HisiPkg/HiKeyPkg/Drivers/DwUsbHostDxe/DwUsbHostDxe.c +++ b/HisiPkg/HiKeyPkg/Drivers/DwUsbHostDxe/DwUsbHostDxe.c @@ -909,12 +909,12 @@ DwCoreInit ( UINT32 AhbCfg = 0; UINT32 UsbCfg = 0; - UsbCfg |= DWC2_GUSBCFG_FORCEHOSTMODE; - UsbCfg &= ~DWC2_GUSBCFG_FORCEDEVMODE; +// UsbCfg |= DWC2_GUSBCFG_FORCEHOSTMODE; +// UsbCfg &= ~DWC2_GUSBCFG_FORCEDEVMODE; - MmioWrite32 (DwHc->DwUsbBase + GUSBCFG, UsbCfg); +// MmioWrite32 (DwHc->DwUsbBase + GUSBCFG, UsbCfg); - MicroSecondDelay (200000); +// MicroSecondDelay (200000); UsbCfg = MmioRead32 (DwHc->DwUsbBase + GUSBCFG); diff --git a/HisiPkg/HiKeyPkg/HiKey.dsc b/HisiPkg/HiKeyPkg/HiKey.dsc index 8b6eb5ffb..aea52c259 100644 --- a/HisiPkg/HiKeyPkg/HiKey.dsc +++ b/HisiPkg/HiKeyPkg/HiKey.dsc @@ -450,7 +450,7 @@ # # AX88772 Ethernet Driver # - OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/Ax88772.inf + OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf # # Fastboot diff --git a/HisiPkg/HiKeyPkg/HiKey.fdf b/HisiPkg/HiKeyPkg/HiKey.fdf index c51a1bbb2..b85338b2c 100644 --- a/HisiPkg/HiKeyPkg/HiKey.fdf +++ b/HisiPkg/HiKeyPkg/HiKey.fdf @@ -157,7 +157,7 @@ READ_LOCK_STATUS = TRUE # # AX88772 Ethernet Driver # - INF OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/Ax88772.inf + INF OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf # # FASTBOOT_PLATFORM_PROTOCOL diff --git a/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772.c b/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772.c index 45ba3e52f..c7376f781 100644 --- a/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772.c +++ b/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772.c @@ -625,6 +625,7 @@ Ax88772Reset ( if (EFI_ERROR(Status)) goto err;
+/*
SetupMsg.RequestType = USB_REQ_TYPE_VENDOR
| USB_TARGET_DEVICE;
SetupMsg.Request = CMD_RXQTC;
@@ -634,6 +635,7 @@ Ax88772Reset ( Status = Ax88772UsbCommand ( pNicDevice,
&SetupMsg,
NULL );
+*/
err:
return Status;
}
diff --git a/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772.h b/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772.h index 5382e44c1..420a6a7e2 100644 --- a/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772.h +++ b/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772.h @@ -142,8 +142,8 @@ #define DEV_SIGNATURE SIGNATURE_32 ('A','X','8','8') ///< Signature of data structures in memory
-#define VENDOR_ID 0x0B95 ///< Vendor ID for Asix
-#define PRODUCT_ID 0x772B ///< Product ID for the AX88772 USB 10/100 Ethernet controller
+#define VENDOR_ID 0x05AC ///< Vendor ID for Asix
+#define PRODUCT_ID 0x1402 ///< Product ID for the AX88772 USB 10/100 Ethernet controller
#define RESET_MSEC 1000 ///< Reset duration
#define PHY_RESET_MSEC 500 ///< PHY reset duration
diff --git a/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/SimpleNetwork.c b/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/SimpleNetwork.c index 9eeb61f87..5e47a67fa 100644 --- a/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/SimpleNetwork.c +++ b/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/SimpleNetwork.c @@ -700,10 +700,10 @@ SN_ReceiveFilters ( EFI_SIMPLE_NETWORK_MODE * pMode;
EFI_STATUS Status = EFI_SUCCESS;
EFI_TPL TplPrevious;
- NIC_DEVICE * pNicDevice;
+// NIC_DEVICE * pNicDevice;
TplPrevious = gBS->RaiseTPL(TPL_CALLBACK);
- pNicDevice = DEV_FROM_SIMPLE_NETWORK ( pSimpleNetwork );
+// pNicDevice = DEV_FROM_SIMPLE_NETWORK ( pSimpleNetwork );
pMode = pSimpleNetwork->Mode;
if (pSimpleNetwork == NULL) {
|