From 2fe88d452268d61b5ca9cb0b1dda2974cc43faeb Mon Sep 17 00:00:00 2001 From: Adam Ford Date: Sun, 14 Oct 2018 15:10:50 -0500 Subject: Convert CONFIG_FLASH_CFI_DRIVER et al to Kconfig This converts the following to Kconfig: CONFIG_FLASH_CFI_DRIVER CONFIG_SYS_FLASH_USE_BUFFER_WRITE CONFIG_FLASH_CFI_MTD CONFIG_SYS_FLASH_PROTECTION CONFIG_SYS_FLASH_CFI Signed-off-by: Adam Ford [trini: Re-migrate] Signed-off-by: Tom Rini --- include/configs/km/keymile-common.h | 2 -- include/configs/km/km-powerpc.h | 1 - include/configs/km/km83xx-common.h | 4 ---- include/configs/km/km_arm.h | 1 - include/configs/km/kmp204x-common.h | 1 - 5 files changed, 9 deletions(-) (limited to 'include/configs/km') diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index f72cc0a012..a83782e1cf 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -33,8 +33,6 @@ #define CONFIG_SYS_IVM_EEPROM_MAX_LEN 0x400 #define CONFIG_SYS_IVM_EEPROM_PAGE_LEN 0x100 -#define CONFIG_SYS_FLASH_PROTECTION - /* * BOOTP options */ diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h index 3b45e27bf5..16b11d82a2 100644 --- a/include/configs/km/km-powerpc.h +++ b/include/configs/km/km-powerpc.h @@ -20,7 +20,6 @@ #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10 #define CONFIG_ENV_SIZE 0x04000 /* Size of Environment */ -#define CONFIG_FLASH_CFI_MTD #define CONFIG_SYS_MEMTEST_START 0x00100000 /* memtest works on */ diff --git a/include/configs/km/km83xx-common.h b/include/configs/km/km83xx-common.h index 337a9cec66..a76f606e3e 100644 --- a/include/configs/km/km83xx-common.h +++ b/include/configs/km/km83xx-common.h @@ -84,11 +84,7 @@ /* * FLASH on the Local Bus */ -#define CONFIG_SYS_FLASH_CFI /* use the Common Flash Interface */ -#define CONFIG_FLASH_CFI_DRIVER /* use the CFI driver */ #define CONFIG_SYS_FLASH_SIZE 256 /* max FLASH size is 256M */ -#define CONFIG_SYS_FLASH_PROTECTION -#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE #define CONFIG_SYS_LBLAWBAR0_PRELIM CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_LBLAWAR0_PRELIM (LBLAWAR_EN | LBLAWAR_256MB) diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index e3dbbc83e6..e2585171af 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -254,7 +254,6 @@ int get_scl(void); "" #if !defined(CONFIG_MTD_NOR_FLASH) -#undef CONFIG_FLASH_CFI_MTD #undef CONFIG_JFFS2_CMDLINE #endif diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index 08e08abb94..a8f7300c1e 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -350,7 +350,6 @@ int get_scl(void); */ /* we don't need flash support */ -#undef CONFIG_FLASH_CFI_MTD #undef CONFIG_JFFS2_CMDLINE /* -- cgit v1.2.3