Merge changes from topic "khadas_fix"
* changes:
bootloader: update to u-boot v2021.01
bootloader: fip_packages: update khadas fip packages
bootloader: readme: add collect part info
bootloader: script: collect-script fix to support new branch
bootloader: script: fix generate script for khadas vim board
diff --git a/sepolicy/hal_sensors.te b/sepolicy/hal_sensors.te
index 885902a..972d792 100644
--- a/sepolicy/hal_sensors.te
+++ b/sepolicy/hal_sensors.te
@@ -9,7 +9,7 @@
allow hal_sensors sensor_vendor_data_file:file create_file_perms;
# Allow access to sensor properties
-set_prop(hal_sensors, sensors_prop)
+set_prop(hal_sensors, vendor_sensors_prop)
# Allow access to gralloc shared memory (ion), for sensor direct report
allow hal_sensors ion_device:chr_file { open read ioctl };
diff --git a/sepolicy/property.te b/sepolicy/property.te
index c47a33e..8596409 100644
--- a/sepolicy/property.te
+++ b/sepolicy/property.te
@@ -1 +1 @@
-vendor_internal_prop(sensors_prop)
+vendor_internal_prop(vendor_sensors_prop)
diff --git a/sepolicy/property_contexts b/sepolicy/property_contexts
index 3a4bde3..a1d6294 100644
--- a/sepolicy/property_contexts
+++ b/sepolicy/property_contexts
@@ -1 +1 @@
-sensors. u:object_r:sensors_prop:s0
+vendor.sensors. u:object_r:vendor_sensors_prop:s0
