[PATCH 18/22] Convert CONFIG_SYS_USE_NORFLASH et al to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_SYS_USE_NORFLASH
   CONFIG_SYS_USE_BOOT_NORFLASH

Signed-off-by: Tom Rini <trini at konsulko.com>
---
 board/atmel/at91sam9263ek/Kconfig             | 3 +++
 configs/at91sam9263ek_norflash_boot_defconfig | 2 +-
 configs/at91sam9263ek_norflash_defconfig      | 2 +-
 include/configs/at91sam9263ek.h               | 5 -----
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/board/atmel/at91sam9263ek/Kconfig b/board/atmel/at91sam9263ek/Kconfig
index 3f0873fe5105..71cbc89123e7 100644
--- a/board/atmel/at91sam9263ek/Kconfig
+++ b/board/atmel/at91sam9263ek/Kconfig
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "at91sam9263ek"
 
+config SYS_USE_NORFLASH
+	bool "Use the NOR flash on the platform"
+
 endif
diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig
index 0e96b3a9c13c..bcd52f666a35 100644
--- a/configs/at91sam9263ek_norflash_boot_defconfig
+++ b/configs/at91sam9263ek_norflash_boot_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_MALLOC_LEN=0x50000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_AT91SAM9263EK=y
 CONFIG_ATMEL_LEGACY=y
+CONFIG_SYS_USE_NORFLASH=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x10000
 CONFIG_ENV_SECT_SIZE=0x10000
@@ -16,7 +17,6 @@ CONFIG_DEBUG_UART_BASE=0xffffee00
 CONFIG_DEBUG_UART_CLOCK=100000000
 CONFIG_DEBUG_UART=y
 CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_BOOT_NORFLASH"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig
index 20a105085cea..68c3dcca18a7 100644
--- a/configs/at91sam9263ek_norflash_defconfig
+++ b/configs/at91sam9263ek_norflash_defconfig
@@ -7,6 +7,7 @@ CONFIG_SYS_MALLOC_LEN=0x50000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_AT91SAM9263EK=y
 CONFIG_ATMEL_LEGACY=y
+CONFIG_SYS_USE_NORFLASH=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x10000
 CONFIG_ENV_SECT_SIZE=0x10000
@@ -17,7 +18,6 @@ CONFIG_DEBUG_UART_BASE=0xffffee00
 CONFIG_DEBUG_UART_CLOCK=100000000
 CONFIG_DEBUG_UART=y
 CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NORFLASH"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index 9fdf48be0d16..eb922ba03dc9 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -22,11 +22,6 @@
 #define CONFIG_SYS_AT91_MAIN_CLOCK	16367660 /* 16.367 MHz crystal */
 #define CONFIG_SYS_AT91_SLOW_CLOCK	32768
 
-#ifndef CONFIG_SYS_USE_BOOT_NORFLASH
-#else
-#define CONFIG_SYS_USE_NORFLASH
-#endif
-
 /*
  * Hardware drivers
  */
-- 
2.25.1