From 42fb6780bfbf1b3b1489e2b2e4c195e3539e21ce Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sun, 4 Apr 2021 01:10:15 +0200 Subject: [PATCH] ARM: rmobile: Enable CONFIG_SYS_FLASH_PROTECTION Enable CONFIG_SYS_FLASH_PROTECTION on Salvator-X(S), ULCB, Ebisu, which means the Spansion HF PPB protection bits can be operated using the 'protect' U-Boot command. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu --- configs/r8a77990_ebisu_defconfig | 3 +++ configs/rcar3_salvator-x_defconfig | 3 +++ configs/rcar3_ulcb_defconfig | 3 +++ include/configs/ebisu.h | 2 -- include/configs/salvator-x.h | 2 -- include/configs/ulcb.h | 2 -- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/configs/r8a77990_ebisu_defconfig b/configs/r8a77990_ebisu_defconfig index cb75b5c3a6..d5797378b0 100644 --- a/configs/r8a77990_ebisu_defconfig +++ b/configs/r8a77990_ebisu_defconfig @@ -58,7 +58,10 @@ CONFIG_RENESAS_SDHI=y CONFIG_MTD=y CONFIG_DM_MTD=y CONFIG_MTD_NOR_FLASH=y +CONFIG_FLASH_CFI_DRIVER=y CONFIG_CFI_FLASH=y +CONFIG_FLASH_CFI_MTD=y +CONFIG_SYS_FLASH_PROTECTION=y CONFIG_RENESAS_RPC_HF=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/rcar3_salvator-x_defconfig b/configs/rcar3_salvator-x_defconfig index 6109a23a31..cd250e93d3 100644 --- a/configs/rcar3_salvator-x_defconfig +++ b/configs/rcar3_salvator-x_defconfig @@ -60,7 +60,10 @@ CONFIG_RENESAS_SDHI=y CONFIG_MTD=y CONFIG_DM_MTD=y CONFIG_MTD_NOR_FLASH=y +CONFIG_FLASH_CFI_DRIVER=y CONFIG_CFI_FLASH=y +CONFIG_FLASH_CFI_MTD=y +CONFIG_SYS_FLASH_PROTECTION=y CONFIG_RENESAS_RPC_HF=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/rcar3_ulcb_defconfig b/configs/rcar3_ulcb_defconfig index df202a7598..e345086f30 100644 --- a/configs/rcar3_ulcb_defconfig +++ b/configs/rcar3_ulcb_defconfig @@ -60,9 +60,12 @@ CONFIG_RENESAS_SDHI=y CONFIG_MTD=y CONFIG_DM_MTD=y CONFIG_MTD_NOR_FLASH=y +CONFIG_FLASH_CFI_DRIVER=y CONFIG_CFI_FLASH=y CONFIG_RENESAS_RPC_HF=y +CONFIG_FLASH_CFI_MTD=y CONFIG_DM_SPI_FLASH=y +CONFIG_SYS_FLASH_PROTECTION=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_BITBANGMII=y CONFIG_PHY_MICREL=y diff --git a/include/configs/ebisu.h b/include/configs/ebisu.h index ee9ddb1336..19ec74fb58 100644 --- a/include/configs/ebisu.h +++ b/include/configs/ebisu.h @@ -23,8 +23,6 @@ /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS -#define CONFIG_FLASH_CFI_DRIVER -#define CONFIG_FLASH_CFI_MTD #define CONFIG_FLASH_SHOW_PROGRESS 45 #define CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_SYS_FLASH_BANKS_LIST { 0x08000000 } diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h index db06fa5ffd..1eafff10ff 100644 --- a/include/configs/salvator-x.h +++ b/include/configs/salvator-x.h @@ -20,8 +20,6 @@ /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS -#define CONFIG_FLASH_CFI_DRIVER -#define CONFIG_FLASH_CFI_MTD #define CONFIG_FLASH_SHOW_PROGRESS 45 #define CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_SYS_FLASH_BANKS_LIST { 0x08000000 } diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h index 165c82d508..1ce844f492 100644 --- a/include/configs/ulcb.h +++ b/include/configs/ulcb.h @@ -20,8 +20,6 @@ /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS -#define CONFIG_FLASH_CFI_DRIVER -#define CONFIG_FLASH_CFI_MTD #define CONFIG_FLASH_SHOW_PROGRESS 45 #define CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_SYS_FLASH_BANKS_LIST { 0x08000000 }