net: Add SMC911X driver to Kconfig, convert
We add the various SMC91XX symbols to drivers/net/Kconfig and then this converts the following to Kconfig: CONFIG_SMC911X CONFIG_SMC911X_BASE CONFIG_SMC911X_16_BIT CONFIG_SMC911X_32_BIT Signed-off-by: Adam Ford <aford173@gmail.com> [trini: Apply to the rest of the tree, re-squash old and new patch] Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
@@ -16,11 +16,6 @@
|
||||
#define CONFIG_DISPLAY_BOARDINFO
|
||||
#undef CONFIG_SHOW_BOOT_PROGRESS
|
||||
|
||||
/* SMC9118 */
|
||||
#define CONFIG_SMC911X 1
|
||||
#define CONFIG_SMC911X_32_BIT 1
|
||||
#define CONFIG_SMC911X_BASE 0xB6080000
|
||||
|
||||
/* MEMORY */
|
||||
#define AP325RXA_SDRAM_BASE (0x88000000)
|
||||
#define AP325RXA_FLASH_BASE_1 (0xA0000000)
|
||||
|
||||
@@ -65,11 +65,7 @@
|
||||
#undef CONFIG_CMD_SPI
|
||||
#endif
|
||||
|
||||
/* BLANCHE on board LANC: SMC89218 (ExCS0) */
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_SMC911X 1
|
||||
#define CONFIG_SMC911X_16_BIT 1
|
||||
#define CONFIG_SMC911X_BASE 0x18000000
|
||||
|
||||
/* Board Clock */
|
||||
#define RMOBILE_XTAL_CLK 20000000u
|
||||
|
||||
@@ -207,14 +207,6 @@
|
||||
#define CONFIG_ENV_OFFSET 0x260000
|
||||
#define CONFIG_ENV_ADDR 0x260000
|
||||
|
||||
#if defined(CONFIG_CMD_NET)
|
||||
#define CONFIG_SMC911X
|
||||
#define CONFIG_SMC911X_32_BIT
|
||||
#define CM_T3X_SMC911X_BASE 0x2C000000
|
||||
#define SB_T35_SMC911X_BASE (CM_T3X_SMC911X_BASE + (16 << 20))
|
||||
#define CONFIG_SMC911X_BASE CM_T3X_SMC911X_BASE
|
||||
#endif /* (CONFIG_CMD_NET) */
|
||||
|
||||
/* additions for new relocation code, must be added to all boards */
|
||||
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
|
||||
#define CONFIG_SYS_INIT_RAM_ADDR 0x4020f800
|
||||
|
||||
@@ -213,9 +213,6 @@
|
||||
#define CONFIG_DRIVER_TI_EMAC
|
||||
#define CONFIG_DRIVER_TI_EMAC_USE_RMII
|
||||
#define CONFIG_MII
|
||||
#define CONFIG_SMC911X
|
||||
#define CONFIG_SMC911X_32_BIT
|
||||
#define CONFIG_SMC911X_BASE (0x2C000000 + (16 << 20))
|
||||
#define CONFIG_ARP_TIMEOUT 200UL
|
||||
#define CONFIG_NET_RETRY_COUNT 5
|
||||
#endif /* CONFIG_CMD_NET */
|
||||
|
||||
@@ -30,10 +30,6 @@
|
||||
|
||||
#define CONFIG_SYS_ENABLE_PADS_ALL
|
||||
|
||||
#define CONFIG_SMC911X
|
||||
#define CONFIG_SMC911X_32_BIT
|
||||
#define CONFIG_SMC911X_BASE 0x2C000000
|
||||
|
||||
/* GPIO */
|
||||
|
||||
/* ENV related config options */
|
||||
|
||||
@@ -123,9 +123,6 @@
|
||||
|
||||
/* Ethernet Controllor Driver */
|
||||
#ifdef CONFIG_CMD_NET
|
||||
#define CONFIG_SMC911X
|
||||
#define CONFIG_SMC911X_BASE 0x5000000
|
||||
#define CONFIG_SMC911X_16_BIT
|
||||
#define CONFIG_ENV_SROM_BANK 1
|
||||
#endif /*CONFIG_CMD_NET*/
|
||||
|
||||
|
||||
@@ -85,10 +85,6 @@
|
||||
"pclk:185925,le:9,ri:17,up:7,lo:10,hs:1,vs:1," \
|
||||
"sync:1241513985,vmode:0\0"
|
||||
|
||||
#define CONFIG_SMC911X
|
||||
#define CONFIG_SMC911X_BASE 0xa8000000
|
||||
#define CONFIG_SMC911X_32_BIT
|
||||
|
||||
/*
|
||||
* Miscellaneous configurable options
|
||||
*/
|
||||
|
||||
@@ -103,10 +103,6 @@
|
||||
#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
|
||||
#define TMU_CLK_DIVIDER (4) /* 4 (default), 16, 64, 256 or 1024 */
|
||||
|
||||
/* Ether */
|
||||
#define CONFIG_SMC911X
|
||||
#define CONFIG_SMC911X_BASE (0x10000000)
|
||||
#define CONFIG_SMC911X_32_BIT
|
||||
#define CONFIG_NFS_TIMEOUT 10000UL
|
||||
|
||||
/* I2C */
|
||||
|
||||
@@ -79,10 +79,6 @@
|
||||
"nand erase 0x0 0x40000; " \
|
||||
"nand write 0x81000000 0x0 0x40000\0"
|
||||
|
||||
#define CONFIG_SMC911X
|
||||
#define CONFIG_SMC911X_BASE 0xB6000000
|
||||
#define CONFIG_SMC911X_32_BIT
|
||||
|
||||
/*
|
||||
* Miscellaneous configurable options
|
||||
*/
|
||||
|
||||
@@ -85,10 +85,6 @@
|
||||
/*
|
||||
* Ethernet on the debug board (SMC911)
|
||||
*/
|
||||
#define CONFIG_SMC911X
|
||||
#define CONFIG_SMC911X_16_BIT 1
|
||||
#define CONFIG_SMC911X_BASE CS5_BASE_ADDR
|
||||
|
||||
#define CONFIG_HAS_ETH1
|
||||
#define CONFIG_ETHPRIME
|
||||
|
||||
|
||||
@@ -60,11 +60,6 @@
|
||||
|
||||
#define CONFIG_ETHPRIME "smc911x"
|
||||
|
||||
/*Support LAN9217*/
|
||||
#define CONFIG_SMC911X
|
||||
#define CONFIG_SMC911X_16_BIT
|
||||
#define CONFIG_SMC911X_BASE CS1_BASE_ADDR
|
||||
|
||||
#define CONFIG_LOADADDR 0x72000000 /* loadaddr env var */
|
||||
#define CONFIG_SYS_TEXT_BASE 0x77800000
|
||||
|
||||
|
||||
@@ -83,13 +83,6 @@
|
||||
/* USB EHCI */
|
||||
#define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1
|
||||
|
||||
/* SMSC911x Ethernet */
|
||||
#if defined(CONFIG_CMD_NET)
|
||||
#define CONFIG_SMC911X
|
||||
#define CONFIG_SMC911X_32_BIT
|
||||
#define CONFIG_SMC911X_BASE 0x2C000000
|
||||
#endif /* CONFIG_CMD_NET */
|
||||
|
||||
/* Environment */
|
||||
#define CONFIG_PREBOOT "usb start"
|
||||
|
||||
|
||||
@@ -101,15 +101,6 @@
|
||||
|
||||
#endif
|
||||
|
||||
/*
|
||||
* SMSC911x Ethernet
|
||||
*/
|
||||
#if defined(CONFIG_CMD_NET)
|
||||
#define CONFIG_SMC911X
|
||||
#define CONFIG_SMC911X_32_BIT
|
||||
#define CONFIG_SMC911X_BASE 0x2C000000
|
||||
#endif /* (CONFIG_CMD_NET) */
|
||||
|
||||
#define CONFIG_MTD_PARTITIONS
|
||||
#define CONFIG_SYS_MTDPARTS_RUNTIME
|
||||
|
||||
|
||||
@@ -236,13 +236,6 @@
|
||||
#define CONFIG_ENV_OFFSET 0x260000
|
||||
#define CONFIG_ENV_ADDR 0x260000
|
||||
|
||||
/* SMSC922x Ethernet */
|
||||
#if defined(CONFIG_CMD_NET)
|
||||
#define CONFIG_SMC911X
|
||||
#define CONFIG_SMC911X_32_BIT
|
||||
#define CONFIG_SMC911X_BASE 0x08000000
|
||||
#endif /* (CONFIG_CMD_NET) */
|
||||
|
||||
/* Defines for SPL */
|
||||
|
||||
/* NAND: SPL falcon mode configs */
|
||||
|
||||
@@ -179,13 +179,6 @@
|
||||
#define CONFIG_ENV_OFFSET 0x240000
|
||||
#define CONFIG_ENV_ADDR 0x240000
|
||||
|
||||
/* Configure SMSC9211 ethernet */
|
||||
#if defined(CONFIG_CMD_NET)
|
||||
#define CONFIG_SMC911X
|
||||
#define CONFIG_SMC911X_32_BIT
|
||||
#define CONFIG_SMC911X_BASE 0x2C000000
|
||||
#endif /* (CONFIG_CMD_NET) */
|
||||
|
||||
/* Initial RAM setup */
|
||||
#define CONFIG_SYS_INIT_RAM_ADDR 0x4020f800
|
||||
#define CONFIG_SYS_INIT_RAM_SIZE 0x800
|
||||
|
||||
@@ -153,12 +153,4 @@
|
||||
#define CONFIG_ENV_OFFSET 0x260000
|
||||
#define CONFIG_ENV_ADDR 0x260000
|
||||
|
||||
#ifdef CONFIG_CMD_NET
|
||||
/* Ethernet (LAN9211 from SMSC9118 family) */
|
||||
#define CONFIG_SMC911X
|
||||
#define CONFIG_SMC911X_32_BIT
|
||||
#define CONFIG_SMC911X_BASE DEBUG_BASE
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* __CONFIG_H */
|
||||
|
||||
@@ -28,11 +28,6 @@
|
||||
#define CONFIG_BITBANGMII_MULTI
|
||||
#define CONFIG_SH_ETHER_SH7734_MII (0x00) /* MII */
|
||||
#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII
|
||||
#ifndef CONFIG_SH_ETHER
|
||||
# define CONFIG_SMC911X
|
||||
# define CONFIG_SMC911X_16_BIT
|
||||
# define CONFIG_SMC911X_BASE (0x84000000)
|
||||
#endif
|
||||
|
||||
/* undef to save memory */
|
||||
#define CONFIG_SYS_LONGHELP
|
||||
|
||||
@@ -67,9 +67,4 @@
|
||||
#define CMT_CLK_DIVIDER 32 /* 8 (default), 32, 128 or 512 */
|
||||
#define CONFIG_SH_CMT_CLK_FREQ (CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER)
|
||||
|
||||
/* Network interface */
|
||||
#define CONFIG_SMC911X
|
||||
#define CONFIG_SMC911X_16_BIT
|
||||
#define CONFIG_SMC911X_BASE (0x24000000)
|
||||
|
||||
#endif /* __RSK7203_H */
|
||||
|
||||
@@ -56,9 +56,4 @@
|
||||
#define CMT_CLK_DIVIDER 32 /* 8 (default), 32, 128 or 512 */
|
||||
#define CONFIG_SH_CMT_CLK_FREQ (CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER)
|
||||
|
||||
/* Network interface */
|
||||
#define CONFIG_SMC911X
|
||||
#define CONFIG_SMC911X_16_BIT
|
||||
#define CONFIG_SMC911X_BASE 0x28000000
|
||||
|
||||
#endif /* __RSK7264_H */
|
||||
|
||||
@@ -55,9 +55,4 @@
|
||||
#define CMT_CLK_DIVIDER 32 /* 8 (default), 32, 128 or 512 */
|
||||
#define CONFIG_SH_CMT_CLK_FREQ (CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER)
|
||||
|
||||
/* Network interface */
|
||||
#define CONFIG_SMC911X
|
||||
#define CONFIG_SMC911X_16_BIT
|
||||
#define CONFIG_SMC911X_BASE 0x24000000
|
||||
|
||||
#endif /* __RSK7269_H */
|
||||
|
||||
@@ -174,9 +174,6 @@
|
||||
* Ethernet Contoller driver
|
||||
*/
|
||||
#ifdef CONFIG_CMD_NET
|
||||
#define CONFIG_SMC911X 1 /* we have a SMC9115 on-board */
|
||||
#define CONFIG_SMC911X_16_BIT 1 /* SMC911X_16_BIT Mode */
|
||||
#define CONFIG_SMC911X_BASE 0x98800300 /* SMC911X Drive Base */
|
||||
#define CONFIG_ENV_SROM_BANK 3 /* Select SROM Bank-3 for Ethernet*/
|
||||
#endif /* CONFIG_CMD_NET */
|
||||
|
||||
|
||||
@@ -88,9 +88,6 @@
|
||||
|
||||
/* Ethernet Controllor Driver */
|
||||
#ifdef CONFIG_CMD_NET
|
||||
#define CONFIG_SMC911X
|
||||
#define CONFIG_SMC911X_BASE 0x5000000
|
||||
#define CONFIG_SMC911X_16_BIT
|
||||
#define CONFIG_ENV_SROM_BANK 1
|
||||
#endif /*CONFIG_CMD_NET*/
|
||||
|
||||
|
||||
@@ -24,14 +24,6 @@
|
||||
|
||||
#define CONFIG_HOSTNAME twister
|
||||
|
||||
/*
|
||||
* Miscellaneous configurable options
|
||||
*/
|
||||
#define CONFIG_SMC911X
|
||||
#define CONFIG_SMC911X_16_BIT
|
||||
#define CONFIG_SMC911X_BASE 0x2C000000
|
||||
#define CONFIG_SMC911X_NO_EEPROM
|
||||
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS CONFIG_TAM3517_SETTINGS \
|
||||
"bootcmd=run nandboot\0"
|
||||
|
||||
|
||||
@@ -28,14 +28,6 @@
|
||||
/* FLASH related */
|
||||
#define CONFIG_MTD_DEVICE
|
||||
|
||||
#define CONFIG_SMC911X_32_BIT
|
||||
/* dummy: referenced by examples/standalone/smc911x_eeprom.c */
|
||||
#define CONFIG_SMC911X_BASE 0
|
||||
|
||||
#ifdef CONFIG_MICRO_SUPPORT_CARD
|
||||
#define CONFIG_SMC911X
|
||||
#endif
|
||||
|
||||
#define CONFIG_FLASH_CFI_DRIVER
|
||||
#define CONFIG_SYS_FLASH_CFI
|
||||
|
||||
|
||||
@@ -65,33 +65,12 @@
|
||||
#define CONFIG_SYS_LOAD_ADDR 0x80400000 /* default load address */
|
||||
|
||||
#if defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)
|
||||
/*
|
||||
* SMSC91C11x Network Card
|
||||
*/
|
||||
#define CONFIG_SMC911X
|
||||
#define CONFIG_SMC911X_BASE 0x00000000
|
||||
#define CONFIG_SMC911X_32_BIT
|
||||
#define CONFIG_NET_RETRY_COUNT 20
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Commands
|
||||
*/
|
||||
|
||||
/*
|
||||
* Only Premium/Platinum have ethernet support right now
|
||||
*/
|
||||
#if (defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)) && \
|
||||
!defined(CONFIG_VCT_SMALL_IMAGE)
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Only Premium/Platinum have USB-EHCI support right now
|
||||
*/
|
||||
#if (defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)) && \
|
||||
!defined(CONFIG_VCT_SMALL_IMAGE)
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_CMD_USB)
|
||||
#define CONFIG_SUPPORT_VFAT
|
||||
|
||||
@@ -236,7 +215,6 @@ int vct_gpio_get(int pin);
|
||||
* (NOR/OneNAND) usage and Linux kernel booting.
|
||||
*/
|
||||
#if defined(CONFIG_VCT_SMALL_IMAGE)
|
||||
#undef CONFIG_SMC911X
|
||||
#undef CONFIG_SYS_I2C_SOFT
|
||||
#undef CONFIG_SOURCE
|
||||
#undef CONFIG_SYS_LONGHELP
|
||||
|
||||
@@ -102,13 +102,7 @@
|
||||
/* Size of malloc() pool */
|
||||
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (8 << 20))
|
||||
|
||||
/* Ethernet Configuration */
|
||||
#ifdef CONFIG_TARGET_VEXPRESS64_JUNO
|
||||
/* The real hardware Versatile express uses SMSC9118 */
|
||||
#define CONFIG_SMC911X 1
|
||||
#define CONFIG_SMC911X_32_BIT 1
|
||||
#define CONFIG_SMC911X_BASE (0x018000000)
|
||||
#else
|
||||
#ifndef CONFIG_TARGET_VEXPRESS64_JUNO
|
||||
/* The Vexpress64 simulators use SMSC91C111 */
|
||||
#define CONFIG_SMC91111 1
|
||||
#define CONFIG_SMC91111_BASE (0x01A000000)
|
||||
|
||||
@@ -55,7 +55,6 @@
|
||||
#define V2M_NOR1 (V2M_PA_CS1)
|
||||
#define V2M_SRAM (V2M_PA_CS2)
|
||||
#define V2M_VIDEO_SRAM (V2M_PA_CS3 + 0x00000000)
|
||||
#define V2M_LAN9118 (V2M_PA_CS3 + 0x02000000)
|
||||
#define V2M_ISP1761 (V2M_PA_CS3 + 0x03000000)
|
||||
|
||||
/* Common peripherals relative to CS7. */
|
||||
@@ -133,11 +132,6 @@
|
||||
#define CONFIG_SYS_TIMER_COUNTER (V2M_TIMER01 + 0x4)
|
||||
#define CONFIG_SYS_TIMER_COUNTS_DOWN
|
||||
|
||||
/* SMSC9115 Ethernet from SMSC9118 family */
|
||||
#define CONFIG_SMC911X 1
|
||||
#define CONFIG_SMC911X_32_BIT 1
|
||||
#define CONFIG_SMC911X_BASE V2M_LAN9118
|
||||
|
||||
/* PL011 Serial Configuration */
|
||||
#define CONFIG_PL011_SERIAL
|
||||
#define CONFIG_PL011_CLOCK 24000000
|
||||
|
||||
Reference in New Issue
Block a user