Viktar Palstsiuk [Tue, 26 Nov 2013 11:30:26 +0000 (14:30 +0300)]
davinci: fix Master Priority Registers location
MSTPRI0 (Master Priority 0 Register) sits at 0x01C14110 not at
0x01C14114
Signed-off-by: Viktar Palstsiuk <viktar.palstsiuk@promwad.com>
Stefan Roese [Fri, 22 Nov 2013 11:56:29 +0000 (12:56 +0100)]
arm: am335x: Add DT (FDT) support to Siemens boards
Enable FDT support for all Siemens AM335x boards. To support
newer Linux kernels with DT booting.
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Heiko Schocher <hs@denx.de>
Cc: Roger Meier <r.meier@siemens.com>
Cc: Lukas Stockmann <lukas.stockmann@siemens.com>
Cc: Tom Rini <trini@ti.com>
Acked-by: Heiko Schocher<hs@denx.de>
Tom Rini [Mon, 18 Nov 2013 15:36:23 +0000 (10:36 -0500)]
am335x_evm: Update nandboot to use partitions and DT
Signed-off-by: Tom Rini <trini@ti.com>
Michael Trimarchi [Mon, 18 Nov 2013 14:06:21 +0000 (15:06 +0100)]
arm: omap3: Add uart4 omap3 adddress
This patch add the OMAP34XX_UART4 memory address
Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
Lokesh Vutla [Thu, 14 Nov 2013 06:01:51 +0000 (11:31 +0530)]
ARM: OMAP5+: Remove unnecessary EFUSE settings
Certain EFUSE settings were recommended for the first
four lots of OMAP5 ES1.0 silicon. These are not applicable
for OMAP5 ES2.0 and DRA7 silicon. So removing these EFUSE settings.
Reported-by: Griffis, Brad <bgriffis@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Roger Quadros [Mon, 11 Nov 2013 14:56:44 +0000 (16:56 +0200)]
ARM: dra7_evm: Add SATA support
The evm has a SATA port. Enable SATA configuration and
inititialize the SATA controller.
Signed-off-by: Roger Quadros <rogerq@ti.com>
Roger Quadros [Mon, 11 Nov 2013 14:56:43 +0000 (16:56 +0200)]
ARM: DRA7xx: Add PRCM and Control information for SATA
Adds the necessary PRCM and Control register information for
SATA on DRA7xx.
Signed-off-by: Roger Quadros <rogerq@ti.com>
Roger Quadros [Mon, 11 Nov 2013 14:56:42 +0000 (16:56 +0200)]
ARM: omap5_uevm: Add SATA support
The uevm has a SATA port. Inititialize the SATA controller.
Signed-off-by: Roger Quadros <rogerq@ti.com>
Roger Quadros [Mon, 11 Nov 2013 14:56:41 +0000 (16:56 +0200)]
ARM: OMAP5: Add SATA platform glue
Add platform glue logic for the SATA controller.
Signed-off-by: Roger Quadros <rogerq@ti.com>
Roger Quadros [Mon, 11 Nov 2013 14:56:40 +0000 (16:56 +0200)]
ARM: OMAP5: Add PRCM and Control information for SATA
Adds the necessary PRCM and Control register information for
SATA on OMAP5.
Signed-off-by: Roger Quadros <rogerq@ti.com>
Roger Quadros [Mon, 11 Nov 2013 14:56:39 +0000 (16:56 +0200)]
ARM: OMAP5: Add Pipe3 PHY driver
Pipe3 PHY is used by SATA, USB3 and PCIe modules. This is
a driver for the Pipe3 PHY.
Signed-off-by: Roger Quadros <rogerq@ti.com>
Roger Quadros [Mon, 11 Nov 2013 14:56:38 +0000 (16:56 +0200)]
ahci: Fix cache align error messages
Align the ATA ID buffer to the cache-line boundary. This gets rid
of the below error mesages on ARM v7 platforms.
scanning bus for devices...
ERROR: v7_dcache_inval_range - start address is not aligned - 0xfee48618
ERROR: v7_dcache_inval_range - stop address is not aligned - 0xfee48818
CC: Aneesh V <aneesh@ti.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Roger Quadros [Mon, 11 Nov 2013 14:56:37 +0000 (16:56 +0200)]
ahci: Error out with message on malloc() failure
If malloc() fails, we don't want to continue in ahci_init() and
ahci_init_one(). Also print a more informative error message on
malloc() failures.
CC: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
SRICHARAN R [Fri, 8 Nov 2013 12:10:38 +0000 (17:40 +0530)]
ARM: DRA7/OMAP5: EMIF: Add workaround for bug 0039
When core power domain hits oswr, then DDR3 memories does not come back
while resuming. This is because when EMIF registers are lost, then the
controller takes care of copying the values from the shadow registers.
If the shadow registers are not updated with the right values, then this
results in incorrect settings while resuming. So updating the shadow registers
with the corresponding status registers here during the boot.
Signed-off-by: Sricharan R <r.sricharan@ti.com>
SRICHARAN R [Fri, 8 Nov 2013 12:10:37 +0000 (17:40 +0530)]
ARM: DRA: EMIF: Change DDR3 settings to use hw leveling
Currently the DDR3 memory on DRA7 ES1.0 evm board is enabled using
software leveling. This was done since hardware leveling was not
working. Now that the right sequence to do hw leveling is identified,
use it. This is required for EMIF clockdomain to idle and come back
during lowpower usecases.
Signed-off-by: Sricharan R <r.sricharan@ti.com>
SRICHARAN R [Fri, 8 Nov 2013 12:10:36 +0000 (17:40 +0530)]
ARM: DRA7: Add is_dra7xx cpu check definition
A generic is_dra7xx cpu check is useful for grouping
all the revisions under that. This is used in the
subsequent patches.
Signed-off-by: Sricharan R <r.sricharan@ti.com>
Tom Rini [Thu, 7 Nov 2013 16:42:57 +0000 (11:42 -0500)]
am33xx: Stop modifying certain EMIF4D registers
Based on the definitive guide to EMIF configuration[1] certain registers
that we have been modifying (and are documented registers) should be
left in their reset values rather than modified. This has been tested
on AM335x GP EVM and Beaglebone White.
[1]: http://processors.wiki.ti.com/index.php/AM335x_EMIF_Configuration_tips
Cc: Enric Balletbo i Serra <eballetbo@iseebcn.com>
Cc: Javier Martinez Canillas <javier@dowhile0.org>
Cc: Heiko Schocher <hs@denx.de>
Cc: Lars Poeschel <poeschel@lemonage.de>
Signed-off-by: Tom Rini <trini@ti.com>
Tested-by: Matt Porter <matt.porter@linaro.org>
Oleg Kosheliev [Tue, 8 Oct 2013 12:49:56 +0000 (15:49 +0300)]
ARMV7: OMAP4: Add twl6032 support
Added chip type detection and twl6032
support in the battery control
and charge functions.
Based on Balaji T K <balajitk@ti.com> patches for TI u-boot.
Signed-off-by: Oleg Kosheliev <oleg.kosheliev@ti.com>
Oleg Kosheliev [Tue, 8 Oct 2013 12:49:55 +0000 (15:49 +0300)]
ARMV7: OMAP4: Add struct for twl603x data
The data struct is used to support different
PMIC chip types. It contains the chip type and
the data (e.g. registers addresses, adc multiplier)
which is different for twl6030 and twl6032.
Replaced some hardcoded values with the
structure vars.
Based on Balaji T K <balajitk@ti.com> patches for TI u-boot.
Signed-off-by: Oleg Kosheliev <oleg.kosheliev@ti.com>
Lubomir Popov [Wed, 20 Nov 2013 13:32:17 +0000 (15:32 +0200)]
ARM: OMAP4: Fix bug in omap4470_volts struct
The struct incorrectly referenced SMPS1 for all three power
domains. Fixed this by using SMPS2 and SMPS5 as appropriate.
Add some comments and choose voltage values that correspond
to voltage selection codes.
Signed-off-by: Lubomir Popov <l-popov@ti.com>
Lars Poeschel [Tue, 19 Nov 2013 10:22:18 +0000 (11:22 +0100)]
pcm051: Support for revision 3
Phytec sells revision or version 3 of pcm051. It is labeled 1358.3 on
the board. The difference for u-boot is that is has other DDR3 RAM on it:
1 x MT41K256M16HA125E instead of 2 x MT41J256M8HX15E on revisions 1 and
2. Both configurations are 512 MiB.
Configure your u-boot build with pcm051_rev3 for the new RAM and
pcm051_rev1 for the old RAM configuration. Board revision 2 has to use
pcm051_rev1 also.
Signed-off-by: Lars Poeschel <poeschel@lemonage.de>
Ilya Ledvich [Thu, 7 Nov 2013 05:57:35 +0000 (07:57 +0200)]
cm_t335: add support for pca9555 i2c gpio extender
Add support for the 16 bits pca9555 i2c to gpio extender featured
by the SB-T335 baseboard.
Signed-off-by: Ilya Ledvich <ilya@compulab.co.il>
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Ilya Ledvich [Thu, 7 Nov 2013 05:57:34 +0000 (07:57 +0200)]
cm_t335: add support for status LED
Add support for status LED. Use the STATUS_LED APIs for indicating a
boot progress.
Signed-off-by: Ilya Ledvich <ilya@compulab.co.il>
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Ilya Ledvich [Thu, 7 Nov 2013 05:57:33 +0000 (07:57 +0200)]
cm_t335: add cm_t335 board support
Add cm_t335 board directory, config file. Enable build.
Signed-off-by: Ilya Ledvich <ilya@compulab.co.il>
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
[trini: Adapt Makefile]
Signed-off-by: Tom Rini <trini@ti.com>
Chin Liang See [Mon, 2 Dec 2013 18:01:39 +0000 (12:01 -0600)]
socfpga: Adding Freeze Controller driver
Adding Freeze Controller driver. All HPS IOs need to be
in freeze state during pin mux or IO buffer configuration.
It is to avoid any glitch which might happen
during the configuration from propagating to external devices.
Signed-off-by: Chin Liang See <clsee@altera.com>
Cc: Wolfgang Denk <wd@denx.de>
CC: Pavel Machek <pavel@denx.de>
Cc: Dinh Nguyen <dinguyen@altera.com>
Cc: Tom Rini <trini@ti.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Albert ARIBAUD [Mon, 2 Dec 2013 15:00:10 +0000 (16:00 +0100)]
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
Jens Scharsig (BuS Elektronik) [Fri, 29 Nov 2013 10:35:16 +0000 (11:35 +0100)]
arm: atmel: eb_cpux9k2: config clean up
* remove mature defines from board config
Signed-off-by: Jens Scharsig (BuS Elektronik) <esw@bus-elektronik.de>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Bo Shen [Wed, 20 Nov 2013 03:17:16 +0000 (11:17 +0800)]
arm: atmel: sam9m10g45ek: let CONFIG_SYS_NO_FLASH at proper position
In config_cmd_default.h, it will use CONFIG_SYS_NO_FLASH to decide
whether include CONFIG_CMD_FLASH and CONFIG_CMD_IMLS. So, if the
CONFIG_SYS_NO_FLASH defined later than include/config_cmd_default.h,
These two commands will be included always.
So move CONFIG_SYS_NO_FLASH definition to proper position.
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Heiko Schocher [Mon, 18 Nov 2013 07:07:23 +0000 (08:07 +0100)]
arm926ejs, at91: add common phy_reset function
add common phy reset code into a common function.
Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Andreas Bießmann <andreas.devel@googlemail.com>
Cc: Bo Shen <voice.shen@atmel.com>
Cc: Jens Scharsig <esw@bus-elektronik.de>
Cc: Sergey Lapin <slapin@ossfans.org>
Cc: Stelian Pop <stelian@popies.net>
Cc: Albin Tonnerre <albin.tonnerre@free-electrons.com>
Cc: Eric Benard <eric@eukrea.com>
Cc: Markus Hubig <mhubig@imko.de>
Acked-by: Jens Scharsig (BuS Elektronik) <esw@bus-elektronik.de>
Tested-by: Jens Scharsig (BuS Elektronik) <esw@bus-elektronik.de>
Tested-by: Bo Shen <voice.shen@atmel.com>
Acked-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Bo Shen [Fri, 15 Nov 2013 03:12:38 +0000 (11:12 +0800)]
arm: atmel: sama5d3: spl boot from fat fs SD card
Enable Atmel sama5d3xek boart spl boot support, which can load u-boot
from SD card with FAT file system.
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Bo Shen [Fri, 15 Nov 2013 03:12:37 +0000 (11:12 +0800)]
arm: atmel: add ddr2 initialization function
The MPDDRC supports different type of SDRAM
This patch add ddr2 initialization function
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Bo Shen [Fri, 15 Nov 2013 03:12:36 +0000 (11:12 +0800)]
arm: atmel: sama5d3: early enable PIO peripherals
Enable the PIO peripherals early than other peripherals.
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Bo Shen [Fri, 15 Nov 2013 03:12:35 +0000 (11:12 +0800)]
arm: atmel: sama5d3: the offset of MULA is 18
The offset of MULA field in PLLA register in sama5d3 is 18,
and the length only 7 bits.
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Bo Shen [Fri, 15 Nov 2013 03:12:34 +0000 (11:12 +0800)]
arm: atmel: sama5d3: correct the error define of DIV
Correct the error define of DIV.
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Bo Shen [Fri, 15 Nov 2013 03:12:33 +0000 (11:12 +0800)]
arm: at91: pm9261: remove undefined bit in mckr
The PLLADIV2 bit is not defined in at91sam9261 SoC, so remove it.
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Bo Shen [Fri, 15 Nov 2013 03:12:32 +0000 (11:12 +0800)]
arm: atmel: sama5d3: correct the ID for DBGU and PIT
As the DBGU and PIT has its own ID on sama5d3 SoC, while not share
with SYS ID. So, correct them.
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Albert ARIBAUD [Fri, 22 Nov 2013 09:19:35 +0000 (10:19 +0100)]
Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'
Wu, Josh [Tue, 5 Nov 2013 07:07:46 +0000 (15:07 +0800)]
ARM: at91: sama5d3: add support for sama5d36 chip
The SAMA5D36 chip is the superset product of SAMA5D3x family.
For detail information please refer to:
http://www.atmel.com/Microsite/sama5d3/default.aspx
Signed-off-by: Josh Wu <josh.wu@atmel.com>
Acked-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Andreas Bießmann [Wed, 30 Oct 2013 14:18:22 +0000 (15:18 +0100)]
at91: remove all occourances of CONFIG_AT91_LEGACY
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Andreas Bießmann [Wed, 30 Oct 2013 14:18:21 +0000 (15:18 +0100)]
net: remove unused CONFIG_AT91_LEGACY
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Andreas Bießmann [Wed, 30 Oct 2013 14:18:20 +0000 (15:18 +0100)]
snapper9260: remove unused AT91_LEGACY
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Andreas Bießmann [Wed, 30 Oct 2013 14:18:19 +0000 (15:18 +0100)]
at91sam9m10g45ek: remove unused CONFIG_AT91_LEGACY
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Acked-by: Bo Shen <voice.shen@atmel.com>
Andreas Bießmann [Wed, 30 Oct 2013 14:18:18 +0000 (15:18 +0100)]
i2c: switch from AT91 legacy to ATMEL legacy
Since the required API is gpio which is enclosed with CONFIG_ATMEL_LEGACY use
that switch here.
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Acked-by: Heiko Schocher <hs@denx.de>
Andreas Bießmann [Wed, 30 Oct 2013 14:18:17 +0000 (15:18 +0100)]
video: remove AT91 legacy API from bus_vcxk
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Acked-by: Jens Scharsig (BuS Elektronik) <esw@bus-elektronik.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
Samuel Egli [Mon, 4 Nov 2013 13:05:03 +0000 (14:05 +0100)]
arm, am335x: update for the siemens boards
- dxr2: define unused pins as input
- do not enable RTC32K OSC on dxr2 board
- update default environment
- add splashpos=m,m to default environment, so splash screen is always
centered.
- adapt environment for bootcount feature
- add altbootcmd to default environment
- rut: SPL add early reset pulse for eth-phy, maXTouch and display
- rut: display timing aenderungen
- siemens boards: adapt for background color = white
- add boutcount feature for the siemens boards
store the bootcount in the environment, as we have no softreset
save registers on this hardware. Use therefore the CONFIG_BOOTCOUNT_ENV
bootcount driver.
- change spi mode from 3 to 0 for the lcd init
- add gpio pin for lcd reset with state 0 and add mdelay
- siemens boards: use own USB id's
- add dfu serial and device number for siemens boards
Add for the siemens boards the possibility to define in dfu mode,
the iSerialNumber and the bcdDevice fields in the USB Device
descriptor.
- fix upgrade mechanism based on bootcount
Correct location of saveenv and remove not active variable.
Add CONFIG_BOOT_RETRY_TIME and CONFIG_RESET_TO_RETRY to
reboot board in case of empty kernel partition. Without
these defines an empty kernel partition leads to an
abort of boot process and one remains in u-boot prompt.
- general cleanup of dxr2, pxm2 and rut boards
all:
* Remove net boot from bootcmd
Ping can cause a crash on boards without ethernet phy.
net_nfs command is used only for development
* Add reset at the end of bootcmd
In order to have an immediate reset of the boot when bootcmd
fails, add reset at the end of bootcmd.
rut:
* add nand_img_size
dxr2:
* update nand_img_size
* ddr3 timings updated with iocontrol property that can be
modified via eeprom. New default parameters from software
leveling with draco ES2.
Signed-off-by: Samuel Egli <samuel.egli@siemens.com>
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Roger Meier <r.meier@siemens.com>
Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Matthias Michel <matthias.michel@siemens.com>
Cc: Tom Rini <trini@ti.com>
Heiko Schocher [Mon, 4 Nov 2013 13:05:02 +0000 (14:05 +0100)]
usb, g_dnl: make bcdDevice value configurable
add the possibility to set the bcdDevice number board specific.
Therefore the weak function g_dnl_get_board_bcd_device_number()
is introduced. Used on the siemens boards.
Signed-off-by: Heiko Schocher <hs@denx.de>
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Tom Rini [Mon, 11 Nov 2013 17:09:10 +0000 (12:09 -0500)]
omap730p2: Remove board
Signed-off-by: Tom Rini <trini@ti.com>
Tom Rini [Fri, 8 Nov 2013 18:53:14 +0000 (13:53 -0500)]
am33xx: Make SoC bootcount driver have its own symbol
Some am33xx boards may not use the RTC block for bootcount (as it may
not be wired up for the board) and use some other facility. So add
another symbol for the bootcount driver for the IP block.
Acked-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Tom Rini <trini@ti.com>
Igor Grinberg [Wed, 6 Nov 2013 14:39:47 +0000 (16:39 +0200)]
cm-t35: use gpio_led driver for status led
Switch to using the generic gpio_led driver instead of the private to
cm_t35 board led implementation.
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Tested-by: Nikita Kiryanov <nikita@compulab.co.il>
Andrew Bradford [Mon, 4 Nov 2013 20:42:52 +0000 (15:42 -0500)]
am335x_evm: Fix CONS_INDEX numbering
Commit
f6d1f6e4a58edae4776937647381a43fea5e83a5 broke selection of UARTs
other than UART0 for am335x_evm configurations by setting CONS_INDEX to
1 for all configurations. Revert the CONS_INDEX changes.
Signed-off-by: Andrew Bradford <andrew@bradfordembedded.com>
Matt Porter [Mon, 4 Nov 2013 20:31:15 +0000 (15:31 -0500)]
boards.cfg: update email address for ti814x_evm maintainer
Update my email address as ti814x_evm maintainer to save
people some frustrating bounces and non-response.
Signed-off-by: Matt Porter <matt.porter@linaro.org>
Heiko Schocher [Mon, 4 Nov 2013 13:05:00 +0000 (14:05 +0100)]
arm, am33x: make RTC32K OSC enable configurable
As
http://www.denx.de/wiki/view/U-Boot/DesignPrinciples#2_Keep_it_Fast
states:
"Initialize devices only when they are needed within U-Boot"
enable the RTC32K OSC only, if CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC is
enabled. Enable this in ti_am335x_common.h, so all boards in mainline
should work as before.
Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Tom Rini <trini@ti.com>
Heiko Schocher [Mon, 4 Nov 2013 13:04:59 +0000 (14:04 +0100)]
bootcount: store bootcount var in environment
If no softreset save registers are found on the hardware
"bootcount" is stored in the environment. To prevent a
saveenv on all reboots, the environment variable
"upgrade_available" is introduced. If "upgrade_available" is
0, "bootcount" is always 0 therefore no need to save the
environment on u-boot boot, if "upgrade_available" is 1 "bootcount"
is incremented in the environment and environment gets written
on u-boot start.
So the Userspace Applikation must set the "upgrade_available"
and "bootcount" variable to 0 (for example with fw_setenv),
if a boot was successfully.
Signed-off-by: Heiko Schocher <hs@denx.de>
Albert ARIBAUD [Sat, 9 Nov 2013 11:51:47 +0000 (12:51 +0100)]
Merge branch 'iu-boot/master' into 'u-boot-arm/master'
Conflicts:
arch/arm/cpu/arm926ejs/mxs/Makefile
board/compulab/cm_t35/Makefile
board/corscience/tricorder/Makefile
board/ppcag/bg0900/Makefile
drivers/bootcount/Makefile
include/configs/omap4_common.h
include/configs/pdnb3.h
Makefile conflicts are due to additions/removals of
object files on the ARM branch vs KBuild introduction
on the main branch. Resolution consists in adjusting
the list of object files in the main branch version.
This also applies to two files which are not listed
as conflicting but had to be modified:
board/compulab/common/Makefile
board/udoo/Makefile
include/configs/omap4_common.h conflicts are due to
the OMAP4 conversion to ti_armv7_common.h on the ARM
side, and CONFIG_SYS_HZ removal on the main side.
Resolution is to convert as this icludes removal of
CONFIG_SYS_HZ.
include/configs/pdnb3.h is due to a removal on ARM side.
Trivial resolution is to remove the file.
Note: 'git show' will also list two files just because
they are new:
include/configs/am335x_igep0033.h
include/configs/omap3_igep00x0.h
Tom Rini [Fri, 8 Nov 2013 20:25:29 +0000 (15:25 -0500)]
Merge branch 'master' of git://denx.de/git/u-boot-usb
Rob Herring [Fri, 8 Nov 2013 14:40:44 +0000 (08:40 -0600)]
sandbox: convert to common time functions
Convert sandbox to use common time functions.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Rob Herring [Fri, 8 Nov 2013 14:40:43 +0000 (08:40 -0600)]
time: add weak annotation to timer_read_counter declaration
A weak annotation is needed in order to prevent link errors when
get_ticks is overridden. This fixes sandbox build.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Suriyan Ramasami [Wed, 16 Oct 2013 16:54:24 +0000 (09:54 -0700)]
netconsole loses 2nd character of input
Netconsole loses the second character when used as input by
either setenv stdin nc or setenv stdin serial,nc if using CONSOLE_CONSOLE_MUX
Before a nc_send_packet() to echo the input, a check is done to see if
nc_ether is valid. If its not, it waits for an arp request and then sends
the packet (which contains the first character of line to be displayed as
output). As part of reaping the arp request, the second character is consumed.
We protect this by making the call to NetLoop(NETCONS) between
input_recursion.
Signed-off-by: Suriyan Ramasami <suriyan.r@gmail.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Axel Lin [Wed, 16 Oct 2013 01:47:13 +0000 (09:47 +0800)]
serial: s5p: Staticize local functions
Staticize local functions in s5p serial driver.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Minkyu Kang <mk7.kang@samsung.com>
Pierre Aubert [Tue, 8 Oct 2013 12:20:27 +0000 (14:20 +0200)]
env: fix the env export varname
The env export command doesn't export the first variable of the list
since commit
5a31ea04c9ee5544fbb70ad7597ea4b294840eab
"env grep" - reimplement command using hexport_r()
Signed-off-by: Pierre Aubert <p.aubert@staubli.com>
Mark Langsdorf [Tue, 10 Sep 2013 20:20:24 +0000 (15:20 -0500)]
highbank: set AUTOBOOT_KEYED_CTRLC config option
Let highbank users break into the autoboot script with ctrl-c.
Signed-off-by: Mark Langsdorf <mark.langsdorf@calxeda.com>
Mark Langsdorf [Tue, 10 Sep 2013 20:20:23 +0000 (15:20 -0500)]
autoboot: add an option to override keyed autoboot
As originally implemented, setting the AUTOBOOT_KEYED config option will
prevent users from breaking into the autoboot script with ctrl-c. Restore
that option with a new config symbol.
Signed-off-by: Mark Langsdorf <mark.langsdorf@calxeda.com>
Axel Lin [Wed, 16 Oct 2013 01:45:56 +0000 (09:45 +0800)]
serial: xuartlite: Staticize local functions
Staticize local functions in xuartlite driver.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Stefan Roese <sr@denx.de>
Tested-by: Michal Simek <monstr@monstr.eu>
Axel Lin [Tue, 15 Oct 2013 02:52:35 +0000 (10:52 +0800)]
serial: mxs_auart: Staticize local functions
Staticize local functions in mxs_auart driver.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Marek Vasut <marex@denx.de>
Piotr Wilczek [Fri, 11 Oct 2013 13:43:33 +0000 (15:43 +0200)]
fs:fat: fix set file name function
Curently memcpy copies string without null terminating char because
function strlen returns only number of characters excluding
null terminating character. Replace memcpy with strcpy.
Signed-off-by: Piotr Wilczek <p.wilczek@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
CC: Tom Rini <trini@ti.com>
Luka Perkov [Wed, 9 Oct 2013 23:32:28 +0000 (01:32 +0200)]
cmd_zfs: normalize 'file not found' errors
Signed-off-by: Luka Perkov <luka@openwrt.org>
Luka Perkov [Wed, 9 Oct 2013 23:32:27 +0000 (01:32 +0200)]
cmd_reiser: normalize 'file not found' errors
Signed-off-by: Luka Perkov <luka@openwrt.org>
Tim Harvey [Wed, 9 Oct 2013 23:32:26 +0000 (01:32 +0200)]
cmd_ubifs: normalize 'file not found' errors
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Masahiro Yamada [Mon, 7 Oct 2013 07:04:18 +0000 (16:04 +0900)]
include: delete include/linux/config.h
Linux Kernel abolished include/linux/config.h long time ago.
(around version v2.6.18..v2.6.19)
We don't need to provide Linux copatibility any more.
This commit deletes include/linux/config.h
and fixes source files not to include this.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Egbert Eich [Fri, 4 Oct 2013 17:44:07 +0000 (19:44 +0200)]
config/sandbox: Add EFI and GPT support
Signed-off-by: Egbert Eich <eich@suse.com>
Egbert Eich [Fri, 4 Oct 2013 17:42:53 +0000 (19:42 +0200)]
config: Define HAVE_BLOCK_DEVICE when CONFIG_CMD_GPT is set
Signed-off-by: Egbert Eich <eich@suse.com>
Egbert Eich [Fri, 4 Oct 2013 16:53:04 +0000 (18:53 +0200)]
cmd/gpt: Support gpt command for all devices
The gpt command was only implemented for mmc devices. There is no reason
why this command should not be generalized and be applied all other
storage device classes.
This change both simplifies the implementation and eliminates a
build failure for systems that don't support mmcs.
Signed-off-by: Egbert Eich <eich@suse.com>
Tested-by: Piotr Wilczek <p.wilczek@samsung.com>
[trini: Change coding style slightly]
Signed-off-by: Tom Rini <trini@ti.com>
Masahiro Yamada [Tue, 24 Sep 2013 01:32:06 +0000 (10:32 +0900)]
cosmetic: UDM-net: clean up the remainders of dead driver
This commit omits non-existing drivers/net/netarm_eth.c from the list.
This driver is deleted by commit
b411eb30f.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Masahiro Yamada [Tue, 24 Sep 2013 01:32:05 +0000 (10:32 +0900)]
cosmetic: UDM-serial: clean up the remainders of dead driver
The following serial drivers do not exist any more.
- ns9750_serial.c: deleted by commit
4cfc611b4
- s3c4510b_uart.c: deleted by commit
afad40299
- serial_clps7111.c: deleted by commit
f2e080156
- serial_netarm.c: deleted by commit
b411eb30f
This commit cleans up UDM-serial.txt.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Masahiro Yamada [Tue, 24 Sep 2013 01:32:04 +0000 (10:32 +0900)]
cosmetic: doc: driver-model: Do not number driver lists
Everytime a dead driver is removed from the list,
we must re-number. This is a painful task.
Try
git show
e53232250 -- doc/driver-model/UDM-serial.txt
git show
6f62f4207 -- doc/driver-model/UDM-serial.txt
git show
b9f4bc34a -- doc/driver-model/UDM-serial.txt
to see what I mean.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Bo Shen [Thu, 7 Nov 2013 06:29:41 +0000 (14:29 +0800)]
usb: dfu: make nand upload working
Nowhere pass a value to len, which always 0, make no transfer which
cause uploading failed.
This patch make nand upload working. However it needs enough malloc
buffer to store read data, that means the buffer at least equal to
the upload partition size, or else it doesn't work.
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Heiko Schocher [Mon, 4 Nov 2013 13:05:01 +0000 (14:05 +0100)]
usb, g_dnl: make iSerialNumber board configurable
add the possibility to set the iSerialNumber board specific.
Default value for iSerialNumber is 0x0. This value can
changed board specific through the new function
g_dnl_set_serialnumber() which must be called from the
board specific function g_dnl_bind_fixup().
Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>
Bo Shen [Wed, 16 Oct 2013 09:26:38 +0000 (17:26 +0800)]
usb: dfu: correct dfu buffer inited value
After dfu buffer is initialized, the buffer should be all available,
while not 0. Initialize its value to min(dfu_buf_size, dfu->r_left).
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Bo Shen [Wed, 16 Oct 2013 09:26:37 +0000 (17:26 +0800)]
usb: dfu: decrease dfu->r_left along with the transfer
The value of dfu->r_left need decrease along with the transfer
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Mateusz Kulikowski [Wed, 23 Oct 2013 18:26:27 +0000 (20:26 +0200)]
usb: ohci-hcd: submit_common_msg: report actual_length properly
submit_common_msg should report amount of data passed from/to device.
Instead, it always returned size requested by Host.
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Przemyslaw Marczak [Wed, 23 Oct 2013 12:30:46 +0000 (14:30 +0200)]
usb: ums: add ums exit feature by ctrl+c or by detach usb cable
This patch allows exiting from UMS mode to u-boot prompt
by detaching usb cable or by pressing ctrl+c.
Add new config: CONFIG_USB_CABLE_CHECK. If defined then board
file should provide function: usb_cable_connected() (include/usb.h)
that return 1 if cable is connected and 0 otherwise.
Changes v2:
- add a note to the README
Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Cc: Marek Vasut <marex@denx.de>
Przemyslaw Marczak [Wed, 23 Oct 2013 12:30:45 +0000 (14:30 +0200)]
usb: ums: move ums code from trats to Samsung common directory
UMS init was implemented in trats board file but mostly it comprises
common code. Due to that it has been moved to common/ums.c to avoid
code duplication in the future.
Changes:
- move ums initialization code from trats to common/ums.c
- remove unused CONFIG_USB_GADGET_MASS_STORAGE from trats.h
Changes v2:
- move this patch at the top of code cleanups patches
Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Przemyslaw Marczak [Wed, 23 Oct 2013 12:30:44 +0000 (14:30 +0200)]
usb: ums: fix disk capacity miscalculation and code cleanup
This patch prevents:
- ums disk capacity miscalculation because of integer overflow
Changes v2:
- Prevents passing zero size disk capacity to ums gadget driver
- Change function ums_get_capacity() to ums_disk_init() and do ums disk
initialization before gadget init
- Remove unnecessary code from mass storage driver
Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Cc: Marek Vasut <marex@denx.de>
Przemyslaw Marczak [Wed, 23 Oct 2013 12:30:43 +0000 (14:30 +0200)]
usb: ums: allows using every mmc device with ums.
Before this change ums command only allowed use of mmc 0.
Now this argument can be set.
Changes:
- remove mmc device number checking because it is always positive number
- remove printing "no such device" - it is done by find_mmc_device()
Change-Id: I767e45151ad515c7bef19e6c13087374f5e23c11
Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Cc: Marek Vasut <marex@denx.de>
Przemyslaw Marczak [Wed, 23 Oct 2013 12:30:42 +0000 (14:30 +0200)]
usb: ums: code refactoring to improve reusability on other boards.
This patch introduces some cleanups to ums code. Changes:
ums common:
- introduce UMS_START_SECTOR and UMS_NUM_SECTORS as defined in
usb_mass_storage.h both default values as 0 if board config
doesn't define them
common cleanup changes:
- change name of struct "ums_board_info" to "ums"
- "ums_device" fields are moved to struct ums and "dev_num" is removed
- change function name: board_ums_init to ums_init
- remove "extern" prefixes from usb_mass_storage.h
cmd_usb_mass_storage:
- change error() to printf() if need to print info message
- change return values to command_ret_t type at ums command code
- add command usage string
Changes v2:
ums common:
- always returns number of read/write sectors
- coding style clean-up
ums gadget:
- calculate amount of read/write from device returned value.
Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Cc: Marek Vasut <marek.vasut@gmail.com>
Igor Grinberg [Wed, 6 Nov 2013 15:24:02 +0000 (17:24 +0200)]
README: remove wrong config name
There is no CONFIG_PCA953X_INFO symbol.
U-Boot uses CONFIG_CMD_PCA953X_INFO instead, which is described in
"Monitor Functions" section and thus no need to be repeated in the
"GPIO Support" section.
Remove the whole line.
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Masahiro Yamada [Tue, 5 Nov 2013 02:28:48 +0000 (11:28 +0900)]
cosmetic: remove empty lines at the top of file
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Miao Yan [Mon, 4 Nov 2013 03:18:14 +0000 (11:18 +0800)]
common/cmd_bootm.c: fix subcommand processing in OS specific do_bootm_xxx() functions
In commit "
5c427e4: use BOOTM_STATE_OS_CMDLINE flag for plain bootm"
and "
3d187b3: Only pass BOOTM_STATE_OS_CMDLINE on PowerPC/MIPS",
BOOTM_STATE_OS_CMDLINE was added to do_bootm for PowerPC and MIPS. This
breaks other OSes (vxworks, netbsd, plan9,...) that don't support
subcommand processing, e.g. they all contain the following code in their
do_bootm_xxx():
if (flag & BOOTM_STATE_OS_PREP)
return 0;
if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
return 1;
which will result a "subcommand not supported" error.
This patch changes the above logic to:
/* if not go command, pretend everything to be OK */
if (flag != BOOTM_STATE_OS_GO)
return 0;
Signed-off-by: Miao Yan <miao.yan@windriver.com>
Masahiro Yamada [Fri, 1 Nov 2013 01:28:45 +0000 (10:28 +0900)]
Makefile: do not create a symbolic link to arch/${ARCH}/include/asm
In-tree build:
- Do not create a symbolic link
from include/asm to arch/${ARCH}/include/asm
- Add ${SRCTREE}/arch/arm/include into the header search path
Out-of-tree build:
- Do not create a directory ${OBJTREE}/include2
- Do not create a symbolic link
from ${OBJTREE}/include2/asm to ${SRCTREE}/arch/${ARCH}/include/asm
- Add ${SRCTREE}/arch/arm/include into the header search path
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Viktar Palstsiuk [Thu, 31 Oct 2013 08:16:59 +0000 (11:16 +0300)]
Add support for SX151x SPI GPIO Expanders
Signed-off-by: Viktar Palstsiuk <viktar.palstsiuk@promwad.com>
Luka Perkov [Thu, 31 Oct 2013 02:59:46 +0000 (03:59 +0100)]
boards.cfg: remove git leftovers
Remove 'HEAD' line which is most likely left there while rebasing. It was
introduced in commit
877bfe37dc00b0ae59f37742954a62bce3fdf3a0.
Signed-off-by: Luka Perkov <luka@openwrt.org>
Paul Burton [Wed, 23 Oct 2013 10:17:14 +0000 (11:17 +0100)]
boards.cfg: remove trailing whitespace
Commit
93e14596 "Coding Style cleanup: replace leading SPACEs by TABs"
added trailing whitespace to a single line of boards.cfg. I presume this
was unintentional, and it causes the file to change after running it
through the reformat.py script. Remove the offending character.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Andrew Ruder [Wed, 23 Oct 2013 00:07:34 +0000 (19:07 -0500)]
cmd_nvedit.c: Add env exists command
env exists is a way to test (in hush) if an environment variable
exists. A workaround existed using printenv but this new command
doesn't require all the stdout/stderr redirection to prevent
printing information to the screen.
Example:
$ set testexists 1
$ env exists testexists && echo "yes"
yes
$ env exists testexists || echo "no"
$ set testexists
$ env exists testexists && echo "yes"
$ env exists testexists || echo "no"
no
$
Signed-off-by: Andrew Ruder <andrew.ruder@elecsyscorp.com>
Masahiro Yamada [Mon, 21 Oct 2013 02:11:28 +0000 (11:11 +0900)]
MAKEALL: rename boards_by_* functions to targets_by_*
We expect boards_by_* function to return the 7th filed, 'Target',
not the 6th field, 'Board name'.
So the function names, boards_by_* are a little misleading,
and should be renamed to targets_by_*.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Masahiro Yamada [Mon, 21 Oct 2013 02:11:27 +0000 (11:11 +0900)]
MAKEALL: fix boards_by_field function
Commit
27af930e changed the boards.cfg format
and it changed boards_by_field() function incorrectly.
For tegra cpus it returned Board Name field,
not Target field.
This commit restores the behavior prior to
27af930e in the right way.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Masahiro Yamada [Mon, 21 Oct 2013 02:11:26 +0000 (11:11 +0900)]
MAKEALL: fix a bug to use CROSS_COMPILE_<ARCH>
Commit
27af930e changed the boards.cfg format but
missed to change get_target_arch() fuction.
This commit adjusts it for CROSS_COMPILE_<ARCH>
to work correctly.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Masahiro Yamada [Mon, 21 Oct 2013 02:11:25 +0000 (11:11 +0900)]
MAKEALL: fix awk warning message
If you do `./MAKEALL -M ` or `./MAKEALL -m`
GNU awk would display warnings like follows:
awk: warning: escape sequence `\ ' treated as plain ` '
In the first place, we do not explicitly set the field separator.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Masahiro Yamada [Mon, 21 Oct 2013 01:19:38 +0000 (10:19 +0900)]
sparc: include config.h to start.S
arch/sparc/cpu/leon3/start.S requires CONFIG_SYS_SPARC_NWINDOES
to be defined:
#ifndef CONFIG_SYS_SPARC_NWINDOWS
#error Must define number of SPARC register windows, default is 8
#endif
But it missed to include <config.h>, which always ended up in compile error.
This commit fixes this problem.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Daniel Hellstrom <daniel@gaisler.com>
Masahiro Yamada [Mon, 21 Oct 2013 01:10:32 +0000 (10:10 +0900)]
EP88x: remove remainders of dead board
Commit
1b0757e deleted the EP88x entry from boards.cfg file.
But it missed to remove include/configs/EP88x.h and board/ep88x/.
This commit removes them and adds EP88x to README.scrapyard.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Wolfgang Denk <wd@denx.de>
Masahiro Yamada [Mon, 21 Oct 2013 01:10:31 +0000 (10:10 +0900)]
README.scrapyard: fix broken format
Some tabs have been replaced with spaces
because doc/README.scrapyard is consistently using spaces.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>