From 5f1b0158ad45aba9cdb23f2f7a6edce4f37a8f07 Mon Sep 17 00:00:00 2001 From: Zhongfu Luo Date: Mon, 9 Sep 2019 11:29:32 +0800 Subject: [PATCH] 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 --- arch/arm/boot/dts/amlogic/mesonaxg.dtsi | 6 ++++++ arch/arm/configs/meson64_a32_smarthome_defconfig | 1 + arch/arm64/boot/dts/amlogic/mesonaxg.dtsi | 6 ++++++ arch/arm64/configs/meson64_smarthome_defconfig | 1 + 4 files changed, 14 insertions(+) diff --git a/arch/arm/boot/dts/amlogic/mesonaxg.dtsi b/arch/arm/boot/dts/amlogic/mesonaxg.dtsi index 50f35d5820ec..233df58409e3 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 8705513d42aa..5731bc544fe2 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 96b762291446..685af2382338 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 b88827d6d613..ecde9c5f7a49 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