From 022253f862b0cebd0a2da514347d5f1e6f6b6549 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 8 Jul 2022 11:47:26 +0200 Subject: [PATCH] ANDROID: GKI: remove CONFIG_RANDOM_TRUST_CPU=y from gki_defconfig In commit 4603a37f6eae ("random: credit cpu and bootloader seeds by default") this option is now the default, so no need to explicitly set it. Fix the build breakage by removing it from the gki_defconfig files. Fixes: 4603a37f6eae ("random: credit cpu and bootloader seeds by default") Signed-off-by: Greg Kroah-Hartman Change-Id: Ibb54fc5c34cf249a8acfa45a373d587fbe2c393a --- arch/arm64/configs/gki_defconfig | 1 - arch/x86/configs/gki_defconfig | 1 - 2 files changed, 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 5b956c2d9b9d..8d7d21d82630 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -402,7 +402,6 @@ CONFIG_SERIAL_DEV_BUS=y CONFIG_HW_RANDOM=y # CONFIG_DEVMEM is not set # CONFIG_DEVPORT is not set -CONFIG_RANDOM_TRUST_CPU=y # CONFIG_I2C_COMPAT is not set # CONFIG_I2C_HELPER_AUTO is not set CONFIG_I3C=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 217ddbd48754..e36b48bb1242 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -365,7 +365,6 @@ CONFIG_HW_RANDOM=y # CONFIG_DEVMEM is not set # CONFIG_DEVPORT is not set CONFIG_HPET=y -CONFIG_RANDOM_TRUST_CPU=y # CONFIG_I2C_COMPAT is not set # CONFIG_I2C_HELPER_AUTO is not set CONFIG_I3C=y