summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* OMAP3 Move twl4030 mmc functionTom Rix2009-07-29-11/+25
| | | | | | | | | | | | | | | | | | | | | | Because twl4030 now has its own device files, move and rename twl4030_mmc_config. twl4030_mmc_config initializes the twl4030 power setting to the mmc device. Because it is in the twl4030 power domain, move it out of drivers/mmc/omap3_mmc.c and into drivers/power/twl4030.c. The function was renamed to twl4030_power_mmc_init because all the functions in this file are to have the format twl4030_power_<device>_<action> In this case the suffix is mmc_init so device : mmc action : init Signed-off-by: Tom Rix <Tom.Rix@windriver.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Heiko Schocher <hs@denx.de>
* OMAP3 Move twl4030 power and led functionsTom Rix2009-07-29-136/+292
| | | | | | | | | | | | | | | | | | | | | | | | Because twl4030 now has its own device files, move exiting omap3 power_init_r to a new location. power_init_r is the only function in board/omap3/common. It initializes the twl4030 power for the board and enables the led. The power part of the the function is moved to twl4030_power_init in drivers/power/twl4030.c The power compilation is conditional on the existing config variable CONFIG_TWL4030_POWER. The led part is moved to twl4030_led_init in the new file drivers/misc/twl4030_led.c The led compilation is conditional on the new config variable CONFIG_TWL4030_LED The directory board/omap3/common was removed because power_init_r was the only function in it. Signed-off-by: Tom Rix <Tom.Rix@windriver.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Heiko Schocher <hs@denx.de>
* TWL4030 Add power reset buttonTom Rix2009-07-28-0/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The Zoom2 power reset button is on the top right side of the main board. Press and hold for about to 8 seconds to completely reset the board. Some of the beta boards have a hardware problem that prevents using this feature. If is difficult to further characterize the boards that fail. So disable resetting for all beta boards. The Zoom1 reset button is the red circle on the top right, front of the board. Press and hold the button for 8 seconds to completely reset the board. After analyzing beagle, it was determined that other boards that use the twl4030 for power managment can also make use this function. The resetting is done by the power management part of the twl4030. Since there is no existing drivers/power, add one. The compilation of power/twl4030.h is controlled by the config variable CONFIG_TWL4030_POWER Signed-off-by: Tom Rix <Tom.Rix@windriver.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Heiko Schocher <hs@denx.de>
* TWL4030 Add initial supportTom Rix2009-07-28-0/+245
| | | | | | | | | | | | | | | | | The TWL4030 supplies many peripherals for OMAP3 boards. These include power management, usb and, keyboard. The product description is found here: http://focus.ti.com/docs/prod/folders/print/tps65950.html Product reference document, tps65950.pdf, is found here: http://www.ti.com/lit/gpn/tps65950 Signed-off-by: Tom Rix <Tom.Rix@windriver.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Heiko Schocher <hs@denx.de>
* OMAP I2C Fix the sampling clock.Tom Rix2009-07-28-14/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This problem is seen on Zoom1 and Zoom2 in the startup and when i2c probe is used Before : In: serial Out: serial Err: serial timed out in wait_for_bb: I2C_STAT=1000 timed out in wait_for_bb: I2C_STAT=1000 timed out in wait_for_bb: I2C_STAT=1000 timed out in wait_for_pin: I2C_STAT=1000 I2C read: I/O error timed out in wait_for_bb: I2C_STAT=1000 timed out in wait_for_bb: I2C_STAT=1000 Die ID #327c00020000000004013ddd05026013 Hit any key to stop autoboot: 0 OMAP3 Zoom1# i2c probe Valid chip addresses:timed out in wait_for_bb: I2C_STAT=1000 02 03 04 05 06 07 08 09 0A 0B 0C 0D <snip> After : In: serial Out: serial Err: serial Die ID #327c00020000000004013ddd05026013 Hit any key to stop autoboot: 0 OMAP3 Zoom1# i2c probe Valid chip addresses: 48 49 4A 4B The addresses are for the twl4030. The prescalar that converts the function clock to the sampling clock is hardcoded to 0. The reference manual recommends 7 if the function clock is 96MHz. Instead of just changing the hardcoded values, the prescalar is calculated from the value I2C_IP_CLK. The i2c #defines are in kHz. The speed passed into the i2c init routine is in Hz. To be consistent, change the defines to be in Hz. The timing calculations are based on what is done in the linux 2.6.30 kernel in drivers/i2c/buses/i2c_omap.c as apposed to what is done in TRM. The major variables in the timing caculations are specified as #defines that can be overriden as required. The variables and their defaults are I2C_IP_CLK SYSTEM_CLOCK_96 I2C_INTERNAL_SAMPLING_CLK 19200000 I2C_FASTSPEED_SCLL_TRIM 6 I2C_FASTSPEED_SCLH_TRIM 6 I2C_HIGHSPEED_PHASE_ONE_SCLL_TRIM I2C_FASTSPEED_SCLL_TRIM I2C_HIGHSPEED_PHASE_ONE_SCLH_TRIM I2C_FASTSPEED_SCLH_TRIM I2C_HIGHSPEED_PHASE_TWO_SCLL_TRIM I2C_FASTSPEED_SCLL_TRIM I2C_HIGHSPEED_PHASE_TWO_SCLH I2C_FASTSPEED_SCLH_TRIM This was runtime verified on Zoom1, Zoom2, Beagle and Overo. The 400kHz and 3.4M cases were verifed on test Zoom1, Zoom2, Beagle and Overo configurations. Testing for omap2 will be done in a second step as Nishanth and Jean-Christophe commented. Signed-off-by: Tom Rix <Tom.Rix@windriver.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Heiko Schocher <hs@denx.de>
* arm, i2c: added support for the TWSI I2C InterfaceHeiko Schocher2009-07-28-0/+485
| | | | Signed-off-by: Heiko Schocher <hs@denx.de>
* Prepare 2009.08-rc1 (again, after fixing last minute issues).v2009.08-rc1Wolfgang Denk2009-07-27-0/+61
| | | | | | Update CHANGELOG Signed-off-by: Wolfgang Denk <wd@denx.de>
* cpu/arm920t/start.S: include <common.h> to have ROUND() definedWolfgang Denk2009-07-27-2/+1
| | | | | | | Commit fcd3c87e made include/common.h usable by assembler code but failed to update cpu/arm920t/start.S Signed-off-by: Wolfgang Denk <wd@denx.de>
* at91cap9adk: fix #ifdef/#endif pairing (2nd try)Wolfgang Denk2009-07-27-1/+0
| | | | | | | Commit 7024aa14 was supposed to fix the #ifdef/#endif pairing in include/configs/at91cap9adk.h, but did not cate all problems. Signed-off-by: Wolfgang Denk <wd@denx.de>
* Fix include/common.h for boards with CONFIG_STATUS_LEDWolfgang Denk2009-07-27-3/+3
| | | | | | | | | The reordering of include/common.h by commit fcd3c87e495f3c48 broke boards with status LED support, resulting in error: #error Status LED configuration missing errors. Undo this reordering to avoid this issue. Signed-off-by: Wolfgang Denk <wd@denx.de>
* ABI: fix build problems due to now needed div64 routine.Wolfgang Denk2009-07-27-0/+1
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* PMC405DE: fix out of tree buildingWolfgang Denk2009-07-27-1/+1
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Prepare 2009.08-rc1Wolfgang Denk2009-07-27-3/+640
| | | | | | Update CHANGELOG, minor coding style fix. Signed-off-by: Wolfgang Denk <wd@denx.de>
* add WATCHDOG_RESET to allow LZMA kernel decompression on slow machinesrhabarber1848@web.de2009-07-27-0/+30
| | | | Signed-off-by: rhabarber1848@web.de
* Less verbose output when loading vxworks 6.x imagesNiklaus Giger2009-07-27-1/+1
| | | | | | | | Loading vxWorks 5.x images resulted just into 3 or 4 lines of output. With vxWorks 6.x and the new GCC it emits about 30 lines, which is far too noisy in my opinion. Signed-off-by: Niklaus Giger <niklaus.giger@member.fsf.org>
* Make include/common.h usable by assembler codeWolfgang Denk2009-07-27-17/+21
| | | | | | | | | | | | | | Commit 70ebf316 factored out the ROUND() macro into include/common.h, not realizing that the primary use of this macro on AT91 systems was in start.S where common.h was not included, and could not be included because it contains a lot of C code which the assembler doesn't understand. This patch wraps such code in common.h in a "#ifndef __ASSEMBLY__" construct, and then adds an include to cpu/arm926ejs/start.S thus solving the problem. Signed-off-by: Wolfgang Denk <wd@denx.de>
* arm: add _lshrdi3.SHeiko Schocher2009-07-27-0/+47
| | | | Signed-off-by: Heiko Schocher <hs@denx.de>
* Make linking against libgcc configurableWolfgang Denk2009-07-27-12/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | Many (especially ARM) tool chains seem to come with broken or otherwise unusable (for the purposes of builing U-Boot) run-time support libraries `libgcc.a'. By using the "USE_PRIVATE_LIBGCC" setting we allow to use alternative libraries instead. "USE_PRIVATE_LIBGCC" can either be set as an environment variable in the shell, or as a command line argument when running "make", i. e. $ make USE_PRIVATE_LIBGCC=yes or $ USE_PRIVATE_LIBGCC=yes $ export USE_PRIVATE_LIBGCC $ make The value of "USE_PRIVATE_LIBGCC" is the name of the directory which contains the alternative run-time support library `libgcc.a'. The special value "yes" selects the directory $(OBJTREE)/lib_$(ARCH) . Note that not all architectures provide an alternative `libgcc.a' in their lib_$(ARCH) directories - so far, only ARM does. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Prafulla Wadaskar <prafulla@marvell.com> cc: Stefan Roese <sr@denx.de>
* Use do_div from div64.h for vsprintfDirk Behme2009-07-27-3/+4
| | | | | | | | | | Use do_div from div64.h for vsprintf in case of 64bit division. For 32bit division, do_div from div64.h can't be used as it needs a 64bit parameter. Signed-off-by: Dirk Behme <dirk.behme@googlemail.com> Acked-by: Stefan Roese <sr@denx.de> CC: Simon Kagstrom <simon.kagstrom@netinsight.net>
* Fix compiler warnings after loff_t changeKyungmin Park2009-07-27-1/+1
| | | | | | Now 'env_addr' type is loff_t so use correct field type. Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
* Revert "ppc: Unlock cache-as-ram in a consistent manner"Wolfgang Denk2009-07-26-3/+12
| | | | | | | | | This reverts commit 982adfc610669482a32127282fe489857a92cfe3. This patch causes problems on MPC83xx boards - flash recognition stops working. Signed-off-by: Wolfgang Denk <wd@denx.de>
* Merge branch 'master' of git://git.denx.de/u-boot-videoWolfgang Denk2009-07-26-279/+914
|\
| * update the EB+MCF-EV123 board supportJens Scharsig2009-07-26-280/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch updates the support for EB+MCF-EV123 board and needs the [PATCH 1/2 V3] new video driver for bus vcxk framebuffers * remove the board framebuffer driver * use the common bus_vcxk framebuffer driver * adds bmp support * adds splashimage support * fix serveral cosmetical errors Signed-off-by: Jens Scharsig <esw@bus-elektronik.de> [agust@denx.de: fixed some style issues before applying] Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * video: bus_vcxk.c: fix style issues added by 50217deeAnatolij Gustschin2009-07-26-11/+15
| | | | | | | | Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * new video driver for bus vcxk framebuffersJens Scharsig2009-07-26-0/+558
| | | | | | | | | | | | | | | | | | | | This patch adds a new video driver * adds common bus_vcxk framebuffer driver Signed-off-by: Jens Scharsig <esw@bus-elektronik.de> [agust@denx.de: fixed lots of style issues before applying] Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * lcd.h: define extern vidinfo_t for all casesAlessandro Rubini2009-07-26-6/+2
| | | | | | | | | | | | | | | | include/lcd.h has different vidinfo for different platforms, and several extern declaration, but one for the default case was missing. This makes them a single extern declaration for everyone. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
| * mimc200.c: fix too long lines added by f68378d6Anatolij Gustschin2009-07-26-12/+12
| | | | | | | | Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * Add LCD support to MIMC200 boardMark Jackson2009-07-26-0/+50
| | | | | | | | | | | | This patch updates the MIMC200 files to enable the LCD. Signed-off-by: Mark Jackson <mpfj@mimc.co.uk>
| * Add 16bit colour support in lcd.hMark Jackson2009-07-26-1/+1
| | | | | | | | | | | | This patch adds support for LCD_COLOR16 in include/lcd.h. Signed-off-by: Mark Jackson <mpfj@mimc.co.uk>
| * lib_avr32/board.c: fix too long line added by 716ece1dAnatolij Gustschin2009-07-26-1/+2
| | | | | | | | Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * Add AVR32 LCD supportMark Jackson2009-07-26-0/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the AVR32 LCD controller. This patch is based off the latest u-boot-video. A quick summary of what's going on:- Enable LCDC pixel clock Enable LCDC port pins Add framebuffer pointer to global_data struct Allocate framebuffer To use the new code, update your board config to include something like this:- #define CONFIG_LCD 1 #if defined(CONFIG_LCD) #define CONFIG_CMD_BMP #define CONFIG_ATMEL_LCD 1 #define LCD_BPP LCD_COLOR16 #define CONFIG_BMP_16BPP 1 #define CONFIG_FB_ADDR 0x10600000 #define CONFIG_WHITE_ON_BLACK 1 #define CONFIG_VIDEO_BMP_GZIP 1 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE 262144 #define CONFIG_ATMEL_LCD_BGR555 1 #define CONFIG_SYS_CONSOLE_IS_IN_ENV 1 #define CONFIG_SPLASH_SCREEN 1 #endif The standard U-Boot BMP and Splash-screen features should just work. Signed-off-by: Mark Jackson <mpfj@mimc.co.uk> [agust@denx.de: fixed some style issues] Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * video: move extern declarations from C to headersAlessandro Rubini2009-07-25-16/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves some extern declaration from lcd.c to lcd.h, removing unneeded ifdef around a pair of them. Additionally, since gunzip_bmp() was declared static in cmd_bmp.c but extern in lcd.c, I removed the static. The extra "#include <lcd.h>" in cmd_bmp.c is added to ensure the header is consistent with the source. This has been compile-tested on both ARM (at91 boards) and PowerPC (HH405_config, TQM823L_LCD_config, mcc200_config), to test all use combinations. Signed-off-by: Alessandro Rubini <rubini@gnudd.it> [agust@denx.de: removed gunzip_bmp() fixes as commit c01171ea did it] Signed-off-by: Anatolij Gustschin <agust@denx.de>
* | Merge branch 'master' of git://git.denx.de/u-boot-blackfinWolfgang Denk2009-07-26-1/+8
|\ \
| * | Blackfin: restore EVT1 handling in linker scriptMike Frysinger2009-07-24-1/+8
| |/ | | | | | | | | | | | | Sadly, the Blackfin linker script unification lost a small #ifdef logic needed on older parts. Restore that CONFIG_BFIN_BOOTROM_USES_EVT1 logic. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Merge branch 'master' of git://git.denx.de/u-boot-ppc4xxWolfgang Denk2009-07-26-2152/+3027
|\ \
| * | ppc4xx: Add chip_config command to AMCC Kilauea eval boardStefan Roese2009-07-24-298/+82
| | | | | | | | | | | | | | | | | | | | | | | | This patch removes the "alterpll" command and replaces it with the now ppc4xx standard "chip_config" command to configure the I2C bootstrap EEPROM. Signed-off-by: Stefan Roese <sr@denx.de>
| * | ppc4xx: Fix EEPROM configuration on KilaueaStefan Roese2009-07-24-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kilauea has an AT24C02 EEPROM which has an 8 byte page. Without defining CONFIG_SYS_EEPROM_PAGE_WRITE_BITS to 3 the "eeprom" command doesn't work correctly. Additionally the page write delay (CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS) is set to a more defensive value of 10ms. Signed-off-by: Stefan Roese <sr@denx.de>
| * | ppc4xx: Add 405EP based PMC405DE boardMatthias Fuchs2009-07-24-0/+1174
| | | | | | | | | | | | | | | Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
| * | ppc4xx: Add struct for 4xx GPIO controller registersMatthias Fuchs2009-07-24-0/+24
| | | | | | | | | | | | | | | Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
| * | ppc4xx: Replace 4xx lowercase SPR referencesMatthias Fuchs2009-07-24-279/+178
| | | | | | | | | | | | | | | Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
| * | Add "chip_config" command for PPC4xx bootstrap configurationStefan Roese2009-07-24-197/+283
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a generic command for programming I2C bootstrap eeproms on PPC4xx. An implementation for Canyonlands board is included. The command name is intentionally chosen not to be PPC4xx specific. This way other CPU's/SoC's can implement a similar command under the same name, perhaps with a different syntax. Usage on Canyonlands: => chip_config Available configurations (I2C address 0x52): 600-nor - NOR CPU: 600 PLB: 200 OPB: 100 EBC: 100 600-nand - NAND CPU: 600 PLB: 200 OPB: 100 EBC: 100 800-nor - NOR CPU: 800 PLB: 200 OPB: 100 EBC: 100 800-nand - NAND CPU: 800 PLB: 200 OPB: 100 EBC: 100 1000-nor - NOR CPU:1000 PLB: 200 OPB: 100 EBC: 100 1000-nand - NAND CPU:1000 PLB: 200 OPB: 100 EBC: 100 1066-nor - NOR CPU:1066 PLB: 266 OPB: 88 EBC: 88 *** 1066-nand - NAND CPU:1066 PLB: 266 OPB: 88 EBC: 88 => chip_config 600-nor Using configuration: 600-nor - NOR CPU: 600 PLB: 200 OPB: 100 EBC: 100 done (dump via 'i2c md 52 0.1 10') Reset the board for the changes to take effect Other 4xx boards will be migrated to use this command soon as well. Signed-off-by: Stefan Roese <sr@denx.de> Signed-off-by: Dirk Eibach <eibach@gdsys.de> Acked-by: Matthias Fuchs <matthias.fuchs@esd.eu>
| * | xpedite1k: Move to X-ES vendor directoryPeter Tyser2009-07-24-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The XPedite1000 is an X-ES product thus it can be put in board/xes along with other X-ES boards. Along with the move, the board was renamed to XPedite1000 from XPedite1K to fit X-ES's standard naming convention. Maintainership was also transfered to Peter Tyser. Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Stefan Roese <sr@denx.de>
| * | xpedite1k: Sync checkboard() with other X-ES boardsPeter Tyser2009-07-24-1/+15
| | | | | | | | | | | | | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Stefan Roese <sr@denx.de>
| * | xpedite1k: Sync up board config options with other X-ES boardsPeter Tyser2009-07-24-19/+19
| | | | | | | | | | | | | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Stefan Roese <sr@denx.de>
| * | xpedite1k: Sync organization of board config with other X-ES boardsPeter Tyser2009-07-24-74/+85
| | | | | | | | | | | | | | | | | | | | | This change should have no functional effect Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Stefan Roese <sr@denx.de>
| * | xpedite1k: Sync up commands and environment with other X-ES boardsPeter Tyser2009-07-24-12/+110
| | | | | | | | | | | | | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Stefan Roese <sr@denx.de>
| * | xpedite1k: Disable unused ethernet port 1Peter Tyser2009-07-24-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | The XPedite1000 only has 2 available ethernet ports: ppc_4xx_eth2 (EMAC2) and ppc_4xx_eth3 (EMAC3) Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Stefan Roese <sr@denx.de>
| * | xpedite1k: Store environment in flashPeter Tyser2009-07-24-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously an I2C EEPROM was used. The EEPROM had size, reliability, and access issues which are resolved by storing the environment in flash. Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Stefan Roese <sr@denx.de>
| * | xpedite1k: Add support for additional GPIO pinsPeter Tyser2009-07-24-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Enable GPIO pins for an I2C EEPROM write protect, a system reset pin, and a PMC #MONARCH pin. These pins are not currently used in U-Boot, but are used in OSes and may be used in U-Boot in the future. Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Stefan Roese <sr@denx.de>
| * | xpedite1k: Add support for optional flashesPeter Tyser2009-07-24-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The XPedite1000 can be built with 4 total flashes: - 512KB AMD socketed - 16MB Intel soldered - 2 x 32MB AMD MirrorBit flashes Add support for the optional 2 32MB CFI-compliant AMD flashes Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Stefan Roese <sr@denx.de>