From 1701c3caa7ed7d183a57301f6513c1f5fb4102cd Mon Sep 17 00:00:00 2001 From: Sammy He Date: Mon, 16 Nov 2009 11:59:54 +0800 Subject: ENGR00118576 MX25: Support Smc911x ethernet 1. Add imx cspi support for cpld access. 2. Add smc911x ethernet support from cpld. Signed-off-by: Sammy He --- include/configs/mx25_3stack.h | 26 ++++++++++++++++++-------- include/configs/mx51_3stack_android.h | 4 ++-- include/configs/mx51_bbg.h | 6 +++--- include/configs/mx51_bbg_android.h | 3 ++- 4 files changed, 25 insertions(+), 14 deletions(-) (limited to 'include/configs') diff --git a/include/configs/mx25_3stack.h b/include/configs/mx25_3stack.h index 8272cbe..aa24d53 100644 --- a/include/configs/mx25_3stack.h +++ b/include/configs/mx25_3stack.h @@ -39,6 +39,10 @@ #define CONFIG_MX25_HCLK_FREQ 24000000 #define CONFIG_MX25_CLK32 32768 +#define CONFIG_IMX_CSPI 1 +#define IMX_CSPI_VER_0_7 1 +#define CONFIG_IMX_SPI_CPLD + /* IF iMX25 3DS V-1.0 define it */ /* #define CONFIG_MX25_3DS_V10 */ @@ -122,23 +126,29 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ - "ethprime=fec\0" \ + "ethprime=smc911x-0\0" \ + "uboot=u-boot.bin\0" \ + "uboot_addr=0xa0000000\0" \ + "kernel=uImage\0" \ "bootargs_base=setenv bootargs console=ttymxc0,115200\0" \ "bootargs_nfs=setenv bootargs $(bootargs) root=/dev/nfs " \ "ip=dhcp nfsroot=$(serverip):$(nfsrootfs),v3,tcp\0" \ "bootcmd=run bootcmd_net\0" \ - "bootcmd_net=run bootargs_base bootargs_mtd bootargs_nfs; " \ - "tftpboot 0x81000000 uImage; bootm\0" + "bootcmd_net=run bootargs_base bootargs_nfs; " \ + "tftpboot ${loadaddr} ${kernel}; bootm\0" \ + "load_uboot=tftpboot ${loadaddr} ${uboot}\0" /*Support LAN9217*/ -/*#define CONFIG_SMC911X 1 -#define CONFIG_SMC911X_16_BIT 1 -#define CONFIG_SMC911X_BASE CS5_BASE*/ +#define CONFIG_SMC911X +#define CONFIG_SMC911X_CPLD +#define CONFIG_SMC911X_BASE 0 -/*#define CONFIG_HAS_ETH1*/ +#define CONFIG_HAS_ETH1 #define CONFIG_CMD_NET #define CONFIG_CMD_DHCP -#define CONFIG_NET_MULTI 1 +#define CONFIG_NET_MULTI +#define CONFIG_ETH_PRIME + #define CONFIG_MXC_FEC #define CONFIG_MII #define CONFIG_DISCOVER_PHY diff --git a/include/configs/mx51_3stack_android.h b/include/configs/mx51_3stack_android.h index 7661713..04bcbb8 100644 --- a/include/configs/mx51_3stack_android.h +++ b/include/configs/mx51_3stack_android.h @@ -77,10 +77,10 @@ #define CONFIG_CMD_SF #define CONFIG_SPI_FLASH_IMX_ATMEL 1 #define CONFIG_SPI_FLASH_CS 1 -#define CONFIG_IMX_SPI +#define CONFIG_IMX_ECSPI #define CONFIG_IMX_SPI_PMIC #define CONFIG_IMX_SPI_PMIC_CS 0 - +#define IMX_CSPI_VER_2_3 1 #define MAX_SPI_BYTES (64 * 4) */ diff --git a/include/configs/mx51_bbg.h b/include/configs/mx51_bbg.h index 64f0e2b..e00ae62 100644 --- a/include/configs/mx51_bbg.h +++ b/include/configs/mx51_bbg.h @@ -73,10 +73,10 @@ #define CONFIG_FSL_SF 1 #define CONFIG_SPI_FLASH_IMX_ATMEL 1 #define CONFIG_SPI_FLASH_CS 1 -#define CONFIG_IMX_SPI +#define CONFIG_IMX_ECSPI #define CONFIG_IMX_SPI_PMIC -#define CONFIG_IMX_SPI_PMIC_CS 0 - +#define CONFIG_IMX_SPI_PMIC_CS 0 +#define IMX_CSPI_VER_2_3 1 #define MAX_SPI_BYTES (64 * 4) /* diff --git a/include/configs/mx51_bbg_android.h b/include/configs/mx51_bbg_android.h index f791f4d..24ffc6c 100644 --- a/include/configs/mx51_bbg_android.h +++ b/include/configs/mx51_bbg_android.h @@ -227,9 +227,10 @@ #define CONFIG_CMD_SF #define CONFIG_SPI_FLASH_IMX_ATMEL 1 #define CONFIG_SPI_FLASH_CS 1 -#define CONFIG_IMX_SPI +#define CONFIG_IMX_ECSPI #define CONFIG_IMX_SPI_PMIC #define CONFIG_IMX_SPI_PMIC_CS 0 +#define IMX_CSPI_VER_2_3 1 #define MAX_SPI_BYTES (64 * 4) -- cgit v1.1