diff options
author | Tom Rini <trini@konsulko.com> | 2016-02-08 14:48:04 (GMT) |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-02-08 14:48:04 (GMT) |
commit | 57dc53a72460e8e301fa1cc7951b41db8e731485 (patch) | |
tree | 856a679e994fdc529a97763e851ed2e546ba3742 /drivers | |
parent | 7b6dc11c1aa69e5cc22d1659f50594edcfab5a9e (diff) | |
parent | 2300184f702656b72394e458bf15f7aaba8af892 (diff) | |
download | u-boot-57dc53a72460e8e301fa1cc7951b41db8e731485.tar.xz |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/block/mvsata_ide.c | 2 | ||||
-rw-r--r-- | drivers/ddr/marvell/axp/ddr3_hw_training.c | 2 | ||||
-rw-r--r-- | drivers/gpio/db8500_gpio.c | 4 | ||||
-rw-r--r-- | drivers/mmc/sh_sdhi.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/fsl_ifc_spl.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/lpc32xx_nand_slc.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/mxc_nand_spl.c | 2 | ||||
-rw-r--r-- | drivers/net/davinci_emac.c | 8 | ||||
-rw-r--r-- | drivers/net/e1000.c | 2 | ||||
-rw-r--r-- | drivers/net/fsl-mc/mc.c | 2 | ||||
-rw-r--r-- | drivers/net/lan91c96.c | 2 | ||||
-rw-r--r-- | drivers/net/ne2000_base.c | 2 | ||||
-rw-r--r-- | drivers/serial/sandbox.c | 2 | ||||
-rw-r--r-- | drivers/serial/serial_bfin.c | 2 | ||||
-rw-r--r-- | drivers/soc/Makefile | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/composite.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/config.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/epautoconf.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/ether.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/gadget_chips.h | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/usbstring.c | 2 | ||||
-rw-r--r-- | drivers/video/video_bmp.c | 2 |
22 files changed, 27 insertions, 25 deletions
diff --git a/drivers/block/mvsata_ide.c b/drivers/block/mvsata_ide.c index 2c6d424..7b6a155 100644 --- a/drivers/block/mvsata_ide.c +++ b/drivers/block/mvsata_ide.c @@ -83,7 +83,7 @@ struct mvsata_port_registers { * Status codes to return to client callers. Currently, callers ignore * exact value and only care for zero or nonzero, so no need to make this * public, it is only #define'd for clarity. - * If/when standard negative codes are implemented in U-boot, then these + * If/when standard negative codes are implemented in U-Boot, then these * #defines should be moved to, or replaced by ones from, the common list * of status codes. */ diff --git a/drivers/ddr/marvell/axp/ddr3_hw_training.c b/drivers/ddr/marvell/axp/ddr3_hw_training.c index a8c5e6a..c8d7041 100644 --- a/drivers/ddr/marvell/axp/ddr3_hw_training.c +++ b/drivers/ddr/marvell/axp/ddr3_hw_training.c @@ -450,7 +450,7 @@ int ddr3_hw_training(u32 target_freq, u32 ddr_width, int xor_bypass, ddr3_set_performance_params(&dram_info); if (dram_info.ecc_ena) { - /* Need to SCRUB the DRAM memory area to load U-boot */ + /* Need to SCRUB the DRAM memory area to load U-Boot */ mv_sys_xor_finish(); dram_info.num_cs = 1; dram_info.cs_ena = 1; diff --git a/drivers/gpio/db8500_gpio.c b/drivers/gpio/db8500_gpio.c index d5cb383..db32db6 100644 --- a/drivers/gpio/db8500_gpio.c +++ b/drivers/gpio/db8500_gpio.c @@ -1,14 +1,14 @@ /* * Code ported from Nomadik GPIO driver in ST-Ericsson Linux kernel code. * The purpose is that GPIO config found in kernel should work by simply - * copy-paste it to U-boot. + * copy-paste it to U-Boot. * * Original Linux authors: * Copyright (C) 2008,2009 STMicroelectronics * Copyright (C) 2009 Alessandro Rubini <rubini@unipv.it> * Rewritten based on work by Prafulla WADASKAR <prafulla.wadaskar@st.com> * - * Ported to U-boot by: + * Ported to U-Boot by: * Copyright (C) 2010 Joakim Axelsson <joakim.axelsson AT stericsson.com> * * This program is free software; you can redistribute it and/or modify diff --git a/drivers/mmc/sh_sdhi.c b/drivers/mmc/sh_sdhi.c index cc62c89..30e538c 100644 --- a/drivers/mmc/sh_sdhi.c +++ b/drivers/mmc/sh_sdhi.c @@ -526,7 +526,7 @@ static int sh_sdhi_start_cmd(struct sh_sdhi_host *host, opc = sh_sdhi_set_cmd(host, data, opc); /* - * U-boot cannot use interrupt. + * U-Boot cannot use interrupt. * So this flag may not be clear by timing */ sh_sdhi_writew(host, SDHI_INFO1, ~INFO1_RESP_END); diff --git a/drivers/mtd/nand/fsl_ifc_spl.c b/drivers/mtd/nand/fsl_ifc_spl.c index fccbfb5..cbeb74a 100644 --- a/drivers/mtd/nand/fsl_ifc_spl.c +++ b/drivers/mtd/nand/fsl_ifc_spl.c @@ -236,7 +236,7 @@ int nand_spl_load_image(uint32_t offs, unsigned int uboot_size, void *vdst) /* * Main entrypoint for NAND Boot. It's necessary that SDRAM is already - * configured and available since this code loads the main U-boot image + * configured and available since this code loads the main U-Boot image * from NAND into SDRAM and starts from there. */ void nand_boot(void) diff --git a/drivers/mtd/nand/lpc32xx_nand_slc.c b/drivers/mtd/nand/lpc32xx_nand_slc.c index 2e5f139..4e1be36 100644 --- a/drivers/mtd/nand/lpc32xx_nand_slc.c +++ b/drivers/mtd/nand/lpc32xx_nand_slc.c @@ -516,7 +516,7 @@ static int lpc32xx_write_page_hwecc(struct mtd_info *mtd, /* * LPC32xx has only one SLC NAND controller, don't utilize * CONFIG_SYS_NAND_SELF_INIT to be able to reuse this function - * both in SPL NAND and U-boot images. + * both in SPL NAND and U-Boot images. */ int board_nand_init(struct nand_chip *lpc32xx_chip) { diff --git a/drivers/mtd/nand/mxc_nand_spl.c b/drivers/mtd/nand/mxc_nand_spl.c index 69b736a..6ac2c96 100644 --- a/drivers/mtd/nand/mxc_nand_spl.c +++ b/drivers/mtd/nand/mxc_nand_spl.c @@ -337,7 +337,7 @@ void nand_boot(void) if (!nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS, CONFIG_SYS_NAND_U_BOOT_SIZE, (uchar *)CONFIG_SYS_NAND_U_BOOT_DST)) { - /* Copy from NAND successful, start U-boot */ + /* Copy from NAND successful, start U-Boot */ uboot = (void *)CONFIG_SYS_NAND_U_BOOT_START; uboot(); } else { diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index 92c3dca..b030498 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c @@ -459,11 +459,11 @@ static int davinci_eth_open(struct eth_device *dev, bd_t *bis) /* Set DMA 8 TX / 8 RX Head pointers to 0 */ addr = &adap_emac->TX0HDP; - for(cnt = 0; cnt < 16; cnt++) + for (cnt = 0; cnt < 8; cnt++) writel(0, addr++); addr = &adap_emac->RX0HDP; - for(cnt = 0; cnt < 16; cnt++) + for (cnt = 0; cnt < 8; cnt++) writel(0, addr++); /* Clear Statistics (do this before setting MacControl register) */ @@ -692,8 +692,10 @@ static int davinci_eth_rcv_packet (struct eth_device *dev) davinci_invalidate_rx_descs(); rx_curr_desc = emac_rx_active_head; + if (!rx_curr_desc) + return 0; status = rx_curr_desc->pkt_flag_len; - if ((rx_curr_desc) && ((status & EMAC_CPPI_OWNERSHIP_BIT) == 0)) { + if ((status & EMAC_CPPI_OWNERSHIP_BIT) == 0) { if (status & EMAC_CPPI_RX_ERROR_FRAME) { /* Error in packet - discard it and requeue desc */ printf ("WARN: emac_rcv_pkt: Error in packet\n"); diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index 2f2185d..196989b 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -5453,7 +5453,7 @@ e1000_initialize(bd_t * bis) for (i = 0; (devno = pci_find_devices(e1000_supported, i)) >= 0; i++) { /* * These will never get freed due to errors, this allows us to - * perform SPI EEPROM programming from U-boot, for example. + * perform SPI EEPROM programming from U-Boot, for example. */ struct eth_device *nic = malloc(sizeof(*nic)); struct e1000_hw *hw = malloc(sizeof(*hw)); diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c index fdbd584..53c4966 100644 --- a/drivers/net/fsl-mc/mc.c +++ b/drivers/net/fsl-mc/mc.c @@ -455,7 +455,7 @@ int mc_init(u64 mc_fw_addr, u64 mc_dpc_addr) /* * Management Complex cores should be held at reset out of POR. - * U-boot should be the first software to touch MC. To be safe, + * U-Boot should be the first software to touch MC. To be safe, * we reset all cores again by setting GCR1 to 0. It doesn't do * anything if they are held at reset. After we setup the firmware * we kick off MC by deasserting the reset bit for core 0, and diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c index c4dd01e..3526876 100644 --- a/drivers/net/lan91c96.c +++ b/drivers/net/lan91c96.c @@ -1,7 +1,7 @@ /*------------------------------------------------------------------------ * lan91c96.c * This is a driver for SMSC's LAN91C96 single-chip Ethernet device, based - * on the SMC91111 driver from U-boot. + * on the SMC91111 driver from U-Boot. * * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> diff --git a/drivers/net/ne2000_base.c b/drivers/net/ne2000_base.c index 887cfd9..71d133c 100644 --- a/drivers/net/ne2000_base.c +++ b/drivers/net/ne2000_base.c @@ -650,7 +650,7 @@ dp83902a_poll(void) } -/* U-boot specific routines */ +/* U-Boot specific routines */ static u8 *pbuf = NULL; static int pkey = -1; diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c index 45dff98..58f882b 100644 --- a/drivers/serial/sandbox.c +++ b/drivers/serial/sandbox.c @@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR; /* * * serial_buf: A buffer that holds keyboard characters for the - * Sandbox U-boot. + * Sandbox U-Boot. * * invariants: * serial_buf_write == serial_buf_read -> empty buffer diff --git a/drivers/serial/serial_bfin.c b/drivers/serial/serial_bfin.c index 0443b84..1d5be2a 100644 --- a/drivers/serial/serial_bfin.c +++ b/drivers/serial/serial_bfin.c @@ -1,5 +1,5 @@ /* - * U-boot - serial.c Blackfin Serial Driver + * U-Boot - serial.c Blackfin Serial Driver * * Copyright (c) 2005-2008 Analog Devices Inc. * diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile index 99345eb..69f680c 100644 --- a/drivers/soc/Makefile +++ b/drivers/soc/Makefile @@ -1,5 +1,5 @@ # -# Makefile for the U-boot SOC specific device drivers. +# Makefile for the U-Boot SOC specific device drivers. # # SPDX-License-Identifier: GPL-2.0+ # diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index a13b21d..60f9272 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -2,7 +2,7 @@ * composite.c - infrastructure for Composite USB Gadgets * * Copyright (C) 2006-2008 David Brownell - * U-boot porting: Lukasz Majewski <l.majewski@samsung.com> + * U-Boot porting: Lukasz Majewski <l.majewski@samsung.com> * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/drivers/usb/gadget/config.c b/drivers/usb/gadget/config.c index 014a679..64284b0 100644 --- a/drivers/usb/gadget/config.c +++ b/drivers/usb/gadget/config.c @@ -5,7 +5,7 @@ * * SPDX-License-Identifier: GPL-2.0+ * - * Ported to U-boot by: Thomas Smits <ts.smits@gmail.com> and + * Ported to U-Boot by: Thomas Smits <ts.smits@gmail.com> and * Remy Bohmer <linux@bohmer.net> */ diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c index 6ddbe83..a53a6dc 100644 --- a/drivers/usb/gadget/epautoconf.c +++ b/drivers/usb/gadget/epautoconf.c @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: GPL-2.0+ * - * Ported to U-boot by: Thomas Smits <ts.smits@gmail.com> and + * Ported to U-Boot by: Thomas Smits <ts.smits@gmail.com> and * Remy Bohmer <linux@bohmer.net> */ diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index cfe9a24..9b06f02 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -256,7 +256,7 @@ static inline int BITRATE(struct usb_gadget *g) #if defined(CONFIG_USBNET_MANUFACTURER) static char *iManufacturer = CONFIG_USBNET_MANUFACTURER; #else -static char *iManufacturer = "U-boot"; +static char *iManufacturer = "U-Boot"; #endif /* These probably need to be configurable. */ diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h index e9811c3..973cd97 100644 --- a/drivers/usb/gadget/gadget_chips.h +++ b/drivers/usb/gadget/gadget_chips.h @@ -11,7 +11,7 @@ * Some are available on 2.4 kernels; several are available, but not * yet pushed in the 2.6 mainline tree. * - * Ported to U-boot by: Thomas Smits <ts.smits@gmail.com> and + * Ported to U-Boot by: Thomas Smits <ts.smits@gmail.com> and * Remy Bohmer <linux@bohmer.net> */ #ifdef CONFIG_USB_GADGET_NET2280 diff --git a/drivers/usb/gadget/usbstring.c b/drivers/usb/gadget/usbstring.c index 8c3ff64..3e24fbf 100644 --- a/drivers/usb/gadget/usbstring.c +++ b/drivers/usb/gadget/usbstring.c @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: LGPL-2.1+ * - * Ported to U-boot by: Thomas Smits <ts.smits@gmail.com> and + * Ported to U-Boot by: Thomas Smits <ts.smits@gmail.com> and * Remy Bohmer <linux@bohmer.net> */ diff --git a/drivers/video/video_bmp.c b/drivers/video/video_bmp.c index c9075d6..fb7943e 100644 --- a/drivers/video/video_bmp.c +++ b/drivers/video/video_bmp.c @@ -194,7 +194,7 @@ int video_bmp_display(struct udevice *dev, ulong bmp_image, int x, int y, { struct video_priv *priv = dev_get_uclass_priv(dev); ushort *cmap_base = NULL; - ushort i, j; + int i, j; uchar *fb; struct bmp_image *bmp = map_sysmem(bmp_image, 0); uchar *bmap; |