summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-02-04Merge branch 'master' of git://git.denx.de/u-boot-x86Tom Rini
2013-02-04Merge branch 'master' of git://git.denx.de/u-bootKim Phillips
2013-02-04Merge branch 'master' of git://www.denx.de/git/u-boot-microblazeTom Rini
2013-02-04serial: arm_dcc: Fix compilation warning and remove unneeded initializationMichal Simek
- 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>
2013-02-04serial: arm_dcc: Remove CONFIG_ARM_DCC_MULTI optionMichal Simek
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>
2013-02-04sf: stmicro: add support for N25Q064Jagannadha Sutradharudu Teki
Add support for Numonyx N25Q064 SPI flash. Signed-off-by: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
2013-02-04cmd_time: merge run_command_and_time_it with cmd_processRichard Genoud
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>
2013-02-04console: USB: KBD: Fix incorrect autoboot timeoutJim Lin
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>
2013-02-04board sc3: fix warning about nested commentJeroen Hofstee
cc: Heiko Schocher <hs@denx.de> Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
2013-02-04common: env_mmc: Use __weak annotation to simplify codeFabio Estevam
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>
2013-02-04common/cmd_bootm.c: prevent running of subcommands before 'bootm start'Gabor Juhos
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>
2013-02-04drivers/block/systemace - fixed data type in "systemace_read" to match ↵Alexey Brodkin
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>
2013-02-04FAT: remove ifdefs to make the code more readableRichard Genoud
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>
2013-02-04FAT: use toupper/tolower instead of recoding themRichard Genoud
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>
2013-02-04configs:Remove unused macro CONFIG_DISCOVER_PHYAshok
Remove unused macro CONFIG_DISCOVER_PHY from configs. Signed-off-by: Ashok Kumar Reddy <ashokkourla2000@gmail.com> Acked-by: Stefano Babic <sbabic@denx.de>
2013-02-04x86: Use generic global_dataSimon Glass
Move x86 over to use generic global_data. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04sparc: Use generic global_dataSimon Glass
Move sparc over to use generic global_data. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04sh: Use generic global_dataSimon Glass
Move sh over to use generic global_data. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04sandbox: Use generic global_dataSimon Glass
Move sandbox over to use generic global_data. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04powerpc: Use generic global_dataSimon Glass
Move powerpc over to use generic global_data. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04openrisc: Use generic global_dataSimon Glass
Move openrisc over to use generic global_data. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04nios2: Use generic global_dataSimon Glass
Move nios2 over to use generic global_data. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Thomas Chou <thomas@wytron.com.tw>
2013-02-04nds32: Use generic global_dataSimon Glass
Move nds32 over to use generic global_data. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04mips: Use generic global_dataSimon Glass
Move mips over to use generic global_data. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04microblaze: Use generic global_dataSimon Glass
Move microblaze over to use generic global_data. Signed-off-by: Simon Glass <sjg@chromium.org> Tested-by: Michal Simek <monstr@monstr.eu>
2013-02-04m68k: Use generic global_dataSimon Glass
Move m68k over to use generic global_data. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04blackfin: Use generic global_dataSimon Glass
Move blackfin over to use generic global_data. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04avr32: Use generic global_dataSimon Glass
Move avr32 over to use generic global_data. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04arm: Use generic global_dataSimon Glass
Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04Only use fb_base if we have a displaySimon Glass
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>
2013-02-04Add generic global_dataSimon Glass
Add a generic global_data structure which all archs will eventually use. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04sandbox: Move ram_buf to arch_global_dataSimon Glass
Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04avr32: Move cpu_hz to arch_global_dataSimon Glass
Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04avr32: Move stack_end to arch_global_dataSimon Glass
Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04mips: Move per_clk and dev_clk to arch_global_dataSimon Glass
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>
2013-02-04m68k: Move CONFIG_EXTRA_CLOCK to arch_global_dataSimon Glass
Move inp_clk, vco_clk and flb_clk into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04sparc: Drop kbd_status and reset_status from global_dataSimon Glass
These fields is not used on sparc, so punt them. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04ppc: arm: Move sdhc_clk into arch_global_dataSimon Glass
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>
2013-02-04ppc: Move kbd_status to arch_global_dataSimon Glass
Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04ppc: Move wdt_last to arch_global_dataSimon Glass
Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04ppc: Move fpga_state to arch_global_dataSimon Glass
Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04ppc: Remove console_addr from global dataSimon Glass
This does not appear to be used, so punt it. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04ppc: Move mirror_hack to arch_global_dataSimon Glass
Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04arm: Move uart_clk to arch_global_dataSimon Glass
Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04ppc: Move dp_alloc_base, dp_alloc_top to arch_global_dataSimon Glass
Move these fields into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04ppc: Move arbiter fields to arch_global_dataSimon Glass
Move arbiter_event_attributes and arbiter_event_address into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04ppc: Move reset_status to arch_global_dataSimon Glass
Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04ppc: Move mpc8220 clocks to arch_global_dataSimon Glass
Move these fields into arch_global_data and tidy up. The bExtUart field does not appear to be used, so punt it. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04ppc: Move mpc512x clocks to arch_global_dataSimon Glass
Move ips_clk and csb_clk into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
2013-02-04ppc: Move mpc5xxx clocks to arch_global_dataSimon Glass
Move ipb_clk and pci_clk into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
generated by cgit (git 2.34.1) at 2024-12-29 14:01:20 +0000