summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://www.denx.de/git/u-boot-microblazeTom Rini2013-02-04-6530/+121
|\
| * microblaze: Remove FSL support from generic boardMichal Simek2013-02-04-24/+0
| | | | | | | | | | | | | | | | This code was targetting one specific Microblaze platform configuration which is obsolete and fsl bus isn't used in this way. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * common: cmd_bdinfo: Fix compilation warning for microblazeMichal Simek2013-02-04-1/+1
| | | | | | | | | | | | | | | | | | | | | | Fix one printf compilation warning in microblaze bdinfo part. Warning log: cmd_bdinfo.c: In function 'do_bdinfo': cmd_bdinfo.c:219:2: warning: format '%u' expects argument of type 'unsigned int', but argument 2 has type 'long unsigned int' [-Wformat] Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * board: xilinx: Remove common folderMichal Simek2013-02-04-5865/+0
| | | | | | | | | | | | | | | | All these files was used for ancient xilinx drivers which are finally gone. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Tested-by: Rommel Custodio <sessyargc@gmail.com>
| * board: xilinx: Remove unused ancient i2c driverMichal Simek2013-02-04-634/+0
| | | | | | | | | | | | | | | | There is new driver in the driver folder. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Tested-by: Rommel Custodio <sessyargc@gmail.com> Acked-by: Heiko Schocher <hs@denx.de>
| * spi: xilinx_spi: Perform software reset during slave setupJason Wu2013-02-04-0/+5
| | | | | | | | | | | | to make sure it is in the clear state. Signed-off-by: Jason Wu <huanyu@xilinx.com>
| * common: cmd_bdinfo: Fix bdinfo to show all MACs for Microblaze and ARMMichal Simek2013-02-04-4/+21
| | | | | | | | | | | | | | - Show all ethernet MACs in the system. - Show current ethernet device Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * microblaze: Add muldi3.c which contains routines for _muldi3David Holsgrove2013-02-04-0/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Referenced arch/blackfin/lib/muldi3.c and the linux kernel. Resolves issue seen when building u-boot for HW_MUL=0; PLATFORM_CPPFLAGS += -mxl-soft-mul PLATFORM_CPPFLAGS += -mno-xl-multiply-high which resulted in error while linking to libgcc.a without mul hw (bs / m); libgcc.a(_muldi3.o): In function `__muldi3': .... src/gcc-4.6.2/libgcc/libgcc2.c:550: undefined reference to `_GLOBAL_OFFSET_TABLE_' This link failure would not occur if we used gcc instead of ld directly, as gcc will correctly use the crt's to resolve this link. Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * block: systemace: Added missing "else" in "ace_writew"Alexey Brodkin2013-02-04-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | System ACE compact flash controller supports either 8-bit (default) or 16-bit data transfers. And in corresponding driver we need to implement read/write of 16-bit data words properly for both modes of operation. In existing code if width==8 both branches get executed which may cause unexpected behavior of SystemAce controller. Addition of "else" fixes described issue and execution is done as expected for both (8-bit and 16-bit) data bus widths. Signed-off-by: Alexey Brodkin <alexey.brodkin@gmail.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
* | serial: arm_dcc: Fix compilation warning and remove unneeded initializationMichal Simek2013-02-04-5/+0
| | | | | | | | | | | | | | | | | | | | | | - arm_dcc_dev is already initialized. - Remove unused rc variable Warning log: arm_dcc.c: In function 'drv_arm_dcc_init': arm_dcc.c:145:6: warning: unused variable 'rc' [-Wunused-variable] Signed-off-by: Michal Simek <michal.simek@xilinx.com> Acked-by: Marek Vasut <marex@denx.de>
* | serial: arm_dcc: Remove CONFIG_ARM_DCC_MULTI optionMichal Simek2013-02-04-13/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG_ARM_DCC_MULTI should be also removed in the patch "serial: Remove CONFIG_SERIAL_MULTI from serial drivers" (sha1: a3827250606895ec2dd4b8d867342b7cabf3692f) Because the driver defines serial_* functions which cause conflict with serial.c (multiple definition of serial_*) Removing CONFIG_SERIAL_MULTI function also require to define default_serial_console for cases where another serial driver is not available in the system. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Acked-by: Marek Vasut <marex@denx.de>
* | sf: stmicro: add support for N25Q064Jagannadha Sutradharudu Teki2013-02-04-0/+6
| | | | | | | | | | | | Add support for Numonyx N25Q064 SPI flash. Signed-off-by: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
* | cmd_time: merge run_command_and_time_it with cmd_processRichard Genoud2013-02-04-35/+12
| | | | | | | | | | | | | | | | | | | | As far as every arch has a get_timer function, run_command_and_time_it code can now disappear. Signed-off-by: Richard Genoud <richard.genoud@gmail.com> Acked-By: Che-Liang Chiou <clchiou@chromium.org> [trini: s/ulong/unsigned long/ in command.h portion] Signed-off-by: Tom Rini <trini@ti.com>
* | console: USB: KBD: Fix incorrect autoboot timeoutJim Lin2013-02-04-5/+5
| | | | | | | | | | | | | | | | | | Autoboot timeout defined by CONFIG_BOOTDELAY will not be accurate if CONFIG_USB_KEYBOARD and CONFIG_SYS_USB_EVENT_POLL are defined in configuration file and when tstc() function for checking key pressed takes longer time than 10 ms (e.g., 50 ms) to finish. Signed-off-by: Jim Lin <jilin@nvidia.com>
* | board sc3: fix warning about nested commentJeroen Hofstee2013-02-04-2/+4
| | | | | | | | | | cc: Heiko Schocher <hs@denx.de> Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
* | common: env_mmc: Use __weak annotation to simplify codeFabio Estevam2013-02-04-3/+1
| | | | | | | | | | | | | | Using the __weak annotation can make the code cleaner. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Marek Vasut <marex@denx.de>
* | common/cmd_bootm.c: prevent running of subcommands before 'bootm start'Gabor Juhos2013-02-04-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The execution order of the bootm subcommands is fixed. Although here is a sanity check in the state machine which should prevent running the subcommands in wrong order but it does not catch all possible errors. It is possible to run any subcommand without running 'bootm start' first which leads to unexpected behaviour. For example, running 'bootm loados' without 'bootm start' causes a hang: U-Boot> bootm loados XIP Invalid Image ... OK OK Add a sanity check to 'do_bootm_subcommand' in order to ensure that no subcommands can be executed before 'bootm start'. After the patch running of any subcommand without running 'bootm start' will cause an error like this: U-Boot> bootm loados Trying to execute a command out of order bootm - boot application image from memory Usage: bootm [addr [arg ...]] - boot application image stored in memory ... Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
* | drivers/block/systemace - fixed data type in "systemace_read" to match ↵Alexey Brodkin2013-02-04-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prototype in "block_dev_desc_t" Currently we have "unsigned long blkcnt" which is fine with CONFIG_SYS_64BIT_LBA undefined because "lbaint_t" is basically the same "unsigned long". If CONFIG_SYS_64BIT_LBA gets defined "lbaint_t" is defined as "unsigned long long". Even though not many embedded systems have CONFIG_SYS_64BIT_LBA defined it's good to have types in function implementation that match exactly with prototypes. Signed-off-by: Alexey Brodkin <alexey.brodkin@gmail.com>
* | FAT: remove ifdefs to make the code more readableRichard Genoud2013-02-04-34/+32
| | | | | | | | | | | | | | | | | | | | | | | | ifdefs in the code are making it harder to read. The use of simple if(vfat_enabled) makes no more code and is cleaner. (the code is discarded by the compiler instead of the preprocessor.) NB: if -O0 is used, the code won't be discarded and bonus, now the code compiles even if CONFIG_SUPPORT_VFAT is not defined. Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
* | FAT: use toupper/tolower instead of recoding themRichard Genoud2013-02-04-5/+4
| | | | | | | | | | | | | | | | toupper/tolower function are already declared, so use them. Signed-off-by: Richard Genoud <richard.genoud@gmail.com> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Stefano Babic <sbabic@denx.de>
* | configs:Remove unused macro CONFIG_DISCOVER_PHYAshok2013-02-04-2/+0
| | | | | | | | | | | | | | Remove unused macro CONFIG_DISCOVER_PHY from configs. Signed-off-by: Ashok Kumar Reddy <ashokkourla2000@gmail.com> Acked-by: Stefano Babic <sbabic@denx.de>
* | x86: Use generic global_dataSimon Glass2013-02-04-34/+3
| | | | | | | | | | | | Move x86 over to use generic global_data. Signed-off-by: Simon Glass <sjg@chromium.org>
* | sparc: Use generic global_dataSimon Glass2013-02-04-45/+1
| | | | | | | | | | | | Move sparc over to use generic global_data. Signed-off-by: Simon Glass <sjg@chromium.org>
* | sh: Use generic global_dataSimon Glass2013-02-04-19/+1
| | | | | | | | | | | | Move sh over to use generic global_data. Signed-off-by: Simon Glass <sjg@chromium.org>
* | sandbox: Use generic global_dataSimon Glass2013-02-04-24/+1
| | | | | | | | | | | | Move sandbox over to use generic global_data. Signed-off-by: Simon Glass <sjg@chromium.org>
* | powerpc: Use generic global_dataSimon Glass2013-02-04-46/+1
| | | | | | | | | | | | Move powerpc over to use generic global_data. Signed-off-by: Simon Glass <sjg@chromium.org>
* | openrisc: Use generic global_dataSimon Glass2013-02-04-24/+1
| | | | | | | | | | | | Move openrisc over to use generic global_data. Signed-off-by: Simon Glass <sjg@chromium.org>
* | nios2: Use generic global_dataSimon Glass2013-02-04-23/+1
| | | | | | | | | | | | | | Move nios2 over to use generic global_data. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Thomas Chou <thomas@wytron.com.tw>
* | nds32: Use generic global_dataSimon Glass2013-02-04-31/+1
| | | | | | | | | | | | Move nds32 over to use generic global_data. Signed-off-by: Simon Glass <sjg@chromium.org>
* | mips: Use generic global_dataSimon Glass2013-02-04-33/+1
| | | | | | | | | | | | Move mips over to use generic global_data. Signed-off-by: Simon Glass <sjg@chromium.org>
* | microblaze: Use generic global_dataSimon Glass2013-02-04-26/+1
| | | | | | | | | | | | | | Move microblaze over to use generic global_data. Signed-off-by: Simon Glass <sjg@chromium.org> Tested-by: Michal Simek <monstr@monstr.eu>
* | m68k: Use generic global_dataSimon Glass2013-02-04-38/+1
| | | | | | | | | | | | Move m68k over to use generic global_data. Signed-off-by: Simon Glass <sjg@chromium.org>
* | blackfin: Use generic global_dataSimon Glass2013-02-04-31/+1
| | | | | | | | | | | | Move blackfin over to use generic global_data. Signed-off-by: Simon Glass <sjg@chromium.org>
* | avr32: Use generic global_dataSimon Glass2013-02-04-28/+1
| | | | | | | | | | | | Move avr32 over to use generic global_data. Signed-off-by: Simon Glass <sjg@chromium.org>
* | arm: Use generic global_dataSimon Glass2013-02-04-37/+1
| | | | | | | | Signed-off-by: Simon Glass <sjg@chromium.org>
* | Only use fb_base if we have a displaySimon Glass2013-02-04-0/+4
| | | | | | | | | | | | | | | | The ideal of having a frame buffer when there isn't a display is not that useful. Change the bdinfo command to expect this only when we have an lcd or video display. Signed-off-by: Simon Glass <sjg@chromium.org>
* | Add generic global_dataSimon Glass2013-02-04-0/+102
| | | | | | | | | | | | | | Add a generic global_data structure which all archs will eventually use. Signed-off-by: Simon Glass <sjg@chromium.org>
* | sandbox: Move ram_buf to arch_global_dataSimon Glass2013-02-04-5/+5
| | | | | | | | | | | | Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
* | avr32: Move cpu_hz to arch_global_dataSimon Glass2013-02-04-7/+7
| | | | | | | | | | | | Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
* | avr32: Move stack_end to arch_global_dataSimon Glass2013-02-04-5/+5
| | | | | | | | | | | | Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
* | mips: Move per_clk and dev_clk to arch_global_dataSimon Glass2013-02-04-4/+5
| | | | | | | | | | | | | | | | Move these field into arch_global_data and tidy up. The other CONFIG_JZSOC fields are used by various architectures, so just remove the #ifdef bracketing for these. Signed-off-by: Simon Glass <sjg@chromium.org>
* | m68k: Move CONFIG_EXTRA_CLOCK to arch_global_dataSimon Glass2013-02-04-26/+26
| | | | | | | | | | | | Move inp_clk, vco_clk and flb_clk into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
* | sparc: Drop kbd_status and reset_status from global_dataSimon Glass2013-02-04-4/+0
| | | | | | | | | | | | These fields is not used on sparc, so punt them. Signed-off-by: Simon Glass <sjg@chromium.org>
* | ppc: arm: Move sdhc_clk into arch_global_dataSimon Glass2013-02-04-26/+27
| | | | | | | | | | | | | | This is used by both powerpc and arm, but I think it still qualifies as architecture-specific. Signed-off-by: Simon Glass <sjg@chromium.org>
* | ppc: Move kbd_status to arch_global_dataSimon Glass2013-02-04-13/+13
| | | | | | | | | | | | Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
* | ppc: Move wdt_last to arch_global_dataSimon Glass2013-02-04-7/+7
| | | | | | | | | | | | Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
* | ppc: Move fpga_state to arch_global_dataSimon Glass2013-02-04-17/+19
| | | | | | | | | | | | Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
* | ppc: Remove console_addr from global dataSimon Glass2013-02-04-6/+0
| | | | | | | | | | | | This does not appear to be used, so punt it. Signed-off-by: Simon Glass <sjg@chromium.org>
* | ppc: Move mirror_hack to arch_global_dataSimon Glass2013-02-04-4/+4
| | | | | | | | | | | | Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
* | arm: Move uart_clk to arch_global_dataSimon Glass2013-02-04-7/+7
| | | | | | | | | | | | Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>