summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Prepare v2010.09v2010.09Wolfgang Denk2010-09-28-1/+1
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* mpc512x: fix build issuesWolfgang Denk2010-09-28-1/+0
| | | | | | | | | | | | | Commit 800eb0964 "POST cleanup." removed file arch/powerpc/cpu/mpc512x/common.c but failed to remove the reference to it from arch/powerpc/cpu/mpc512x/Makefile which causes somewhat obscure build errors: make[1]: *** No rule to make target `/work/wd/tmp-ppc/arch/powerpc/cpu/mpc512x/.depend', needed by `_depend'. Stop. Fix these. Signed-off-by: Wolfgang Denk <wd@denx.de>
* ARMV7: OMAP3: Update Beagle xM pinmux with USB hub and DVI gpio setupSteve Sakoman2010-09-28-0/+4
| | | | | | | | | | | This patch adds missing pinmux setup for 4 GPIO signals used on the Beagle xM: - USB hub reset (gpio_56) - P8 USB hub reset (gpio_63) - DVI enable (gpio_129) - P8 DVI enable (gpio_170) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
* ARMV7: OMAP4: Calculate SDRAM sizeAneesh V2010-09-28-1/+39
| | | | | | | | | | | Calculate the SDRAM size from DMM configuration registers instead of using hard-coded values. This gives correct values for all different boards. It's assumed that DMM sections do not overlap memory areas. Signed-off-by: Aneesh V <aneesh@ti.com> Tested-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
* ARMV7: OMAP4: Fix Panda pinmux setting to enable Wifi/BT ModuleSteve Sakoman2010-09-28-9/+9
| | | | | | | | This patch corrects the pinmux settings to enable proper functioning of the wifi/bluetooth module. Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
* ixp/npe: Remove duplicated commentThomas Weber2010-09-28-5/+0
| | | | Signed-off-by: Thomas Weber <weber@corscience.de>
* bmw: Remove duplicated include of header fileThomas Weber2010-09-28-1/+0
| | | | Signed-off-by: Thomas Weber <weber@corscience.de>
* README: Fix description of version numbering schemeThomas Weber2010-09-28-7/+11
| | | | | | | | | | | | The version numbering scheme was changed in Oct, 2008. This patch brings the documentation to the actual level. The description is taken from: http://www.denx.de/wiki/U-Boot/ReleaseCycle Signed-off-by: Thomas Weber <weber@corscience.de> Changed text slightly. Signed-off-by: Wolfgang Denk <wd@denx.de>
* Fix "ubi part" cmd re-entrancyKarl Beldan2010-09-27-0/+1
| | | | | | | | | Commit 2ee951ba (UBI: Enable re-initializing of the "ubi part" command) reset mtd_devs in ubi_exit() but missed ubi_init()'s failure path. Signed-off-by: Karl Beldan <karl.beldan@gmail.com> Cc: Stefan Roese <sr@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
* Merge branch 'master' of git://git.denx.de/u-boot-ppc4xxWolfgang Denk2010-09-23-102/+138
|\
| * ppc4xx/fdt/flash: Change fdt_fixup_nor_flash_node() to not rely on cs sizeStefan Roese2010-09-23-17/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes the behaviour of the fdt_fixup_nor_flash_node() function. Now it doesn't patch the size of the "reg" property with the chip-select size, but with the size returned from the new function flash_get_bank_size(). This function will return per weak default the flash size of the bank (bank = chip-select numer) detected by the flash driver. If this does not fit your needs, this function may be overridden by a board specific one. For this the parameters needed to be changed. So I intentionally squashed the PPC4xx stuff using this routine into this patch. Otherwise it would not be git-bisectable anymore. The board specific function for the AMCC/APM Ebony eval board is now included in this patch version. Signed-off-by: Stefan Roese <sr@denx.de> Tested-by: Detlev Zundel <dzu@denx.de> Cc: Gerald Van Baren <vanbaren@cideas.com> Cc: Wolfgang Denk <wd@denx.de>
| * ppc4xx: POST UART: Use in/out_8() io-accessor functionsStefan Roese2010-09-23-64/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a problem in the PPC4xx POST UART driver. This driver incorrectly used the in/out8() io-accessor functions. This could lead to problems since these functions don't guarantee execution ordering. This patch now replaces these functions with the correct ones. Additionally the driver is converted to using the NS16550 struct instead of macros for the register offsets. And some common code is factored out for better maintainability. Signed-off-by: Stefan Roese <sr@denx.de>
| * ppc4xx: Fix CATcenter buildStefan Roese2010-09-23-21/+2
| | | | | | | | Signed-off-by: Stefan Roese <sr@denx.de>
* | Merge branch 'master' of git://git.denx.de/u-boot-videoWolfgang Denk2010-09-22-0/+0
|\ \ | |/ |/|
| * video: cfb_console: fix definition and usage of CURSOR_xxx macrosTimur Tabi2010-09-21-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CURSOR_ON, CURSOR_OFF, and CURSOR_SET macros are defined incorrectly. If cursor support is disabled, then these macros are defined to nothing, but then they are used like this: if (console_col < CONSOLE_COLS) CURSOR_OFF console_row++; which was compiled like this: if (console_col < CONSOLE_COLS) console_row++; This is obviously not what was intended. Signed-off-by: Timur Tabi <timur@freescale.com> Acked-by: Detlev Zundel <dzu@denx.de>
* | Merge branch 'master' of git://git.denx.de/u-boot-blackfinWolfgang Denk2010-09-22-6/+7
|\ \
| * | Blackfin: bfin_spi: use same gpio cs define as LinuxMike Frysinger2010-09-21-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Linux uses an offset of 8 to switch from hardware cs to a gpio cs, so have u-boot use the same value. Also make sure it is public for boards to access. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: update some missed board config.mk filesMike Frysinger2010-09-21-4/+4
| |/ | | | | | | | | | | Seems these two files were missed during the big lib shuffle. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Merge branch 'master' of /home/wd/git/u-boot/masterWolfgang Denk2010-09-22-720/+106
|\ \ | |/
| * POST cleanup.Michael Zaidman2010-09-21-713/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Revives POST for blackfin arch; - Removes redundant code: arch/blackfin/lib/post.c arch/powerpc/cpu/ppc4xx/commproc.c arch/powerpc/cpu/mpc512x/common.c - fixes up the post_word_{load|store} usage. Signed-off-by: Michael Zaidman <michael.zaidman@gmail.com> Acked-by: Detlev Zundel <dzu@denx.de> Tested-by: Anatolij Gustschin <agust@denx.de> List of the maintainers of the affected by patch boards: Cc: Stephan Linz <linz@li-pro.net> Cc: Denis Peter <d.peter@mpl.ch> Cc: Matthias Fuchs <matthias.fuchs@esd-electronics.com> Cc: Peter Tyser <ptyser@xes-inc.com> Cc: Stefan Roese <sr@denx.de> Cc: Mike Frysinger <vapier@gentoo.org> Cc: Niklaus Giger <niklaus.giger@netstal.com> Cc: Larry Johnson <lrj@acm.org> Cc: Feng Kan <fkan@amcc.com>
| * cmd_mmc: use common usage functionMike Frysinger2010-09-21-6/+3
| | | | | | | | | | | | | | Rather than using a custom "Usage:", use the common cmd_usage() function, and tail into it now that it returns 1 for us. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * setlocalversion: add some more fallbacks for git describeMike Frysinger2010-09-21-1/+2
| | | | | | | | | | | | | | | | | | If working out of a custom git tree that lacks annotated tags, the 'git describe' operation spews "fatal: cannot describe" errors all over the place. So add some fallback code in case the best naming was unable to locate something useful. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Merge branch 'master' of /home/wd/git/u-boot/masterWolfgang Denk2010-09-21-21/+1448
|\ \ | |/
| * Prepare v2010.09-rc2v2010.09-rc2Wolfgang Denk2010-09-19-2/+2
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * Save environment data to mmc.Terry Lv2010-09-19-12/+177
| | | | | | | | | | | | | | | | This patch is to save environment data to mmc card. It uses interfaces defined in generic mmc. Signed-off-by: Terry Lv <r65388@freescale.com> Acked-by: Stefano Babic <sbabic@denx.de>
| * socrates: adjust TEXT_BASE to increase U-Boot image sizeWolfgang Denk2010-09-19-1/+1
| | | | | | | | | | | | | | We need more room for the U-Boot image. Shift TEXT_BASE as needed. Signed-off-by: Wolfgang Denk <wd@denx.de>
| * mmc: fix compiler warningsWolfgang Denk2010-09-19-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit d2bf29e3 caused a number of compiler warnings: mmc.c: In function 'mmc_bwrite': mmc.c:97: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'long unsigned int' mmc.c:97: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'lbaint_t' mmc.c: In function 'mmc_bread': mmc.c:229: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'long unsigned int' mmc.c:229: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'lbaint_t' Fix these. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Lei Wen <leiwen@marvell.com>
| * tools/env: fail on invalid optionsDaniel Hobi2010-09-18-0/+4
| | | | | | | | Signed-off-by: Daniel Hobi <daniel.hobi@schmid-telecom.ch>
| * tools/env: allow option "-n" for fw_printenvDaniel Hobi2010-09-18-2/+5
| | | | | | | | | | | | | | | | | | | | | | In commit bd7b26f8 (Tools: set multiple variable with fw_setenv utility), the option parsing was changed to getopt_long(3), but option "-n" of fw_printenv was not included. This leads to an error message "invalid option -- 'n'" on stderr, although the output on stdout is correct. Signed-off-by: Daniel Hobi <daniel.hobi@schmid-telecom.ch>
| * ARM: Update ARM mach-typesThomas Weber2010-09-18-4/+1226
| | | | | | | | | | | | This patch updates the mach-types.h based on the latest linux kernel Signed-off-by: Thomas Weber <weber@corscience.de>
| * mmc: print out partition tableLei Wen2010-09-18-0/+23
| | | | | | | | Signed-off-by: Lei Wen <leiwen@marvell.com>
| * mmc: add boundary check for mmc operationLei Wen2010-09-18-0/+10
| | | | | | | | Signed-off-by: Lei Wen <leiwen@marvell.com>
* | video: cfb_console: fix definition and usage of CURSOR_xxx macrosTimur Tabi2010-09-16-10/+14
|/ | | | | | | | | | | | | | | | | | | | The CURSOR_ON, CURSOR_OFF, and CURSOR_SET macros are defined incorrectly. If cursor support is disabled, then these macros are defined to nothing, but then they are used like this: if (console_col < CONSOLE_COLS) CURSOR_OFF console_row++; which was compiled like this: if (console_col < CONSOLE_COLS) console_row++; This is obviously not what was intended. Signed-off-by: Timur Tabi <timur@freescale.com> Acked-by: Detlev Zundel <dzu@denx.de>
* Merge branch 'master' of git://git.denx.de/u-boot-nand-flashWolfgang Denk2010-09-15-1/+14
|\
| * nand/davinci: make sure ECC calculation has really startedWolfram Sang2010-09-13-1/+14
| | | | | | | | | | | | | | | | | | | | Due to a register glitch (result code <4 might show up right after the start-calculation-bit was set), make sure the ECC has really started. See 1c3275b656045aff9a75bb2c9f3251af1043ebb3 in the kernel. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Cc: Sandeep Paulraj <s-paulraj@ti.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-x86Wolfgang Denk2010-09-15-4479/+70
|\ \ | |/ |/|
| * x86: Remove Unmaintained BoardsGraeme Russ2010-09-13-4471/+0
| | | | | | | | | | | | The SC520 CDP boards originally implemented by Daniel Engström are now very broken. Attempts to contact Daniel via the email address on the copyright notice have failed. Remove these boards from mainline
| * x86: Fix x86 Cold BootGraeme Russ2010-09-13-0/+5
| | | | | | | | | | | | Commit 077e1958ca4afe12d88043b123ded058c51b89f7 broke the ability of the x86 port to boot from a cold-reset by removing the initial IDT. Re- instate the initial IDT to allow cold-booting of x86 boards
| * x86: Add do_bdinfo()Graeme Russ2010-09-13-3/+45
| | | | | | | | | | x86 failed to compile with a message "a case for this architecture does not exist!" - Add do_bdinfo() for this arch
| * x86: Fix do_go_exec() - const argv[]Graeme Russ2010-09-13-5/+20
| | | | | | | | | | | | | | | | | | | | | | Commit 54841ab50c20d6fa6c9cc3eb826989da3a22d934 made the argv parameter to do_go_exec() const but did not allow for the fact that argv[-1] is set to point to the global data structure and relies on argv being non- const. With this patch, do_go_exec() creates a new copy of the argv array with an extra element to store global data pointer rather than simply clobbering an arbitrary memory location.
* | display_buffer: fix misaligned bufferReinhard Meyer2010-09-13-12/+15
|/ | | | | | use a union to cause necessary alignment per architecture Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
* usb: musb: set target address for non-multipoint devicesBryan Wu2010-09-11-0/+7
| | | | | | Signed-off-by: Bryan Wu <bryan.wu@analog.com> Signed-off-by: Cliff Cai <cliff.cai@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* usb: musb: setup TXCOUNT for Blackfin musbBryan Wu2010-09-11-0/+5
| | | | | | | | | The Blackfin implementation of musb has a TXCOUNT register that needs to be programmed when transmitting data. Signed-off-by: Bryan Wu <bryan.wu@analog.com> Signed-off-by: Cliff Cai <cliff.cai@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Prepare v2010.09-rc1v2010.09-rc1Wolfgang Denk2010-09-10-27/+14
| | | | | | Coding style cleanup. Signed-off-by: Wolfgang Denk <wd@denx.de>
* Merge branch 'master' of git://git.denx.de/u-boot-armWolfgang Denk2010-09-09-846/+4866
|\
| * MX51: Update responsible for mx51evkStefano Babic2010-09-09-4/+1
| | | | | | | | Signed-off-by: Stefano Babic <sbabic@denx.de>
| * Merge branch 'master' of git://git.denx.de/u-boot-tiWolfgang Denk2010-09-09-418/+1070
| |\
| | * ARMV7: Fix pad mux for Panda LEDsRicardo Salveti de Araujo2010-09-08-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly set PAD1_FREF_CLK4_REQ and PAD0_FREF_CLK4_OUT to enable and activate both LEDs while setting pad mux. Since this increases the line length, this patch also adjusts the white space in this section of code to allign the pad mux signal description comments. Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| | * ARMV7: OMAP: Overo: Autodetect presence/absence of transceiver on mmc2Steve Sakoman2010-09-08-2/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An upcoming version of Overo uses a Wifi/BT module with 1.8V signaling, eliminating the need for an external transceiver to handle the level shifting. This patch detects whether an external transceiver is present and adjusts the pinmux settings as appropriate. Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| | * ARMV7: OMAP3: Add support for Beagle xMSteve Sakoman2010-09-08-5/+44
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the Beagle xM. It uses the board ID GPIO bits to recognize this revision and perform appropriate setup. Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>