| author | weitao.qiao <weitao.qiao@amlogic.com> | 2020-11-26 06:07:37 (GMT) |
|---|---|---|
| committer | Xindong Xu <xindong.xu@amlogic.com> | 2020-12-03 04:22:12 (GMT) |
| commit | 609d3122ead1e13443e1263c24d13854f98d80c3 (patch) | |
| tree | d2b7fe658926e9f5020c7e0cb31ce46edee5cffe | |
| parent | 972637c0a198b907a070c6774f81ad87de782ebb (diff) | |
| download | common-609d3122ead1e13443e1263c24d13854f98d80c3.zip common-609d3122ead1e13443e1263c24d13854f98d80c3.tar.gz common-609d3122ead1e13443e1263c24d13854f98d80c3.tar.bz2 | |
dts: add a unifykey for google prop ro.oem.key1 [2/4]
PD#SWPL-37522
Problem:
gts com.google.android.tv.gts.ReadOnlyPropertiesTest#testReadOnlyProperties failed
ro.oem.key1 not set
Solution:
add a unifykey for google prop ro.oem.key1
Verify:
anning
Change-Id: Ief6fa3d5668b6a5bc738fe54568ae132ba45f95f
| -rwxr-xr-x[-rw-r--r--] | arch/arm/boot/dts/amlogic/gxl_p244_1g.dts | 9 | ||||
| -rwxr-xr-x[-rw-r--r--] | arch/arm/boot/dts/amlogic/gxl_p244_2g.dts | 8 | ||||
| -rwxr-xr-x | arch/arm64/boot/dts/amlogic/gxl_p244_1g.dts | 8 | ||||
| -rwxr-xr-x[-rw-r--r--] | arch/arm64/boot/dts/amlogic/gxl_p244_2g.dts | 8 |
4 files changed, 28 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/amlogic/gxl_p244_1g.dts b/arch/arm/boot/dts/amlogic/gxl_p244_1g.dts index 64b97cd..541187f 100644..100755 --- a/arch/arm/boot/dts/amlogic/gxl_p244_1g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p244_1g.dts @@ -1095,7 +1095,7 @@ compatible = "amlogic, unifykey"; status = "ok"; - unifykey-num = <17>; + unifykey-num = <18>; unifykey-index-0 = <&keysn_0>; unifykey-index-1 = <&keysn_1>; unifykey-index-2 = <&keysn_2>; @@ -1113,7 +1113,7 @@ unifykey-index-14= <&keysn_14>; unifykey-index-15= <&keysn_15>; unifykey-index-16= <&keysn_16>; - + unifykey-index-17= <&keysn_17>; keysn_0: key_0{ key-name = "usid"; @@ -1203,6 +1203,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_17:key_17{ + key-name = "oemkey"; + key-device = "normal"; + key-permit = "read","write","del"; + }; };//End unifykey }; diff --git a/arch/arm/boot/dts/amlogic/gxl_p244_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p244_2g.dts index 47cf81b..c0986570 100644..100755 --- a/arch/arm/boot/dts/amlogic/gxl_p244_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p244_2g.dts @@ -1102,7 +1102,7 @@ compatible = "amlogic, unifykey"; status = "ok"; - unifykey-num = <17>; + unifykey-num = <18>; unifykey-index-0 = <&keysn_0>; unifykey-index-1 = <&keysn_1>; unifykey-index-2 = <&keysn_2>; @@ -1120,6 +1120,7 @@ unifykey-index-14= <&keysn_14>; unifykey-index-15= <&keysn_15>; unifykey-index-16= <&keysn_16>; + unifykey-index-17= <&keysn_17>; keysn_0: key_0{ key-name = "usid"; @@ -1209,6 +1210,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_17:key_17{ + key-name = "oemkey"; + key-device = "normal"; + key-permit = "read","write","del"; + }; };//End unifykey }; &efuse { diff --git a/arch/arm64/boot/dts/amlogic/gxl_p244_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p244_1g.dts index 8616bd4..5dd0d95 100755 --- a/arch/arm64/boot/dts/amlogic/gxl_p244_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p244_1g.dts @@ -1092,7 +1092,7 @@ compatible = "amlogic, unifykey"; status = "ok"; - unifykey-num = <17>; + unifykey-num = <18>; unifykey-index-0 = <&keysn_0>; unifykey-index-1 = <&keysn_1>; unifykey-index-2 = <&keysn_2>; @@ -1110,6 +1110,7 @@ unifykey-index-14= <&keysn_14>; unifykey-index-15= <&keysn_15>; unifykey-index-16= <&keysn_16>; + unifykey-index-17= <&keysn_17>; keysn_0: key_0{ key-name = "usid"; @@ -1199,6 +1200,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_17:key_17{ + key-name = "oemkey"; + key-device = "normal"; + key-permit = "read","write","del"; + }; };//End unifykey }; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p244_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p244_2g.dts index b1b713b6..1332502 100644..100755 --- a/arch/arm64/boot/dts/amlogic/gxl_p244_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p244_2g.dts @@ -1101,7 +1101,7 @@ compatible = "amlogic, unifykey"; status = "ok"; - unifykey-num = <17>; + unifykey-num = <18>; unifykey-index-0 = <&keysn_0>; unifykey-index-1 = <&keysn_1>; unifykey-index-2 = <&keysn_2>; @@ -1119,6 +1119,7 @@ unifykey-index-14= <&keysn_14>; unifykey-index-15= <&keysn_15>; unifykey-index-16= <&keysn_16>; + unifykey-index-17= <&keysn_17>; keysn_0: key_0{ key-name = "usid"; @@ -1208,6 +1209,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_17:key_17{ + key-name = "oemkey"; + key-device = "normal"; + key-permit = "read","write","del"; + }; };//End unifykey }; &efuse { |