diff options
| author | Bruce Beare <bruce.j.beare@intel.com> | 2016-05-06 21:03:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-06 21:03:01 +0000 |
| commit | e07542593592fed4899a3ffdef0afdc43e1bfda1 (patch) | |
| tree | 603fbe32be1483d3347f6cee6a529689800a2283 | |
| parent | 4cfb5f6f9d07112035bacdc3959a66feab938de1 (diff) | |
| parent | 8681186a5565f9fb2576e85af45129a5af1c965d (diff) | |
| download | intel-e07542593592fed4899a3ffdef0afdc43e1bfda1.tar.gz | |
Reland "chaabi: Enable Edison HW Keymaster" am: efdbdd36f1
am: 8681186a55
* commit '8681186a5565f9fb2576e85af45129a5af1c965d':
Reland "chaabi: Enable Edison HW Keymaster"
Change-Id: I8ed62746efd4b63c1409d328b96fbd69c1bc3fe5
| -rw-r--r-- | soc/edison/sepolicy/file_contexts | 4 | ||||
| -rw-r--r-- | soc/edison/soc.mk | 7 | ||||
| -rw-r--r-- | soc/edison/ueventd.edison.rc | 4 |
3 files changed, 12 insertions, 3 deletions
diff --git a/soc/edison/sepolicy/file_contexts b/soc/edison/sepolicy/file_contexts index e52a322..bc59ce3 100644 --- a/soc/edison/sepolicy/file_contexts +++ b/soc/edison/sepolicy/file_contexts @@ -7,3 +7,7 @@ # Bluetooth ON/OFF functions /sys/devices/platform/bcm_bt_lpm.0/rfkill/rfkill0/state u:object_r:sysfs_bluetoothtbd_writable:s0 /sys/devices/platform/bcm_bt_lpm.0/rfkill/rfkill0/type u:object_r:sysfs_bluetoothtbd_readable:s0 + +# Hardware keystore +/dev/dx_sep_q0 u:object_r:tee_device:s0 +/dev/dx_sep_q1 u:object_r:tee_device:s0 diff --git a/soc/edison/soc.mk b/soc/edison/soc.mk index 325f49e..5cec739 100644 --- a/soc/edison/soc.mk +++ b/soc/edison/soc.mk @@ -50,9 +50,6 @@ TARGET_KERNEL_CONFIGS := $(TARGET_KERNEL_CONFIGS) $(realpath $(LOCAL_PATH)/soc.k TARGET_BOOTCTRL_HAL := intel -DEVICE_PACKAGES += \ - keystore.default - # Boot control HAL package. DEVICE_PACKAGES += \ bootctrl.$(TARGET_DEVICE) @@ -60,3 +57,7 @@ DEVICE_PACKAGES += \ # Audio utilities. You may not need these for a product. DEVICE_PACKAGES += \ tinyplay tinypcminfo tinymix tinycap + +# Chaabi Integration. Chaabi is the HW security engine on Edison. +DEVICE_PACKAGES += \ + libdx_cc7 libkeymaster intel_keymaster_test diff --git a/soc/edison/ueventd.edison.rc b/soc/edison/ueventd.edison.rc index 042f050..855106d 100644 --- a/soc/edison/ueventd.edison.rc +++ b/soc/edison/ueventd.edison.rc @@ -1,3 +1,7 @@ # Device needed by shared transport layer /dev/rfkill 0660 bluetooth bluetooth /dev/ttyMFD0 0660 bluetooth net_bt_stack + +# Used by HW-backed keystore +/dev/dx_sep_q0 0660 keystore keystore +/dev/dx_sep_q1 0660 keystore keystore |