diff options
Diffstat (limited to 'include')
68 files changed, 1 insertions, 299 deletions
diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h index ed971e5911e..143c9a3867d 100644 --- a/include/configs/10m50_devboard.h +++ b/include/configs/10m50_devboard.h @@ -23,12 +23,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 1024 /* - * NET options - */ -#define CONFIG_SYS_RX_ETH_BUFFER 0 -#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN - -/* * BOOTP options */ diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h index c33616bf46b..1aea9ad5c88 100644 --- a/include/configs/3c120_devboard.h +++ b/include/configs/3c120_devboard.h @@ -23,12 +23,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 512 /* - * NET options - */ -#define CONFIG_SYS_RX_ETH_BUFFER 0 -#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN - -/* * MEMORY ORGANIZATION * -Monitor at top of sdram. * -The heap is placed below the monitor diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index 76c85a7f5c3..e73c656c384 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -18,18 +18,11 @@ #define CONFIG_WATCHDOG_TIMEOUT 5000 #ifdef CONFIG_MCFFEC -# define CONFIG_MII_INIT 1 # define CONFIG_SYS_DISCOVER_PHY -# define CONFIG_SYS_RX_ETH_BUFFER 8 -# define CONFIG_SYS_FAULT_ECHO_LINK_DOWN /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */ # ifndef CONFIG_SYS_DISCOVER_PHY # define FECDUPLEX FULL # define FECSPEED _100BASET -# else -# ifndef CONFIG_SYS_FAULT_ECHO_LINK_DOWN -# define CONFIG_SYS_FAULT_ECHO_LINK_DOWN -# endif # endif /* CONFIG_SYS_DISCOVER_PHY */ #endif diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index 25f784e3980..bbe12d10db6 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -23,18 +23,11 @@ #define CONFIG_WATCHDOG_TIMEOUT 5000 /* timeout in milliseconds, max timeout is 6.71sec */ #ifdef CONFIG_MCFFEC -# define CONFIG_MII_INIT 1 # define CONFIG_SYS_DISCOVER_PHY -# define CONFIG_SYS_RX_ETH_BUFFER 8 -# define CONFIG_SYS_FAULT_ECHO_LINK_DOWN /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */ # ifndef CONFIG_SYS_DISCOVER_PHY # define FECDUPLEX FULL # define FECSPEED _100BASET -# else -# ifndef CONFIG_SYS_FAULT_ECHO_LINK_DOWN -# define CONFIG_SYS_FAULT_ECHO_LINK_DOWN -# endif # endif /* CONFIG_SYS_DISCOVER_PHY */ #endif diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index c3fcf73a5d9..c4ee8c933d9 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -33,18 +33,11 @@ env/embedded.o(.text); #ifdef CONFIG_MCFFEC -# define CONFIG_MII_INIT 1 # define CONFIG_SYS_DISCOVER_PHY -# define CONFIG_SYS_RX_ETH_BUFFER 8 -# define CONFIG_SYS_FAULT_ECHO_LINK_DOWN /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */ # ifndef CONFIG_SYS_DISCOVER_PHY # define FECDUPLEX FULL # define FECSPEED _100BASET -# else -# ifndef CONFIG_SYS_FAULT_ECHO_LINK_DOWN -# define CONFIG_SYS_FAULT_ECHO_LINK_DOWN -# endif # endif /* CONFIG_SYS_DISCOVER_PHY */ #endif diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h index e9057ffd955..5db85ad1842 100644 --- a/include/configs/M5275EVB.h +++ b/include/configs/M5275EVB.h @@ -36,18 +36,11 @@ /* Available command configuration */ #ifdef CONFIG_MCFFEC -#define CONFIG_MII_INIT 1 #define CONFIG_SYS_DISCOVER_PHY -#define CONFIG_SYS_RX_ETH_BUFFER 8 -#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */ #ifndef CONFIG_SYS_DISCOVER_PHY #define FECDUPLEX FULL #define FECSPEED _100BASET -#else -#ifndef CONFIG_SYS_FAULT_ECHO_LINK_DOWN -#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN -#endif #endif #endif diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index cf87795eda9..cc64893b9af 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -31,18 +31,11 @@ env/embedded.o(.text*); #ifdef CONFIG_MCFFEC -# define CONFIG_MII_INIT 1 # define CONFIG_SYS_DISCOVER_PHY -# define CONFIG_SYS_RX_ETH_BUFFER 8 -# define CONFIG_SYS_FAULT_ECHO_LINK_DOWN /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */ # ifndef CONFIG_SYS_DISCOVER_PHY # define FECDUPLEX FULL # define FECSPEED _100BASET -# else -# ifndef CONFIG_SYS_FAULT_ECHO_LINK_DOWN -# define CONFIG_SYS_FAULT_ECHO_LINK_DOWN -# endif # endif /* CONFIG_SYS_DISCOVER_PHY */ #endif diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index 06eb03b2b8e..431fa7406c6 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -25,21 +25,14 @@ #define CONFIG_SYS_UNIFY_CACHE #ifdef CONFIG_MCFFEC -# define CONFIG_MII_INIT 1 # define CONFIG_SYS_DISCOVER_PHY -# define CONFIG_SYS_RX_ETH_BUFFER 8 # define CONFIG_SYS_TX_ETH_BUFFER 8 # define CONFIG_SYS_FEC_BUF_USE_SRAM -# define CONFIG_SYS_FAULT_ECHO_LINK_DOWN /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */ # ifndef CONFIG_SYS_DISCOVER_PHY # define FECDUPLEX FULL # define FECSPEED _100BASET -# else -# ifndef CONFIG_SYS_FAULT_ECHO_LINK_DOWN -# define CONFIG_SYS_FAULT_ECHO_LINK_DOWN -# endif # endif /* CONFIG_SYS_DISCOVER_PHY */ #endif diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 865d23c6b57..d155f2cba04 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -25,18 +25,11 @@ #define CONFIG_SYS_UNIFY_CACHE #ifdef CONFIG_MCFFEC -# define CONFIG_MII_INIT 1 # define CONFIG_SYS_DISCOVER_PHY -# define CONFIG_SYS_RX_ETH_BUFFER 8 -# define CONFIG_SYS_FAULT_ECHO_LINK_DOWN /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */ # ifndef CONFIG_SYS_DISCOVER_PHY # define FECDUPLEX FULL # define FECSPEED _100BASET -# else -# ifndef CONFIG_SYS_FAULT_ECHO_LINK_DOWN -# define CONFIG_SYS_FAULT_ECHO_LINK_DOWN -# endif # endif /* CONFIG_SYS_DISCOVER_PHY */ #endif diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index ca13c8cbd30..b0b0e2e13bf 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -27,18 +27,11 @@ #define CONFIG_SYS_UNIFY_CACHE #ifdef CONFIG_MCFFEC -# define CONFIG_MII_INIT 1 # define CONFIG_SYS_DISCOVER_PHY -# define CONFIG_SYS_RX_ETH_BUFFER 8 -# define CONFIG_SYS_FAULT_ECHO_LINK_DOWN /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */ # ifndef CONFIG_SYS_DISCOVER_PHY # define FECDUPLEX FULL # define FECSPEED _100BASET -# else -# ifndef CONFIG_SYS_FAULT_ECHO_LINK_DOWN -# define CONFIG_SYS_FAULT_ECHO_LINK_DOWN -# endif # endif /* CONFIG_SYS_DISCOVER_PHY */ #endif diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h index 4a26ae8f7f1..e26b70a0823 100644 --- a/include/configs/MCR3000.h +++ b/include/configs/MCR3000.h @@ -88,7 +88,6 @@ /* Ethernet configuration part */ #define CONFIG_SYS_DISCOVER_PHY 1 -#define CONFIG_MII_INIT 1 /* NAND configuration part */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index c81e8cb580c..40898a6d1f9 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -56,7 +56,6 @@ * These can be toggled for performance analysis, otherwise use default. */ #define CONFIG_SYS_CACHE_STASHING -#define CONFIG_BACKSIDE_L2_CACHE #define CONFIG_SYS_INIT_L2CSR0 L2CSR0_L2E #define CONFIG_ENABLE_36BIT_PHYS diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h index dbaffc635d2..8114373655f 100644 --- a/include/configs/SBx81LIFKW.h +++ b/include/configs/SBx81LIFKW.h @@ -46,7 +46,6 @@ #include <asm/arch/config.h> /* There is no PHY directly connected so don't ask it for link status */ -#undef CONFIG_SYS_FAULT_ECHO_LINK_DOWN /* * Ethernet Driver configuration diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h index bbd3ccc6d9d..b70829c09d5 100644 --- a/include/configs/SBx81LIFXCAT.h +++ b/include/configs/SBx81LIFXCAT.h @@ -51,7 +51,6 @@ #include <asm/arch/config.h> /* There is no PHY directly connected so don't ask it for link status */ -#undef CONFIG_SYS_FAULT_ECHO_LINK_DOWN /* * Ethernet Driver configuration diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 57aad411abe..dfb9e9120ae 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -119,7 +119,6 @@ * These can be toggled for performance analysis, otherwise use default. */ #define CONFIG_SYS_CACHE_STASHING -#define CONFIG_BACKSIDE_L2_CACHE #define CONFIG_SYS_INIT_L2CSR0 L2CSR0_L2E #ifdef CONFIG_DDR_ECC #define CONFIG_MEM_INIT_VALUE 0xdeadbeef diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 07ced21e40a..6fbeebc1a66 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -96,7 +96,6 @@ * These can be toggled for performance analysis, otherwise use default. */ #define CONFIG_SYS_CACHE_STASHING -#define CONFIG_BACKSIDE_L2_CACHE #define CONFIG_SYS_INIT_L2CSR0 L2CSR0_L2E #ifdef CONFIG_DDR_ECC #define CONFIG_MEM_INIT_VALUE 0xdeadbeef diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 651eb19759f..e4bd13b47dc 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -147,8 +147,6 @@ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs longer aneg time at 1G */ -#define CONFIG_SYS_RX_ETH_BUFFER 64 - /* NAND support */ #ifdef CONFIG_MTD_RAW_NAND /* NAND: device related configs */ diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index fefdb837092..4e72bf5f062 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -22,14 +22,6 @@ /* LCD */ #define LCD_BPP LCD_COLOR8 -#define CONFIG_LCD_LOGO -#undef LCD_TEST_PATTERN -#define CONFIG_LCD_INFO -#define CONFIG_LCD_INFO_BELOW_LOGO -#define CONFIG_ATMEL_LCD -#ifdef CONFIG_AT91SAM9261EK -#define CONFIG_ATMEL_LCD_BGR555 -#endif /* SDRAM */ #define CONFIG_SYS_SDRAM_BASE 0x20000000 @@ -58,7 +50,6 @@ #define DM9000_DATA (CONFIG_DM9000_BASE + 4) #define CONFIG_DM9000_USE_16BIT #define CONFIG_DM9000_NO_SROM -#define CONFIG_RESET_PHY_R /* USB */ #define CONFIG_USB_ATMEL diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index b084f96afd8..15df8f30272 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -33,12 +33,6 @@ /* LCD */ #define LCD_BPP LCD_COLOR8 -#define CONFIG_LCD_LOGO 1 -#undef LCD_TEST_PATTERN -#define CONFIG_LCD_INFO 1 -#define CONFIG_LCD_INFO_BELOW_LOGO 1 -#define CONFIG_ATMEL_LCD 1 -#define CONFIG_ATMEL_LCD_BGR555 1 /* SDRAM */ #define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS1 @@ -184,10 +178,6 @@ #define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PA22 #endif -/* Ethernet */ -#define CONFIG_RESET_PHY_R 1 -#define CONFIG_AT91_WANTS_COMMON_PHY - /* USB */ #define CONFIG_USB_ATMEL #define CONFIG_USB_ATMEL_CLK_SEL_PLLB diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 0f5d991022c..1a408f835a5 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -18,12 +18,6 @@ /* LCD */ #define LCD_BPP LCD_COLOR8 -#define CONFIG_LCD_LOGO -#undef LCD_TEST_PATTERN -#define CONFIG_LCD_INFO -#define CONFIG_LCD_INFO_BELOW_LOGO -#define CONFIG_ATMEL_LCD -#define CONFIG_ATMEL_LCD_RGB565 /* SDRAM */ #define CONFIG_SYS_SDRAM_BASE 0x70000000 @@ -46,10 +40,6 @@ #endif -/* Ethernet */ -#define CONFIG_RESET_PHY_R -#define CONFIG_AT91_WANTS_COMMON_PHY - #ifdef CONFIG_NAND_BOOT /* bootstrap + u-boot + env in nandflash */ #elif CONFIG_SD_BOOT diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 1771defa164..cd7c271cdc7 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -18,10 +18,6 @@ /* LCD */ #define LCD_BPP LCD_COLOR16 #define LCD_OUTPUT_BPP 24 -#define CONFIG_LCD_LOGO -#define CONFIG_LCD_INFO -#define CONFIG_LCD_INFO_BELOW_LOGO -#define CONFIG_ATMEL_LCD_RGB565 #define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE 0x08000000 diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 89cfcbd9517..0105cb0a80e 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -22,12 +22,6 @@ /* LCD */ #define LCD_BPP LCD_COLOR8 -#define CONFIG_LCD_LOGO 1 -#undef LCD_TEST_PATTERN -#define CONFIG_LCD_INFO 1 -#define CONFIG_LCD_INFO_BELOW_LOGO 1 -#define CONFIG_ATMEL_LCD 1 -#define CONFIG_ATMEL_LCD_RGB565 1 /* Let board_init_f handle the framebuffer allocation */ #undef CONFIG_FB_ADDR diff --git a/include/configs/bmips_common.h b/include/configs/bmips_common.h index 0f63239e5a5..0c357dea9d3 100644 --- a/include/configs/bmips_common.h +++ b/include/configs/bmips_common.h @@ -8,10 +8,6 @@ #include <linux/sizes.h> -/* ETH */ -#define CONFIG_PHY_RESET_DELAY 20 -#define CONFIG_SYS_RX_ETH_BUFFER 6 - /* UART */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, \ 230400, 500000, 1500000 } diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index 2d09a6f4c75..eb015e1b20f 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -32,9 +32,6 @@ 42, 43, 44, 45, 46, 47, 48, 49, \ 50, 51, 52, 53, 54, 55, 56, 57, } -/* CPSW Ethernet support */ -#define CONFIG_SYS_RX_ETH_BUFFER 64 - /* Power */ #define CONFIG_POWER_TPS65218 diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index 9d3ee7f2245..577936b5af9 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -89,18 +89,11 @@ env/embedded.o(.text); #ifdef CONFIG_MCFFEC -# define CONFIG_MII_INIT 1 # define CONFIG_SYS_DISCOVER_PHY -# define CONFIG_SYS_RX_ETH_BUFFER 8 -# define CONFIG_SYS_FAULT_ECHO_LINK_DOWN /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */ # ifndef CONFIG_SYS_DISCOVER_PHY # define FECDUPLEX FULL # define FECSPEED _100BASET -# else -# ifndef CONFIG_SYS_FAULT_ECHO_LINK_DOWN -# define CONFIG_SYS_FAULT_ECHO_LINK_DOWN -# endif # endif /* CONFIG_SYS_DISCOVER_PHY */ #endif diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index b34a5c9f242..17ff703d74b 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -38,7 +38,6 @@ #ifdef CONFIG_LCD #define CONFIG_PXA_LCD #define CONFIG_PXA_VGA -#define CONFIG_LCD_LOGO #endif /* diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index c377187b803..c45016a8358 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -15,9 +15,6 @@ #define CONFIG_TEGRA_UARTA_SDIO1 #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE -/* LCD support */ -#define CONFIG_LCD_LOGO - /* NAND support */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index c654653fce7..1c1c69dbd6a 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -57,7 +57,6 @@ * These can be toggled for performance analysis, otherwise use default. */ #define CONFIG_SYS_CACHE_STASHING -#define CONFIG_BACKSIDE_L2_CACHE #define CONFIG_SYS_INIT_L2CSR0 L2CSR0_L2E #ifdef CONFIG_DDR_ECC #define CONFIG_MEM_INIT_VALUE 0xdeadbeef diff --git a/include/configs/corvus.h b/include/configs/corvus.h index caadf646261..18bb5547fa9 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -32,7 +32,6 @@ #define CONFIG_USART_ID ATMEL_ID_SYS /* LED */ -#define CONFIG_AT91_LED #define CONFIG_RED_LED AT91_PIN_PD31 /* this is the user1 led */ #define CONFIG_GREEN_LED AT91_PIN_PD0 /* this is the user2 led */ @@ -56,10 +55,6 @@ #define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC8 #endif -/* Ethernet */ -#define CONFIG_RMII -#define CONFIG_AT91_WANTS_COMMON_PHY - /* DFU class support */ #define DFU_MANIFEST_POLL_TIMEOUT 25000 diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 0a701e7dd03..bc5282a4893 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -30,13 +30,6 @@ */ /* - * Ethernet - */ -#define CONFIG_RMII -#define CONFIG_LPC32XX_ETH -#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN - -/* * NOR Flash */ #define CONFIG_SYS_MAX_FLASH_SECT 71 diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h index 736c724736c..381a189149e 100644 --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h @@ -35,8 +35,5 @@ */ #define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 0 -#ifdef CONFIG_RESET_PHY_R -#undef CONFIG_RESET_PHY_R /* remove legacy reset_phy() */ -#endif #endif /* _CONFIG_DOCKSTAR_H */ diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index fd12a391875..07e2b8781fd 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -29,9 +29,6 @@ */ #define CONFIG_MVGBE_PORTS {1, 1} /* enable both ports */ #define CONFIG_PHY_BASE_ADR 0 -#ifdef CONFIG_RESET_PHY_R -#undef CONFIG_RESET_PHY_R /* remove legacy reset_phy() */ -#endif /* * SATA Driver configuration diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h index 57ae33e188b..4d88657ca61 100644 --- a/include/configs/eb_cpu5282.h +++ b/include/configs/eb_cpu5282.h @@ -52,10 +52,7 @@ *----------------------------------------------------------------------*/ #ifdef CONFIG_MCFFEC -#define CONFIG_MII_INIT 1 #define CONFIG_SYS_DISCOVER_PHY -#define CONFIG_SYS_RX_ETH_BUFFER 8 -#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN #define CONFIG_OVERWRITE_ETHADDR_ONCE #endif diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index a599722ae3b..8e2c24594fa 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -100,8 +100,6 @@ #define CONFIG_MVGBE_PORTS {1} /* enable port 0 only */ #define CONFIG_SKIP_LOCAL_MAC_RANDOMIZATION /* don't randomize MAC */ #define CONFIG_PHY_BASE_ADR 0x8 -#define CONFIG_RESET_PHY_R /* use reset_phy() to init mv8831116 PHY */ -#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN /* detect link using phy */ #endif /* diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index 860709a2770..3231f3cc035 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -54,7 +54,6 @@ /* JFFS2 */ /* Ethernet */ -#define CONFIG_RMII #define CONFIG_PHY_ID 0 #define CONFIG_MACB_SEARCH_PHY diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index 51e671a9517..832441a7b72 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -43,9 +43,6 @@ */ #define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 0 -#ifdef CONFIG_RESET_PHY_R -#undef CONFIG_RESET_PHY_R /* remove legacy reset_phy() */ -#endif /* SATA driver configuration */ #define CONFIG_LBA48 diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index 2598deaac6e..aff948cfe70 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -32,7 +32,6 @@ #ifdef CONFIG_CMD_NET #define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 0 -#undef CONFIG_RESET_PHY_R #endif /* CONFIG_CMD_NET */ /* diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index 44a4b4409f9..cb4cf9beb74 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -26,9 +26,6 @@ #ifdef CONFIG_CMD_NET #define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 11 -#ifdef CONFIG_RESET_PHY_R -#undef CONFIG_RESET_PHY_R /* remove legacy reset_phy() */ -#endif #endif /* CONFIG_CMD_NET */ #endif /* _CONFIG_ICONNECT_H */ diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h index 91116f1021b..f15a4d57258 100644 --- a/include/configs/integratorap.h +++ b/include/configs/integratorap.h @@ -27,8 +27,6 @@ * PCI definitions */ -#define CONFIG_SYS_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */ - /*----------------------------------------------------------------------- * There are various dependencies on the core module (CM) fitted * Users should refer to their CM user guide diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index fe773d503c0..29cc674e6d6 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -150,7 +150,6 @@ * These can be toggled for performance analysis, otherwise use default. */ #define CONFIG_SYS_CACHE_STASHING -#define CONFIG_BACKSIDE_L2_CACHE #define CONFIG_SYS_INIT_L2CSR0 L2CSR0_L2E #define CONFIG_ENABLE_36BIT_PHYS diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h index 9eeb7ef9bfc..77ea1327f9a 100644 --- a/include/configs/kontron_sl28.h +++ b/include/configs/kontron_sl28.h @@ -43,9 +43,6 @@ #define COUNTER_FREQUENCY_REAL (get_board_sys_clk() / 4) -/* ethernet */ -#define CONFIG_SYS_RX_ETH_BUFFER 8 - /* SPL */ #define CONFIG_SPL_BSS_START_ADDR 0x80100000 #define CONFIG_SPL_BSS_MAX_SIZE 0x00100000 diff --git a/include/configs/ls1028a_common.h b/include/configs/ls1028a_common.h index 8bdfddcbc75..516a7306a64 100644 --- a/include/configs/ls1028a_common.h +++ b/include/configs/ls1028a_common.h @@ -91,8 +91,4 @@ #include <asm/fsl_secure_boot.h> #endif -/* Ethernet */ -/* smallest ENETC BD ring has 8 entries */ -#define CONFIG_SYS_RX_ETH_BUFFER 8 - #endif /* __L1028A_COMMON_H */ diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h index 965fdfead24..121fd3cf182 100644 --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@ -108,11 +108,6 @@ unsigned long long get_qixis_addr(void); #define CONFIG_SYS_LS_MC_AIOP_IMG_MAX_LENGTH 0x200000 #define CONFIG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET 0x07000000 -/* Define phy_reset function to boot the MC based on mcinitcmd. - * This happens late enough to properly fixup u-boot env MAC addresses. - */ -#define CONFIG_RESET_PHY_R - /* * Carve out a DDR region which will not be used by u-boot/Linux * diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 766da3969d2..9027bd06b02 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -120,11 +120,6 @@ unsigned long long get_qixis_addr(void); #define CONFIG_SYS_LS_MC_AIOP_IMG_MAX_LENGTH 0x200000 #define CONFIG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET 0x07000000 -/* Define phy_reset function to boot the MC based on mcinitcmd. - * This happens late enough to properly fixup u-boot env MAC addresses. - */ -#define CONFIG_RESET_PHY_R - /* * Carve out a DDR region which will not be used by u-boot/Linux * diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index 7fa4f00734c..19fd702ab24 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -92,7 +92,6 @@ #ifdef CONFIG_CMD_NET #define CONFIG_MVGBE_PORTS {0, 1} /* enable port 1 only */ #define CONFIG_PHY_BASE_ADR 7 -#undef CONFIG_RESET_PHY_R #endif /* CONFIG_CMD_NET */ #ifdef CONFIG_SATA diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index 469989a97df..38c4c310237 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -68,11 +68,6 @@ #define CONFIG_SYS_LS_MC_DRAM_DPL_OFFSET 0x00F20000 #define CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS 5000 -/* Define phy_reset function to boot the MC based on mcinitcmd. - * This happens late enough to properly fixup u-boot env MAC addresses. - */ -#define CONFIG_RESET_PHY_R - /* * Carve out a DDR region which will not be used by u-boot/Linux * diff --git a/include/configs/meesc.h b/include/configs/meesc.h index df2902116c3..fa4513b2b99 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -66,10 +66,6 @@ # define CONFIG_SYS_NAND_READY_PIN GPIO_PIN_PA(22) #endif -/* Ethernet */ -#define CONFIG_RMII -#undef CONFIG_RESET_PHY_R - /* hw-controller addresses */ #define CONFIG_ET1100_BASE 0x70000000 diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 6bde4c29d7c..744e20e58e7 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -119,10 +119,6 @@ BOOTENV #endif -#if defined(CONFIG_XILINX_AXIEMAC) -# define CONFIG_SYS_FAULT_ECHO_LINK_DOWN 1 -#endif - /* SPL part */ #define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h index ccf4519119a..485a3fe42dc 100644 --- a/include/configs/nsa310s.h +++ b/include/configs/nsa310s.h @@ -27,7 +27,6 @@ #ifdef CONFIG_CMD_NET #define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 1 -#define CONFIG_RESET_PHY_R #endif /* CONFIG_CMD_NET */ /* SATA driver configuration */ diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h index 0a782b4ae44..25470583149 100644 --- a/include/configs/pic32mzdask.h +++ b/include/configs/pic32mzdask.h @@ -44,11 +44,6 @@ */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ -/*----------------------------------------------------------------------- - * Networking Configuration - */ -#define CONFIG_SYS_RX_ETH_BUFFER 8 - /*-------------------------------------------------- * USB Configuration */ diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index 3960a5cf96a..87f216be672 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -130,12 +130,6 @@ /* LCD */ #define LCD_BPP LCD_COLOR8 -#define CONFIG_LCD_LOGO 1 -#undef LCD_TEST_PATTERN -#define CONFIG_LCD_INFO 1 -#define CONFIG_LCD_INFO_BELOW_LOGO 1 -#define CONFIG_ATMEL_LCD 1 -#define CONFIG_ATMEL_LCD_BGR555 1 /* SDRAM */ #define PHYS_SDRAM 0x20000000 diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index 8ee8bbb2192..3be7e1ca0b3 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -141,14 +141,6 @@ */ /* LCD */ #define LCD_BPP LCD_COLOR8 -#define CONFIG_LCD_LOGO 1 -#undef LCD_TEST_PATTERN -#define CONFIG_LCD_INFO 1 -#define CONFIG_LCD_INFO_BELOW_LOGO 1 -#define CONFIG_ATMEL_LCD 1 -#define CONFIG_ATMEL_LCD_BGR555 1 - -#define CONFIG_LCD_IN_PSRAM 1 /* SDRAM */ #define PHYS_SDRAM 0x20000000 diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index 61a7c6255fe..3a59045df7f 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -39,10 +39,6 @@ #define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PD3 #endif -/* Ethernet */ -#define CONFIG_RESET_PHY_R -#define CONFIG_AT91_WANTS_COMMON_PHY - #ifdef CONFIG_NAND_BOOT /* bootstrap + u-boot + env in nandflash */ #elif CONFIG_SD_BOOT diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index 51c802f2b31..cb221501e26 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -31,8 +31,5 @@ */ #define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 0 -#ifdef CONFIG_RESET_PHY_R -#undef CONFIG_RESET_PHY_R /* remove legacy reset_phy() */ -#endif #endif /* _CONFIG_POGO_E02_H */ diff --git a/include/configs/pogo_v4.h b/include/configs/pogo_v4.h index f8555f6e48a..3365ebe3d2f 100644 --- a/include/configs/pogo_v4.h +++ b/include/configs/pogo_v4.h @@ -38,9 +38,6 @@ */ #define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 0 -#ifdef CONFIG_RESET_PHY_R -#undef CONFIG_RESET_PHY_R /* remove legacy reset_phy() */ -#endif /* * Support large disk for SATA and USB diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 259c05df553..a0b353902e7 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -76,15 +76,6 @@ #define CONFIG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID ATMEL_ID_SYS -/* - * Ethernet configuration - * - */ -#define CONFIG_RMII /* use reduced MII inteface */ -#define CONFIG_AT91_WANTS_COMMON_PHY - -/* BOOTP and DHCP options */ - #if !defined(CONFIG_SPL_BUILD) /* USB configuration */ #define CONFIG_USB_ATMEL diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index 028c6234a07..f7ee9dbac35 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -37,12 +37,6 @@ #define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14 #define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC13 -/* Ethernet */ -#define CONFIG_RMII -#define CONFIG_RESET_PHY_R -#define CONFIG_AT91_WANTS_COMMON_PHY -#define CONFIG_TFTP_PORT - /* USB */ #define CONFIG_USB_ATMEL #define CONFIG_USB_ATMEL_CLK_SEL_PLLB diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index 55e51b4b469..0e3567f535b 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -38,16 +38,6 @@ #define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14 #define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC8 -/* Ethernet */ -#define CONFIG_RMII -#define CONFIG_RESET_PHY_R -#define CONFIG_AT91_WANTS_COMMON_PHY -#define CONFIG_TFTP_PORT - -/* LCD */ -#define CONFIG_ATMEL_LCD -#define CONFIG_GURNARD_SPLASH - /* UARTs/Serial console */ /* Boot options */ diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h index 9d9ac036274..781dba542bd 100644 --- a/include/configs/stmark2.h +++ b/include/configs/stmark2.h @@ -132,18 +132,11 @@ CONFIG_SYS_INIT_RAM_SIZE - 12) #ifdef CONFIG_MCFFEC -#define CONFIG_MII_INIT 1 #define CONFIG_SYS_DISCOVER_PHY -#define CONFIG_SYS_RX_ETH_BUFFER 8 -#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */ #ifndef CONFIG_SYS_DISCOVER_PHY #define FECDUPLEX FULL #define FECSPEED _100BASET -#else -#ifndef CONFIG_SYS_FAULT_ECHO_LINK_DOWN -#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN -#endif #endif /* CONFIG_SYS_DISCOVER_PHY */ #endif #endif /* __STMARK2_CONFIG_H */ diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h index dd942168763..feec8695f2e 100644 --- a/include/configs/stv0991.h +++ b/include/configs/stv0991.h @@ -29,9 +29,6 @@ #define CONFIG_DW_ALTDESCRIPTOR -/* Command support defines */ -#define CONFIG_PHY_RESET_DELAY 10000 /* in usec */ - /* Misc configuration */ /* diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 4ea3607116e..b0d06e7b552 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -63,10 +63,6 @@ #define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC13 #endif -/* Ethernet */ -#define CONFIG_RMII -#define CONFIG_AT91_WANTS_COMMON_PHY - /* USB */ #if defined(CONFIG_BOARD_TAURUS) #define CONFIG_USB_ATMEL diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h index 128be9262a1..2b6078a1cc9 100644 --- a/include/configs/usb_a9263.h +++ b/include/configs/usb_a9263.h @@ -43,10 +43,6 @@ #define CONFIG_SYS_NAND_READY_PIN GPIO_PIN_PA(22) #endif -/* Ethernet */ -#define CONFIG_RMII -#define CONFIG_AT91_WANTS_COMMON_PHY - /* USB */ #ifdef CONFIG_CMD_USB #define CONFIG_USB_ATMEL diff --git a/include/configs/vinco.h b/include/configs/vinco.h index a6511b34f52..74eccfa2e64 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -30,12 +30,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_SDRAM_BASE + 4 * 1024 - GENERATED_GBL_DATA_SIZE) -/* SerialFlash */ - -#ifdef CONFIG_CMD_SF -#define CONFIG_ATMEL_SPI0 -#endif - /* MMC */ #ifdef CONFIG_CMD_MMC @@ -49,7 +43,6 @@ /* USB device */ /* Ethernet Hardware */ -#define CONFIG_RMII #define CONFIG_MACB_SEARCH_PHY #ifdef CONFIG_SPI_BOOT diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 2f02f96458f..33245375979 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -22,14 +22,6 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_512K \ - GENERATED_GBL_DATA_SIZE) -/* - * Ethernet Driver - */ - -#define CONFIG_LPC32XX_ETH -#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN -/* FIXME: remove "Waiting for PHY auto negotiation to complete..." message */ - #define CONFIG_RTC_DS1374 /* diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h index a8009f23693..19e09e3cafa 100644 --- a/include/configs/xilinx_versal.h +++ b/include/configs/xilinx_versal.h @@ -40,7 +40,6 @@ /* Ethernet driver */ #if defined(CONFIG_ZYNQ_GEM) -# define CONFIG_SYS_FAULT_ECHO_LINK_DOWN # define PHY_ANEG_TIMEOUT 20000 #endif diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 27ec3e06270..494a7c4b001 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -55,7 +55,6 @@ /* Ethernet driver */ #if defined(CONFIG_ZYNQ_GEM) -# define CONFIG_SYS_FAULT_ECHO_LINK_DOWN # define PHY_ANEG_TIMEOUT 20000 #endif diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index a66845338a4..06b85b26a9d 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -26,9 +26,6 @@ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400} /* Ethernet driver */ -#if defined(CONFIG_ZYNQ_GEM) -# define CONFIG_SYS_FAULT_ECHO_LINK_DOWN -#endif /* NOR */ #ifdef CONFIG_MTD_NOR_FLASH diff --git a/include/net.h b/include/net.h index b02e4f630c0..675bf4171b1 100644 --- a/include/net.h +++ b/include/net.h @@ -35,13 +35,7 @@ struct udevice; * alignment in memory. * */ - -#ifdef CONFIG_SYS_RX_ETH_BUFFER -# define PKTBUFSRX CONFIG_SYS_RX_ETH_BUFFER -#else -# define PKTBUFSRX 4 -#endif - +#define PKTBUFSRX CONFIG_SYS_RX_ETH_BUFFER #define PKTALIGN ARCH_DMA_MINALIGN /* Number of packets processed together */ |