summaryrefslogtreecommitdiff
authorZhongfu Luo <zhongfu.luo@amlogic.com>2019-09-09 03:29:32 (GMT)
committer Zhongfu Luo <zhongfu.luo@amlogic.com>2019-09-16 10:44:12 (GMT)
commit5f1b0158ad45aba9cdb23f2f7a6edce4f37a8f07 (patch)
treeaeac2177534412aaca46b1187888ee633108ae9a
parentf853652b0ae9eaed91be4bb8199c1cb1bc2afdea (diff)
downloadcommon-5f1b0158ad45aba9cdb23f2f7a6edce4f37a8f07.zip
common-5f1b0158ad45aba9cdb23f2f7a6edce4f37a8f07.tar.gz
common-5f1b0158ad45aba9cdb23f2f7a6edce4f37a8f07.tar.bz2
defendkey: AXG: support secure upgrade check [3/3]
PD#SH-1185 Problem: AXG need to support secure upgrade check Solution: 1.add defendkey support in AXG dts 2.add defendkey config in smarthome defconfig Verify: AXG skt board verify pass Change-Id: I1d173d4e7ce8d47c486bf8df4f6b7e417809c424 Signed-off-by: Zhongfu Luo <zhongfu.luo@amlogic.com>
Diffstat
-rw-r--r--arch/arm/boot/dts/amlogic/mesonaxg.dtsi6
-rw-r--r--arch/arm/configs/meson64_a32_smarthome_defconfig1
-rw-r--r--arch/arm64/boot/dts/amlogic/mesonaxg.dtsi6
-rw-r--r--arch/arm64/configs/meson64_smarthome_defconfig1
4 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/amlogic/mesonaxg.dtsi b/arch/arm/boot/dts/amlogic/mesonaxg.dtsi
index 50f35d5..233df58 100644
--- a/arch/arm/boot/dts/amlogic/mesonaxg.dtsi
+++ b/arch/arm/boot/dts/amlogic/mesonaxg.dtsi
@@ -825,6 +825,12 @@
cpu_ver_name{
compatible = "amlogic, cpu-major-id-axg";
};
+
+ defendkey: defendkey {
+ compatible = "amlogic, defendkey";
+ mem_size = <0x0 0x100000>;
+ status = "okay";
+ };
};/* end of / */
&pinctrl_aobus {
diff --git a/arch/arm/configs/meson64_a32_smarthome_defconfig b/arch/arm/configs/meson64_a32_smarthome_defconfig
index 8705513..5731bc5 100644
--- a/arch/arm/configs/meson64_a32_smarthome_defconfig
+++ b/arch/arm/configs/meson64_a32_smarthome_defconfig
@@ -324,6 +324,7 @@ CONFIG_AMLOGIC_SARADC=y
CONFIG_AMLOGIC_DDR_WINDOW_TOOL=m
CONFIG_AMLOGIC_LEDRING=y
CONFIG_AMLOGIC_GPIO_IRQ=y
+CONFIG_AMLOGIC_DEFENDKEY=y
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
diff --git a/arch/arm64/boot/dts/amlogic/mesonaxg.dtsi b/arch/arm64/boot/dts/amlogic/mesonaxg.dtsi
index 96b7622..685af23 100644
--- a/arch/arm64/boot/dts/amlogic/mesonaxg.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesonaxg.dtsi
@@ -831,6 +831,12 @@
cpu_ver_name{
compatible = "amlogic, cpu-major-id-axg";
};
+
+ defendkey: defendkey {
+ compatible = "amlogic, defendkey";
+ mem_size = <0x0 0x100000>;
+ status = "okay";
+ };
};/* end of / */
&pinctrl_aobus {
diff --git a/arch/arm64/configs/meson64_smarthome_defconfig b/arch/arm64/configs/meson64_smarthome_defconfig
index b88827d..ecde9c5 100644
--- a/arch/arm64/configs/meson64_smarthome_defconfig
+++ b/arch/arm64/configs/meson64_smarthome_defconfig
@@ -318,6 +318,7 @@ CONFIG_AMLOGIC_PCA9557_KEYPAD=y
CONFIG_AMLOGIC_SENSOR=y
CONFIG_AMLOGIC_SENSOR_CY8C4014=y
CONFIG_AMLOGIC_GPIO_IRQ=y
+CONFIG_AMLOGIC_DEFENDKEY=y
CONFIG_DOLBY_FW=y
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_DEVTMPFS=y