summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* m68k: Fix unused variable in board.cMarek Vasut2012-10-19-1/+2
| | | | | | | | | | | The following warning was produced, fix it: board.c: In function 'board_init_r': board.c:390:8: warning: unused variable 's' [-Wunused-variable] Signed-off-by: Marek Vasut <marex@denx.de> Cc: "Jin Zhengxiong-R64188" <R64188@freescale.com> Cc: Jason Jin <jason.jin@freescale.com>
* m68k: Fix unused variable warning in speed.cMarek Vasut2012-10-19-2/+7
| | | | | | | | | | | The following warning was produced, fix it: speed.c: In function 'get_clocks': speed.c:94:15: warning: variable 'bPci' set but not used [-Wunused-but-set-variable] Signed-off-by: Marek Vasut <marex@denx.de> Cc: "Jin Zhengxiong-R64188" <R64188@freescale.com> Cc: Jason Jin <jason.jin@freescale.com>
* m68k: Fix unused variable warningMarek Vasut2012-10-19-1/+2
| | | | | | | | | | | The fbcs variable was unused, producing the following warning: cpu_init.c: In function 'cpu_init_f': cpu_init.c:52:10: warning: unused variable 'fbcs' [-Wunused-variable] Signed-off-by: Marek Vasut <marex@denx.de> Cc: "Jin Zhengxiong-R64188" <R64188@freescale.com> Cc: Jason Jin <jason.jin@freescale.com>
* m68k: Fix wrong assembler instruction in start.SMarek Vasut2012-10-19-4/+4
| | | | | | | | | | | | The jmp _fault generated the following error message, thus change it to bra _fault: start.S: Assembler messages: start.S:310: Error: Conversion of PC relative displacement to absolute Signed-off-by: Marek Vasut <marex@denx.de> Cc: "Jin Zhengxiong-R64188" <R64188@freescale.com> Cc: Jason Jin <jason.jin@freescale.com>
* m68k: Fix relocation errors in start.SPhilippe De Muyter2012-10-19-2/+2
| | | | | | | | | | | | | | | When the environment sectors in the flash are big, one get those errors : mcf547x_8x/start.S:173: relocation truncated to fit: R_68K_PC16 against symbol `cpu_init_f' defined in .text section in libmcf547x_8x.a(cpu_init.o) mcf547x_8x/start.S:174: relocation truncated to fit: R_68K_PC16 against symbol `board_init_f' defined in .text section in libm68k.a(board.o) Fix that. Signed-off-by: Philippe De Muyter <phdm@macqel.be> Cc: "Jin Zhengxiong-R64188" <R64188@freescale.com> Cc: Jason Jin <jason.jin@freescale.com>
* powerpc: delete Wind River SBC8560/8540 supportPaul Gortmaker2012-10-17-1539/+0
| | | | | | | | The sbc8548/60 (both similar, just variations in UART hardware) support has been removed from the linux kernel as of v3.6-rc1~132 so lets also now remove it from the u-boot tree as well. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
* Merge branch 'master' of git://git.denx.de/u-boot-i2cTom Rini2012-10-17-43/+181
|\
| * i2c_probe: update for use in scriptingEric Nelson2012-10-16-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | Allow the use of an I2C address to test and return success if one or more devices is found. This allows device presence to alter the flow of a script. e.g. if i2c probe 0x04 ; then echo found Hannstar touch ; fi Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
| * common/i2c: Add i2c write commandYork Sun2012-10-16-0/+50
| | | | | | | | | | | | Add i2c write command to write data from memory to i2c devices. Signed-off-by: York Sun <yorksun@freescale.com>
| * i2c: sh_i2c: use setbits/clrbits macroTetsuyuki Kobayashi2012-10-16-4/+4
| | | | | | | | | | | | | | Use setbits/clrbits macro when read-modify-write register. Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp> Acked-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
| * arm: rmobile: kzm9g: enable I2C2Tetsuyuki Kobayashi2012-10-16-0/+2
| | | | | | | | | | Acked-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
| * arm: rmobile: kzm9g: enable I2C1Tetsuyuki Kobayashi2012-10-16-2/+3
| | | | | | | | | | | | | | Supply clock to I2C1 and release resetting. Acked-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
| * i2c: sh_i2c.c: check error in i2c_read and i2c_writeTetsuyuki Kobayashi2012-10-16-18/+32
| | | | | | | | | | | | | | | | Before this patch, i2c_{read,write} always returned 0. Check TACK in i2c_raw_{read,write} so that i2c_{read,write} return non-zero when error. Acked-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
| * i2c: sh_i2c: enable i2c_probeTetsuyuki Kobayashi2012-10-16-5/+27
| | | | | | | | | | | | | | | | | | Before this patch i2c_probe() always returned 0 and "i2c probe" command did not work properly. Modify i2c_set_addr() to check TACK when waiting DTE and make i2c_probe() call this function. Acked-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
| * i2c: sh_i2c.c: support I2C2, I2C3 and I2C4Tetsuyuki Kobayashi2012-10-16-1/+19
| | | | | | | | | | | | | | sh_i2c.c support I2C0 and I2C1. This patch extends it to I2C4. Acked-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
| * i2c: sh_i2c.c: adjust for SH73A0Tetsuyuki Kobayashi2012-10-16-1/+5
| | | | | | | | | | | | | | | | Adjust i2c_raw_read() in sh_i2c.c to work for SH73A0. After this patch, "i2c md" and "i2c mw" command on U-Boot work properly on KZM-A9-GT board. Acked-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
| * i2c: sh_i2c.c: correct BUSY bit define in ICSRTetsuyuki Kobayashi2012-10-16-1/+1
| | | | | | | | | | | | | | Correct BUSY bit define in ICSR from (1<<3) to (1<<4). Acked-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
| * i2c: sh_i2c.c: support iccl and icch extensionTetsuyuki Kobayashi2012-10-16-8/+23
| | | | | | | | | | | | | | | | R-mobile SoC (at least SH73A0) has extension bits to store 8th bit of iccl and icch. This patch add support for the extentin bits. Acked-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
* | Merge branch 'master' of git://git.denx.de/u-boot-mipsTom Rini2012-10-17-98/+1155
|\ \
| * | MIPS: qemu_mips.h: cleanup coding style and checkpatch.pl issuesDaniel Schwierzeck2012-10-16-28/+26
| | | | | | | | | | | | Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
| * | MIPS: add board qemu-mips64 supportZhi-zhou Zhang2012-10-16-0/+1046
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both big-endian and little-endian are tested with below commands: Rom version: (Default, Now we config it as rom version) qemu-system-mips64el -M mips -bios u-boot.bin -cpu MIPS64R2-generic -nographic qemu-system-mips64 -M mips -bios u-boot.bin -cpu MIPS64R2-generic -nographic Ram version: qemu-system-mips64el -M mips -cpu MIPS64R2-generic -kernel u-boot -nographic qemu-system-mips64 -M mips -cpu MIPS64R2-generic -kernel u-boot -nographic Signed-off-by: Zhizhou Zhang <etou.zh@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
| * | MIPS: qemu_mips: move CONFIG_SYS_TEXT_BASE to qemu-mips.hZhi-zhou Zhang2012-10-16-10/+1
| | | | | | | | | | | | | | | | | | | | | We define CONFIG_SYS_TEXT_BASE in board's specified header file. So config.mk is useless, then remove it. Signed-off-by: Zhizhou Zhang <etou.zh@gmail.com>
| * | MIPS: add support for 64 bit addressingZhi-zhou Zhang2012-10-16-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare for upcoming mips64 support. This patch add mips64 address support. Signed-off-by: Zhizhou Zhang <etou.zh@gmail.com> [daniel.schwierzeck@gmail.com: prefer _MIPS_SZLONG in posix_types.h to fix some warnings] Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
| * | MIPS: don't use camel-case styleZhi-zhou Zhang2012-10-16-59/+59
| |/ | | | | | | | | | | Replace camel-case style with upper-case style globally. Signed-off-by: Zhizhou Zhang <etou.zh@gmail.com>
* | fs: fat: Fix mkcksum() function parametersMarek Vasut2012-10-17-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mkcksum() function now takes one parameter, the pointer to 11-byte wide character array, which it then operates on. Currently, the function is wrongly passed (dir_entry)->name, which is only 8-byte wide character array. Though by further inspecting the dir_entry structure, it can be noticed that the name[8] entry is immediatelly followed by ext[3] entry. Thus, name[8] and ext[3] in the dir_entry structure actually work as this 11-byte wide array since they're placed right next to each other by current compiler behavior. Depending on this is obviously wrong, thus fix this by correctly passing both (dir_entry)->name and (dir_entry)->ext to the mkcksum() function and adjust the function appropriately. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Tom Rini <trini@ti.com>
* | disk: part_dos: print partition UUID in partition listStephen Warren2012-10-17-8/+11
| | | | | | | | | | | | | | | | | | | | | | This information may be useful to compare against command "part uuid", or if you want to manually paste the information into the kernel command-line. Signed-off-by: Stephen Warren <swarren@nvidia.com> [trini: print_one_part / print_part_dos output strings didn't quite match before the changes] Signed-off-by: Tom Rini <trini@ti.com>
* | disk: part_dos: checkpatch cleanupsStephen Warren2012-10-17-10/+11
| | | | | | | | | | | | Minor cleanups required so later patches don't trigger checkpatch. Signed-off-by: Stephen Warren <swarren@nvidia.com>
* | disk: part_efi: set bootable flag in partition objectsStephen Warren2012-10-17-0/+10
| | | | | | | | | | | | | | | | A partition is considered bootable if it either has the "legacy BIOS bootable" flag set, or if the partition type UUID matches the standard "system" type. Signed-off-by: Stephen Warren <swarren@nvidia.com>
* | disk: part_efi: print raw partition attributesStephen Warren2012-10-17-6/+11
| | | | | | | | | | | | | | When printing the EFI partition table, print the raw attributes. Convert struct gpt_entry_attributes to a union to allow raw access. Signed-off-by: Stephen Warren <swarren@nvidia.com>
* | disk: part_efi: add new partition attribute definitionsStephen Warren2012-10-17-1/+3
| | | | | | | | | | | | | | | | Add no_block_io_protocol and legacy_bios_bootable attribute definitions. These are sourced from UEFI Spec 2.3, page 105, table 19. Credits to the libparted source for the specification pointer. Signed-off-by: Stephen Warren <swarren@nvidia.com>
* | disk: part_efi: print partition UUIDsStephen Warren2012-10-17-22/+28
| | | | | | | | | | | | | | | | When printing the partition table, print the partition type UUID and the individual partition UUID. Do this unconditionally, since partition UUIDs are useful. Signed-off-by: Stephen Warren <swarren@nvidia.com>
* | disk: part_efi: re-order partition list printf, change caseStephen Warren2012-10-17-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | The partition name is a long variable-length string. Move it last on the line to ensure consistent layout and that the entries align with the "header" line. Also, surround it in quotes, so if it's empty, it's obvious that something is still being printed. Also, change the case of the LBA numbers; lower-case looks nicer in my opinion, and will be more consistent with the UUID printing that is added later in this series. Signed-off-by: Stephen Warren <swarren@nvidia.com>
* | disk: part_efi: remove indent level from loopStephen Warren2012-10-17-8/+7
| | | | | | | | | | | | | | | | Simplify the partition printing loop in print_part_efi() to bail out early when the first invalid partition is found, rather than indenting the whole body of the loop. This simplifies later patches. Signed-off-by: Stephen Warren <swarren@nvidia.com>
* | disk: get_device_and_partition() return value fixesStephen Warren2012-10-17-1/+1
| | | | | | | | | | | | | | | | | | | | | | When no valid partitions are found, guarantee that we return -1. This most likely already happens, since the most recent get_partition_info() will have returned an error. However, it's best to be explicit. Remove an unnecessary assignment of ret=0 in the success case; this value is over-written with the processed partition ID later. Signed-off-by: Stephen Warren <swarren@nvidia.com>
* | remove unnecessary includes from cmd_ide.cPavel Herrmann2012-10-17-8/+0
| | | | | | | | | | | | mpc8xx and mpc5xxx specific includes in cmd_ide.c are not required, remove them. Signed-off-by: Pavel Herrmann <morpheus.ibis@gmail.com>
* | split PCS440EP specific code from cmd_ide.cPavel Herrmann2012-10-17-18/+56
| | | | | | | | | | | | Move specific ide_input_data and friends to board-specific file. Signed-off-by: Pavel Herrmann <morpheus.ibis@gmail.com>
* | split AU1X00 specific code from cmd_ide.cPavel Herrmann2012-10-17-4/+35
| | | | | | | | | | | | move special case of ide_swap_read() for AU1X00 SoC into SoC-specific directory. Signed-off-by: Pavel Herrmann <morpheus.ibis@gmail.com>
* | move CPC45 ide_led to the same file as other IDE hooksPavel Herrmann2012-10-17-15/+15
| | | | | | | | | | | | Keep all IDE-related hooks and overrides in a single file, to avoid confusion Signed-off-by: Pavel Herrmann <morpheus.ibis@gmail.com>
* | make ide_led() a weak aliasPavel Herrmann2012-10-17-36/+27
| | | | | | | | | | | | | | | | | | | | Make ide_led() a weak alias instead of global/local function/empty macro based on CONFIG_IDE_LED value and/or board-specific CONFIGs, to get rid of board-specific code in cmd_ide.c Define dummy values to get rid of compoler errors in case where ide_led() used to be an empty macro Signed-off-by: Pavel Herrmann <morpheus.ibis@gmail.com>
* | split CPC45 board-specific IDE functions from cmd_ide.cPavel Herrmann2012-10-17-92/+131
| | | | | | | | | | | | | | | | | | Move input_data() and friends to board/cpc45/ide.c, as overrides for weak aliases in cmd_ide.c note: checkpatch emits warnings about using volatile Signed-off-by: Pavel Herrmann <morpheus.ibis@gmail.com>
* | change all versions of input_data() and output_data() to global weak aliasesPavel Herrmann2012-10-17-23/+48
| | | | | | | | | | | | | | | | | | | | This changes input_data() and friends from static function to global symbols under weak alias, to enable board specific overrides (and therefore get rid of board-specific code in cmd_ide.c) Also declare ide_bus_offset in the header file, so other files can use ATA_CURR_BASE as well. Signed-off-by: Pavel Herrmann <morpheus.ibis@gmail.com>
* | split IVM power hooks from cmd_ide.cPavel Herrmann2012-10-17-48/+46
| | | | | | | | | | | | Move power control code from ide_reset() into IVM-specific IDE reset code. Signed-off-by: Pavel Herrmann <morpheus.ibis@gmail.com>
* | split mpc8xx hooks from cmd_ide.cPavel Herrmann2012-10-17-183/+287
| | | | | | | | | | | | | | | | | | | | | | | | | | move most of mpc8xx hooks from cmd_ide.c into ide_preinit() and newly created ide_init_postreset() (invoked after calling ide_reset after ide_preinit), some cleanup to make checkpatch happy, enable IDE init hooks in configs of affected boards. confusingly, these hooks are used by more than just mpc8xx-based boards, and therefore are placed in arch/ppc/lib/ note: checkpatch still emits warnings about using volatile Signed-off-by: Pavel Herrmann <morpheus.ibis@gmail.com>
* | remove CONFIG_SC3 from cmd_ide.cPavel Herrmann2012-10-17-7/+0
| | | | | | | | | | | | There is no difference in codepath with CONFIG_SC3 enabled, so just remove it Signed-off-by: Pavel Herrmann <morpheus.ibis@gmail.com>
* | kerneldoc: stdio: tmpl: Add stdio templateMarek Vasut2012-10-17-1/+47
| | | | | | | | | | | | | | | | | | | | Add STDIO documentation template. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Tom Rini <trini@ti.com> [trini: Fix DOCBOOKS line as we don't have linker_lists yet] Signed-off-by: Tom Rini <trini@ti.com>
* | kerneldoc: Annotate drivers/serial/serial.cMarek Vasut2012-10-17-0/+165
| | | | | | | | | | | | | | | | Add kerneldoc annotations into serial core. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Tom Rini <trini@ti.com>
* | serial: Reorder get_current()Marek Vasut2012-10-17-9/+12
| | | | | | | | | | | | | | | | | | | | Reorder the get_current() function to make it a bit more readable. The code does not grow and there is minor change in the code logic, where dev != NULL is now checked in any case. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Tom Rini <trini@ti.com>
* | serial: Reorder serial_assign()Marek Vasut2012-10-17-5/+6
| | | | | | | | | | | | | | | | | | | | Reorder serial_assign() function to get rid of the extra level of indentation. Also, adjust the return value to be -EINVAL instead of positive one to be more consistent. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Tom Rini <trini@ti.com>
* | serial: Use default_serial_puts() in driversMarek Vasut2012-10-17-297/+39
| | | | | | | | | | | | | | | | | | | | Replace the in-place ad-hoc implementation of serial_puts() within the drivers with default_serial_puts() call. This cuts down on the code duplication quite a bit. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Tom Rini <trini@ti.com>
* | serial: Implement default_serial_puts()Marek Vasut2012-10-17-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | U-Boot contains a lot of duplicit implementations of serial_puts() call which just pipes single characters into the port in loop. Implement function that does this behavior into common code, so others can make easy use of it. This function is called default_serial_puts() and it's sole purpose is to call putc() in loop on the whole string passed to it. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Tom Rini <trini@ti.com>