summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* fdt: Check for a token to skip auto-hash validationJoe Hershberger2012-10-15-0/+45
| | | | | | | | | | Allow the itb file to declare to u-boot that its hash should not be checked automatically on bootm or iminfo. This allows an image to either be checked automatically or to include a script which may check it otherwise (such as after part of the itb has been relocated to RAM by the script). Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
* fdt: Identify scripts in ITBs as printable stringsJoe Hershberger2012-10-15-3/+3
| | | | | | | Scripts in the ITB format will have spaces in them and will end in a newline charachter. Make sure that these are considered printable. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
* fdt: Add get commands to fdtJoe Hershberger2012-10-15-0/+144
| | | | | | | Add commands to access data in the fdt. This allows data from a dtb or itb to be accessed from the shell scripts. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
* fdt: Limit printed hex in fdt print and list commandsJoe Hershberger2012-10-15-12/+24
| | | | | | | | Prevent printing the entire image in a itb. It is most likely unhelpful to have the hex of the entire image scroll for minutes on your slow serial console. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
* fdt: Check error codes returned from fdtlib when loading ITBJoe Hershberger2012-10-15-0/+5
| | | | | | | | Before this patch, error codes returned from fdtlib were ignored and continued access would cause a crash. Now just check if the image is truncated and error if so. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
* libfdt: Add helpers for 64-bit integer propertiesDavid Gibson2012-10-15-23/+170
| | | | | | | | | | | | | | | In device trees in the world, properties consisting of a single 64-bit integer are not as common as those consisting of a single 32-bit, cell sized integer, but they're common enough that they're worth including convenience functions for. This patch adds helper wrappers of fdt_setprop_inplace(), fdt_setprop() and fdt_appendprop() for handling 64-bit integer quantities in properties. For better consistency with the names of these new *_u64() functions we also add *_u32() functions as alternative names for the existing *_cell() functions handling 32-bit integers. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
* libfdt: Add support for appending the values to a existing propertyMinghuan Lian2012-10-15-0/+122
| | | | | | | | | | | Some properties may contain multiple values, these values may need to be added to the property respectively. this patch provides this functionality. The main purpose of fdt_append_prop() is to append the values to a existing property, or create a new property if it dose not exist. Signed-off-by: Minghuan Lian <Minghuan.Lian@freescale.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
* Prepare v2012.10Tom Rini2012-10-15-1/+1
| | | | Signed-off-by: Tom Rini <trini@ti.com>
* m28: Properly configure the SPI flash chipselectMarek Vasut2012-10-12-3/+5
| | | | | | | | | | The SPI flash is not properly detected by plain "sf probe" due to it being located on different bus and different chipselect. Fix this problem. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Stefano Babic <sbabic@denx.de> Cc: Tom Rini <trini@ti.com>
* Prepare v2012.10-rc3Tom Rini2012-10-08-1/+1
| | | | Signed-off-by: Tom Rini <trini@ti.com>
* arm: armv7: omap3: Fix restore sequence in lowlevel_initAlbert ARIBAUD2012-10-08-5/+4
| | | | | | | | | | | The restore sequence in lowlevel_init was in the wrong order, causing lr to lose its original value and be set equal to ip instead. Also, its use of the stack clashes with that of s_init, so move the s_init call after the restore and turn it into a tail-optimized branch. Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net> Tested-by: Jeroen Hofstee <jeroen@myspectrum.nl>
* yaffs2: Fix GCC 4.6 compile warningsAnatolij Gustschin2012-10-08-40/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: yaffs_guts.c: In function 'yaffs_check_chunk_erased': yaffs_guts.c:324:6: warning: variable 'result' set but not used [-Wunused-but-set-variable] yaffs_guts.c: In function 'yaffs_verify_chunk_written': yaffs_guts.c:352:6: warning: variable 'result' set but not used [-Wunused-but-set-variable] yaffs_guts.c: In function 'yaffs_grab_chunk_cache': yaffs_guts.c:1488:6: warning: variable 'pushout' set but not used [-Wunused-but-set-variable] yaffs_guts.c: In function 'yaffs_check_obj_details_loaded': yaffs_guts.c:3180:6: warning: variable 'alloc_failed' set but not used [-Wunused-but-set-variable] yaffs_guts.c:3179:6: warning: variable 'result' set but not used [-Wunused-but-set-variable] yaffs_guts.c: In function 'yaffs_update_oh': yaffs_guts.c:3288:6: warning: variable 'result' set but not used [-Wunused-but-set-variable] yaffs_guts.c: In function 'yaffs_get_obj_name': yaffs_guts.c:4447:7: warning: variable 'result' set but not used [-Wunused-but-set-variable] yaffs_summary.c: In function 'yaffs_summary_read': yaffs_summary.c:194:6: warning: variable 'sum_tags_bytes' set but not used [-Wunused-but-set-variable] yaffs_verify.c: In function 'yaffs_verify_file': yaffs_verify.c:227:6: warning: variable 'actual_depth' set but not used [-Wunused-but-set-variable] yaffs_yaffs1.c: In function 'yaffs1_scan': yaffs_yaffs1.c:26:6: warning: variable 'result' set but not used [-Wunused-but-set-variable] yaffs_yaffs2.c: In function 'yaffs2_scan_chunk': yaffs_yaffs2.c:949:6: warning: variable 'result' set but not used [-Wunused-but-set-variable] yaffs_yaffs2.c: In function 'yaffs2_scan_backwards': yaffs_yaffs2.c:1352:6: warning: variable 'deleted' set but not used [-Wunused-but-set-variable] Signed-off-by: Anatolij Gustschin <agust@denx.de> Cc: Charles Manning <cdhmanning@gmail.com> Tested-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
* disk: part_dos: don't claim whole-disk FAT filesystemsStephen Warren2012-10-08-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logically, a disk that contains a raw FAT filesystem does not in fact have a partition table. However, test_part_dos() was claiming that such disks did in fact have a DOS-style partition table. This caused get_device_and_partition() not to return a whole-disk disk_partition_t, since part_type != PART_TYPE_UNKNOWN. part_dos.c's print_partition_extended() detected the raw FAT filesystem condition and printed a fake partition table that encompassed the whole disk. However, part_dos.c's get_partition_info_extended() did not return any valid partitions in this case. This combination caused get_device_and_partition() not to find any valid partitions, and hence to return an error. Fix test_part_dos() not to claim that raw FAT filesystems are DOS partition tables. In turn, this causes get_device_and_partition() to return a whole-disk disk_partition_t, and hence the following commands work: fatls mmc 0 / fatls mmc 0:auto / An alternative would be to modify print_partition_extended() to detect raw FAT filesystems, just like print_partition_extended() does, and to return a fake partition in this case. However, this seems logically incorrect, and also duplicates code, since get_device_and_partition() falls back to returning a whole-disk partition when there is no partition table on the device. Signed-off-by: Stephen Warren <swarren@nvidia.com>
* FAT: check for partition 0 not 1 for whole-disk fsStephen Warren2012-10-08-1/+1
| | | | | | | | | | | | | | | | | | | | | The recent switch to use get_device_and_partition() from do_fat_ls() broke the ability to access a FAT filesystem directly on a whole device; FAT only works within a partition on a device. This change makes e.g. "fatls mmc 0:0" work; explicitly requesting partition ID 0 is something that get_device_and_partition() fully supports. However, fat_register_device() expects partition ID 1 to be used in the full-disk case; partition ID 1 was previously implicitly specified when the user didn't actually specify a partition ID. Update fat_register_device() to expect the correct ID. This change does imply that if a user explicitly executes "fatls mmc 0:1" then this will fail, and may be a change in behaviour. Note that this still prevents "fatls mmc 0:auto" from working. The next patch will fix that. Signed-off-by: Stephen Warren <swarren@nvidia.com>
* arm: rmobile: bugfix: wrong register saving in lowlevel_initTetsuyuki Kobayashi2012-10-08-11/+1
| | | | | | | | lowlevel_init() of rmobile badly assumed that ip register holds return address. The commit "63ee53a7 armv7 cpu_init_crit: Simplify code" breaks this assumption. This patch removes this bad assumption and simplify code. Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
* ide: Correct IDE_BUS(dev) macroLuka Perkov2012-10-08-1/+1
| | | | | | | | | | | | | | The IDE_BUS(dev) macro was previously doing dev >> 1. This however is a mis-match of the usage in common/cmd_ide.c and would cause boards with multiple ports / devices to not correctly detect all devices. For more details please see: http://lists.denx.de/pipermail/u-boot/2012-April/122525.html [Tom Rini: Reword commit message only] Tested-by: Luka Perkov <uboot@lukaperkov.net> Signed-off-by: Simon Baatz <gmbnomis@gmail.com> Signed-off-by: Tom Rini <trini@ti.com>
* GPIO: pca953x: fix error reportingLaurence Withers2012-10-08-14/+35
| | | | | | | | Use the standard CMD_RET_* constants to clearly report errors from the pca953x command. In addition, print error messages when I2C communication fails. Signed-off-by: Laurence Withers <lwithers@guralp.com>
* GPIO: pca953x: fix spelling in helpLaurence Withers2012-10-08-1/+1
| | | | Signed-off-by: Laurence Withers <lwithers@guralp.com>
* ml507: Fix Xilinx uartlite driver hangRommel Custodio2012-10-08-1/+1
| | | | | | | | | | | The default configuration for ml507 will generate a hang() in the Xilinx uartlite driver. userial_ports[] in drivers/serial/serial_xuartlite.c does not get initialized properly. CONFIG_SERIAL_BASE is unused. XILINX_UARTLITE_BASEADDR is used instead. Signed-off-by: Rommel Custodio <sessyargc+uboot@gmail.com>
* Merge branch 'master' of git://git.denx.de/u-boot-armTom Rini2012-10-05-0/+3
|\
| * arm: armv7: temporarily set -mno-unaligned-accessAlbert ARIBAUD2012-10-05-0/+2
| | | | | | | | | | | | | | | | | | This patch aims at ensuring that the 2012.10 release works out-of-the-box on as many targets as possible, by reinstating commit 5347560f5427bcdd48a563b62180481606ac8044, which adds option -mno-unaligned-access to armv7 builds. This patch will be overriden immediately after release of 2012.10.
| * MAINTAINERS: Add Tetsuyuki Kobayshi for kzm9gTetsuyuki Kobayashi2012-10-05-0/+1
| | | | | | | | Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
* | env: fix crash using default -f -aGerlando Falauto2012-10-05-0/+3
| | | | | | | | | | | | | | | | | | | | | | env default -a -f calls env_check_apply on all existing environment variables with a NULL value for "newval" as a way of cleaning up. This causes string manipulation functions to crash on most architectures. So replace a NULL argument with an empty string. Reported-By: Stefano Babic <sbabic@denx.de> Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com> Tested-by: Stefano Babic <sbabic@denx.de>
* | Improve license declaration for cmd_ini.hJoe Hershberger2012-10-05-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | Instead of referenceing the source webpage (which can change) include the license in the source file. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Reported-by: Igor Grinberg <grinberg@compulab.co.il> Cc: Igor Grinberg <grinberg@compulab.co.il> Cc: Tom Rini <trini@ti.com> Cc: Wolfgang Denk <wd@denx.de> Acked-by: Wolfgang Denk <wd@denx.de>
* | MPC85xx: remove support for TQM85xx boardsWolfgang Denk2012-10-05-2590/+8
| | | | | | | | | | | | | | | | | | | | | | | | Due to grown code sizes the TQM85xx boards don't build any more with some older tool chains (like ELDK 4.2). As these boards have long reached EOL it seems a waste of effort trying to fix them. The vendor has agreed to drop support for them, too. So let's get rid of them. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Stefan Roese <sr@denx.de> cc: Kim Phillips <kim.phillips@freescale.com> Acked-by: Stefan Roese <sr@denx.de>
* | sh: ap_sh4a_4a: Fixed initialization value of DDR memoryNobuhiro Iwamatsu2012-10-05-1/+1
| | | | | | | | | | | | | | | | The wrong value was set as value of column of DDR memory for ap_sh4a_4a. 10 is the right value. This fixed this problem. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* | Merge branch 'master' of git://git.denx.de/u-boot-armTom Rini2012-10-04-179/+13849
|\ \ | |/
| * ARM: Add Altera SOCFPGA Cyclone5Dinh Nguyen2012-10-04-0/+901
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add minimal support for Altera's SOCFPGA Cyclone 5 hardware. Signed-off-by: Dinh Nguyen <dinguyen@altera.com> Signed-off-by: Chin Liang See <clsee@altera.com> Signed-off-by: Pavel Machek <pavel@denx.de> Reviewed-by: Marek Vasut <marex@denx.de> Acked-by: Tom Trini <trini@ti.com> Cc: Wolfgang Denx <wd@denx.de> Cc: Albert Aribaud <albert.u.boot@aribaud.net> Cc: Stefan Roese <sr@denx.de> ---- v8: Remove no_return attribute for reset_cpu Based on v2012.10-rc2
| * snowball: Clear UART RX FIFORamesh Chandrasekaran2012-10-04-0/+4
| | | | | | | | | | | | | | | | | | Without usb-serial cable plugged at this stage, some garbage is seen in UART RX FIFO, which blocks autoboot progress. The fix makes sure to empty the RX FIFO, before we wait for user input to interrupt autoboot. Signed-off-by: Ramesh Chandrasekaran <ramesh.chandrasekaran@stericsson.com>
| * xilinx: Add new Zynq boardMichal Simek2012-10-04-0/+225
| | | | | | | | | | | | | | | | Add support for Xilinx Zynq board. Signed-off-by: Michal Simek <monstr@monstr.eu> Acked-by: Marek Vasut <marex@denx.de> CC: Joe Hershberger <joe.hershberger@gmail.com>
| * arm: Support new Xilinx Zynq platformMichal Simek2012-10-04-0/+232
| | | | | | | | | | | | | | | | | | Add timer driver. Signed-off-by: Michal Simek <monstr@monstr.eu> CC: Joe Hershberger <joe.hershberger@gmail.com> CC: Marek Vasut <marex@denx.de> Acked-by: Marek Vasut <marex@denx.de>
| * serial: Add Zynq serial driverMichal Simek2012-10-04-0/+261
| | | | | | | | | | | | | | | | | | The driver is used on Xilinx Zynq platform. Signed-off-by: Michal Simek <monstr@monstr.eu> CC: Joe Hershberger <joe.hershberger@gmail.com> CC: Marek Vasut <marex@denx.de> Acked-by: Marek Vasut <marex@denx.de>
| * arm: Fixed the offset for the no relocation.Zhong Hongbo2012-10-04-0/+12
| | | | | | | | | | | | | | | | When the u-boot address of destination equal to __start, no relocation. relocation offset(r9) = 0. Signed-off-by: Zhong Hongbo <bocui107@gmail.com> Tested-by: Stefano Babic <sbabic@denx.de>
| * arm: Add CONFIG_OF_BOARD_SETUP support to bootmJoe Hershberger2012-10-04-0/+3
| | | | | | | | | | | | ARM boards need to change device tree settings as well Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
| * arm: Remove additional config flagsMichal Simek2012-10-04-10/+0
| | | | | | | | | | | | These options are just duplicated from arch/arm/cpu/armv7/config.mk Signed-off-by: Michal Simek <monstr@monstr.eu>
| * armv7 cpu_init_crit: Simplify codeBenoît Thébaudeau2012-10-04-4/+1
| | | | | | | | | | | | | | | | We don't need to return to cpu_init_crit after calling lowlevel_init, so lowlevel_init can directly return to the caller of cpu_init_crit. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
| * arm: work around assembler bugAllen Martin2012-10-04-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | Disable sibling call optimization based on binutils version. This is to work around a bug in the assember in binutils versions < 2.22. Branches to weak symbols can be incorrectly optimized in thumb mode to a short branch (b.n instruction) that won't reach when the symbol gets preempted. http://sourceware.org/bugzilla/show_bug.cgi?id=12532 Signed-off-by: Allen Martin <amartin@nvidia.com> Acked-by: Tom Rini <trini@ti.com>
| * tools, config.mk: add binutils-versionAllen Martin2012-10-04-0/+21
| | | | | | | | | | | | | | Modeled after gcc-version, add function to get binutils version. Signed-off-by: Allen Martin <amartin@nvidia.com> Acked-by: Wolfgang Denk <wd@denx.de>
| * ARM: increase lmb stack space reservation to 4KBRob Herring2012-10-04-2/+2
| | | | | | | | | | | | | | | | | | | | The bootm initrd image copy to ram can collide with the stack in cases where the print buffer size is large (i.e. 1K). The result is intermittent initrd decompression errors depending on the initrd size MOD 4KB since the initrd start address is 4KB aligned. Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Signed-off-by: Rob Herring <rob.herring@calxeda.com>
| * ARM: Add X600 board support (SPEAr600 based)Stefan Roese2012-10-04-0/+816
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the X600 SPEAr600 based board. Its also the first SPEAr600 board that uses the newly introduced SPEAr600 SPL support. Xloader is not necessary any more. By using the new "u-boot.spr" make target, one image will generated containing both, U-Boot SPL (with mkimage header as needed by the SPEAr BootROM, and the main U-Boot with mkimage header. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Amit Virdi <amit.virdi@st.com> Cc: Vipin Kumar <vipin.kumar@st.com>
| * Merge remote-tracking branch 'u-boot-marvell/master'Albert ARIBAUD2012-10-03-21/+862
| |\
| | * lsxl: also turn off fan in power down modeMichael Walle2012-10-03-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | If while booting the power switch is in OFF position, turn off the fan, too. Signed-off-by: Michael Walle <michael@walle.cc> Cc: Prafulla Wadaskar <prafulla@marvell.com>
| | * km_kirkwood: enable MV88E6352_SWITCH support for kmnusaValentin Longchamp2012-10-03-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is required to configure the external 88e6352 switch on nusa. Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com> cc: Holger Brunck <holger.brunck@keymile.com> cc: Prafulla Wadaskar <prafulla@marvell.com> Acked-by: Prafulla Wadaskar <Prafulla@marvell.com>
| | * arm/km: add mv88e6352 configuration for kmnusaValentin Longchamp2012-10-03-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The kmnusa board uses a mv88e6352 switch that is connected to the main eth interface of the kirkwood. Therefore the switch must be configured so that the kirkwood's egiga eth inferface can be used. Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com> Cc: Holger Brunck <holger.brunck@keymile.com> Cc: Prafulla Wadaskar <prafulla@marvell.com> Acked-By: Prafulla Wadaskar <prafulla@marvell.com>
| | * edminiv2: increase malloc len to 256KAlbert ARIBAUD2012-10-03-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Malloc len of 128K caused a warning from ehci_hcd asking for more. Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net> Acked-by: Prafulla Wadaskar <prafulla@marvell.com>
| | * ARM: kirkwood/orion5x: Use reset_cpu definition in include/common.hDinh Nguyen2012-10-03-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | include/common.h has the reset_cpu defined already. No need to re-define here. Signed-off-by: Dinh Nguyen <dinguyen@altera.com> Signed-off-by: Pavel Machek <pavel@denx.de> Acked-By: Prafulla Wadaskar <Prafulla@marvell.com>
| | * kirkwood: ib62x0: Invert SATA activity LEDsSimon Baatz2012-10-03-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hardware design of the IB-NAS62x0 causes the SATA activity LEDs to be on when idle by default. Reverse the polarity of the activity LEDs in early init. Signed-off-by: Simon Baatz <gmbnomis@gmail.com> Cc: Luka Perkov <uboot@lukaperkov.net> Cc: Prafulla Wadaskar <prafulla@marvell.com> Acked-by: Luka Perkov <uboot@lukaperkov.net>
| | * arm/km: use kw_sdram_size_adjust to adjust SDRAM sizeHolger Brunck2012-10-03-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some boards may differ only in the SDRAM size. This function allows to fix the size accordingly and we can use the same u-boot binary for both boards. Signed-off-by: Holger Brunck <holger.brunck@keymile.com> Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com> cc: Prafulla Wadaskar <prafulla@marvell.com> cc: Valentin Longchamp <valentin.longchamp@keymile.com>
| | * kirkwood: implement kw_sdram_size_adjustGerlando Falauto2012-10-03-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Size of the SDRAM chips might differ between any two (otherwise identical) instances of the same board. So add a function kw_sdram_size_adjust() which reads out the current ram size for a given bank, and adjusts the Kirkwood's SDRAM window size register accordingly. Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com> Signed-off-by: Holger Brunck <holger.brunck@keymile.com> cc: Prafulla Wadaskar <prafulla@marvell.com> cc: Valentin Longchamp <valentin.longchamp@keymile.com>
| | * kirkwood: implement kw_sdram_bs_set()Gerlando Falauto2012-10-03-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some boards might be equipped with different SDRAM configurations. When that is the case, CPU CS Window Size Register (CS[0]n Size) should be set to the biggest value through board.cfg file; then its value can be fixed at runtime according to the detected SDRAM size. Therefore, implement kw_sdram_bs_set(). Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com> Signed-off-by: Holger Brunck <holger.brunck@keymile.com> cc: Prafulla Wadaskar <prafulla@marvell.com> cc: Valentin Longchamp <valentin.longchamp@keymile.com> cc: Marek Vasut <marex@denx.de> Acked-by: Prafulla Wadaskar <Prafulla@marvell.com>