diff mbox

[U-Boot,V3] Convert CONFIG_NAND_OMAP_GPMC et al to Kconfig

Message ID 1502591888-483-1-git-send-email-aford173@gmail.com
State Changes Requested
Delegated to: Tom Rini
Headers show

Commit Message

Adam Ford Aug. 13, 2017, 2:38 a.m. UTC
This converts the following to Kconfig:
   CONFIG_NAND_OMAP_GPMC
   CONFIG_NAND_OMAP_GPMC_PREFETCH
   CONFIG_NAND_OMAP_ELM
   CONFIG_SYS_NAND_BUSWIDTH_16BIT
   CONFIG_SPL_NAND_AM33XX_BCH
   CONFIG_SPL_NAND_SIMPLE (ARCH_OMAP2PLUS only)

Signed-off-by: Adam Ford <aford173@gmail.com>

V3:
Remove selection from CMD_NAND

Changes since V1:
  Rebased on latest Master
  Fixed a few missing entries where some features lacked dependancies
---
 configs/am3517_crane_defconfig    | 6 ++++--
 configs/cm_t3517_defconfig        | 1 +
 configs/cm_t35_defconfig          | 1 +
 configs/omap3_evm_defconfig       | 1 +
 configs/omap3_ha_defconfig        | 6 ++++--
 configs/tao3530_defconfig         | 6 ++++--
 configs/tricorder_defconfig       | 1 +
 include/configs/ti_omap3_common.h | 1 -
 8 files changed, 16 insertions(+), 7 deletions(-)

Comments

Tom Rini Sept. 1, 2017, 9:54 p.m. UTC | #1
On Sat, Aug 12, 2017 at 09:38:08PM -0500, Adam Ford wrote:

> This converts the following to Kconfig:
>    CONFIG_NAND_OMAP_GPMC
>    CONFIG_NAND_OMAP_GPMC_PREFETCH
>    CONFIG_NAND_OMAP_ELM
>    CONFIG_SYS_NAND_BUSWIDTH_16BIT
>    CONFIG_SPL_NAND_AM33XX_BCH
>    CONFIG_SPL_NAND_SIMPLE (ARCH_OMAP2PLUS only)
> 
> Signed-off-by: Adam Ford <aford173@gmail.com>
> 
> V3:
> Remove selection from CMD_NAND
> 
> Changes since V1:
>   Rebased on latest Master
>   Fixed a few missing entries where some features lacked dependancies
> ---

The changelog goes below the '---' :)  And more importantly..

>  configs/am3517_crane_defconfig    | 6 ++++--
>  configs/cm_t3517_defconfig        | 1 +
>  configs/cm_t35_defconfig          | 1 +
>  configs/omap3_evm_defconfig       | 1 +
>  configs/omap3_ha_defconfig        | 6 ++++--
>  configs/tao3530_defconfig         | 6 ++++--
>  configs/tricorder_defconfig       | 1 +
>  include/configs/ti_omap3_common.h | 1 -
>  8 files changed, 16 insertions(+), 7 deletions(-)

You forgot the Kconfig part of these changes.
Adam Ford Sept. 1, 2017, 11:59 p.m. UTC | #2
On Fri, Sep 1, 2017 at 4:54 PM, Tom Rini <trini@konsulko.com> wrote:
> On Sat, Aug 12, 2017 at 09:38:08PM -0500, Adam Ford wrote:
>
>> This converts the following to Kconfig:
>>    CONFIG_NAND_OMAP_GPMC
>>    CONFIG_NAND_OMAP_GPMC_PREFETCH
>>    CONFIG_NAND_OMAP_ELM
>>    CONFIG_SYS_NAND_BUSWIDTH_16BIT
>>    CONFIG_SPL_NAND_AM33XX_BCH
>>    CONFIG_SPL_NAND_SIMPLE (ARCH_OMAP2PLUS only)
>>
>> Signed-off-by: Adam Ford <aford173@gmail.com>
>>
>> V3:
>> Remove selection from CMD_NAND
>>
>> Changes since V1:
>>   Rebased on latest Master
>>   Fixed a few missing entries where some features lacked dependancies
>> ---
>
> The changelog goes below the '---' :)  And more importantly..
>
>>  configs/am3517_crane_defconfig    | 6 ++++--
>>  configs/cm_t3517_defconfig        | 1 +
>>  configs/cm_t35_defconfig          | 1 +
>>  configs/omap3_evm_defconfig       | 1 +
>>  configs/omap3_ha_defconfig        | 6 ++++--
>>  configs/tao3530_defconfig         | 6 ++++--
>>  configs/tricorder_defconfig       | 1 +
>>  include/configs/ti_omap3_common.h | 1 -
>>  8 files changed, 16 insertions(+), 7 deletions(-)
>
> You forgot the Kconfig part of these changes.

My bad.  I didn't add the '--amend' to my git commit, so version 2 &3
totally missed the vast majority of what I had in V1.  Sorry about
that.  I just re-sent V4 with everything from V1-V3 combined into 1
patch.

adam
>
> --
> Tom
diff mbox

Patch

diff --git a/configs/am3517_crane_defconfig b/configs/am3517_crane_defconfig
index 396aadd..e7d92b6 100644
--- a/configs/am3517_crane_defconfig
+++ b/configs/am3517_crane_defconfig
@@ -13,11 +13,11 @@  CONFIG_SYS_PROMPT="AM3517_CRANE # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
-# CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 CONFIG_CMD_DHCP=y
@@ -26,6 +26,8 @@  CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/cm_t3517_defconfig b/configs/cm_t3517_defconfig
index d5550fe..66cdc19 100644
--- a/configs/cm_t3517_defconfig
+++ b/configs/cm_t3517_defconfig
@@ -37,6 +37,7 @@  CONFIG_LED_STATUS_STATE=2
 CONFIG_LED_STATUS_BOOT_ENABLE=y
 CONFIG_LED_STATUS_BOOT=0
 CONFIG_MMC_OMAP_HS=y
+CONFIG_NAND=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig
index 16f1eab..21bf5c3 100644
--- a/configs/cm_t35_defconfig
+++ b/configs/cm_t35_defconfig
@@ -39,6 +39,7 @@  CONFIG_LED_STATUS_STATE=2
 CONFIG_LED_STATUS_BOOT_ENABLE=y
 CONFIG_LED_STATUS_BOOT=0
 CONFIG_MMC_OMAP_HS=y
+CONFIG_NAND=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig
index 9bbc980..40a91dd 100644
--- a/configs/omap3_evm_defconfig
+++ b/configs/omap3_evm_defconfig
@@ -45,6 +45,7 @@  CONFIG_SPL_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MTD=y
+CONFIG_NAND=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
diff --git a/configs/omap3_ha_defconfig b/configs/omap3_ha_defconfig
index f88c2e1..2884d5a 100644
--- a/configs/omap3_ha_defconfig
+++ b/configs/omap3_ha_defconfig
@@ -12,11 +12,11 @@  CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
-# CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
@@ -25,6 +25,8 @@  CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
diff --git a/configs/tao3530_defconfig b/configs/tao3530_defconfig
index e6c7e60..f8c9596 100644
--- a/configs/tao3530_defconfig
+++ b/configs/tao3530_defconfig
@@ -12,11 +12,11 @@  CONFIG_SYS_PROMPT="TAO-3530 # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
-# CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
@@ -25,6 +25,8 @@  CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig
index de42b4d..ad07dbc 100644
--- a/configs/tricorder_defconfig
+++ b/configs/tricorder_defconfig
@@ -35,5 +35,6 @@  CONFIG_LED_STATUS_BIT2=4
 CONFIG_LED_STATUS_STATE2=2
 CONFIG_LED_STATUS_CMD=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_NAND=y
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y
diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h
index 393d867..2373727 100644
--- a/include/configs/ti_omap3_common.h
+++ b/include/configs/ti_omap3_common.h
@@ -65,7 +65,6 @@ 
 					 (64 << 20))
 
 #ifdef CONFIG_NAND
-#define CONFIG_SPL_NAND_SIMPLE
 #define CONFIG_SYS_NAND_BASE		0x30000000
 #endif