aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRui Paulo <rpaulo@FreeBSD.org>2009-07-27 13:51:55 +0000
committerRui Paulo <rpaulo@FreeBSD.org>2009-07-27 13:51:55 +0000
commit1f93ae9453aceed4c329afec71ce74167f217d6e (patch)
tree4b3e38144ccbe4c23562a04e34270cf523976ff7
parent8e71b6947adbd076ec6893cb74319e4dab15245b (diff)
downloadsrc-1f93ae9453aceed4c329afec71ce74167f217d6e.tar.gz
src-1f93ae9453aceed4c329afec71ce74167f217d6e.zip
Refine the MacBook hack to only match early models that have Intel ICH.
Discussed with: kjim Approved by: re (kib)
Notes
Notes: svn path=/head/; revision=195907
-rw-r--r--sys/amd64/amd64/machdep.c5
-rw-r--r--sys/i386/i386/machdep.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 41e7a03cd41d..336e7b810719 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -213,7 +213,10 @@ cpu_startup(dummy)
*/
sysenv = getenv("smbios.system.product");
if (sysenv != NULL) {
- if (strncmp(sysenv, "MacBook", 7) == 0) {
+ if (strncmp(sysenv, "MacBook1,1", 10) == 0 ||
+ strncmp(sysenv, "MacBookPro1,1", 13) == 0 ||
+ strncmp(sysenv, "MacBookPro1,2", 13) == 0 ||
+ strncmp(sysenv, "Macmini1,1", 10) == 0) {
if (bootverbose)
printf("Disabling LEGACY_USB_EN bit on "
"Intel ICH.\n");
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index abef65e6de2e..440b492865e1 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -257,7 +257,10 @@ cpu_startup(dummy)
*/
sysenv = getenv("smbios.system.product");
if (sysenv != NULL) {
- if (strncmp(sysenv, "MacBook", 7) == 0) {
+ if (strncmp(sysenv, "MacBook1,1", 10) == 0 ||
+ strncmp(sysenv, "MacBookPro1,1", 13) == 0 ||
+ strncmp(sysenv, "MacBookPro1,2", 13) == 0 ||
+ strncmp(sysenv, "Macmini1,1", 10) == 0) {
if (bootverbose)
printf("Disabling LEGACY_USB_EN bit on "
"Intel ICH.\n");