| Message ID | 20190403093409.15868-2-urjaman@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rk3288 (also rk3036, rk322x) defconfig fixes | expand |
On Wed, 3 Apr 2019 at 03:34, Urja Rannikko <urjaman@gmail.com> wrote: > > Affects rk3288 veyrons and rk3036, this was mostly done by > moveconfig.py. > > Signed-off-by: Urja Rannikko <urjaman@gmail.com> > --- > configs/chromebit_mickey_defconfig | 1 + > configs/chromebook_jerry_defconfig | 1 + > configs/chromebook_minnie_defconfig | 1 + > configs/chromebook_speedy_defconfig | 1 + > configs/evb-rk3036_defconfig | 1 + > configs/kylin-rk3036_defconfig | 1 + > include/configs/rk3036_common.h | 2 -- > include/configs/veyron.h | 2 -- > 8 files changed, 6 insertions(+), 4 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig index d7c343b924..be8bd49542 100644 --- a/configs/chromebit_mickey_defconfig +++ b/configs/chromebit_mickey_defconfig @@ -61,6 +61,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 5943db037a..84f55ac250 100644 --- 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 2a1f1c1e35..f692a7b208 100644 --- a/configs/chromebook_minnie_defconfig +++ b/configs/chromebook_minnie_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_speedy_defconfig b/configs/chromebook_speedy_defconfig index aeaee38a9a..3a44716370 100644 --- a/configs/chromebook_speedy_defconfig +++ b/configs/chromebook_speedy_defconfig @@ -63,6 +63,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 a0ca4e1ae6..8cc6abed17 100644 --- a/configs/evb-rk3036_defconfig +++ b/configs/evb-rk3036_defconfig @@ -44,6 +44,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 29113f99b4..8abbc7c63e 100644 --- a/configs/kylin-rk3036_defconfig +++ b/configs/kylin-rk3036_defconfig @@ -42,6 +42,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 50c6b560d0..aa7ca75c7d 100644 --- 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 0761de3ad2..2ab6d6c6aa 100644 --- 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
Affects rk3288 veyrons and rk3036, this was mostly done by moveconfig.py. Signed-off-by: Urja Rannikko <urjaman@gmail.com> --- configs/chromebit_mickey_defconfig | 1 + configs/chromebook_jerry_defconfig | 1 + configs/chromebook_minnie_defconfig | 1 + configs/chromebook_speedy_defconfig | 1 + configs/evb-rk3036_defconfig | 1 + configs/kylin-rk3036_defconfig | 1 + include/configs/rk3036_common.h | 2 -- include/configs/veyron.h | 2 -- 8 files changed, 6 insertions(+), 4 deletions(-)