Convert CONFIG_EFLASH_PROTSECTORS to Kconfig

This converts the following to Kconfig:
   CONFIG_EFLASH_PROTSECTORS

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index b87639f8c07bf89906f89cefc544132d64d1d0c0..4fee9772bf1c1eaab06b423519e494f90cd10373 100644 (file)
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -327,6 +327,13 @@ config AT91_EFLASH
          Enable the driver for the embedded flash used in the Atmel
          AT91SAM9XE devices.
 
+config EFLASH_PROTSECTORS
+       int "Number of flash sectors to protect from erasing"
+       depends on AT91_EFLASH
+       help
+         If non-zero, this will be the number of sectors of the flash to disallow
+         U-Boot to ease, starting from the beginning of flash.
+
 config AT91_GPIO_PULLUP
        bool "Keep pullups on peripheral pins"
        depends on CPU_ARM926EJS

diff --git a/arch/arm/mach-at91/arm926ejs/eflash.c b/arch/arm/mach-at91/arm926ejs/eflash.c
index 23c24936edf0246d5078959985544c66157edf32..043f06a82717d57fd2b9b1caa919e70039864f47 100644 (file)
--- a/arch/arm/mach-at91/arm926ejs/eflash.c
+++ b/arch/arm/mach-at91/arm926ejs/eflash.c
@@ -120,7 +120,7 @@ unsigned long flash_init(void)
                if (i%32 == 0)
                        tmp = readl(&eefc->frr);
                flash_info[0].protect[i] = (tmp >> (i%32)) & 1;
-#if defined(CONFIG_EFLASH_PROTSECTORS)
+#if CONFIG_VAL(EFLASH_PROTSECTORS)
                if (i < CONFIG_EFLASH_PROTSECTORS)
                        flash_info[0].protect[i] = 1;
 #endif
@@ -158,7 +158,7 @@ int flash_real_protect (flash_info_t *info, long sector, int prot)
 
        debug("protect sector=%ld prot=%d\n", sector, prot);
 
-#if defined(CONFIG_EFLASH_PROTSECTORS)
+#if CONFIG_VAL(EFLASH_PROTSECTORS)
        if (sector < CONFIG_EFLASH_PROTSECTORS) {
                if (!prot) {
                        printf("eflash: sector %lu cannot be unprotected\n",

diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig
index da8c0bd9cbe92a116fbed9f2cd66a0ac5f5e5e52..256f6520a598903af9a7f5d06b92e004b4561749 100644 (file)
--- a/configs/ethernut5_defconfig
+++ b/configs/ethernut5_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x27000000
 CONFIG_SYS_MALLOC_LEN=0x121000
 CONFIG_TARGET_ETHERNUT5=y
 CONFIG_AT91_EFLASH=y
+CONFIG_EFLASH_PROTSECTORS=1
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x21000
 CONFIG_ENV_OFFSET=0x3DE000

diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index 8e7bfadf64ed97d9bff3a469d669f5638074d6c9..8f9cfd50bc1e6fd0fe6eca1c64e6d837c3b2ce58 100644 (file)
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -32,7 +32,6 @@
 /* 512kB on-chip NOR flash */
 # define CONFIG_SYS_FLASH_BASE         0x00200000 /* AT91SAM9XE_FLASH_BASE */
 # define CONFIG_SYS_MAX_FLASH_SECT     32
-# define CONFIG_EFLASH_PROTSECTORS     1
 
 
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */