[PATCH 08/41] Convert CONFIG_DM9000_BYTE_SWAPPED et al to Kconfig

Tom Rini
2022-12-02T21:44:24Z

This converts the following to Kconfig:
CONFIG_DM9000_BYTE_SWAPPED
CONFIG_DM9000_NO_SROM
CONFIG_DM9000_USE_16BIT
CONFIG_DM9000_DEBUG
CONFIG_MXC_GPT_HCLK
CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC

Signed-off-by: Tom Rini <trini@konsulko.com>
---
arch/arm/Kconfig | 2 ++
arch/arm/mach-imx/Kconfig | 3 +++
board/davinci/da8xxevm/Kconfig | 3 +++
board/timll/devkit8000/devkit8000.c | 7 +++----
configs/M5253DEMO_defconfig | 1 +
configs/at91sam9261ek_dataflash_cs0_defconfig | 2 ++
configs/at91sam9261ek_dataflash_cs3_defconfig | 2 ++
configs/at91sam9261ek_nandflash_defconfig | 2 ++
configs/devkit8000_defconfig | 2 ++
drivers/net/Kconfig | 12 ++++++++++++
include/configs/M5253DEMO.h | 6 ------
include/configs/at91sam9261ek.h | 7 -------
include/configs/brppt2.h | 2 --
include/configs/ci20.h | 7 -------
include/configs/devkit8000.h | 11 -----------
include/configs/mx6_common.h | 1 -
include/configs/mx7_common.h | 1 -
include/configs/omapl138_lcdk.h | 1 -
18 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f55113fb5c8b..5eb382ea1d70 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -961,6 +961,7 @@ config ARCH_MX7
select CPU_V7A
select GPIO_EXTRA_HEADER
select MACH_IMX
+ select MXC_GPT_HCLK
select SYS_FSL_HAS_SEC
select SYS_FSL_SEC_COMPAT_4
select SYS_FSL_SEC_LE
@@ -974,6 +975,7 @@ config ARCH_MX6
select CPU_V7A
select GPIO_EXTRA_HEADER
select MACH_IMX
+ select MXC_GPT_HCLK
select SYS_FSL_HAS_SEC
select SYS_FSL_SEC_COMPAT_4
select SYS_FSL_SEC_LE
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index ee5f1996a830..3266545c2663 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -18,6 +18,9 @@ config SYSCOUNTER_TIMER
config GPT_TIMER
bool

+config MXC_GPT_HCLK
+ bool
+
config IMX_RDC
bool "i.MX Resource domain controller driver"
depends on ARCH_MX6 || ARCH_MX7
diff --git a/board/davinci/da8xxevm/Kconfig b/board/davinci/da8xxevm/Kconfig
index c5499a63fd36..34055f69754b 100644
--- a/board/davinci/da8xxevm/Kconfig
+++ b/board/davinci/da8xxevm/Kconfig
@@ -37,6 +37,9 @@ config SYS_VENDOR
config SYS_CONFIG_NAME
default "omapl138_lcdk"

+config NAND_6BYTES_OOB_FREE_10BYTES_ECC
+ def_bool y
+
endif

source "board/ti/common/Kconfig"
diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c
index 0808ca1a54c0..06009d8ad54c 100644
--- a/board/timll/devkit8000/devkit8000.c
+++ b/board/timll/devkit8000/devkit8000.c
@@ -76,10 +76,11 @@ int board_init(void)
}

/* Configure GPMC registers for DM9000 */
+#define DM9000_BASE 0x2c000000
static void gpmc_dm9000_config(void)
{
enable_gpmc_cs_config(gpmc_net_config, &gpmc_cfg->cs[6],
- CONFIG_DM9000_BASE, GPMC_SIZE_16M);
+ DM9000_BASE, GPMC_SIZE_16M);
}

/*
@@ -100,9 +101,7 @@ int misc_init_r(void)
#endif

#ifdef CONFIG_DRIVER_DM9000
- /* Configure GPMC registers for DM9000 */
- enable_gpmc_cs_config(gpmc_net_config, &gpmc_cfg->cs[6],
- CONFIG_DM9000_BASE, GPMC_SIZE_16M);
+ gpmc_dm9000_config();

/* Use OMAP DIE_ID as MAC address */
if (!eth_env_get_enetaddr("ethaddr", enetaddr)) {
diff --git a/configs/M5253DEMO_defconfig b/configs/M5253DEMO_defconfig
index 581023f967b8..2684ce05f267 100644
--- a/configs/M5253DEMO_defconfig
+++ b/configs/M5253DEMO_defconfig
@@ -44,4 +44,5 @@ CONFIG_MTD_NOR_FLASH=y
CONFIG_SYS_MAX_FLASH_SECT=2048
CONFIG_USE_SYS_MAX_FLASH_BANKS=y
CONFIG_DRIVER_DM9000=y
+CONFIG_DM9000_BYTE_SWAPPED=y
CONFIG_MCFUART=y
diff --git a/configs/at91sam9261ek_dataflash_cs0_defconfig b/configs/at91sam9261ek_dataflash_cs0_defconfig
index c6c83b8da355..a398e6d97a1e 100644
--- a/configs/at91sam9261ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs0_defconfig
@@ -54,6 +54,8 @@ CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_SPI_FLASH_DATAFLASH=y
CONFIG_DRIVER_DM9000=y
+CONFIG_DM9000_NO_SROM=y
+CONFIG_DM9000_USE_16BIT=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 1c16d26c8248..1b464ff29259 100644
--- a/configs/at91sam9261ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs3_defconfig
@@ -54,6 +54,8 @@ CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_SPI_FLASH_DATAFLASH=y
CONFIG_DRIVER_DM9000=y
+CONFIG_DM9000_NO_SROM=y
+CONFIG_DM9000_USE_16BIT=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 8dbcb27f95c2..f23262494250 100644
--- a/configs/at91sam9261ek_nandflash_defconfig
+++ b/configs/at91sam9261ek_nandflash_defconfig
@@ -52,6 +52,8 @@ CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_SPI_FLASH_DATAFLASH=y
CONFIG_DRIVER_DM9000=y
+CONFIG_DM9000_NO_SROM=y
+CONFIG_DM9000_USE_16BIT=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_AT91=y
CONFIG_DM_SERIAL=y
diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig
index 8347b67681d4..6fd4410df5b6 100644
--- a/configs/devkit8000_defconfig
+++ b/configs/devkit8000_defconfig
@@ -84,4 +84,6 @@ 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_DM9000_NO_SROM=y
+CONFIG_DM9000_USE_16BIT=y
CONFIG_JFFS2_NAND=y
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 4e5da5ab72a5..0607f959da49 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -198,6 +198,18 @@ config DRIVER_DM9000
help
The Davicom DM9000 parallel bus external ethernet interface chip.

+config DM9000_BYTE_SWAPPED
+ bool "Byte swapped access for DM9000"
+ depends on DRIVER_DM9000
+
+config DM9000_NO_SROM
+ bool "No SROM on DM9000"
+ depends on DRIVER_DM9000
+
+config DM9000_USE_16BIT
+ bool "Use 16bit access in DM9000"
+ depends on DRIVER_DM9000
+
config DWC_ETH_QOS
bool "Synopsys DWC Ethernet QOS device support"
select PHYLIB
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index 7e37c6d11997..ad55938348e5 100644
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -20,12 +20,6 @@
env/embedded.o(.text*);

#ifdef CONFIG_DRIVER_DM9000
-# define CONFIG_DM9000_BASE (CFG_SYS_CS1_BASE | 0x300)
-# define DM9000_IO CONFIG_DM9000_BASE
-# define DM9000_DATA (CONFIG_DM9000_BASE + 4)
-# undef CONFIG_DM9000_DEBUG
-# define CONFIG_DM9000_BYTE_SWAPPED
-
# define CONFIG_OVERWRITE_ETHADDR_ONCE

# define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 56247e390bf6..39f6ff8a7252 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -34,13 +34,6 @@

#endif

-/* Ethernet */
-#define CONFIG_DM9000_BASE 0x30000000
-#define DM9000_IO CONFIG_DM9000_BASE
-#define DM9000_DATA (CONFIG_DM9000_BASE + 4)
-#define CONFIG_DM9000_USE_16BIT
-#define CONFIG_DM9000_NO_SROM
-
/* USB */
#define CFG_SYS_USB_OHCI_REGS_BASE 0x00500000 /* AT91SAM9261_UHP_BASE */

diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h
index d35c7c4a591e..80104b2d3193 100644
--- a/include/configs/brppt2.h
+++ b/include/configs/brppt2.h
@@ -16,8 +16,6 @@
#define CFG_SYS_PL310_BASE L2_PL310_BASE
#endif /* !CONFIG_SYS_L2CACHE_OFF */

-#define CONFIG_MXC_GPT_HCLK
-
/* MMC */

/* Boot */
diff --git a/include/configs/ci20.h b/include/configs/ci20.h
index 3329c24fa68c..446d5c4f3da9 100644
--- a/include/configs/ci20.h
+++ b/include/configs/ci20.h
@@ -17,11 +17,4 @@
/* NS16550-ish UARTs */
#define CFG_SYS_NS16550_CLK 48000000

-/* Ethernet: davicom DM9000 */
-#define CONFIG_DM9000_BASE 0xb6000000
-#define DM9000_IO CONFIG_DM9000_BASE
-#define DM9000_DATA (CONFIG_DM9000_BASE + 2)
-
-/* Miscellaneous configuration options */
-
#endif /* __CONFIG_CI20_H__ */
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index 46410595c2bc..e3621fd6f9c7 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -16,17 +16,6 @@

#include <configs/ti_omap3_common.h>

-/* Hardware drivers */
-/* DM9000 */
-#define CONFIG_DM9000_BASE 0x2c000000
-#define DM9000_IO CONFIG_DM9000_BASE
-#define DM9000_DATA (CONFIG_DM9000_BASE + 0x400)
-#define CONFIG_DM9000_USE_16BIT 1
-#define CONFIG_DM9000_NO_SROM 1
-#undef CONFIG_DM9000_DEBUG
-
-/* TWL4030 */
-
/* BOOTP/DHCP options */

#define MEM_LAYOUT_ENV_SETTINGS \
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index 245530aa640b..dd8cabc2e935 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -16,7 +16,6 @@
#endif

#endif
-#define CONFIG_MXC_GPT_HCLK

#include <linux/sizes.h>
#include <asm/arch/imx-regs.h>
diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index d5af6990107d..6e14b4fbf053 100644
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -14,7 +14,6 @@
#include <asm/mach-imx/gpio.h>

/* Timer settings */
-#define CONFIG_MXC_GPT_HCLK
#define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */

/* Miscellaneous configurable options */
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 788a1113868b..f19211fe6479 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -109,7 +109,6 @@
#define CFG_SYS_NAND_BASE DAVINCI_ASYNC_EMIF_DATA_CE3_BASE
#define CFG_SYS_NAND_MASK_CLE 0x10
#define CFG_SYS_NAND_MASK_ALE 0x8
-#define CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
#define CFG_SYS_NAND_U_BOOT_SIZE SZ_512K
#define CFG_SYS_NAND_U_BOOT_DST 0xc1080000
#define CFG_SYS_NAND_U_BOOT_START CFG_SYS_NAND_U_BOOT_DST
--
2.25.1