aboutsummaryrefslogtreecommitdiff
path: root/libstb
diff options
context:
space:
mode:
authorStewart Smith <stewart@linux.vnet.ibm.com>2016-11-02 19:16:23 +1100
committerStewart Smith <stewart@linux.vnet.ibm.com>2016-11-02 19:18:46 +1100
commit1f4b254bb8ca6cb2d3ccc0e3f50dff153caab8bc (patch)
treebb6d9aa7e764c069584df9653c04fe3f98275ee4 /libstb
parent4382d472a517d6a39f919b139eed3c86c6db9009 (diff)
downloadskiboot-1f4b254bb8ca6cb2d3ccc0e3f50dff153caab8bc.zip
skiboot-1f4b254bb8ca6cb2d3ccc0e3f50dff153caab8bc.tar.gz
skiboot-1f4b254bb8ca6cb2d3ccc0e3f50dff153caab8bc.tar.bz2
stb: Obey secure-enabled in device tree
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'libstb')
-rw-r--r--libstb/stb.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/libstb/stb.c b/libstb/stb.c
index 4a9aa88..28d004d 100644
--- a/libstb/stb.c
+++ b/libstb/stb.c
@@ -122,14 +122,8 @@ void stb_init(void)
if (nvram_query_eq("force-secure-mode", "always")) {
prlog(PR_NOTICE, "STB: secure mode on (FORCED by nvram)\n");
secure_mode = true;
- } else if (nvram_query_eq("force-secure-mode", "true")) {
- prlog(PR_NOTICE, "STB: secure mode %s\n",
- (secure_mode) ? "on, *not* partial" : "off");
} else if (secure_mode) {
- prlog(PR_NOTICE, "STB: secure mode on (but not enforced, core secure mode only)\n");
- dt_check_del_prop(ibm_secureboot, "secure-enabled");
- dt_add_property(ibm_secureboot, "partial-secure-enabled", NULL, 0);
- secure_mode = false;
+ prlog(PR_NOTICE, "STB: secure mode on.\n");
} else {
prlog(PR_NOTICE, "STB: secure mode off\n");
}