Convert CONFIG_DM9000_BYTE_SWAPPED et al to Kconfig

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>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d3b11b84959e3ade8fbc4625589d1a2e787ef1ae..8381e09e102a94c22d266d49b2fe068584f1da42 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -915,6 +915,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
@@ -928,6 +929,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 ee5f1996a830f6ee009db7349909c5d35d83c329..3266545c2663b71d4de55fd62a4171968b6a1eb8 100644 (file)
--- 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 c5499a63fd36f54991033f6829fef88585a3cf90..34055f69754b2b82f11edb4b3af4a75f74b3bf38 100644 (file)
--- 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 0808ca1a54c09548e3cc34b83146122cb6419eb3..06009d8ad54c37069bcbe21c7a3bace5ea04e0d7 100644 (file)
--- 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 581023f967b8932284921953818757709bfcc05a..2684ce05f267e6def45ecb6e7d9d66685da2c504 100644 (file)
--- 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 c6c83b8da3553fc62af3a5174c36b2b50f840248..a398e6d97a1e0f89018d8205c4c5a0166b1977a8 100644 (file)
--- 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 1c16d26c8248c99dce94ccc52f5e1623a167134b..1b464ff2925984be03cc4a4317dfba2bbe0da60b 100644 (file)
--- 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 8dbcb27f95c237865315294b58115d2e57d18b44..f2326249425079c9a74a476403caf1b64fb82a6e 100644 (file)
--- 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 8347b67681d441403a5ecf61440a6a24caa07e44..6fd4410df5b6e03a61318d31d9ad065b9fba6f89 100644 (file)
--- 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 4e5da5ab72a5ca1b67f3d668a32caaac81da8573..0607f959da4931b37e61e5f7990b176d3504b4cd 100644 (file)
--- 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 7e37c6d11997db73be42e3b7dec520e7052363ac..ad55938348e5db1707efe91ae765017876e4d0f2 100644 (file)
--- 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 56247e390bf65b65c3c410f6a2ee5928b359b0ef..39f6ff8a72525f066fec291639b0e730f1d07ec5 100644 (file)
--- 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 d35c7c4a591e5bb16b604139e1036cfd9c3c38df..80104b2d319316bffe18baa5e6c0200b9a8e3a1b 100644 (file)
--- 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 3329c24fa68c62361460df20e554d0e697e495d7..446d5c4f3da924c43565fda8696edf6436c88255 100644 (file)
--- 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 46410595c2bccef63dd13595e34ae8ad5a621910..e3621fd6f9c74aa36c8b630f9f66cbd3ec7b35b1 100644 (file)
--- 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 245530aa640b846e083f9ccd31c419919a0afe8d..dd8cabc2e935bdb2d5af96cabecd0b7cbe2512f9 100644 (file)
--- 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 d5af6990107d476b5fb2ea8e272f54033b31474e..6e14b4fbf053396bddf43d4851764959fd7c9c80 100644 (file)
--- 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 788a1113868b36669862c6cf3ac939992ade9a92..f19211fe64794ac9039fb4c56d63c5495ae2e054 100644 (file)
--- 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