diff options
30 files changed, 261 insertions, 270 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 46183ae900..3c3f5f7d05 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -253,7 +253,7 @@ config USE_ARCH_MEMCPY but may increase the binary size. config SPL_USE_ARCH_MEMCPY - bool "Use an assembly optimized implementation of memcpy" + bool "Use an assembly optimized implementation of memcpy for SPL" default y if USE_ARCH_MEMCPY depends on !ARM64 help @@ -271,7 +271,7 @@ config USE_ARCH_MEMSET but may increase the binary size. config SPL_USE_ARCH_MEMSET - bool "Use an assembly optimized implementation of memset" + bool "Use an assembly optimized implementation of memset for SPL" default y if USE_ARCH_MEMSET depends on !ARM64 help diff --git a/arch/arm/dts/at91sam9260-smartweb.dts b/arch/arm/dts/at91sam9260-smartweb.dts index faed763e43..e59781bf45 100644 --- a/arch/arm/dts/at91sam9260-smartweb.dts +++ b/arch/arm/dts/at91sam9260-smartweb.dts @@ -18,6 +18,7 @@ compatible = "atmel,at91sam9260", "atmel,at91sam9"; chosen { + u-boot,dm-pre-reloc; stdout-path = &dbgu; }; @@ -48,6 +49,7 @@ }; dbgu: serial@fffff200 { + u-boot,dm-pre-reloc; status = "okay"; }; diff --git a/arch/arm/dts/at91sam9g20-taurus.dts b/arch/arm/dts/at91sam9g20-taurus.dts index f27d77279f..7931c0af7b 100644 --- a/arch/arm/dts/at91sam9g20-taurus.dts +++ b/arch/arm/dts/at91sam9g20-taurus.dts @@ -18,6 +18,7 @@ compatible = "atmel,at91sam9g20ek", "atmel,at91sam9g20", "atmel,at91sam9"; chosen { + u-boot,dm-pre-reloc; stdout-path = &dbgu; }; @@ -48,6 +49,7 @@ }; dbgu: serial@fffff200 { + u-boot,dm-pre-reloc; status = "okay"; }; diff --git a/arch/arm/include/asm/arch-am33xx/emac_defs.h b/arch/arm/include/asm/arch-am33xx/emac_defs.h new file mode 100644 index 0000000000..b5703f710f --- /dev/null +++ b/arch/arm/include/asm/arch-am33xx/emac_defs.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2010 Texas Instruments + * + * Based on: + * + * ---------------------------------------------------------------------------- + * + * dm644x_emac.h + * + * TI DaVinci (DM644X) EMAC peripheral driver header for DV-EVM + * + * Copyright (C) 2005 Texas Instruments. + * + * ---------------------------------------------------------------------------- + * + * SPDX-License-Identifier: GPL-2.0+ + * + */ + +#ifndef _EMAC_DEFS_H_ +#define _EMAC_DEFS_H_ + +#ifdef CONFIG_TI816X +#define EMAC_BASE_ADDR (0x4A100000) +#define EMAC_WRAPPER_BASE_ADDR (0x4A100900) +#define EMAC_WRAPPER_RAM_ADDR (0x4A102000) +#define EMAC_MDIO_BASE_ADDR (0x4A100800) +#define EMAC_MDIO_BUS_FREQ (250000000UL) +#define EMAC_MDIO_CLOCK_FREQ (2000000UL) + +typedef volatile unsigned int dv_reg; +typedef volatile unsigned int *dv_reg_p; + +#define DAVINCI_EMAC_VERSION2 +#define DAVINCI_EMAC_GIG_ENABLE +#endif + +#endif /* _EMAC_DEFS_H_ */ diff --git a/arch/arm/include/asm/arch-am33xx/hardware_ti816x.h b/arch/arm/include/asm/arch-am33xx/hardware_ti816x.h index 3c680649ab..78b79486ed 100644 --- a/arch/arm/include/asm/arch-am33xx/hardware_ti816x.h +++ b/arch/arm/include/asm/arch-am33xx/hardware_ti816x.h @@ -31,6 +31,7 @@ /* Control Module Base Address */ #define CTRL_BASE 0x48140000 +#define CTRL_DEVICE_BASE 0x48140600 /* PRCM Base Address */ #define PRCM_BASE 0x48180000 diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 99b88d1785..033c1efd2b 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -124,7 +124,7 @@ config TARGET_SAMA5D4EK select BOARD_EARLY_INIT_F config TARGET_MA5D4EVK - bool "DENX MA5D4EVK Evaluation Kit" + bool "Aries MA5D4EVK Evaluation Kit" select CPU_V7 select SUPPORT_SPL @@ -169,6 +169,7 @@ endchoice config SYS_SOC default "at91" +source "board/aries/ma5d4evk/Kconfig" source "board/atmel/at91rm9200ek/Kconfig" source "board/atmel/at91sam9260ek/Kconfig" source "board/atmel/at91sam9261ek/Kconfig" @@ -186,7 +187,6 @@ source "board/atmel/sama5d4ek/Kconfig" source "board/bluewater/gurnard/Kconfig" source "board/bluewater/snapper9260/Kconfig" source "board/calao/usb_a9263/Kconfig" -source "board/denx/ma5d4evk/Kconfig" source "board/egnite/ethernut5/Kconfig" source "board/esd/meesc/Kconfig" source "board/l+g/vinco/Kconfig" diff --git a/board/denx/ma5d4evk/Kconfig b/board/aries/ma5d4evk/Kconfig index b4ef106532..56b4f4a1a8 100644 --- a/board/denx/ma5d4evk/Kconfig +++ b/board/aries/ma5d4evk/Kconfig @@ -4,7 +4,7 @@ config SYS_BOARD default "ma5d4evk" config SYS_VENDOR - default "denx" + default "aries" config SYS_CONFIG_NAME default "ma5d4evk" diff --git a/board/denx/ma5d4evk/MAINTAINERS b/board/aries/ma5d4evk/MAINTAINERS index bb25a9ca94..664a29a0df 100644 --- a/board/denx/ma5d4evk/MAINTAINERS +++ b/board/aries/ma5d4evk/MAINTAINERS @@ -1,6 +1,6 @@ -DENX MA5D4EVK BOARD +Aries MA5D4EVK BOARD M: Marek Vasut <marek.vasut@gmail.com> S: Maintained -F: board/denx/ma5d4evk/ +F: board/aries/ma5d4evk/ F: include/configs/ma5d4evk.h F: configs/ma5d4evk_defconfig diff --git a/board/denx/ma5d4evk/Makefile b/board/aries/ma5d4evk/Makefile index b12b5dcbd4..b12b5dcbd4 100644 --- a/board/denx/ma5d4evk/Makefile +++ b/board/aries/ma5d4evk/Makefile diff --git a/board/denx/ma5d4evk/ma5d4evk.c b/board/aries/ma5d4evk/ma5d4evk.c index 81463712fa..b9294fc881 100644 --- a/board/denx/ma5d4evk/ma5d4evk.c +++ b/board/aries/ma5d4evk/ma5d4evk.c @@ -22,10 +22,14 @@ #include <net.h> #include <netdev.h> #include <spi.h> +#include <spi_flash.h> +#include <spl.h> #include <version.h> DECLARE_GLOBAL_DATA_PTR; +static u8 boot_mode_sf; + #ifdef CONFIG_ATMEL_SPI int spi_cs_is_valid(unsigned int bus, unsigned int cs) { @@ -200,19 +204,20 @@ void ma5d4evk_mci1_hw_init(void) int board_mmc_init(bd_t *bis) { int ret; + void *mci0 = (void *)ATMEL_BASE_MCI0; + void *mci1 = (void *)ATMEL_BASE_MCI1; /* De-assert reset on On-SoM eMMC */ at91_set_pio_output(AT91_PIO_PORTE, 15, 1); at91_pio3_set_pio_pulldown(AT91_PIO_PORTE, 15, 0); - ret = atmel_mci_init((void *)ATMEL_BASE_MCI0); + ret = atmel_mci_init(boot_mode_sf ? mci0 : mci1); if (ret) /* eMMC init failed, skip it. */ at91_set_pio_output(AT91_PIO_PORTE, 15, 0); /* Enable the power supply to On-board MicroSD */ at91_set_pio_output(AT91_PIO_PORTE, 17, 0); - - ret = atmel_mci_init((void *)ATMEL_BASE_MCI1); + ret = atmel_mci_init(boot_mode_sf ? mci1 : mci0); if (ret) /* uSD init failed, power it down. */ at91_set_pio_output(AT91_PIO_PORTE, 17, 1); @@ -269,17 +274,19 @@ int board_early_init_f(void) at91_set_pio_output(AT91_PIO_PORTD, 29, 0); at91_set_pio_output(AT91_PIO_PORTD, 30, 0); - /* Reset CAN controllers */ - at91_set_pio_output(AT91_PIO_PORTB, 21, 0); - udelay(100); - at91_set_pio_output(AT91_PIO_PORTB, 21, 1); - at91_pio3_set_pio_pulldown(AT91_PIO_PORTB, 21, 0); - ma5d4evk_serial_hw_init(); return 0; } +static void board_identify(void) +{ + struct spi_flash *sf; + sf = spi_flash_probe(CONFIG_SF_DEFAULT_BUS, CONFIG_SF_DEFAULT_CS, + CONFIG_SF_DEFAULT_SPEED, CONFIG_SF_DEFAULT_MODE); + boot_mode_sf = (sf != NULL); +} + int board_init(void) { /* adress of boot parameters */ @@ -305,6 +312,20 @@ int board_init(void) at91_udp_hw_init(); #endif + board_identify(); + + /* Reset CAN controllers */ + at91_set_pio_output(AT91_PIO_PORTB, 21, 0); + udelay(100); + at91_set_pio_output(AT91_PIO_PORTB, 21, 1); + at91_pio3_set_pio_pulldown(AT91_PIO_PORTB, 21, 0); + + return 0; +} + +int board_late_init(void) +{ + setenv("bootmode", boot_mode_sf ? "sf" : "emmc"); return 0; } @@ -337,7 +358,31 @@ int board_eth_init(bd_t *bis) #ifdef CONFIG_SPL_BUILD void spl_board_init(void) { +#ifdef CONFIG_ATMEL_SPI ma5d4evk_spi0_hw_init(); +#endif +#ifdef CONFIG_GENERIC_ATMEL_MCI + ma5d4evk_mci0_hw_init(); + ma5d4evk_mci1_hw_init(); +#endif + board_identify(); +} + +void board_boot_order(u32 *spl_boot_list) +{ + spl_boot_list[0] = spl_boot_device(); + + switch (spl_boot_list[0]) { + case BOOT_DEVICE_MMC1: + case BOOT_DEVICE_MMC2: + spl_boot_list[0] = BOOT_DEVICE_MMC1; + break; + case BOOT_DEVICE_SPI: + break; + case BOOT_DEVICE_USB: + spl_boot_list[0] = BOOT_DEVICE_MMC2; + break; + } } static void ddr2_conf(struct atmel_mpddrc_config *ddr2) @@ -349,7 +394,6 @@ static void ddr2_conf(struct atmel_mpddrc_config *ddr2) ATMEL_MPDDRC_CR_CAS_DDR_CAS3 | ATMEL_MPDDRC_CR_NB_8BANKS | ATMEL_MPDDRC_CR_NDQS_DISABLED | - ATMEL_MPDDRC_CR_DECOD_INTERLEAVED | ATMEL_MPDDRC_CR_UNAL_SUPPORTED); ddr2->rtr = 0x2b0; diff --git a/board/siemens/smartweb/smartweb.c b/board/siemens/smartweb/smartweb.c index 78a7946836..c6ba6738a4 100644 --- a/board/siemens/smartweb/smartweb.c +++ b/board/siemens/smartweb/smartweb.c @@ -34,6 +34,7 @@ #ifndef CONFIG_DM_ETH # include <netdev.h> #endif +#include <g_dnl.h> DECLARE_GLOBAL_DATA_PTR; @@ -257,11 +258,8 @@ void mem_init(void) } #endif -static struct atmel_serial_platdata at91sam9260_serial_plat = { - .base_addr = ATMEL_BASE_DBGU, -}; - -U_BOOT_DEVICE(at91sam9260_serial) = { - .name = "serial_atmel", - .platdata = &at91sam9260_serial_plat, -}; +int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) +{ + g_dnl_set_serialnumber("1"); + return 0; +} diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c index 8da24be568..4aa8d64869 100644 --- a/board/siemens/taurus/taurus.c +++ b/board/siemens/taurus/taurus.c @@ -448,12 +448,3 @@ U_BOOT_CMD( ); #endif #endif - -static struct atmel_serial_platdata at91sam9260_serial_plat = { - .base_addr = ATMEL_BASE_DBGU, -}; - -U_BOOT_DEVICE(at91sam9260_serial) = { - .name = "serial_atmel", - .platdata = &at91sam9260_serial_plat, -}; diff --git a/board/ti/ti816x/evm.c b/board/ti/ti816x/evm.c index 577e60f875..9d6c3d6b5d 100644 --- a/board/ti/ti816x/evm.c +++ b/board/ti/ti816x/evm.c @@ -9,6 +9,7 @@ #include <common.h> #include <spl.h> +#include <netdev.h> #include <asm/cache.h> #include <asm/io.h> #include <asm/arch/clock.h> @@ -31,6 +32,33 @@ int board_init(void) return 0; } +int board_eth_init(bd_t *bis) +{ + uint8_t mac_addr[6]; + uint32_t mac_hi, mac_lo; + struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE; + + if (!eth_getenv_enetaddr("ethaddr", mac_addr)) { + printf("<ethaddr> not set. Reading from E-fuse\n"); + /* try reading mac address from efuse */ + mac_lo = readl(&cdev->macid0l); + mac_hi = readl(&cdev->macid0h); + mac_addr[0] = mac_hi & 0xFF; + mac_addr[1] = (mac_hi & 0xFF00) >> 8; + mac_addr[2] = (mac_hi & 0xFF0000) >> 16; + mac_addr[3] = (mac_hi & 0xFF000000) >> 24; + mac_addr[4] = mac_lo & 0xFF; + mac_addr[5] = (mac_lo & 0xFF00) >> 8; + + if (is_valid_ethaddr(mac_addr)) + eth_setenv_enetaddr("ethaddr", mac_addr); + else + printf("Unable to read MAC address. Set <ethaddr>\n"); + } + + return davinci_emac_initialize(); +} + #ifdef CONFIG_SPL_BUILD static struct module_pin_mux mmc_pin_mux[] = { { OFFSET(pincntl157), PULLDOWN_EN | PULLUDDIS | MODE(0x0) }, diff --git a/configs/ge_b450v3_defconfig b/configs/ge_b450v3_defconfig index c5d78538b6..aaeb34d7c0 100644 --- a/configs/ge_b450v3_defconfig +++ b/configs/ge_b450v3_defconfig @@ -5,7 +5,7 @@ CONFIG_TARGET_GE_B450V3=y CONFIG_BOOTDELAY=1 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y -CONFIG_DEFAULT_FDT_FILE="/boot/imx6q-b450v3.dtb" +CONFIG_DEFAULT_FDT_FILE="imx6q-b450v3.dtb" CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/ge_b650v3_defconfig b/configs/ge_b650v3_defconfig index dd44663dde..78187051eb 100644 --- a/configs/ge_b650v3_defconfig +++ b/configs/ge_b650v3_defconfig @@ -5,7 +5,7 @@ CONFIG_TARGET_GE_B650V3=y CONFIG_BOOTDELAY=1 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y -CONFIG_DEFAULT_FDT_FILE="/boot/imx6q-b650v3.dtb" +CONFIG_DEFAULT_FDT_FILE="imx6q-b650v3.dtb" CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/ge_b850v3_defconfig b/configs/ge_b850v3_defconfig index 45e5fb1ff4..967ddba13a 100644 --- a/configs/ge_b850v3_defconfig +++ b/configs/ge_b850v3_defconfig @@ -5,7 +5,7 @@ CONFIG_TARGET_GE_B850V3=y CONFIG_BOOTDELAY=1 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y -CONFIG_DEFAULT_FDT_FILE="/boot/imx6q-b850v3.dtb" +CONFIG_DEFAULT_FDT_FILE="imx6q-b850v3.dtb" CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/ma5d4evk_defconfig b/configs/ma5d4evk_defconfig index eca10d3c85..668816066a 100644 --- a/configs/ma5d4evk_defconfig +++ b/configs/ma5d4evk_defconfig @@ -15,6 +15,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL=y CONFIG_HUSH_PARSER=y +CONFIG_NET_RANDOM_ETHADDR=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set @@ -43,3 +44,11 @@ CONFIG_USB_GADGET_ATMEL_USBA=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT=y # CONFIG_EFI_LOADER is not set +CONFIG_CMD_DFU=y +CONFIG_CMD_USB_MASS_STORAGE=y +CONFIG_DFU_MMC=y +CONFIG_DFU_SF=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="AriesEmbedded" +CONFIG_G_DNL_VENDOR_NUM=0x0525 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig index 48c8781ead..a769fc5535 100644 --- a/configs/smartweb_defconfig +++ b/configs/smartweb_defconfig @@ -7,6 +7,7 @@ CONFIG_TARGET_SMARTWEB=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SPL_NAND_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9260-smartweb" CONFIG_FIT=y @@ -33,6 +34,8 @@ CONFIG_CMD_FAT=y # CONFIG_DOS_PARTITION is not set CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y +CONFIG_CLK=y +CONFIG_CLK_AT91=y CONFIG_DFU_NAND=y # CONFIG_MMC is not set CONFIG_USB=y diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig index 2de9cad688..70d44a760b 100644 --- a/configs/taurus_defconfig +++ b/configs/taurus_defconfig @@ -7,6 +7,7 @@ CONFIG_TARGET_TAURUS=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_SYS_MALLOC_F_LEN=0x1000 CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y @@ -36,6 +37,8 @@ CONFIG_CMD_PING=y # CONFIG_DOS_PARTITION is not set CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y +CONFIG_CLK=y +CONFIG_CLK_AT91=y CONFIG_DFU_NAND=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y diff --git a/configs/ti816x_evm_defconfig b/configs/ti816x_evm_defconfig index 1c6608218b..7f43ecb7eb 100644 --- a/configs/ti816x_evm_defconfig +++ b/configs/ti816x_evm_defconfig @@ -35,6 +35,11 @@ CONFIG_OF_CONTROL=y CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_FAT=y CONFIG_MMC_OMAP_HS=y CONFIG_SYS_NS16550=y # CONFIG_USE_PRIVATE_LIBGCC is not set diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index 5e7ebc8a99..d1024879a0 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c @@ -341,6 +341,14 @@ static int gen_auto_negotiate(int phy_addr) if (!davinci_eth_phy_read(phy_addr, MII_BMCR, &tmp)) return(0); +#ifdef DAVINCI_EMAC_GIG_ENABLE + davinci_eth_phy_read(phy_addr, MII_CTRL1000, &val); + val |= PHY_1000BTCR_1000FD; + val &= ~PHY_1000BTCR_1000HD; + davinci_eth_phy_write(phy_addr, MII_CTRL1000, val); + davinci_eth_phy_read(phy_addr, MII_CTRL1000, &val); +#endif + /* Restart Auto_negotiation */ tmp |= BMCR_ANRESTART; davinci_eth_phy_write(phy_addr, MII_BMCR, tmp); @@ -407,7 +415,8 @@ static void __attribute__((unused)) davinci_eth_gigabit_enable(int phy_addr) static int davinci_eth_open(struct eth_device *dev, bd_t *bis) { dv_reg_p addr; - u_int32_t clkdiv, cnt; + u_int32_t clkdiv, cnt, mac_control; + uint16_t __maybe_unused lpa_val; volatile emac_desc *rx_desc; int index; @@ -488,19 +497,6 @@ static int davinci_eth_open(struct eth_device *dev, bd_t *bis) /* Enable ch 0 only */ writel(1, &adap_emac->RXUNICASTSET); - /* Enable MII interface and Full duplex mode */ -#if defined(CONFIG_SOC_DA8XX) || \ - (defined(CONFIG_OMAP34XX) && defined(CONFIG_DRIVER_TI_EMAC_USE_RMII)) - writel((EMAC_MACCONTROL_MIIEN_ENABLE | - EMAC_MACCONTROL_FULLDUPLEX_ENABLE | - EMAC_MACCONTROL_RMIISPEED_100), - &adap_emac->MACCONTROL); -#else - writel((EMAC_MACCONTROL_MIIEN_ENABLE | - EMAC_MACCONTROL_FULLDUPLEX_ENABLE), - &adap_emac->MACCONTROL); -#endif - /* Init MDIO & get link state */ clkdiv = CONFIG_SYS_EMAC_TI_CLKDIV; writel((clkdiv & 0xff) | MDIO_CONTROL_ENABLE | MDIO_CONTROL_FAULT, @@ -513,8 +509,26 @@ static int davinci_eth_open(struct eth_device *dev, bd_t *bis) if (index == -1) return(0); - emac_gigabit_enable(active_phy_addr[index]); + /* Enable MII interface */ + mac_control = EMAC_MACCONTROL_MIIEN_ENABLE; +#ifdef DAVINCI_EMAC_GIG_ENABLE + davinci_eth_phy_read(active_phy_addr[index], MII_STAT1000, &lpa_val); + if (lpa_val & PHY_1000BTSR_1000FD) { + debug_emac("eth_open : gigabit negotiated\n"); + mac_control |= EMAC_MACCONTROL_FULLDUPLEX_ENABLE; + mac_control |= EMAC_MACCONTROL_GIGABIT_ENABLE; + } +#endif + davinci_eth_phy_read(active_phy_addr[index], MII_LPA, &lpa_val); + if (lpa_val & (LPA_100FULL | LPA_10FULL)) + /* set EMAC for Full Duplex */ + mac_control |= EMAC_MACCONTROL_FULLDUPLEX_ENABLE; +#if defined(CONFIG_SOC_DA8XX) || \ + (defined(CONFIG_OMAP34XX) && defined(CONFIG_DRIVER_TI_EMAC_USE_RMII)) + mac_control |= EMAC_MACCONTROL_RMIISPEED_100; +#endif + writel(mac_control, &adap_emac->MACCONTROL); /* Start receive process */ writel(BD_TO_HW((u_int32_t)emac_rx_desc), &adap_emac->RX0HDP); @@ -619,8 +633,6 @@ static int davinci_eth_send_packet (struct eth_device *dev, return (ret_status); } - emac_gigabit_enable(active_phy_addr[index]); - /* Check packet size and if < EMAC_MIN_ETHERNET_PKT_SIZE, pad it up */ if (length < EMAC_MIN_ETHERNET_PKT_SIZE) { length = EMAC_MIN_ETHERNET_PKT_SIZE; @@ -648,8 +660,6 @@ static int davinci_eth_send_packet (struct eth_device *dev, return (ret_status); } - emac_gigabit_enable(active_phy_addr[index]); - if (readl(&adap_emac->TXINTSTATRAW) & 0x01) { ret_status = length; break; @@ -870,11 +880,19 @@ int davinci_emac_initialize(void) retval = mdio_register(mdiodev); if (retval < 0) return retval; +#ifdef DAVINCI_EMAC_GIG_ENABLE +#define PHY_CONF_REG 22 + /* Enable PHY to clock out TX_CLK */ + davinci_eth_phy_read(active_phy_addr[i], PHY_CONF_REG, &tmp); + tmp |= PHY_CONF_TXCLKEN; + davinci_eth_phy_write(active_phy_addr[i], PHY_CONF_REG, tmp); + davinci_eth_phy_read(active_phy_addr[i], PHY_CONF_REG, &tmp); +#endif } -#if defined(CONFIG_DRIVER_TI_EMAC_USE_RMII) && \ +#if defined(CONFIG_TI816X) || (defined(CONFIG_DRIVER_TI_EMAC_USE_RMII) && \ defined(CONFIG_MACH_DAVINCI_DA850_EVM) && \ - !defined(CONFIG_DRIVER_TI_EMAC_RMII_NO_NEGOTIATE) + !defined(CONFIG_DRIVER_TI_EMAC_RMII_NO_NEGOTIATE)) for (i = 0; i < num_phy; i++) { if (phy[i].is_phy_connected(i)) phy[i].auto_negotiate(i); diff --git a/drivers/net/davinci_emac.h b/drivers/net/davinci_emac.h index 13cd68f040..e2ed54bac5 100644 --- a/drivers/net/davinci_emac.h +++ b/drivers/net/davinci_emac.h @@ -40,6 +40,8 @@ /* MII Status Register */ #define MII_STATUS_REG 1 +/* PHY Configuration register */ +#define PHY_CONF_TXCLKEN (1 << 5) /* Number of statistics registers */ #define EMAC_NUM_STATS 36 diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c index 01a59078b8..9df6d32c65 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c @@ -1341,51 +1341,7 @@ static int at91_stop(struct usb_gadget *gadget) /*-------------------------------------------------------------------------*/ -static int at91rm9200_udc_init(struct at91_udc *udc) -{ - struct at91_ep *ep; - int ret; - int i; - - for (i = 0; i < NUM_ENDPOINTS; i++) { - ep = &udc->ep[i]; - - switch (i) { - case 0: - case 3: - ep->maxpacket = 8; - break; - case 1 ... 2: - ep->maxpacket = 64; - break; - case 4 ... 5: - ep->maxpacket = 256; - break; - } - } - - ret = gpio_request(udc->board.pullup_pin, "udc_pullup"); - if (ret) { - DBG("D+ pullup is busy\n"); - return ret; - } - - gpio_direction_output(udc->board.pullup_pin, - udc->board.pullup_active_low); - - return 0; -} - -static void at91rm9200_udc_pullup(struct at91_udc *udc, int is_on) -{ - int active = !udc->board.pullup_active_low; - - if (is_on) - gpio_set_value(udc->board.pullup_pin, active); - else - gpio_set_value(udc->board.pullup_pin, !active); -} - +#if defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9G20) static int at91sam9260_udc_init(struct at91_udc *udc) { struct at91_ep *ep; @@ -1407,7 +1363,6 @@ static int at91sam9260_udc_init(struct at91_udc *udc) return 0; } -#if defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9G20) static void at91sam9260_udc_pullup(struct at91_udc *udc, int is_on) { u32 txvc = at91_udp_read(udc, AT91_UDP_TXVC); @@ -1473,31 +1428,6 @@ static const struct at91_udc_caps at91sam9261_udc_caps = { }; #endif -static int at91sam9263_udc_init(struct at91_udc *udc) -{ - struct at91_ep *ep; - int i; - - for (i = 0; i < NUM_ENDPOINTS; i++) { - ep = &udc->ep[i]; - - switch (i) { - case 0: - case 1: - case 2: - case 3: - ep->maxpacket = 64; - break; - case 4: - case 5: - ep->maxpacket = 256; - break; - } - } - - return 0; -} - int usb_gadget_handle_interrupts(int index) { struct at91_udc *udc = controller; diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c index d4bee9b03e..0491a0eea9 100644 --- a/drivers/usb/gadget/g_dnl.c +++ b/drivers/usb/gadget/g_dnl.c @@ -224,6 +224,8 @@ static int g_dnl_bind(struct usb_composite_dev *cdev) g_dnl_string_defs[1].id = id; device_desc.iProduct = id; + g_dnl_bind_fixup(&device_desc, cdev->driver->name); + if (strlen(g_dnl_serial)) { id = usb_string_id(cdev); if (id < 0) @@ -233,7 +235,6 @@ static int g_dnl_bind(struct usb_composite_dev *cdev) device_desc.iSerialNumber = id; } - g_dnl_bind_fixup(&device_desc, cdev->driver->name); ret = g_dnl_config_register(cdev); if (ret) goto error; diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h index bb661400ec..82aee15132 100644 --- a/include/configs/ma5d4evk.h +++ b/include/configs/ma5d4evk.h @@ -1,5 +1,5 @@ /* - * DENX MA5D4 configuration + * Aries MA5D4 configuration * Copyright (C) 2015 Marek Vasut <marex@denx.de> * * SPDX-License-Identifier: GPL-2.0+ @@ -13,6 +13,7 @@ #include "at91-sama5_common.h" #undef CONFIG_BOOTARGS #define CONFIG_SYS_USE_SERIALFLASH 1 +#define CONFIG_BOARD_LATE_INIT /* * Memory configurations @@ -31,13 +32,12 @@ /* * Environment */ -#define CONFIG_ENV_IS_IN_SPI_FLASH -#define CONFIG_SYS_REDUNDAND_ENVIRONMENT -#define CONFIG_ENV_OFFSET 0x8000 +#define CONFIG_ENV_IS_IN_MMC +#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE +#define CONFIG_SYS_CONSOLE_ENV_OVERWRITE #define CONFIG_ENV_SIZE 0x4000 -#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) -#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE -#define CONFIG_ENV_SECT_SIZE 0x1000 +#define CONFIG_SYS_MMC_ENV_DEV 0 /* eMMC */ +#define CONFIG_ENV_OFFSET 512 /* just after the MBR */ /* * U-Boot general configurations @@ -102,7 +102,10 @@ /* USB device */ #define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS -#define CONFIG_USBNET_MANUFACTURER "DENX" +#define CONFIG_USBNET_MANUFACTURER "AriesEmbedded" +#define CONFIG_USB_FUNCTION_MASS_STORAGE +#define CONFIG_SYS_DFU_DATA_BUF_SIZE (1 * 1024 * 1024) +#define DFU_DEFAULT_POLL_TIMEOUT 300 #endif /* @@ -127,10 +130,11 @@ "consdev=ttyS3\0" \ "baudrate=115200\0" \ "bootscript=boot.scr\0" \ - "bootdev=/dev/mmcblk1p1\0" \ - "bootpart=1:1\0" \ - "rootdev=/dev/mmcblk1p2\0" \ + "bootdev=/dev/mmcblk0p1\0" \ + "bootpart=0:1\0" \ + "rootdev=/dev/mmcblk0p2\0" \ "netdev=eth0\0" \ + "dfu_alt_info=mmc raw 0 3867148288\0" \ "kernel_addr_r=0x22000000\0" \ "update_spi_firmware_spl_addr=0x21000000\0" \ "update_spi_firmware_spl_filename=boot.bin\0" \ @@ -171,22 +175,27 @@ "nfsargs=" \ "setenv bootargs root=/dev/nfs rw " \ "nfsroot=${serverip}:${rootpath},v3,tcp\0" \ + "fdtimg=if test ${bootmode} = \"sf\" ; then " \ + "setenv kernel_fdt 1 ; " \ + "else ; " \ + "setenv kernel_fdt 2 ; " \ + "fi\0" \ "mmc_mmc=" \ - "run mmcload mmcargs addargs ; " \ - "bootm ${kernel_addr_r}\0" \ + "run fdtimg mmcload mmcargs addargs ; " \ + "bootm ${kernel_addr_r}:kernel@1 - ${kernel_addr_r}:fdt@${kernel_fdt}\0" \ "mmc_nfs=" \ - "run mmcload nfsargs addip addargs ; " \ - "bootm ${kernel_addr_r}\0" \ + "run fdtimg mmcload nfsargs addip addargs ; " \ + "bootm ${kernel_addr_r}:kernel@1 - ${kernel_addr_r}:fdt@${kernel_fdt}\0" \ "net_mmc=" \ - "run netload mmcargs addargs ; " \ - "bootm ${kernel_addr_r}\0" \ + "run fdtimg netload mmcargs addargs ; " \ + "bootm ${kernel_addr_r}:kernel@1 - ${kernel_addr_r}:fdt@${kernel_fdt}\0" \ "net_nfs=" \ - "run netload nfsargs addip addargs ; " \ - "bootm ${kernel_addr_r}\0" \ + "run fdtimg netload nfsargs addip addargs ; " \ + "bootm ${kernel_addr_r}:kernel@1 - ${kernel_addr_r}:fdt@${kernel_fdt}\0" \ "try_bootscript=" \ "mmc rescan;" \ - "if test -e mmc ${bootpart} ${bootscript} ; then " \ - "if load mmc ${bootpart} ${kernel_addr_r} ${bootscript};"\ + "if test -e mmc 1:1 ${bootscript} ; then " \ + "if load mmc 1:1 ${kernel_addr_r} ${bootscript};" \ "then ; " \ "echo Running bootscript... ; " \ "source ${kernel_addr_r} ; " \ @@ -206,4 +215,13 @@ #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 +#define CONFIG_SYS_USE_MMC +#define CONFIG_SPL_LDSCRIPT arch/arm/mach-at91/armv7/u-boot-spl.lds +#define CONFIG_SPL_MMC_SUPPORT +#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x200 +#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 +#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" +#define CONFIG_SPL_FAT_SUPPORT +#define CONFIG_SPL_LIBDISK_SUPPORT + #endif /* __MA5D4EVK_CONFIG_H__ */ diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 1236da724e..8400278209 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -211,6 +211,9 @@ #define CONFIG_SYS_INIT_SP_ADDR 0x301000 #define CONFIG_SPL_STACK_R #define CONFIG_SPL_STACK_R_ADDR CONFIG_SYS_TEXT_BASE +/* we have only 4k sram in SPL, so cut SYS_MALLOC_F_LEN */ +#undef CONFIG_SYS_MALLOC_F_LEN +#define CONFIG_SYS_MALLOC_F_LEN 0x400 #else /* * Initial stack pointer: 4k - GENERATED_GBL_DATA_SIZE in internal SRAM, diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index defcad4518..4a81b1daf8 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -123,6 +123,15 @@ #define CONFIG_SYS_TEXT_BASE 0x80800000 +#define CONFIG_DRIVER_TI_EMAC +#define CONFIG_MII +#define CONFIG_BOOTP_DNS +#define CONFIG_BOOTP_DNS2 +#define CONFIG_BOOTP_SEND_HOSTNAME +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_SUBNETMASK +#define CONFIG_NET_RETRY_COUNT 10 + /* Since SPL did pll and ddr initialization for us, * we don't need to do it twice. */ diff --git a/scripts/build-whitelist.sh b/scripts/build-whitelist.sh index f169eaa3b2..7d8160d5f2 100755 --- a/scripts/build-whitelist.sh +++ b/scripts/build-whitelist.sh @@ -39,8 +39,8 @@ git grep CONFIG_ | \ # Finally, we need a list of the valid Kconfig options to exclude these from # the whitelist. cat `find . -name "Kconfig*"` |sed -n \ - -e 's/^config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \ - -e 's/^menuconfig *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \ + -e 's/^\s*config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \ + -e 's/^\s*menuconfig *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \ |sort |uniq >scripts/config_whitelist.txt.tmp2 # Use only the options that are present in the first file but not the second. diff --git a/scripts/check-config.sh b/scripts/check-config.sh index 97e52dce83..267758498b 100755 --- a/scripts/check-config.sh +++ b/scripts/check-config.sh @@ -33,8 +33,9 @@ cat ${path} |sed -n 's/^#define \(CONFIG_[A-Za-z0-9_]*\).*/\1/p' |sort |uniq \ comm -23 ${configs} ${whitelist} > ${suspects} cat `find ${srctree} -name "Kconfig*"` |sed -n \ - -e 's/^config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \ - -e 's/^menuconfig \([A-Za-z0-9_]*\).*$/CONFIG_\1/p' |sort |uniq > ${ok} + -e 's/^\s*config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \ + -e 's/^\s*menuconfig \([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \ + |sort |uniq > ${ok} comm -23 ${suspects} ${ok} >${new_adhoc} if [ -s ${new_adhoc} ]; then echo >&2 "Error: You must add new CONFIG options using Kconfig" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 31cbb86e7f..ada2762fab 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -116,7 +116,6 @@ CONFIG_ARMV7_SECURE_MAX_SIZE CONFIG_ARMV7_SECURE_RESERVE_SIZE CONFIG_ARMV8_SWITCH_TO_EL1 CONFIG_ARM_ARCH_CP15_ERRATA -CONFIG_ARM_ASM_UNIFIED CONFIG_ARM_DCC CONFIG_ARM_FREQ CONFIG_ARM_GIC_BASE_ADDRESS @@ -219,7 +218,6 @@ CONFIG_BMP_16BPP CONFIG_BMP_24BPP CONFIG_BMP_32BPP CONFIG_BOARDDIR -CONFIG_BOARDINFO CONFIG_BOARDNAME CONFIG_BOARDNAME_LOCAL CONFIG_BOARD_AXM @@ -297,7 +295,6 @@ CONFIG_BOOT_RETRY_MIN CONFIG_BOOT_RETRY_TIME CONFIG_BOUNCE_BUFFER CONFIG_BPTR_VIRT_ADDR -CONFIG_BSEIP CONFIG_BS_ADDR_DEVICE CONFIG_BS_ADDR_RAM CONFIG_BS_COPY_CMD @@ -325,7 +322,6 @@ CONFIG_CDP_POWER_CONSUMPTION CONFIG_CDP_TRIGGER CONFIG_CDP_VERSION CONFIG_CFG_DATA_SECTOR -CONFIG_CFG_USB CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS CONFIG_CF_DSPI CONFIG_CF_SBF @@ -829,7 +825,6 @@ CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN CONFIG_FEATURE_SH_EXTRA_QUIET CONFIG_FEATURE_SH_FANCY_PROMPT CONFIG_FEATURE_SH_STANDALONE_SHELL -CONFIG_FEC_ENET CONFIG_FEC_ENET_DEV CONFIG_FEC_FIXED_SPEED CONFIG_FEC_MXC_25M_REF_CLK @@ -952,7 +947,6 @@ CONFIG_FTIDE020S_BASE CONFIG_FTIIC010_BASE CONFIG_FTINTC010_BASE CONFIG_FTLCDC100_BASE -CONFIG_FTMAC100 CONFIG_FTMAC100_BASE CONFIG_FTMAC110_BASE CONFIG_FTPCI100_BASE @@ -1032,7 +1026,6 @@ CONFIG_HAS_FSL_DR_USB CONFIG_HAS_FSL_MPH_USB CONFIG_HAS_FSL_XHCI_USB CONFIG_HAS_POST -CONFIG_HAVE_ACPI_RESUME CONFIG_HCLK_FREQ CONFIG_HDBOOT CONFIG_HDMI_ENCODER_I2C_ADDR @@ -1041,9 +1034,7 @@ CONFIG_HIDE_LOGO_VERSION CONFIG_HIGH_BATS CONFIG_HIKEY_GPIO CONFIG_HIS_DRIVER -CONFIG_HITACHI_SP19X001_Z1A CONFIG_HITACHI_SX14 -CONFIG_HLD1045 CONFIG_HOSTNAME CONFIG_HOST_MAX_DEVICES CONFIG_HOTPLUG @@ -1198,7 +1189,6 @@ CONFIG_HUSH_INIT_VAR CONFIG_HVBOOT CONFIG_HWCONFIG CONFIG_HW_ENV_SETTINGS -CONFIG_HW_WATCHDOG CONFIG_HW_WATCHDOG_TIMEOUT_MS CONFIG_I2C CONFIG_I2C_CHIPADDRESS @@ -1284,7 +1274,6 @@ CONFIG_IRAM_SIZE CONFIG_IRAM_STACK CONFIG_IRAM_TOP CONFIG_IRDA_BASE -CONFIG_ISP1362_USB CONFIG_IS_BUILTIN CONFIG_IS_ENABLED CONFIG_IS_INVALID @@ -1352,7 +1341,6 @@ CONFIG_KM_ECC_MODE CONFIG_KM_ENV_IS_IN_SPI_NOR CONFIG_KM_FDT_ADDR CONFIG_KM_FPGA_CONFIG -CONFIG_KM_I2C_ABORT CONFIG_KM_IVM_BUS CONFIG_KM_KERNEL_ADDR CONFIG_KM_KIRKWOOD @@ -1422,7 +1410,6 @@ CONFIG_KVM_GUEST CONFIG_KW88F6192 CONFIG_KW88F6281 CONFIG_KW88F6702 -CONFIG_KYOCERA_KCS057QV1AJ CONFIG_KZM_A9_GT CONFIG_L1_INIT_RAM CONFIG_L2_CACHE @@ -1460,7 +1447,6 @@ CONFIG_LOADADDR CONFIG_LOADCMD CONFIG_LOADS_ECHO CONFIG_LOGBUFFER -CONFIG_LOWBOOT CONFIG_LOWPOWER_ADDR CONFIG_LOWPOWER_FLAG CONFIG_LOW_MCFCLK @@ -1535,7 +1521,6 @@ CONFIG_MACH_TYPE_COMPAT_REV CONFIG_MACRESET_TIMEOUT CONFIG_MAC_ADDR_IN_EEPROM CONFIG_MAC_ADDR_IN_SPIFLASH -CONFIG_MAC_OFFSET CONFIG_MAKALU CONFIG_MALLOC_F_ADDR CONFIG_MALTA @@ -1570,8 +1555,6 @@ CONFIG_MENUKEY CONFIG_MENUPROMPT CONFIG_MENU_SHOW CONFIG_MFG_ENV_SETTINGS -CONFIG_MGCOGE -CONFIG_MGCOGE3NE CONFIG_MIGO_R CONFIG_MII CONFIG_MIIM_ADDRESS @@ -1638,11 +1621,6 @@ CONFIG_MPC83XX_PCI2 CONFIG_MPC85XX_FEC CONFIG_MPC85XX_FEC_NAME CONFIG_MPC85XX_PCI2 -CONFIG_MPC860 -CONFIG_MPC860T -CONFIG_MPC866 -CONFIG_MPC866_FAMILY -CONFIG_MPC885 CONFIG_MPC8XXX_SPI CONFIG_MPC8xxx_DISABLE_BPTR CONFIG_MPLL_FREQ @@ -1767,9 +1745,6 @@ CONFIG_NCEL2C100_BASE CONFIG_NCEMIC100_BASE CONFIG_NDS_DLM1_BASE CONFIG_NDS_DLM2_BASE -CONFIG_NEC_NL6448AC33 -CONFIG_NEC_NL6448BC20 -CONFIG_NEC_NL6448BC33_54 CONFIG_NEEDS_MANUAL_RELOC CONFIG_NEO CONFIG_NET2BIG_V2 @@ -1809,7 +1784,6 @@ CONFIG_NUM_PAMU CONFIG_ODROID_REV_AIN CONFIG_OFF_PADCONF CONFIG_OF_ -CONFIG_OF_IDE_FIXUP CONFIG_OF_SPI CONFIG_OF_SPI_FLASH CONFIG_OF_STDOUT_PATH @@ -1819,7 +1793,6 @@ CONFIG_OMAP_EHCI_PHY3_RESET_GPIO CONFIG_OMAP_USB2PHY2_HOST CONFIG_OMAP_USB3PHY1_HOST CONFIG_OMAP_USB_PHY -CONFIG_OPTREX_BW CONFIG_ORIGEN CONFIG_OS1_ENV_ADDR CONFIG_OS2_ENV_ADDR @@ -1870,9 +1843,6 @@ CONFIG_PCI_INDIRECT_BRIDGE CONFIG_PCI_IO_BUS CONFIG_PCI_IO_PHYS CONFIG_PCI_IO_SIZE -CONFIG_PCI_MEMORY_BUS -CONFIG_PCI_MEMORY_PHYS -CONFIG_PCI_MEMORY_SIZE CONFIG_PCI_MEM_BUS CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_SIZE @@ -1914,19 +1884,15 @@ CONFIG_PHY_CLK_FREQ CONFIG_PHY_CMD_DELAY CONFIG_PHY_DYNAMIC_ANEG CONFIG_PHY_ET1011C_TX_CLK_FIX -CONFIG_PHY_GIGE CONFIG_PHY_ID CONFIG_PHY_INTERFACE_MODE CONFIG_PHY_IRAM_BASE CONFIG_PHY_KSZ9031 CONFIG_PHY_M88E1111 CONFIG_PHY_MAX_ADDR -CONFIG_PHY_MICREL_KSZ9021 -CONFIG_PHY_MICREL_KSZ9031 CONFIG_PHY_MODE_NEED_CHANGE CONFIG_PHY_RESET CONFIG_PHY_RESET_DELAY -CONFIG_PHY_TYPE CONFIG_PHYx_ADDR CONFIG_PICOSAM CONFIG_PIGGY_MAC_ADRESS_OFFSET @@ -2037,7 +2003,6 @@ CONFIG_PQ_MDS_PIB CONFIG_PQ_MDS_PIB_ATM CONFIG_PRAM CONFIG_PREBOOT -CONFIG_PRIMEVIEW_V16C6448AC CONFIG_PRINTK CONFIG_PROC_FS CONFIG_PROFILE_ALL_BRANCHES @@ -2158,7 +2123,6 @@ CONFIG_ROOTPATH CONFIG_RSK7203 CONFIG_RSK7264 CONFIG_RSK7269 -CONFIG_RTC_DS1307 CONFIG_RTC_DS1337 CONFIG_RTC_DS1337_NOOSC CONFIG_RTC_DS1338 @@ -2184,7 +2148,6 @@ CONFIG_RTC_MV CONFIG_RTC_MXS CONFIG_RTC_PCF8563 CONFIG_RTC_PT7C4338 -CONFIG_RTC_RV3029 CONFIG_RTC_RX8025 CONFIG_RTC_X1205 CONFIG_RUN_FROM_DDR0 @@ -2192,7 +2155,6 @@ CONFIG_RUN_FROM_DDR1 CONFIG_RUN_FROM_IRAM_ONLY CONFIG_RX_DESCR_NUM CONFIG_S32V234 -CONFIG_S3C24X0 CONFIG_S3D2_CLK_FREQ CONFIG_S3D4_CLK_FREQ CONFIG_S5P @@ -2226,8 +2188,6 @@ CONFIG_SATA_ULI5288 CONFIG_SBC8349 CONFIG_SBC8548 CONFIG_SBC8641D -CONFIG_SCC1_ENET -CONFIG_SCC2_ENET CONFIG_SCF0403_LCD CONFIG_SCIF CONFIG_SCIF_A @@ -2298,14 +2258,8 @@ CONFIG_SH7780_PCI_BAR CONFIG_SH7780_PCI_LAR CONFIG_SH7780_PCI_LSR CONFIG_SH7785LCR -CONFIG_SHARP_16x9 CONFIG_SHARP_LM8V31 CONFIG_SHARP_LQ035Q7DH06 -CONFIG_SHARP_LQ057Q3DC02 -CONFIG_SHARP_LQ065T9DR51U -CONFIG_SHARP_LQ084V1DG21 -CONFIG_SHARP_LQ104V7DS01 -CONFIG_SHARP_LQ64D341 CONFIG_SHEEVA_88SV131 CONFIG_SHEEVA_88SV331xV5 CONFIG_SHELL @@ -2326,8 +2280,6 @@ CONFIG_SH_ETHER_USE_GETHER CONFIG_SH_ETHER_USE_PORT CONFIG_SH_GPIO_PFC CONFIG_SH_I2C_8BIT -CONFIG_SH_I2C_BASE0 -CONFIG_SH_I2C_BASE1 CONFIG_SH_I2C_CLOCK CONFIG_SH_I2C_DATA_HIGH CONFIG_SH_I2C_DATA_LOW @@ -2339,7 +2291,6 @@ CONFIG_SH_QSPI_BASE CONFIG_SH_SCIF_CLK_FREQ CONFIG_SH_SDHI_FREQ CONFIG_SH_SDRAM_OFFSET -CONFIG_SH_SH7734_I2C CONFIG_SH_SPI CONFIG_SH_SPI_BASE CONFIG_SH_TMU_CLK_FREQ @@ -2405,7 +2356,6 @@ CONFIG_SOC_OMAP3430 CONFIG_SOFT_I2C_GPIO_SCL CONFIG_SOFT_I2C_GPIO_SDA CONFIG_SOFT_I2C_READ_REPEATED_START -CONFIG_SOFT_SPI CONFIG_SOURCE CONFIG_SPARSE_RCU_POINTER CONFIG_SPDDRAM_SILENT @@ -2458,7 +2408,6 @@ CONFIG_SPLL_FREQ CONFIG_SPL_ CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC CONFIG_SPL_ATMEL_SIZE -CONFIG_SPL_BOARD_INIT CONFIG_SPL_BOARD_LOAD_IMAGE CONFIG_SPL_BOOTROM_SAVE CONFIG_SPL_BOOT_DEVICE @@ -2732,10 +2681,8 @@ CONFIG_SYS_BR0_8M CONFIG_SYS_BR0_PRELIM CONFIG_SYS_BR1_PRELIM CONFIG_SYS_BR2_PRELIM -CONFIG_SYS_BR3_CAN CONFIG_SYS_BR3_PRELIM CONFIG_SYS_BR4_PRELIM -CONFIG_SYS_BR5_ISP1362 CONFIG_SYS_BR5_PRELIM CONFIG_SYS_BR6_64M CONFIG_SYS_BR6_8M @@ -2755,8 +2702,6 @@ CONFIG_SYS_CACHE_DCACR CONFIG_SYS_CACHE_ICACR CONFIG_SYS_CACHE_STASHING CONFIG_SYS_CADMUS_BASE_REG -CONFIG_SYS_CAN_BASE -CONFIG_SYS_CAN_OR_AM CONFIG_SYS_CBSIZE CONFIG_SYS_CCCR CONFIG_SYS_CCI400_ADDR @@ -2822,7 +2767,6 @@ CONFIG_SYS_CPLD_FTIM2 CONFIG_SYS_CPLD_FTIM3 CONFIG_SYS_CPLD_SIZE CONFIG_SYS_CPMFCR_RAMTYPE -CONFIG_SYS_CPM_BOOTCOUNT_ADDR CONFIG_SYS_CPM_INTERRUPT CONFIG_SYS_CPRI CONFIG_SYS_CPRI_CLK @@ -3307,8 +3251,6 @@ CONFIG_SYS_FLASH_BASE CONFIG_SYS_FLASH_BASE0 CONFIG_SYS_FLASH_BASE1 CONFIG_SYS_FLASH_BASE2 -CONFIG_SYS_FLASH_BASE_1 -CONFIG_SYS_FLASH_BASE_2 CONFIG_SYS_FLASH_BASE_PHYS CONFIG_SYS_FLASH_BASE_PHYS_EARLY CONFIG_SYS_FLASH_BASE_PHYS_H @@ -3338,8 +3280,6 @@ CONFIG_SYS_FLASH_READ2 CONFIG_SYS_FLASH_SECT_SIZE CONFIG_SYS_FLASH_SECT_SZ CONFIG_SYS_FLASH_SIZE -CONFIG_SYS_FLASH_SIZE_1 -CONFIG_SYS_FLASH_SIZE_2 CONFIG_SYS_FLASH_UNLOCK_TOUT CONFIG_SYS_FLASH_USE_BUFFER_WRITE CONFIG_SYS_FLASH_VERIFY_AFTER_WRITE @@ -3788,7 +3728,6 @@ CONFIG_SYS_GBL_DATA_SIZE CONFIG_SYS_GENERIC_BOARD CONFIG_SYS_GENERIC_GLOBAL_DATA CONFIG_SYS_GIC400_ADDR -CONFIG_SYS_GLOBAL_SDRAM_LIMIT CONFIG_SYS_GP1DIR CONFIG_SYS_GP1ODR CONFIG_SYS_GP2DIR @@ -3895,9 +3834,6 @@ CONFIG_SYS_HRCW_HIGH CONFIG_SYS_HRCW_HIGH_BASE CONFIG_SYS_HRCW_LOW CONFIG_SYS_HSDRAMC -CONFIG_SYS_HWINFO_MAGIC -CONFIG_SYS_HWINFO_OFFSET -CONFIG_SYS_HWINFO_SIZE CONFIG_SYS_HZ_CLOCK CONFIG_SYS_I2C CONFIG_SYS_I2C2_FSL_OFFSET @@ -3937,22 +3873,18 @@ CONFIG_SYS_I2C_EEPROM_ADDR CONFIG_SYS_I2C_EEPROM_ADDR_LEN CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW CONFIG_SYS_I2C_EEPROM_BUS -CONFIG_SYS_I2C_EEPROM_BUS_NUM CONFIG_SYS_I2C_EEPROM_CCID CONFIG_SYS_I2C_EEPROM_CPU_ADDR -CONFIG_SYS_I2C_EEPROM_MAC_OFFSET CONFIG_SYS_I2C_EEPROM_MB_ADDR CONFIG_SYS_I2C_EEPROM_NXID CONFIG_SYS_I2C_EEPROM_NXID_MAC CONFIG_SYS_I2C_EEPROM_PAGE_WRITE_BITS CONFIG_SYS_I2C_EEPROM_PAGE_WRITE_DELAY_MS CONFIG_SYS_I2C_EXPANDER_ADDR -CONFIG_SYS_I2C_FACT_ADDR CONFIG_SYS_I2C_FPGA_ADDR CONFIG_SYS_I2C_FRAM CONFIG_SYS_I2C_G762_ADDR CONFIG_SYS_I2C_GENERIC_MAC -CONFIG_SYS_I2C_HWMON_ADDR CONFIG_SYS_I2C_IDT6V49205B CONFIG_SYS_I2C_IFDR_DIV CONFIG_SYS_I2C_IHS @@ -3999,12 +3931,10 @@ CONFIG_SYS_I2C_MAC2_DATA_ADDR CONFIG_SYS_I2C_MAC_OFFSET CONFIG_SYS_I2C_MAX1237_ADDR CONFIG_SYS_I2C_MAX_HOPS -CONFIG_SYS_I2C_MODULE CONFIG_SYS_I2C_MXC_I2C1 CONFIG_SYS_I2C_MXC_I2C2 CONFIG_SYS_I2C_MXC_I2C3 CONFIG_SYS_I2C_MXC_I2C4 -CONFIG_SYS_I2C_MXS CONFIG_SYS_I2C_NCT72_ADDR CONFIG_SYS_I2C_NOPROBES CONFIG_SYS_I2C_OFFSET @@ -4092,7 +4022,6 @@ CONFIG_SYS_I2C_ZYNQ_SLAVE CONFIG_SYS_I2C_ZYNQ_SPEED CONFIG_SYS_I2ODMA_BASE CONFIG_SYS_I2ODMA_PHYS_ADDR -CONFIG_SYS_I2c_INIT_MPC5XXX CONFIG_SYS_IBAT CONFIG_SYS_IBAT0L CONFIG_SYS_IBAT0U @@ -4116,7 +4045,6 @@ CONFIG_SYS_ICACHE_INV CONFIG_SYS_ICACHE_LINESZ CONFIG_SYS_ICACHE_SACR_VALUE CONFIG_SYS_ICS8N3QV01_I2C -CONFIG_SYS_ICTRL CONFIG_SYS_IDE_MAXBUS CONFIG_SYS_IDE_MAXDEVICE CONFIG_SYS_ID_EEPROM @@ -4162,7 +4090,6 @@ CONFIG_SYS_INTSRAMSZ CONFIG_SYS_INT_FLASH_BASE CONFIG_SYS_INT_FLASH_ENABLE CONFIG_SYS_IO_BASE -CONFIG_SYS_IPBCLK_EQUALS_XLBCLK CONFIG_SYS_IR_REG_BASE_ADDR CONFIG_SYS_ISA_BASE CONFIG_SYS_ISA_IO @@ -4308,14 +4235,9 @@ CONFIG_SYS_MACB2_BASE CONFIG_SYS_MACB3_BASE CONFIG_SYS_MAIN_PWR_ON CONFIG_SYS_MALLOC_BASE -CONFIG_SYS_MALLOC_CLEAR_ON_INIT CONFIG_SYS_MALLOC_LEN CONFIG_SYS_MALLOC_SIMPLE CONFIG_SYS_MAMR -CONFIG_SYS_MAMR_10COL -CONFIG_SYS_MAMR_8COL -CONFIG_SYS_MAMR_9COL -CONFIG_SYS_MAMR_PTA CONFIG_SYS_MAPLE CONFIG_SYS_MAPLE_MEM_PHYS CONFIG_SYS_MAPPED_RAM_BASE @@ -4490,7 +4412,6 @@ CONFIG_SYS_MPC8xxx_PIC_ADDR CONFIG_SYS_MPC92469AC CONFIG_SYS_MRAM_BASE CONFIG_SYS_MRAM_SIZE -CONFIG_SYS_MRS_OFFS CONFIG_SYS_MSC0_VAL CONFIG_SYS_MSC1_VAL CONFIG_SYS_MSC2_VAL @@ -4702,24 +4623,18 @@ CONFIG_SYS_OR0_64M CONFIG_SYS_OR0_8M CONFIG_SYS_OR0_PRELIM CONFIG_SYS_OR0_REMAP -CONFIG_SYS_OR1 CONFIG_SYS_OR1_PRELIM CONFIG_SYS_OR1_REMAP CONFIG_SYS_OR2_PRELIM -CONFIG_SYS_OR3_CAN CONFIG_SYS_OR3_PRELIM CONFIG_SYS_OR4_PRELIM -CONFIG_SYS_OR5_ISP1362 CONFIG_SYS_OR5_PRELIM -CONFIG_SYS_OR5_REMAP CONFIG_SYS_OR6_64M CONFIG_SYS_OR6_8M CONFIG_SYS_OR6_PRELIM CONFIG_SYS_OR7_PRELIM CONFIG_SYS_OR_TIMING_FLASH -CONFIG_SYS_OR_TIMING_FLASH_AT_50MHZ CONFIG_SYS_OR_TIMING_MRAM -CONFIG_SYS_OR_TIMING_SDRAM CONFIG_SYS_OSC0_HZ CONFIG_SYS_OSC1_HZ CONFIG_SYS_OSCIN_FREQ @@ -4953,7 +4868,6 @@ CONFIG_SYS_PCI_CFG_SIZE CONFIG_SYS_PCI_CLASSCODE CONFIG_SYS_PCI_CLASSCODE_MONARCH CONFIG_SYS_PCI_CLASSCODE_NONMONARCH -CONFIG_SYS_PCI_CON_DEVICE CONFIG_SYS_PCI_EP_MEMORY_BASE CONFIG_SYS_PCI_FORCE_PCI_CONV CONFIG_SYS_PCI_IO_BASE @@ -5007,16 +4921,10 @@ CONFIG_SYS_PCI_TBATR3 CONFIG_SYS_PCI_TBATR4 CONFIG_SYS_PCI_TBATR5 CONFIG_SYS_PCI_VIRT -CONFIG_SYS_PCMCIA_ATTRB_ADDR -CONFIG_SYS_PCMCIA_ATTRB_SIZE CONFIG_SYS_PCMCIA_ATTR_BASE CONFIG_SYS_PCMCIA_CIS_WIN CONFIG_SYS_PCMCIA_CIS_WIN_SIZE -CONFIG_SYS_PCMCIA_DMA_ADDR -CONFIG_SYS_PCMCIA_DMA_SIZE -CONFIG_SYS_PCMCIA_IO_ADDR CONFIG_SYS_PCMCIA_IO_BASE -CONFIG_SYS_PCMCIA_IO_SIZE CONFIG_SYS_PCMCIA_IO_WIN CONFIG_SYS_PCMCIA_IO_WIN_SIZE CONFIG_SYS_PCMCIA_MEM_ADDR @@ -5173,7 +5081,6 @@ CONFIG_SYS_RCAR_I2C3_SPEED CONFIG_SYS_RCWH_PCIHOST CONFIG_SYS_READ_SPD CONFIG_SYS_REDUNDAND_ENVIRONMENT -CONFIG_SYS_REMAP_OR_AM CONFIG_SYS_RESET_ADDR CONFIG_SYS_RESET_ADDRESS CONFIG_SYS_RESET_BASE @@ -5209,7 +5116,6 @@ CONFIG_SYS_SATA_FAT_BOOT_PARTITION CONFIG_SYS_SATA_MAX_DEVICE CONFIG_SYS_SBFHDR_DATA_OFFSET CONFIG_SYS_SBFHDR_SIZE -CONFIG_SYS_SCCR CONFIG_SYS_SCCR_ENCCM CONFIG_SYS_SCCR_PCICM CONFIG_SYS_SCCR_PCIEXP1CM @@ -5310,7 +5216,6 @@ CONFIG_SYS_SDRAM_DRVSTRENGTH CONFIG_SYS_SDRAM_DRV_STRENGTH CONFIG_SYS_SDRAM_EMOD CONFIG_SYS_SDRAM_LDF -CONFIG_SYS_SDRAM_LIST CONFIG_SYS_SDRAM_LOWER CONFIG_SYS_SDRAM_MODE CONFIG_SYS_SDRAM_PLBADDUHB @@ -5565,14 +5470,10 @@ CONFIG_SYS_UPDATE_FLASH_SIZE CONFIG_SYS_USB2D0_BASE CONFIG_SYS_USBCTRL CONFIG_SYS_USBD_BASE -CONFIG_SYS_USB_BRGCLK CONFIG_SYS_USB_DEVICE CONFIG_SYS_USB_EHCI_CPU_INIT CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS CONFIG_SYS_USB_EHCI_REGS_BASE -CONFIG_SYS_USB_EVENT_POLL -CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP -CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE CONFIG_SYS_USB_FAT_BOOT_PARTITION CONFIG_SYS_USB_HOST CONFIG_SYS_USB_OHCI_BOARD_INIT @@ -5596,7 +5497,6 @@ CONFIG_SYS_USE_NAND CONFIG_SYS_USE_NANDFLASH CONFIG_SYS_USE_NOR CONFIG_SYS_USE_NORFLASH -CONFIG_SYS_USE_PPCENV CONFIG_SYS_USE_SERIALFLASH CONFIG_SYS_USE_SPIFLASH CONFIG_SYS_USE_UBI @@ -5672,7 +5572,6 @@ CONFIG_TEGRA_SLINK_CTRLS CONFIG_TEGRA_SPI CONFIG_TEGRA_UARTA_GPU CONFIG_TEGRA_UARTA_SDIO1 -CONFIG_TEGRA_UARTA_UAA_UAB CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3 CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1 CONFIG_TESTPIN_MASK @@ -5684,7 +5583,6 @@ CONFIG_TFTP_FILE_NAME_MAX_LEN CONFIG_TFTP_PORT CONFIG_TFTP_TSIZE CONFIG_THOR_RESET_OFF -CONFIG_THUMB2_KERNEL CONFIG_THUNDERX CONFIG_TIMESTAMP CONFIG_TIZEN @@ -5696,17 +5594,7 @@ CONFIG_TPL_DRIVERS_MISC_SUPPORT CONFIG_TPL_PAD_TO CONFIG_TPM_TIS_BASE_ADDRESS CONFIG_TPS6586X_POWER -CONFIG_TQM823L -CONFIG_TQM823M CONFIG_TQM834X -CONFIG_TQM850L -CONFIG_TQM850M -CONFIG_TQM855L -CONFIG_TQM855M -CONFIG_TQM860L -CONFIG_TQM860M -CONFIG_TQM862L -CONFIG_TQM862M CONFIG_TRACE CONFIG_TRACE_BUFFER_SIZE CONFIG_TRACE_EARLY @@ -5937,7 +5825,6 @@ CONFIG_UTBIPAR_INIT_TBIPA CONFIG_U_BOOT_HDR_ADDR CONFIG_U_BOOT_HDR_SIZE CONFIG_U_QE -CONFIG_V38B CONFIG_VAL CONFIG_VAR_SIZE_SPL CONFIG_VCT_NOR @@ -5964,9 +5851,7 @@ CONFIG_VIDEO_MXS_MODE_SYSTEM CONFIG_VIDEO_OMAP3 CONFIG_VIDEO_ONBOARD CONFIG_VIDEO_SM501 -CONFIG_VIDEO_SM501_16BPP CONFIG_VIDEO_SM501_32BPP -CONFIG_VIDEO_SM501_8BPP CONFIG_VIDEO_SM501_PCI CONFIG_VIDEO_STD_TIMINGS CONFIG_VIDEO_SUNXI |