From c206a750c80dc4aaa8e7eade50199b3198a3e288 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 19 Aug 2020 15:49:25 +0100 Subject: [PATCH 1/3] rockchip: RockPro64: enable rng to provide an entropy source Enable the rng so UEFI can provide entropy for KASLR Signed-off-by: Peter Robinson --- configs/rockpro64-rk3399_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig index a6e2c3d71d..9b1ba04b9e 100644 --- a/configs/rockpro64-rk3399_defconfig +++ b/configs/rockpro64-rk3399_defconfig @@ -41,6 +41,8 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ROCKCHIP=y +CONFIG_DM_RNG=y +CONFIG_RNG_ROCKCHIP=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y -- 2.26.2 From 91db3a7baa4cfc8f1f8879b4bdafeb05902f2114 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 19 Aug 2020 15:52:15 +0100 Subject: [PATCH 2/3] rockchip: Rock960: enable rng to provide an entropy source Enable the rng so UEFI can provide entropy for KASLR Signed-off-by: Peter Robinson --- arch/arm/dts/rk3399-rock960-u-boot.dtsi | 4 ++++ configs/rock960-rk3399_defconfig | 2 ++ 2 files changed, 6 insertions(+) diff --git a/arch/arm/dts/rk3399-rock960-u-boot.dtsi b/arch/arm/dts/rk3399-rock960-u-boot.dtsi index c190089e26..08292dbd39 100644 --- a/arch/arm/dts/rk3399-rock960-u-boot.dtsi +++ b/arch/arm/dts/rk3399-rock960-u-boot.dtsi @@ -24,3 +24,7 @@ }; }; + +&rng { + status = "okay"; +}; diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig index 1d997847c2..9c4d8871b7 100644 --- a/configs/rock960-rk3399_defconfig +++ b/configs/rock960-rk3399_defconfig @@ -38,6 +38,8 @@ CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_ROCKCHIP=y +CONFIG_DM_RNG=y +CONFIG_RNG_ROCKCHIP=y CONFIG_DM_ETH=y CONFIG_NVME=y CONFIG_PCI=y -- 2.26.2 From ac0793c7c4ee032da11bddbd0bdefee2322bb621 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 19 Aug 2020 15:53:58 +0100 Subject: [PATCH 3/3] rockchip: firefly-rk3399: enable rng to provide an entropy source Enable the rng so UEFI can provide entropy for KASLR Signed-off-by: Peter Robinson --- arch/arm/dts/rk3399-firefly-u-boot.dtsi | 4 ++++ configs/firefly-rk3399_defconfig | 2 ++ 2 files changed, 6 insertions(+) diff --git a/arch/arm/dts/rk3399-firefly-u-boot.dtsi b/arch/arm/dts/rk3399-firefly-u-boot.dtsi index 38e0897db9..a6c7b913da 100644 --- a/arch/arm/dts/rk3399-firefly-u-boot.dtsi +++ b/arch/arm/dts/rk3399-firefly-u-boot.dtsi @@ -11,3 +11,7 @@ u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc; }; }; + +&rng { + status = "okay"; +}; diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig index ea4a30ebf3..e242ee5009 100644 --- a/configs/firefly-rk3399_defconfig +++ b/configs/firefly-rk3399_defconfig @@ -35,6 +35,8 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ROCKCHIP=y +CONFIG_DM_RNG=y +CONFIG_RNG_ROCKCHIP=y CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y -- 2.26.2