[PATCH v2 17/17] configs: net: dm9000: Move new Kconfig option to board configs

Ramon Fried rfried.dev at gmail.com
Wed Apr 13 05:49:30 CEST 2022 

On Wed, Apr 13, 2022 at 5:16 AM Marek Vasut <marex at denx.de> wrote:
>
> Drop legacy #define CONFIG_DRIVER_DM9000 from board include/configs/
> and enable the same in Kconfig configs/ .
>
> Signed-off-by: Marek Vasut <marex at denx.de>
> Cc: Joe Hershberger <joe.hershberger at ni.com>
> Cc: Ramon Fried <rfried.dev at gmail.com>
> ---
> V2: New patch
> ---
>  configs/M5253DEMO_defconfig                   | 1 +
>  configs/at91sam9261ek_dataflash_cs0_defconfig | 1 +
>  configs/at91sam9261ek_dataflash_cs3_defconfig | 1 +
>  configs/at91sam9261ek_nandflash_defconfig     | 1 +
>  configs/ci20_mmc_defconfig                    | 1 +
>  configs/colibri_pxa270_defconfig              | 1 +
>  configs/devkit8000_defconfig                  | 1 +
>  include/configs/M5253DEMO.h                   | 1 -
>  include/configs/at91sam9261ek.h               | 1 -
>  include/configs/ci20.h                        | 1 -
>  include/configs/colibri_pxa270.h              | 1 -
>  include/configs/devkit8000.h                  | 1 -
>  scripts/config_whitelist.txt                  | 1 -
>  13 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/configs/M5253DEMO_defconfig b/configs/M5253DEMO_defconfig
> index a072f9663e9..6f69acaee16 100644
> --- a/configs/M5253DEMO_defconfig
> +++ b/configs/M5253DEMO_defconfig
> @@ -37,4 +37,5 @@ CONFIG_SYS_I2C_SLAVE=0x7F
>  CONFIG_SYS_I2C_SPEED=80000
>  CONFIG_MTD_NOR_FLASH=y
>  CONFIG_USE_SYS_MAX_FLASH_BANKS=y
> +CONFIG_DRIVER_DM9000=y
>  CONFIG_MCFUART=y
> diff --git a/configs/at91sam9261ek_dataflash_cs0_defconfig b/configs/at91sam9261ek_dataflash_cs0_defconfig
> index c43a8a58db7..2f6651e4fb9 100644
> --- a/configs/at91sam9261ek_dataflash_cs0_defconfig
> +++ b/configs/at91sam9261ek_dataflash_cs0_defconfig
> @@ -53,6 +53,7 @@ CONFIG_NAND_ATMEL=y
>  CONFIG_DM_SPI_FLASH=y
>  CONFIG_SPI_FLASH_ATMEL=y
>  CONFIG_SPI_FLASH_DATAFLASH=y
> +CONFIG_DRIVER_DM9000=y
>  CONFIG_PINCTRL=y
>  CONFIG_PINCTRL_AT91=y
>  CONFIG_DM_SERIAL=y
> diff --git a/configs/at91sam9261ek_dataflash_cs3_defconfig b/configs/at91sam9261ek_dataflash_cs3_defconfig
> index baf527ff32d..99fecc5aef5 100644
> --- a/configs/at91sam9261ek_dataflash_cs3_defconfig
> +++ b/configs/at91sam9261ek_dataflash_cs3_defconfig
> @@ -53,6 +53,7 @@ CONFIG_NAND_ATMEL=y
>  CONFIG_DM_SPI_FLASH=y
>  CONFIG_SPI_FLASH_ATMEL=y
>  CONFIG_SPI_FLASH_DATAFLASH=y
> +CONFIG_DRIVER_DM9000=y
>  CONFIG_PINCTRL=y
>  CONFIG_PINCTRL_AT91=y
>  CONFIG_DM_SERIAL=y
> diff --git a/configs/at91sam9261ek_nandflash_defconfig b/configs/at91sam9261ek_nandflash_defconfig
> index 482a37d6a55..71127466208 100644
> --- a/configs/at91sam9261ek_nandflash_defconfig
> +++ b/configs/at91sam9261ek_nandflash_defconfig
> @@ -51,6 +51,7 @@ CONFIG_NAND_ATMEL=y
>  CONFIG_DM_SPI_FLASH=y
>  CONFIG_SPI_FLASH_ATMEL=y
>  CONFIG_SPI_FLASH_DATAFLASH=y
> +CONFIG_DRIVER_DM9000=y
>  CONFIG_PINCTRL=y
>  CONFIG_PINCTRL_AT91=y
>  CONFIG_DM_SERIAL=y
> diff --git a/configs/ci20_mmc_defconfig b/configs/ci20_mmc_defconfig
> index ed1ca2c7cdb..bcbfaad8ca8 100644
> --- a/configs/ci20_mmc_defconfig
> +++ b/configs/ci20_mmc_defconfig
> @@ -49,6 +49,7 @@ CONFIG_MMC_UHS_SUPPORT=y
>  CONFIG_MMC_HS400_SUPPORT=y
>  # CONFIG_MMC_VERBOSE is not set
>  CONFIG_JZ47XX_MMC=y
> +CONFIG_DRIVER_DM9000=y
>  CONFIG_DM_SERIAL=y
>  CONFIG_SYS_NS16550=y
>  CONFIG_SPL_TINY_MEMSET=y
> diff --git a/configs/colibri_pxa270_defconfig b/configs/colibri_pxa270_defconfig
> index 9ce65861046..0a7a2a3bd58 100644
> --- a/configs/colibri_pxa270_defconfig
> +++ b/configs/colibri_pxa270_defconfig
> @@ -50,6 +50,7 @@ CONFIG_FLASH_CFI_DRIVER=y
>  CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
>  CONFIG_SYS_FLASH_PROTECTION=y
>  CONFIG_SYS_FLASH_CFI=y
> +CONFIG_DRIVER_DM9000=y
>  CONFIG_DM_SERIAL=y
>  CONFIG_PXA_SERIAL=y
>  CONFIG_USB=y
> diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig
> index e009f21ecd6..2bff7dfbf42 100644
> --- a/configs/devkit8000_defconfig
> +++ b/configs/devkit8000_defconfig
> @@ -57,6 +57,7 @@ CONFIG_SYS_NAND_OOBSIZE=0x40
>  CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
>  CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
>  CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000
> +CONFIG_DRIVER_DM9000=y
>  CONFIG_CONS_INDEX=3
>  CONFIG_JFFS2_NAND=y
>  CONFIG_OF_LIBFDT=y
> diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
> index b7fdd7135f2..079675be5bc 100644
> --- a/include/configs/M5253DEMO.h
> +++ b/include/configs/M5253DEMO.h
> @@ -25,7 +25,6 @@
>  #      undef CONFIG_LBA48
>  #endif
>
> -#define CONFIG_DRIVER_DM9000
>  #ifdef CONFIG_DRIVER_DM9000
>  #      define CONFIG_DM9000_BASE       (CONFIG_SYS_CS1_BASE | 0x300)
>  #      define DM9000_IO                CONFIG_DM9000_BASE
> diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
> index 55ddb38c70a..2089fe52e45 100644
> --- a/include/configs/at91sam9261ek.h
> +++ b/include/configs/at91sam9261ek.h
> @@ -44,7 +44,6 @@
>  #endif
>
>  /* Ethernet */
> -#define CONFIG_DRIVER_DM9000
>  #define CONFIG_DM9000_BASE             0x30000000
>  #define DM9000_IO                      CONFIG_DM9000_BASE
>  #define DM9000_DATA                    (CONFIG_DM9000_BASE + 4)
> diff --git a/include/configs/ci20.h b/include/configs/ci20.h
> index ea9440dac07..cc70a59e728 100644
> --- a/include/configs/ci20.h
> +++ b/include/configs/ci20.h
> @@ -24,7 +24,6 @@
>  #define CONFIG_SYS_NS16550_CLK         48000000
>
>  /* Ethernet: davicom DM9000 */
> -#define CONFIG_DRIVER_DM9000           1
>  #define CONFIG_DM9000_BASE             0xb6000000
>  #define DM9000_IO                      CONFIG_DM9000_BASE
>  #define DM9000_DATA                    (CONFIG_DM9000_BASE + 2)
> diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
> index a5ba916279a..809afb77f20 100644
> --- a/include/configs/colibri_pxa270.h
> +++ b/include/configs/colibri_pxa270.h
> @@ -43,7 +43,6 @@
>   */
>  #ifdef CONFIG_CMD_NET
>
> -#define        CONFIG_DRIVER_DM9000            1
>  #define CONFIG_DM9000_BASE             0x08000000
>  #define DM9000_IO                      (CONFIG_DM9000_BASE)
>  #define DM9000_DATA                    (CONFIG_DM9000_BASE + 4)
> diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
> index 16b36501329..5dbd126a2a0 100644
> --- a/include/configs/devkit8000.h
> +++ b/include/configs/devkit8000.h
> @@ -35,7 +35,6 @@
>
>  /* Hardware drivers */
>  /* DM9000 */
> -#define        CONFIG_DRIVER_DM9000            1
>  #define        CONFIG_DM9000_BASE              0x2c000000
>  #define        DM9000_IO                       CONFIG_DM9000_BASE
>  #define        DM9000_DATA                     (CONFIG_DM9000_BASE + 0x400)
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 3065da78e1d..603b9387e55 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -25,7 +25,6 @@ CONFIG_DM9000_DEBUG
>  CONFIG_DM9000_NO_SROM
>  CONFIG_DM9000_USE_16BIT
>  CONFIG_DP_DDR_DIMM_SLOTS_PER_CTLR
> -CONFIG_DRIVER_DM9000
>  CONFIG_DSP_CLUSTER_START
>  CONFIG_DWC_AHSATA_BASE_ADDR
>  CONFIG_DWC_AHSATA_PORT_ID
> --
> 2.35.1
>
Reviewed-by: Ramon Fried <rfried.dev at gmail.com>

More information about the U-Boot mailing list