November 2015 - U-Boot

[U-Boot] [PATCH 00/13] device model bringup of ti-qspi on dra72, dra74 and am437x-sk evm
by Mugunthan V N 06 Nov '15

06 Nov '15

This patch series enables ti_qspi to adopt driver model. This has been tested on dra72, dra74 and am437x-sk evms (logs [1]). Also pushed a branch for testing [2] [1]: http://pastebin.ubuntu.com/12978685/ [2]: git://git.ti.com/~mugunthanvnm/ti-u-boot/mugunth-ti-u-boot.git dm-qspi Mugunthan V N (13): drivers: spi: ti_qspi: prepare driver for DM conversion dm: core: Add a new api to get indexed device address spi: Add support for dual and quad mode drivers: spi: spi-uclass: fix spi slave device register dra7xx_evm: qspi: do not define DM_SPI and DM_SPI_FLASH for spl dts: dra7: add spi alias for qspi drivers: spi: ti_qspi: convert driver to adopt device driver model arm: dts: dra7: add qspi register maps for memory map and control module defconfig: dra72_evm: enable spi driver model defconfig: dra74_evm: enable spi driver model am43xx_evm: qspi: do not define DM_SPI and DM_SPI_FLASH for spl arm: dts: am4372: add qspi register maps for memory map defconfig: am437x_sk_evm: enable spi driver model arch/arm/dts/am4372.dtsi | 4 +- arch/arm/dts/dra7.dtsi | 6 +- configs/am437x_sk_evm_defconfig | 3 + configs/dra72_evm_defconfig | 2 + configs/dra74_evm_defconfig | 2 + drivers/core/device.c | 20 ++ drivers/spi/spi-uclass.c | 71 +++++- drivers/spi/ti_qspi.c | 467 +++++++++++++++++++++++++++------------- include/configs/am43xx_evm.h | 2 + include/configs/dra7xx_evm.h | 5 + include/dm/device.h | 9 + include/spi.h | 4 + 12 files changed, 433 insertions(+), 162 deletions(-) -- 2.6.2.280.g74301d6

2 32

[U-Boot] [PATCH 0/3] MIPS: rework and fix broken bootm code
by Daniel Schwierzeck 06 Nov '15

06 Nov '15

I recently discovered that booting Linux with FIT images containg initramfs or DTB images do not work anymore. That is a regression by the move to 'generic board' which broke LMB on MIPS. Also the MIPS DTB support was not compatible anymore with some changes made in the generic bootm code. Daniel Schwierzeck (3): common/board_f: enable setup_board_part1() for MIPS MIPS: bootm: rework and fix broken bootm code MIPS: bootm: use CONFIG_IS_ENABLED() everywhere arch/mips/lib/bootm.c | 196 ++++++++++++++++++++++++-------------------------- common/board_f.c | 8 ++- 2 files changed, 98 insertions(+), 106 deletions(-) -- 2.5.0

3 8

[U-Boot] [PATCH 1/8] sf: Add MTD support to spi_flash
by Jagan Teki 06 Nov '15

06 Nov '15

This patch adds mtd_info support to spi_flash layer, MTD has proven core for flash operations so adding MTD to spi_flash will extends more functionality. Signed-off-by: Jagan Teki <jteki(a)openedev.com> --- drivers/mtd/spi/sf_ops.c | 45 +++++++++++++++++++++++++-------------------- drivers/mtd/spi/sf_probe.c | 26 ++++++++++++++++++-------- include/spi_flash.h | 9 +++++---- 3 files changed, 48 insertions(+), 32 deletions(-) diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c index 703099f..f5ee376 100644 --- a/drivers/mtd/spi/sf_ops.c +++ b/drivers/mtd/spi/sf_ops.c @@ -146,7 +146,7 @@ static int spi_flash_read_bar(struct spi_flash *flash, u8 idcode0) u8 curr_bank = 0; int ret; - if (flash->size <= SPI_FLASH_16MB_BOUN) + if (flash->mtd->size <= SPI_FLASH_16MB_BOUN) goto bank_end; switch (idcode0) { @@ -176,8 +176,8 @@ static void spi_flash_dual(struct spi_flash *flash, u32 *addr) { switch (flash->dual_flash) { case SF_DUAL_STACKED_FLASH: - if (*addr >= (flash->size >> 1)) { - *addr -= flash->size >> 1; + if (*addr >= (flash->mtd->size >> 1)) { + *addr -= flash->mtd->size >> 1; flash->spi->flags |= SPI_XFER_U_PAGE; } else { flash->spi->flags &= ~SPI_XFER_U_PAGE; @@ -303,7 +303,7 @@ static int spi_flash_cmd_erase_ops(struct spi_flash *flash, u32 offset, u8 cmd[SPI_FLASH_CMD_LEN]; int ret = -1; - erase_size = flash->erase_size; + erase_size = mtd->erasesize; if (offset % erase_size || len % erase_size) { debug("SF: Erase offset/length not multiple of erase size\n"); return -1; @@ -693,7 +693,7 @@ int spi_flash_decode_fdt(const void *blob, struct spi_flash *flash) return 0; } - if (flash->size != size) { + if (flash->mtd->size != size) { debug("%s: Memory map must cover entire device\n", __func__); return -1; } @@ -705,6 +705,7 @@ int spi_flash_decode_fdt(const void *blob, struct spi_flash *flash) int spi_flash_scan(struct spi_flash *flash) { + struct mtd_info *mtd = flash->mtd; const struct spi_flash_params *params; u16 jedec, ext_jedec; u8 idcode[5]; @@ -754,24 +755,27 @@ int spi_flash_scan(struct spi_flash *flash) /* Assign spi data */ flash->name = params->name; + mtd->type = MTD_NORFLASH; + mtd->writesize = 1; + mtd->flags = MTD_CAP_NORFLASH; flash->memory_map = flash->spi->memory_map; flash->dual_flash = flash->spi->option; /* Assign spi_flash ops */ - flash->write = spi_flash_cmd_write_ops; + mtd->_write = spi_flash_cmd_write_ops; #if defined(CONFIG_SPI_FLASH_SST) if (params->flags & SST_WR) flash->flags |= SNOR_F_SST_WR; if (params->flags & SNOR_F_SST_WR) { if (flash->spi->op_mode_tx & SPI_OPM_TX_BP) - flash->write = sst_write_bp; + mtd->_write = sst_write_bp; else - flash->write = sst_write_wp; + mtd->_write = sst_write_wp; } #endif - flash->erase = spi_flash_cmd_erase_ops; - flash->read = spi_flash_cmd_read_ops; + mtd->_erase = spi_flash_cmd_erase_ops; + mtd->_read = spi_flash_cmd_read_ops; /* Compute the flash size */ flash->shift = (flash->dual_flash & SF_DUAL_PARALLEL_FLASH) ? 1 : 0; @@ -790,27 +794,28 @@ int spi_flash_scan(struct spi_flash *flash) flash->page_size = 256; } flash->page_size <<= flash->shift; + mtd->writebufsize = flash->page_size; flash->sector_size = params->sector_size << flash->shift; - flash->size = flash->sector_size * params->nr_sectors << flash->shift; + mtd->size = flash->sector_size * params->nr_sectors << flash->shift; #ifdef CONFIG_SF_DUAL_FLASH if (flash->dual_flash & SF_DUAL_STACKED_FLASH) - flash->size <<= 1; + mtd->size <<= 1; #endif /* Compute erase sector and command */ if (params->flags & SECT_4K) { flash->erase_cmd = CMD_ERASE_4K; - flash->erase_size = 4096 << flash->shift; + mtd->erasesize = 4096 << flash->shift; } else if (params->flags & SECT_32K) { flash->erase_cmd = CMD_ERASE_32K; - flash->erase_size = 32768 << flash->shift; + mtd->erasesize = 32768 << flash->shift; } else { flash->erase_cmd = CMD_ERASE_64K; - flash->erase_size = flash->sector_size; + mtd->erasesize = flash->sector_size; } /* Now erase size becomes valid sector size */ - flash->sector_size = flash->erase_size; + flash->sector_size = mtd->erasesize; /* Look for the fastest read cmd */ cmd = fls(params->e_rd_cmd & flash->spi->op_mode_rx); @@ -882,8 +887,8 @@ int spi_flash_scan(struct spi_flash *flash) #ifndef CONFIG_SPL_BUILD printf("SF: Detected %s with page size ", flash->name); print_size(flash->page_size, ", erase size "); - print_size(flash->erase_size, ", total "); - print_size(flash->size, ""); + print_size(mtd->erasesize, ", total "); + print_size(mtd->size, ""); if (flash->memory_map) printf(", mapped at %p", flash->memory_map); puts("\n"); @@ -891,9 +896,9 @@ int spi_flash_scan(struct spi_flash *flash) #ifndef CONFIG_SPI_FLASH_BAR if (((flash->dual_flash == SF_SINGLE_FLASH) && - (flash->size > SPI_FLASH_16MB_BOUN)) || + (mtd->size > SPI_FLASH_16MB_BOUN)) || ((flash->dual_flash > SF_SINGLE_FLASH) && - (flash->size > SPI_FLASH_16MB_BOUN << 1))) { + (mtd->size > SPI_FLASH_16MB_BOUN << 1))) { puts("SF: Warning - Only lower 16MiB accessible,"); puts(" Full access #define CONFIG_SPI_FLASH_BAR\n"); } diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index 87ac33e..b8704e2 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -14,9 +14,15 @@ #include <malloc.h> #include <spi.h> #include <spi_flash.h> +#include <linux/mtd/mtd.h> #include "sf_internal.h" +struct spi_flash_priv { + struct spi_flash flash; + struct mtd_info mtd; +}; + #ifndef CONFIG_DM_SPI_FLASH struct spi_flash *spi_flash_probe_tail(struct spi_slave *bus) { @@ -123,12 +129,19 @@ int spi_flash_std_erase(struct udevice *dev, u32 offset, size_t len) int spi_flash_std_probe(struct udevice *dev) { - struct spi_flash *flash = dev_get_uclass_priv(dev); + struct spi_flash_priv *priv = dev_get_uclass_priv(dev); struct spi_slave *slave = dev_get_parentdata(dev); + struct spi_flash *flash; int ret; - flash->dev = dev; + flash = &priv->flash; + flash->mtd = &priv->mtd; + flash->spi = slave; + flash->priv = priv; + + priv->mtd.priv = flash; + flash->dev = dev; /* Claim spi bus */ ret = spi_claim_bus(slave); @@ -143,19 +156,16 @@ int spi_flash_std_probe(struct udevice *dev) goto err_scan; } -#ifdef CONFIG_SPI_FLASH_MTD - ret = spi_flash_mtd_register(flash); + ret = add_mtd_device(&priv->mtd); if (ret) { printf("SF: failed to register mtd device: %d\n", ret); goto err_mtd; } -#endif + return ret; -#ifdef CONFIG_SPI_FLASH_MTD err_mtd: spi_free_slave(slave); -#endif err_scan: spi_release_bus(slave); return ret; @@ -177,7 +187,7 @@ U_BOOT_DRIVER(spi_flash_std) = { .id = UCLASS_SPI_FLASH, .of_match = spi_flash_std_ids, .probe = spi_flash_std_probe, - .priv_auto_alloc_size = sizeof(struct spi_flash), + .priv_auto_alloc_size = sizeof(struct spi_flash_priv), .ops = &spi_flash_std_ops, }; diff --git a/include/spi_flash.h b/include/spi_flash.h index 0732172..d0af8d3 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -17,6 +17,7 @@ #include <dm.h> /* Because we dereference struct udevice here */ #include <linux/types.h> +#include <linux/mtd/mtd.h> #ifndef CONFIG_SF_DEFAULT_SPEED # define CONFIG_SF_DEFAULT_SPEED 1000000 @@ -36,16 +37,15 @@ struct spi_slave; /** * struct spi_flash - SPI flash structure * + * @mtd: point to a mtd_info structure * @spi: SPI slave * @dev: SPI flash device * @name: Name of SPI flash * @dual_flash: Indicates dual flash memories - dual stacked, parallel * @shift: Flash shift useful in dual parallel * @flags: Indication of spi flash flags - * @size: Total flash size * @page_size: Write (page) size * @sector_size: Sector size - * @erase_size: Erase size * @bank_read_cmd: Bank read cmd * @bank_write_cmd: Bank write cmd * @bank_curr: Current flash bank @@ -54,6 +54,7 @@ struct spi_slave; * @write_cmd: Write cmd - page and quad program. * @dummy_byte: Dummy cycles for read operation. * @memory_map: Address of read-only SPI flash access + * @priv: the private data * @read: Flash read ops: Read len bytes at offset into buf * Supported cmds: Fast Array Read * @write: Flash write ops: Write len bytes from buf into offset @@ -63,6 +64,7 @@ struct spi_slave; * return 0 - Success, 1 - Failure */ struct spi_flash { + struct mtd_info *mtd; struct spi_slave *spi; #ifdef CONFIG_DM_SPI_FLASH struct udevice *dev; @@ -72,10 +74,8 @@ struct spi_flash { u8 shift; u16 flags; - u32 size; u32 page_size; u32 sector_size; - u32 erase_size; #ifdef CONFIG_SPI_FLASH_BAR u8 bank_read_cmd; u8 bank_write_cmd; @@ -87,6 +87,7 @@ struct spi_flash { u8 dummy_byte; void *memory_map; + void *priv; int (*read)(struct spi_flash *flash, u32 offset, size_t len, void *buf); int (*write)(struct spi_flash *flash, u32 offset, size_t len, const void *buf); -- 1.9.1

3 15

[U-Boot] [PATCH 1/6] net: altera_tse: use data type u32 for regs and desc
by Thomas Chou 06 Nov '15

06 Nov '15

Use data type u32/u16/u8 for regs and desc, as it is more portable. Signed-off-by: Thomas Chou <thomas(a)wytron.com.tw> --- drivers/net/altera_tse.c | 16 ++-- drivers/net/altera_tse.h | 186 +++++++++++++++++++++++------------------------ 2 files changed, 101 insertions(+), 101 deletions(-) diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c index 319983c..394503f 100644 --- a/drivers/net/altera_tse.c +++ b/drivers/net/altera_tse.c @@ -27,12 +27,12 @@ static inline void alt_sgdma_construct_descriptor( struct alt_sgdma_descriptor *next, void *read_addr, void *write_addr, - unsigned short length_or_eop, + u16 length_or_eop, int generate_eop, int read_fixed, int write_fixed_or_sop) { - unsigned char val; + u8 val; /* * Mark the "next" descriptor as "not" owned by hardware. This prevents @@ -100,7 +100,7 @@ static int alt_sgdma_wait_transfer(struct alt_sgdma_registers *regs) static int alt_sgdma_start_transfer(struct alt_sgdma_registers *regs, struct alt_sgdma_descriptor *desc) { - unsigned int val; + u32 val; /* Point the controller at the descriptor */ writel(virt_to_phys(desc), &regs->next_descriptor_pointer); @@ -121,7 +121,7 @@ static void tse_adjust_link(struct altera_tse_priv *priv, struct phy_device *phydev) { struct alt_tse_mac *mac_dev = priv->mac_dev; - unsigned int refvar; + u32 refvar; if (!phydev->link) { debug("%s: No link.\n", phydev->dev->name); @@ -230,7 +230,7 @@ static void altera_tse_stop(struct udevice *dev) struct alt_sgdma_registers *rx_sgdma = priv->sgdma_rx; struct alt_sgdma_registers *tx_sgdma = priv->sgdma_tx; struct alt_sgdma_descriptor *rx_desc = priv->rx_desc; - unsigned int status; + u32 status; int ret; ulong ctime; @@ -266,7 +266,7 @@ static int tse_mdio_read(struct mii_dev *bus, int addr, int devad, int reg) { struct altera_tse_priv *priv = bus->priv; struct alt_tse_mac *mac_dev = priv->mac_dev; - unsigned int value; + u32 value; /* set mdio address */ writel(addr, &mac_dev->mdio_phy1_addr); @@ -337,7 +337,7 @@ static int altera_tse_write_hwaddr(struct udevice *dev) struct alt_tse_mac *mac_dev = priv->mac_dev; struct eth_pdata *pdata = dev_get_platdata(dev); u8 *hwaddr = pdata->enetaddr; - unsigned int mac_lo, mac_hi; + u32 mac_lo, mac_hi; mac_lo = (hwaddr[3] << 24) | (hwaddr[2] << 16) | (hwaddr[1] << 8) | hwaddr[0]; @@ -362,7 +362,7 @@ static int altera_tse_start(struct udevice *dev) { struct altera_tse_priv *priv = dev_get_priv(dev); struct alt_tse_mac *mac_dev = priv->mac_dev; - unsigned int val; + u32 val; int ret; /* need to create sgdma */ diff --git a/drivers/net/altera_tse.h b/drivers/net/altera_tse.h index 08c4f66..83923bd 100644 --- a/drivers/net/altera_tse.h +++ b/drivers/net/altera_tse.h @@ -71,34 +71,34 @@ * */ struct alt_sgdma_descriptor { - unsigned int source; /* the address of data to be read. */ - unsigned int source_pad; + u32 source; /* the address of data to be read. */ + u32 source_pad; - unsigned int destination; /* the address to write data */ - unsigned int destination_pad; + u32 destination; /* the address to write data */ + u32 destination_pad; - unsigned int next; /* the next descriptor in the list. */ - unsigned int next_pad; + u32 next; /* the next descriptor in the list. */ + u32 next_pad; - unsigned short bytes_to_transfer; /* the number of bytes to transfer */ - unsigned char read_burst; - unsigned char write_burst; + u16 bytes_to_transfer; /* the number of bytes to transfer */ + u8 read_burst; + u8 write_burst; - unsigned short actual_bytes_transferred;/* bytes transferred by DMA */ - unsigned char descriptor_status; - unsigned char descriptor_control; + u16 actual_bytes_transferred;/* bytes transferred by DMA */ + u8 descriptor_status; + u8 descriptor_control; } __packed_1_; /* SG-DMA Control/Status Slave registers map */ struct alt_sgdma_registers { - unsigned int status; - unsigned int status_pad[3]; - unsigned int control; - unsigned int control_pad[3]; - unsigned int next_descriptor_pointer; - unsigned int descriptor_pad[3]; + u32 status; + u32 status_pad[3]; + u32 control; + u32 control_pad[3]; + u32 next_descriptor_pointer; + u32 descriptor_pad[3]; }; /* TSE Stuff */ @@ -142,101 +142,101 @@ struct alt_sgdma_registers { /* MAC register Space */ struct alt_tse_mac { - unsigned int megacore_revision; - unsigned int scratch_pad; - unsigned int command_config; - unsigned int mac_addr_0; - unsigned int mac_addr_1; - unsigned int max_frame_length; - unsigned int pause_quanta; - unsigned int rx_sel_empty_threshold; - unsigned int rx_sel_full_threshold; - unsigned int tx_sel_empty_threshold; - unsigned int tx_sel_full_threshold; - unsigned int rx_almost_empty_threshold; - unsigned int rx_almost_full_threshold; - unsigned int tx_almost_empty_threshold; - unsigned int tx_almost_full_threshold; - unsigned int mdio_phy0_addr; - unsigned int mdio_phy1_addr; + u32 megacore_revision; + u32 scratch_pad; + u32 command_config; + u32 mac_addr_0; + u32 mac_addr_1; + u32 max_frame_length; + u32 pause_quanta; + u32 rx_sel_empty_threshold; + u32 rx_sel_full_threshold; + u32 tx_sel_empty_threshold; + u32 tx_sel_full_threshold; + u32 rx_almost_empty_threshold; + u32 rx_almost_full_threshold; + u32 tx_almost_empty_threshold; + u32 tx_almost_full_threshold; + u32 mdio_phy0_addr; + u32 mdio_phy1_addr; /* only if 100/1000 BaseX PCS, reserved otherwise */ - unsigned int reservedx44[5]; + u32 reservedx44[5]; - unsigned int reg_read_access_status; - unsigned int min_tx_ipg_length; + u32 reg_read_access_status; + u32 min_tx_ipg_length; /* IEEE 802.3 oEntity Managed Object Support */ - unsigned int aMACID_1; /*The MAC addresses */ - unsigned int aMACID_2; - unsigned int aFramesTransmittedOK; - unsigned int aFramesReceivedOK; - unsigned int aFramesCheckSequenceErrors; - unsigned int aAlignmentErrors; - unsigned int aOctetsTransmittedOK; - unsigned int aOctetsReceivedOK; + u32 aMACID_1; /*The MAC addresses */ + u32 aMACID_2; + u32 aFramesTransmittedOK; + u32 aFramesReceivedOK; + u32 aFramesCheckSequenceErrors; + u32 aAlignmentErrors; + u32 aOctetsTransmittedOK; + u32 aOctetsReceivedOK; /* IEEE 802.3 oPausedEntity Managed Object Support */ - unsigned int aTxPAUSEMACCtrlFrames; - unsigned int aRxPAUSEMACCtrlFrames; + u32 aTxPAUSEMACCtrlFrames; + u32 aRxPAUSEMACCtrlFrames; /* IETF MIB (MIB-II) Object Support */ - unsigned int ifInErrors; - unsigned int ifOutErrors; - unsigned int ifInUcastPkts; - unsigned int ifInMulticastPkts; - unsigned int ifInBroadcastPkts; - unsigned int ifOutDiscards; - unsigned int ifOutUcastPkts; - unsigned int ifOutMulticastPkts; - unsigned int ifOutBroadcastPkts; + u32 ifInErrors; + u32 ifOutErrors; + u32 ifInUcastPkts; + u32 ifInMulticastPkts; + u32 ifInBroadcastPkts; + u32 ifOutDiscards; + u32 ifOutUcastPkts; + u32 ifOutMulticastPkts; + u32 ifOutBroadcastPkts; /* IETF RMON MIB Object Support */ - unsigned int etherStatsDropEvent; - unsigned int etherStatsOctets; - unsigned int etherStatsPkts; - unsigned int etherStatsUndersizePkts; - unsigned int etherStatsOversizePkts; - unsigned int etherStatsPkts64Octets; - unsigned int etherStatsPkts65to127Octets; - unsigned int etherStatsPkts128to255Octets; - unsigned int etherStatsPkts256to511Octets; - unsigned int etherStatsPkts512to1023Octets; - unsigned int etherStatsPkts1024to1518Octets; - - unsigned int etherStatsPkts1519toXOctets; - unsigned int etherStatsJabbers; - unsigned int etherStatsFragments; - - unsigned int reservedxE4; + u32 etherStatsDropEvent; + u32 etherStatsOctets; + u32 etherStatsPkts; + u32 etherStatsUndersizePkts; + u32 etherStatsOversizePkts; + u32 etherStatsPkts64Octets; + u32 etherStatsPkts65to127Octets; + u32 etherStatsPkts128to255Octets; + u32 etherStatsPkts256to511Octets; + u32 etherStatsPkts512to1023Octets; + u32 etherStatsPkts1024to1518Octets; + + u32 etherStatsPkts1519toXOctets; + u32 etherStatsJabbers; + u32 etherStatsFragments; + + u32 reservedxE4; /*FIFO control register. */ - unsigned int tx_cmd_stat; - unsigned int rx_cmd_stat; + u32 tx_cmd_stat; + u32 rx_cmd_stat; - unsigned int ipaccTxConf; - unsigned int ipaccRxConf; - unsigned int ipaccRxStat; - unsigned int ipaccRxStatSum; + u32 ipaccTxConf; + u32 ipaccRxConf; + u32 ipaccRxStat; + u32 ipaccRxStatSum; /*Multicast address resolution table */ - unsigned int hash_table[64]; + u32 hash_table[64]; /*Registers 0 to 31 within PHY device 0/1 */ - unsigned int mdio_phy0[0x20]; - unsigned int mdio_phy1[0x20]; + u32 mdio_phy0[0x20]; + u32 mdio_phy1[0x20]; /*4 Supplemental MAC Addresses */ - unsigned int supp_mac_addr_0_0; - unsigned int supp_mac_addr_0_1; - unsigned int supp_mac_addr_1_0; - unsigned int supp_mac_addr_1_1; - unsigned int supp_mac_addr_2_0; - unsigned int supp_mac_addr_2_1; - unsigned int supp_mac_addr_3_0; - unsigned int supp_mac_addr_3_1; - - unsigned int reservedx320[56]; + u32 supp_mac_addr_0_0; + u32 supp_mac_addr_0_1; + u32 supp_mac_addr_1_0; + u32 supp_mac_addr_1_1; + u32 supp_mac_addr_2_0; + u32 supp_mac_addr_2_1; + u32 supp_mac_addr_3_0; + u32 supp_mac_addr_3_1; + + u32 reservedx320[56]; }; struct altera_tse_priv { -- 2.5.0

5 29

[U-Boot] [PATCH] net: altera_tse: get numbers of fdt address and size cells
by Thomas Chou 06 Nov '15

06 Nov '15

Get numbers of fdt address and size cells in altera_tse_probe(), thereby remove the assumption of one address cell and one size cell. Signed-off-by: Thomas Chou <thomas(a)wytron.com.tw> --- drivers/net/altera_tse.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c index 394503f..b2002f4 100644 --- a/drivers/net/altera_tse.c +++ b/drivers/net/altera_tse.c @@ -409,20 +409,22 @@ static int altera_tse_probe(struct udevice *dev) { struct eth_pdata *pdata = dev_get_platdata(dev); struct altera_tse_priv *priv = dev_get_priv(dev); - const void *blob = gd->fdt_blob; + void *blob = (void *)gd->fdt_blob; int node = dev->of_offset; const char *list, *end; const fdt32_t *cell; void *base, *desc_mem = NULL; unsigned long addr, size; + int parent, addrc, sizec; int len, idx; int ret; /* - * decode regs, assume address-cells and size-cells are both one. - * there are multiple reg tuples, and they need to match with - * reg-names. + * decode regs. there are multiple reg tuples, and they need to + * match with reg-names. */ + parent = fdt_parent_offset(blob, node); + of_bus_default_count_cells(blob, parent, &addrc, &sizec); list = fdt_getprop(blob, node, "reg-names", &len); if (!list) return -ENOENT; @@ -434,7 +436,7 @@ static int altera_tse_probe(struct udevice *dev) while (list < end) { addr = fdt_translate_address((void *)blob, node, cell + idx); - size = fdt_addr_to_cpu(cell[idx + 1]); + size = fdt_addr_to_cpu(cell[idx + addrc]); base = ioremap(addr, size); len = strlen(list); if (strcmp(list, "control_port") == 0) @@ -445,7 +447,7 @@ static int altera_tse_probe(struct udevice *dev) priv->sgdma_tx = base; else if (strcmp(list, "s1") == 0) desc_mem = base; - idx += 2; + idx += addrc + sizec; list += (len + 1); } /* decode fifo depth */ -- 2.5.0

2 2

[U-Boot] [PATCH 1/3] nios2: remove CONFIG_SYS_MALLOC_BASE macro
by Thomas Chou 06 Nov '15

06 Nov '15

Remove CONFIG_SYS_MALLOC_BASE macro, as it is not used by the generic board. Signed-off-by: Thomas Chou <thomas(a)wytron.com.tw> --- include/configs/nios2-generic.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/configs/nios2-generic.h b/include/configs/nios2-generic.h index 84faa4c..74c715d 100644 --- a/include/configs/nios2-generic.h +++ b/include/configs/nios2-generic.h @@ -84,8 +84,6 @@ CONFIG_SYS_SDRAM_SIZE - \ CONFIG_SYS_MONITOR_LEN) #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 0x20000) -#define CONFIG_SYS_MALLOC_BASE (CONFIG_SYS_MONITOR_BASE - \ - CONFIG_SYS_MALLOC_LEN) #define CONFIG_SYS_INIT_SP CONFIG_SYS_MALLOC_BASE /* -- 2.5.0

3 9

[U-Boot] SPL: how to compile with SPL?
by 发面 06 Nov '15

06 Nov '15

My u-boot version is 2015.10. I failed when I try to find a way to compile u-boot-spl. I've add the following configurations in configs/smdk2410_defconfig: CONFIG_SPL=y CONFIG_SPL_BUILD=y CONFIG_FRAMEWORK=y but the compiler doesn't recognize it. When I make the project, it still only compile the u-boot without spl. (It seems like spl/u-boot-spl.bin is not added to ALL-y according to "ALL-$(CONFIG_SPL) += spl/u-boot-spl.bin" in Makefile) I still try to do it by 'make menuconfig'. But I can't find the SPL related options in the menu. It will be preciate that someone can offer SPL related documents or some promptions.

1 0

[U-Boot] Ethernet PHY Power Down
by Michael Welling 06 Nov '15

06 Nov '15

I have run into an issue with a KSZ9031 Gigabit Ethernet PHY on an IMX6 module. After booting into Linux and rebooting the ethernet fails consistently. With a bit of investigation I found that the power-down bit in the PHY control register is being set on reboot. => dhcp BOOTP broadcast 1 BOOTP broadcast 2 BOOTP broadcast 3 BOOTP broadcast 4 BOOTP broadcast 5 . . Abort => mii dump 1 0 0. (1940) -- PHY control register -- (8000:0000) 0.15 = 0 reset (4000:0000) 0.14 = 0 loopback (2040:0040) 0. 6,13 = b10 speed selection = 1000 Mbps (1000:1000) 0.12 = 1 A/N enable (0800:0800) 0.11 = 1 power-down (0400:0000) 0.10 = 0 isolate (0200:0000) 0. 9 = 0 restart A/N (0100:0100) 0. 8 = 1 duplex = full (0080:0000) 0. 7 = 0 collision test enable (003f:0000) 0. 5- 0 = 0 (reserved) When I manually toggle the power down bit it starts to work again. => mii write 1 0 1140 => dhcp FEC Waiting for PHY auto negotiation to complete........ done BOOTP broadcast 1 DHCP client bound to address 192.168.0.12 (62 ms) I tried performing the above steps in the PHY driver code with little luck. When I toggle the bit in the code the first dhcp always fails but then it works on subsequent attempts. Any ideas?

1 0

[U-Boot] [PATCH] Fixing timing issue with eMMC on atmel MCI
by Gregory CLEMENT 05 Nov '15

05 Nov '15

Hi, I got similar issues that Marek had: http://lists.denx.de/pipermail/u-boot/2015-October/231420.html. When trying to initialize an eMMC on a SAMA5D4 based board the CPU stuck. However, the fix sent by Marek was not enough for me and after digging in the sources and trying many combinations I found that the culprit was the switch command (CMD 6). A small delay was needed after this command before the next one. The MMC spec seems to confirm that by speaking about waiting 8 clocks after this command. In the following patch I removed the delay introduced by Marek, and instead I added a 8 clocks wait just after the switch command. Marek, could you test it on your board and confirm that it is still work for you? Thanks, Gregory CLEMENT (1): mmc: atmel: Properly fix clock configuration drivers/mmc/gen_atmel_mci.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) -- 2.5.0

2 3

[U-Boot] Pull request: u-boot-video/master
by Anatolij Gustschin 05 Nov '15

05 Nov '15

Hello Tom, The following changes since commit 8168ee38c26be586012743ded262145081d49d05: Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx (2015-11-04 18:30:51 -0500) are available in the git repository at: git://git.denx.de/u-boot-video.git master for you to fetch changes up to 4b6d09449fdeaa5659c5d277bdf133457521e70b: video: Drop DEV_EXT_VIDEO flag (2015-11-05 08:24:42 +0100) ---------------------------------------------------------------- Bin Meng (2): video: Drop DEV_FLAGS_SYSTEM flag video: Drop DEV_EXT_VIDEO flag arch/blackfin/cpu/jtag-console.c | 2 +- arch/powerpc/cpu/mpc8xx/video.c | 1 - board/bf527-ezkit/video.c | 2 -- board/bf533-stamp/video.c | 2 -- board/bf548-ezkit/video.c | 2 -- board/cm-bf548/video.c | 2 -- board/kosagi/novena/novena.c | 2 +- board/mpl/common/kbd.c | 2 +- board/mpl/pati/pati.c | 2 +- common/cmd_console.c | 3 +-- common/stdio.c | 4 ++-- common/usb_kbd.c | 2 +- drivers/input/cros_ec_keyb.c | 2 +- drivers/input/keyboard.c | 2 +- drivers/input/tegra-kbc.c | 2 +- drivers/net/netconsole.c | 2 +- drivers/video/cfb_console.c | 3 +-- include/stdio_dev.h | 2 -- 18 files changed, 13 insertions(+), 26 deletions(-) Please pull. Thanks! Anatolij

2 1