configs: Move CONFIG_SPI_FLASH_GIGADEVICE properly into Kconfig

Affects rk3288 veyrons and rk3036, this was mostly done by
moveconfig.py.

Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Urja Rannikko <urjaman@gmail.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig
index e9c3a8d152b6d8bbceb9828e858f1e7ee8acf5d1..75a25b84838b63f4ead300bbb1fb89bec29b5347 100644 (file)
--- a/configs/chromebit_mickey_defconfig
+++ b/configs/chromebit_mickey_defconfig
@@ -62,6 +62,7 @@ CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_SPEED=20000000
+CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 CONFIG_DM_PMIC=y

diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig
index ac516115d2db7763d3319b920ae896f42c3588f1..f8af061146181ff989116e882fbaae14f7442fd1 100644 (file)
--- a/configs/chromebook_jerry_defconfig
+++ b/configs/chromebook_jerry_defconfig
@@ -65,6 +65,7 @@ CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_SPEED=20000000
+CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 CONFIG_DM_PMIC=y

diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig
index 64142e026d2c0da0681efd8decf3a112b78b9056..73d55a7fdefb2f3d9937dfdbd372cda3df9dee85 100644 (file)
--- a/configs/chromebook_minnie_defconfig
+++ b/configs/chromebook_minnie_defconfig
@@ -64,6 +64,7 @@ CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_SPEED=20000000
+CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 CONFIG_DM_PMIC=y

diff --git a/configs/chromebook_speedy_defconfig b/configs/chromebook_speedy_defconfig
index 4179e80a8cf8c2de15f87295b62208e25f47611f..766f3763417397c905321fe6c7dcef4d047c9ff3 100644 (file)
--- a/configs/chromebook_speedy_defconfig
+++ b/configs/chromebook_speedy_defconfig
@@ -64,6 +64,7 @@ CONFIG_PWRSEQ=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_SF_DEFAULT_SPEED=20000000
+CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 # CONFIG_SPL_PINCTRL_FULL is not set

diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig
index 1b164557ab38a0a93e550dd7897ea06c39de17fc..7999ddb08915a943be269175bada773fdba7d39f 100644 (file)
--- a/configs/evb-rk3036_defconfig
+++ b/configs/evb-rk3036_defconfig
@@ -45,6 +45,7 @@ CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_SPEED=20000000
+CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_PINCTRL=y
 # CONFIG_SPL_DM_SERIAL is not set
 CONFIG_DEBUG_UART_SHIFT=2

diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig
index e0dc09574f9ebeaf355f498b021ff497150a4ccd..badb1edf4c32c9938520d90549e47e9ab1343efc 100644 (file)
--- a/configs/kylin-rk3036_defconfig
+++ b/configs/kylin-rk3036_defconfig
@@ -47,6 +47,7 @@ CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_SPEED=20000000
+CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_PINCTRL=y
 CONFIG_DM_REGULATOR_FIXED=y
 # CONFIG_SPL_DM_SERIAL is not set

diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h
index ec0e157ec506dd7c1f6691b03d738c78095219f1..8fe2dbcb574e8fd9b7dc477ecf5dd82d225dd2a0 100644 (file)
--- a/include/configs/rk3036_common.h
+++ b/include/configs/rk3036_common.h
@@ -28,8 +28,6 @@
 #define SDRAM_BANK_SIZE                        (512UL << 20UL)
 #define SDRAM_MAX_SIZE                  (CONFIG_NR_DRAM_BANKS * SDRAM_BANK_SIZE)
 
-#define CONFIG_SPI_FLASH_GIGADEVICE
-
 #ifndef CONFIG_SPL_BUILD
 /* usb otg */
 

diff --git a/include/configs/veyron.h b/include/configs/veyron.h
index 0761de3ad2f084c9002f3e0a7171c98933f653f0..2ab6d6c6aac20592c0cc2de4a243ec74e24b976d 100644 (file)
--- a/include/configs/veyron.h
+++ b/include/configs/veyron.h
@@ -13,8 +13,6 @@
 
 #include <configs/rk3288_common.h>
 
-#define CONFIG_SPI_FLASH_GIGADEVICE
-
 #define CONFIG_KEYBOARD
 
 #endif