summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrpaulo <rpaulo@FreeBSD.org>2009-07-27 13:51:55 +0000
committerrpaulo <rpaulo@FreeBSD.org>2009-07-27 13:51:55 +0000
commit9b50a8b4b6400d84ba399ce6d5c5d9ff9a6ddb2c (patch)
tree4b3e38144ccbe4c23562a04e34270cf523976ff7
parent23576da010b9826c283b7e25c08045c9cda6308d (diff)
downloadFreeBSD-src-9b50a8b4b6400d84ba399ce6d5c5d9ff9a6ddb2c.zip
FreeBSD-src-9b50a8b4b6400d84ba399ce6d5c5d9ff9a6ddb2c.tar.gz
Refine the MacBook hack to only match early models that have Intel ICH.
Discussed with: kjim Approved by: re (kib)
-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 41e7a03..336e7b8 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 abef65e..440b492 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");
OpenPOWER on IntegriCloud