lualoader: Ignore ACPI bits on !i386

This commit is contained in:
Kyle Evans 2018-02-20 19:21:34 +00:00
parent a4e5960730
commit c1ab36f54d
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=329654
2 changed files with 6 additions and 1 deletions

View File

@ -218,6 +218,10 @@ function core.isSerialBoot()
return false;
end
function core.isSystem386()
return (loader.machine_arch == "i386");
end
-- This may be a better candidate for a 'utility' module.
function core.shallowCopyTable(tbl)
local new_tbl = {};
@ -235,7 +239,7 @@ end
-- 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
-- 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);
end
return core;

View File

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