Author: arekm
Date: Thu Apr 25 09:20:17 2013
New Revision: 12655
Modified:
geninitrd/trunk/functions
Log:
Load ehci_platform, too. Load xhci as last (follow dracut way).
Modified: geninitrd/trunk/functions
==============================================================================
--- geninitrd/trunk/functions (original)
+++ geninitrd/trunk/functions Thu Apr 25 09:20:17 2013
@@ -207,15 +207,17 @@
fi
echo $modaliases | xargs modprobe --set-version $kernel -aRn | awk '
- BEGIN { skip_modules[notexisting_module]=""; modules[1]="";
xhci=""; ehci=""; ohci=""; uhci="" }
+ BEGIN { skip_modules[notexisting_module]=""; modules[1]="";
xhci=""; ehci_pci=""; ehci_hcd=""; ehci_platform=""; ohci=""; uhci="" }
{
module=$1
if (module == "xhci_hcd") {
xhci="xhci_hcd"
+ } else if (module == "ehci_hcd") {
+ ehci_hcd="ehci_hcd"
} else if (module == "ehci_pci") {
ehci_pci="ehci_pci"
- } else if (module == "ehci_hcd") {
- ehci="ehci_hcd"
+ } else if (module == "ehci_platform") {
+ ehci_platform="ehci_platform"
} else if (module == "ohci_hcd") {
ohci="ohci_hcd"
} else if (module == "uhci_hcd") {
@@ -226,8 +228,8 @@
skip_modules[module]=1;
}
END {
- # xhci/ehci/ohci/uhci hack to preserve such order
- printf "%s %s %s %s %s ", xhci, ehci_pci, ehci, ohci,
uhci;
+ # ehci/ohci/uhci/xhci hack to preserve such order
+ printf "%s %s %s %s %s %s ", ehci_hcd, ehci_pci,
ehci_platform, ohci, uhci, xhci;
for (i in modules) { printf "%s ", modules[i]; };
}
'
@@ -257,17 +259,19 @@
fi
LC_ALL=C lspci -p "$pcimap" -kvmmn | awk -vreq_class="${req_class}" '
- BEGIN { skip_modules[notexisting_module]="";
modules[1]=""; xhci=""; ehci=""; ohci=""; uhci="" }
+ BEGIN { skip_modules[notexisting_module]="";
modules[1]=""; xhci=""; ehci_pci=""; ehci_hcd=""; ehci_platform=""; ohci="";
uhci="" }
/^Slot:/ { found=0 }
/^Class:/ { if (req_class == $2) { found = 1 } }
/^Driver:/ { if (found) {
module = $2;
if (module == "xhci_hcd") {
xhci = "xhci_hcd"
+ } else if (module == "ehci_hcd") {
+ ehci_hcd = "ehci_hcd"
} else if (module == "ehci_pci") {
ehci_pci="ehci_pci"
- } else if (module == "ehci_hcd") {
- ehci = "ehci_hcd"
+ } else if (module == "ehci_platform") {
+ ehci_platform="ehci_platform"
} else if (module == "ohci_hcd") {
ohci = "ohci_hcd"
} else if (module == "uhci_hcd") {
@@ -280,8 +284,8 @@
found=0
}
END {
- # xhci/ehci/ohci/uhci hack to preserve such order
- printf "%s %s %s %s %s ", xhci, ehci_pci, ehci, ohci, uhci;
+ # ehci/ohci/uhci/xhci hack to preserve such order
+ printf "%s %s %s %s %s %s ", ehci_hcd, ehci_pci,
ehci_platform, ohci, uhci, xhci;
for (i in modules) { printf "%s ", modules[i]; }
}
'
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
