[edk2-devel] [edk2-platform][PATCH v1 2/4] Drivers/OptionRomPkg: Move ASIX drivers to AsixPkg
Samer El-Haj-Mahmoud
samer.el-haj-mahmoud at arm.com
Sun May 10 11:15:28 UTC 2020
Move ASIX Ax88772 and Ax88772b USB networking drivers to the newly
created Silicon/AsixPkg/.
Cc: Ray Ni <ray.ni at intel.com>
Cc: Leif Lindholm <leif at nuviainc.com>
Cc: Ard Biesheuvel <ard.biesheuvel at arm.com>
Cc: Michael D Kinney <michael.d.kinney at intel.com>
Signed-off-by: Samer El-Haj-Mahmoud <samer.el-haj-mahmoud at arm.com>
---
Drivers/OptionRomPkg/OptionRomPkg.dsc | 2 --
Platform/Hisilicon/HiKey/HiKey.dsc | 2 +-
Platform/RaspberryPi/RPi3/RPi3.dsc | 2 +-
Platform/RaspberryPi/RPi4/RPi4.dsc | 2 +-
Silicon/ASIX/AsixPkg.dsc | 3 ++-
Platform/Hisilicon/HiKey/HiKey.fdf | 2 +-
Platform/RaspberryPi/RPi3/RPi3.fdf | 2 +-
Platform/RaspberryPi/RPi4/RPi4.fdf | 2 +-
{Drivers/OptionRomPkg => Silicon/ASIX/Drivers}/Bus/Usb/UsbNetworking/Ax88772/Ax88772.inf | 0
{Drivers/OptionRomPkg => Silicon/ASIX/Drivers}/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf | 0
{Drivers/OptionRomPkg => Silicon/ASIX/Drivers}/Bus/Usb/UsbNetworking/Ax88772/Ax88772.h | 0
{Drivers/OptionRomPkg => Silicon/ASIX/Drivers}/Bus/Usb/UsbNetworking/Ax88772b/Ax88772.h | 0
{Drivers/OptionRomPkg => Silicon/ASIX/Drivers}/Bus/Usb/UsbNetworking/Ax88772/Ax88772.c | 0
{Drivers/OptionRomPkg => Silicon/ASIX/Drivers}/Bus/Usb/UsbNetworking/Ax88772/ComponentName.c | 0
{Drivers/OptionRomPkg => Silicon/ASIX/Drivers}/Bus/Usb/UsbNetworking/Ax88772/DriverBinding.c | 0
{Drivers/OptionRomPkg => Silicon/ASIX/Drivers}/Bus/Usb/UsbNetworking/Ax88772/SimpleNetwork.c | 0
{Drivers/OptionRomPkg => Silicon/ASIX/Drivers}/Bus/Usb/UsbNetworking/Ax88772b/Ax88772.c | 0
{Drivers/OptionRomPkg => Silicon/ASIX/Drivers}/Bus/Usb/UsbNetworking/Ax88772b/ComponentName.c | 0
{Drivers/OptionRomPkg => Silicon/ASIX/Drivers}/Bus/Usb/UsbNetworking/Ax88772b/DriverBinding.c | 0
{Drivers/OptionRomPkg => Silicon/ASIX/Drivers}/Bus/Usb/UsbNetworking/Ax88772b/SimpleNetwork.c | 0
20 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/Drivers/OptionRomPkg/OptionRomPkg.dsc b/Drivers/OptionRomPkg/OptionRomPkg.dsc
index bea64b585ec6..153f47de5be1 100644
--- a/Drivers/OptionRomPkg/OptionRomPkg.dsc
+++ b/Drivers/OptionRomPkg/OptionRomPkg.dsc
@@ -106,8 +106,6 @@ [Components]
OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf
OptionRomPkg/UndiRuntimeDxe/UndiRuntimeDxe.inf
OptionRomPkg/Bus/Usb/FtdiUsbSerialDxe/FtdiUsbSerialDxe.inf
- OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/Ax88772.inf
- OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
[Components.IA32, Components.X64]
OptionRomPkg/Application/BltLibSample/BltLibSample.inf
diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc b/Platform/Hisilicon/HiKey/HiKey.dsc
index 600f19a30762..88674d4564d0 100644
--- a/Platform/Hisilicon/HiKey/HiKey.dsc
+++ b/Platform/Hisilicon/HiKey/HiKey.dsc
@@ -247,7 +247,7 @@ [Components.common]
#
# AX88772 Ethernet Driver
#
- Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
+ Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
#
# FAT filesystem + GPT/MBR partitioning
diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc
index bf645110eb61..0f736fa80e91 100644
--- a/Platform/RaspberryPi/RPi3/RPi3.dsc
+++ b/Platform/RaspberryPi/RPi3/RPi3.dsc
@@ -648,7 +648,7 @@ [Components.common]
MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
- Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
+ Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
#
# SD/MMC support
diff --git a/Platform/RaspberryPi/RPi4/RPi4.dsc b/Platform/RaspberryPi/RPi4/RPi4.dsc
index 0d54fa477ca2..064ca762c650 100644
--- a/Platform/RaspberryPi/RPi4/RPi4.dsc
+++ b/Platform/RaspberryPi/RPi4/RPi4.dsc
@@ -661,7 +661,7 @@ [Components.common]
MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
- Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
+ Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
#
# SD/MMC support
diff --git a/Silicon/ASIX/AsixPkg.dsc b/Silicon/ASIX/AsixPkg.dsc
index d200bb7848c6..0e4ffd0f1743 100644
--- a/Silicon/ASIX/AsixPkg.dsc
+++ b/Silicon/ASIX/AsixPkg.dsc
@@ -64,4 +64,5 @@ [PcdsFixedAtBuild]
#
################################################################################
[Components]
-
+Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772/Ax88772.inf
+Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
diff --git a/Platform/Hisilicon/HiKey/HiKey.fdf b/Platform/Hisilicon/HiKey/HiKey.fdf
index 657e6c8ef2ec..10bbe62ef121 100644
--- a/Platform/Hisilicon/HiKey/HiKey.fdf
+++ b/Platform/Hisilicon/HiKey/HiKey.fdf
@@ -158,7 +158,7 @@ [FV.FvMain]
#
# AX88772 Ethernet Driver for Apple Ethernet Adapter
#
- INF Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
+ INF Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
#
# FAT filesystem + GPT/MBR partitioning
diff --git a/Platform/RaspberryPi/RPi3/RPi3.fdf b/Platform/RaspberryPi/RPi3/RPi3.fdf
index e854cd214153..c2f60cf93022 100644
--- a/Platform/RaspberryPi/RPi3/RPi3.fdf
+++ b/Platform/RaspberryPi/RPi3/RPi3.fdf
@@ -289,7 +289,7 @@ [FV.FvMain]
INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
- INF Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
+ INF Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
#
# SD/MMC support
diff --git a/Platform/RaspberryPi/RPi4/RPi4.fdf b/Platform/RaspberryPi/RPi4/RPi4.fdf
index b1f7aa2387df..e6e039434569 100644
--- a/Platform/RaspberryPi/RPi4/RPi4.fdf
+++ b/Platform/RaspberryPi/RPi4/RPi4.fdf
@@ -293,7 +293,7 @@ [FV.FvMain]
INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
- INF Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
+ INF Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
#
# SD/MMC support
diff --git a/Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/Ax88772.inf b/Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772/Ax88772.inf
similarity index 100%
rename from Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/Ax88772.inf
rename to Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772/Ax88772.inf
diff --git a/Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf b/Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
similarity index 100%
rename from Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
rename to Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
diff --git a/Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/Ax88772.h b/Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772/Ax88772.h
similarity index 100%
rename from Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/Ax88772.h
rename to Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772/Ax88772.h
diff --git a/Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772.h b/Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772b/Ax88772.h
similarity index 100%
rename from Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772.h
rename to Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772b/Ax88772.h
diff --git a/Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/Ax88772.c b/Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772/Ax88772.c
similarity index 100%
rename from Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/Ax88772.c
rename to Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772/Ax88772.c
diff --git a/Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/ComponentName.c b/Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772/ComponentName.c
similarity index 100%
rename from Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/ComponentName.c
rename to Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772/ComponentName.c
diff --git a/Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/DriverBinding.c b/Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772/DriverBinding.c
similarity index 100%
rename from Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/DriverBinding.c
rename to Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772/DriverBinding.c
diff --git a/Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/SimpleNetwork.c b/Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772/SimpleNetwork.c
similarity index 100%
rename from Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/SimpleNetwork.c
rename to Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772/SimpleNetwork.c
diff --git a/Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772.c b/Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772b/Ax88772.c
similarity index 100%
rename from Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772.c
rename to Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772b/Ax88772.c
diff --git a/Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/ComponentName.c b/Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772b/ComponentName.c
similarity index 100%
rename from Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/ComponentName.c
rename to Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772b/ComponentName.c
diff --git a/Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/DriverBinding.c b/Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772b/DriverBinding.c
similarity index 100%
rename from Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/DriverBinding.c
rename to Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772b/DriverBinding.c
diff --git a/Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/SimpleNetwork.c b/Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772b/SimpleNetwork.c
similarity index 100%
rename from Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/SimpleNetwork.c
rename to Silicon/ASIX/Drivers/Bus/Usb/UsbNetworking/Ax88772b/SimpleNetwork.c
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#58988): https://edk2.groups.io/g/devel/message/58988
Mute This Topic: https://groups.io/mt/74113378/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list