From f6696bebb3f8df57bacb643d28597d5a9bb68d71 Mon Sep 17 00:00:00 2001
From: Tao Huang <huangtao@rock-chips.com>
Date: Mon, 19 Jun 2023 20:32:12 +0800
Subject: [PATCH] Revert "arm: configs: enable slc nand and sfc devices for
 rk3308 aarch32"

This reverts commit 7361795f1db0a89c74098fc04b7e6513859c4abd.
CONFIG_RK_FLASH is deprecated.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I660d356e42baa31fdf7e526344b2ce880053d1ec
---
 arch/arm/configs/rk3308_linux_aarch32_defconfig | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/arch/arm/configs/rk3308_linux_aarch32_defconfig b/arch/arm/configs/rk3308_linux_aarch32_defconfig
index 24b198eabc81..6ada2faa8cb6 100644
--- a/arch/arm/configs/rk3308_linux_aarch32_defconfig
+++ b/arch/arm/configs/rk3308_linux_aarch32_defconfig
@@ -262,10 +262,6 @@ CONFIG_PHY_ROCKCHIP_INNO_USB2=y
 CONFIG_ANDROID=y
 CONFIG_NVMEM=y
 CONFIG_NVMEM_ROCKCHIP_OTP=y
-CONFIG_RK_FLASH=y
-CONFIG_RK_NANDC_NAND=y
-CONFIG_RK_SFC_NAND=y
-CONFIG_RK_SFC_NOR=y
 CONFIG_ROCKCHIP_SIP=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT4_FS=m