d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lualoader: Ignore ACPI bits on !i386

Browse Source
This commit is contained in:
kevans 2018-02-20 19:21:34 +00:00
parent c1c5080794
commit b945f29eeb
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
stand/lua/core.lua
View File

@ -218,6 +218,10 @@ function core.isSerialBoot()
return false; return false;
end end
function core.isSystem386()
return (loader.machine_arch == "i386");
end
-- This may be a better candidate for a 'utility' module. -- This may be a better candidate for a 'utility' module.
function core.shallowCopyTable(tbl) function core.shallowCopyTable(tbl)
local new_tbl = {}; local new_tbl = {};
@ -235,7 +239,7 @@ end
-- generally be set upon execution of the kernel. Because of this, we can't (or -- generally be set upon execution of the kernel. Because of this, we can't (or
-- don't really want to) detect/disable ACPI on !i386 reliably. Just set it -- don't really want to) detect/disable ACPI on !i386 reliably. Just set it
-- enabled if we detect it and leave well enough alone if we don't. -- enabled if we detect it and leave well enough alone if we don't.
if (core.getACPIPresent(false)) then if (core.isSystem386()) and (core.getACPIPresent(false)) then
core.setACPI(true); core.setACPI(true);
end end
return core; return core;

1
stand/lua/menu.lua
View File

@ -128,6 +128,7 @@ menu.boot_options = {
-- acpi -- acpi
{ {
entry_type = core.MENU_ENTRY, entry_type = core.MENU_ENTRY,
visible = core.isSystem386,
name = function() name = function()
return OnOff(color.highlight("A") .. return OnOff(color.highlight("A") ..
"CPI :", core.acpi); "CPI :", core.acpi);