summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://git.denx.de/u-boot-blackfinWolfgang Denk2009-05-28-0/+17
|\
| * Blackfin: bf518f-ezbrd: setup portmux for async flashGraf Yang2009-05-25-0/+17
| | | | | | | | | | | | | | | | The pins for async memory where parallel flash lives are not enabled by default, so make sure we mux them as needed. Signed-off-by: Graf Yang <graf.yang@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | jffs2/mtdparts: Fix problem with usage from JFFS2 and MTDPARTS togetherStefan Roese2009-05-28-54/+64
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently using JFFS2 with MTDPARTS enabled doesn't work. This is because mtdparts_init() is available in both files, cmd_mtdparts.c and cmd_jffs2.c. Please note that in the original cmd_jffs2.c file (before the jffs2/mtdparts command/file split those 2 different versions already existed. So this is nothing new. The main problem is that the variables "current_dev" and "current_partnum" are declared in both files now. This doesn't work. This patch now changes the names of those variable to more specific names: "current_mtd_dev" and "current_mtd_partnum". This is because this patch also changes the declaration from static to global, so that they can be used from both files. Please note that my first tests were not successful. The MTD devices selected via mtdparts are now accessed but I'm failing to see the directory listed via the "ls" command. Nothing is displayed. Perhaps I didn't generate the JFFS2 image correctly (I never used JFFS2 in U-Boot before). Not sure. Perhaps somebody else could take a look at this as well. I'll continue looking into this on Monday. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Wolfgang Denk <wd@denx.de> Cc: Detlev Zundel <dzu@denx.de> Cc: Ilya Yanok <yanok@emcraft.com> Cc: Renaud barbier <renaud.barbier@ge.com>
* nand: Fix problem with ECC ordering for PPC4xx NDFC platformsStefan Roese2009-05-23-0/+5
| | | | | | | | | This patch enables Smart Media (SMC) ECC byte ordering which is used on the PPC4xx NAND FLASH controller (NDFC). Without this patch we have incompatible ECC byte ordering to the Linux kernel NDFC driver. Signed-off-by: Stefan Roese <sr@denx.de> Acked-by: Scott Wood <scottwood@freescale.com>
* ppc4xx: Fix problem with ECC ordering for PPC4xx NDFC platformsStefan Roese2009-05-23-2/+2
| | | | | | | | | | | | | This patch now uses the correct ECC byte order (Smart Media - SMC) to be used on the 4xx NAND FLASH driver. Without this patch we have incompatible ECC byte ordering to the Linux kernel NDFC driver. Please note that we also have to enable CONFIG_MTD_NAND_ECC_SMC in drivers/mtd/nand/nand_ecc.c for correct operation. This is done with a seperate patch. Signed-off-by: Stefan Roese <sr@denx.de> Acked-by: Scott Wood <scottwood@freescale.com>
* ppc4xx: Move definition for PPC4xx NAND FLASH controller to headerStefan Roese2009-05-23-6/+10
| | | | | | | | | This patch moves the definition for the PPC4xx NAND FLASH controller (NDFC) CONFIG_NAND_NDFC into include/ppc4xx.h. This is needed for the upcoming fix for the ECC byte ordering of the NDFC driver. Signed-off-by: Stefan Roese <sr@denx.de> Acked-by: Scott Wood <scottwood@freescale.com>
* Merge branch 'master' of git://git.denx.de/u-boot-ubiWolfgang Denk2009-05-20-1/+1
|\
| * UBI: fix return code in ubi_volume_readAndreas Huber2009-05-20-1/+1
| | | | | | | | | | | | | | Return -ENODEV instead of 0 when trying to read from a non existing volume. Signed-off-by: Andreas Huber <andreas.huber@keymile.com> Signed-off-by: Stefan Roese <sr@denx.de>
* | Merge branch 'master' of git://git.denx.de/u-boot-blackfinWolfgang Denk2009-05-20-2/+3
|\ \
| * | Blackfin: fix timer_init()/timer_reset()Graf Yang2009-05-19-2/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | | | The timer_init() function was not using the right csync instruction, nor was it doing it right after disabling the core timer. The timer_reset() function would reset the timestamp, but not the actual timer, so there was a common edge case where get_timer() return a jump of one timestamp (couple milliseconds) right after resetting. This caused many functions to improperly timeout right away. Signed-off-by: Graf Yang <graf.yang@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | common: fix inline--weak error spotted by gcc 4.4Kim Phillips2009-05-20-2/+2
| | | | | | | | | | | | | | | | cmd_ide.c:547: error: inline function 'ide_inb' cannot be declared weak removing the inline attribute fixes it. Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
* | TQM834x: remove defines causing gcc4.4 warningsKim Phillips2009-05-20-20/+0
|/ | | | | | | | | | | Configuring for TQM834x board... cpu_init.c: In function 'cpu_init_f': cpu_init.c:262: warning: array subscript is above array bounds cpu_init.c:263: warning: array subscript is above array bounds cpu_init.c:270: warning: array subscript is above array bounds ... Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
* MIPS: lib_mips/board.c: Remove unused variablesShinya Kuribayashi2009-05-16-2/+1
| | | | | | | | | | This fixes the following build warnings: board.c: In function 'board_init_r': board.c:328: warning: unused variable 'i' board.c:326: warning: unused variable 'e' Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
* MIPS: Make all extern-ed functions in bitops.h staticShinya Kuribayashi2009-05-16-32/+32
| | | | | | | | | | | | All these functions are expected to be static inline-ed. This patch also fixes the following build warnings on MIPS targets: include/asm/bitops.h: In function 'ext2_find_next_zero_bit': include/asm/bitops.h:862: warning: '__fswab32' is static but used in inline function 'ext2_find_next_zero_bit' which is not static include/asm/bitops.h:885: warning: '__fswab32' is static but used in inline function 'ext2_find_next_zero_bit' which is not static include/asm/bitops.h:887: warning: '__fswab32' is static but used in inline function 'ext2_find_next_zero_bit' which is not static Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
* MIPS: Implement ethernet halt for au1x00Thomas Lange2009-05-16-0/+4
| | | | | | | | | Implement ethernet halt() by putting MAC0 in reset. If we do not do this, we will get memory corruption when ethernet frames are received during early OS boot. Signed-off-by: Thomas Lange <thomas@corelatus.se> Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
* Prepare v2009.06-rc2v2009.06-rc2Wolfgang Denk2009-05-15-1/+26
| | | | | | Update CHANGELOG. Signed-off-by: Wolfgang Denk <wd@denx.de>
* ARM: fix PXA build by defining UP2OCRDaniel Mack2009-05-15-0/+4
| | | | | | | | | | | | | U-Boot does not currently build for PXA platforms with USB support enabled: usb.c:46: error: 'UP2OCR' undeclared (first use in this function) Signed-off-by: Daniel Mack <daniel@caiaq.de> Cc: Markus Klotzbuecher <mk@denx.de> Edited commit message. Signed-off-by: Wolfgang Denk <wd@denx.de>
* Minor Coding Style fix; update CHANGELOG.Wolfgang Denk2009-05-15-2/+273
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* IDE: bail out of dev_print() for unknown device typesWolfgang Denk2009-05-15-0/+5
| | | | | | | | | | | | | | | | | | | | | Commit 574b319512 introduced a subtle bug by mixing a list of tests for "dev_desc->type" and "dev_desc->if_type" into one switch(), which then mostly did not work because "dev_desc->type" cannot take any "IF_*" type values. A later fix in commit 8ec6e332ea changed the switch() into testing "dev_desc->if_type", but at this point the initial test for unknown device types was completely lost, which resulted in output like that for IDE ports without device attached: Device 1: Model: Firm: Ser#: Type: # 1F # Capacity: not available This patch re-introduces the missing test for unknown device types. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Stefan Roese <sr@denx.de> Cc: Detlev Zundel <dzu@denx.de> Tested-by: Stefan Roese <sr@denx.de>
* 74xx_7xx: Fix rounding problem in CPU frequency calculationStefan Roese2009-05-15-2/+2
| | | | | | | This patch fixes a problem in the CPU frequency calculation. Without it a 798MHz CPU is displayed as 368.503 MHz. And with it it's 798 MHz. Signed-off-by: Stefan Roese <sr@denx.de>
* console.h: remove unused prototype 'console_realloc'Jean-Christophe PLAGNIOL-VILLARD2009-05-15-2/+0
| | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* api: remove un-needed ifdef CONFIG_API already handle by the MakefileJean-Christophe PLAGNIOL-VILLARD2009-05-15-23/+0
| | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* Fix e-mail address of Gary Jennejohn.Detlev Zundel2009-05-15-135/+135
| | | | Signed-off-by: Detlev Zundel <dzu@denx.de>
* Remove inline qualifier from show_boot_progress()Emil Medve2009-05-15-1/+1
| | | | | | | | | | | The 'inline' is conflicting with the semantic of 'weak' attribute and with the way the show_boot_progress() function is used. Also gcc 4.4 is complaining about it: main.c:51: error: inline function 'show_boot_progress' cannot be declared weak Signed-off-by: Emil Medve <Emilian.Medve@Freescale.com>
* MPC8260: fixup device tree by property instead of pathWolfgang Denk2009-05-15-5/+6
| | | | | | | | | | | | | | | | | | | | cpu/mpc8260/cpu.c used to use do_fixup_by_path_u32() to update the clock frequencies in the device tree, using a CPU path "/cpus/OF_CPU", with OF_CPU beind defined in the board config file. However, this does not work when one board config file (here: MPC8260ADS.h) is intended to be used for several diffrent CPUs and therefor contains a generic definition like "cpu@0", as the device trees that will then be loaded will contain specific names like "PowerPC,8272@0". We switch to using do_fixup_by_prop_u32() instead, so we can search for device_type="cpu", as it is done in other architectures, too. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Heiko Schocher <hs@denx.de> Acked-by: Heiko Schocher <hs@denx.de> Tested-by: Heiko Schocher <hs@denx.de>
* Fix OneNAND ipl to read CONFIG_SYS_MONITOR_LENRohit Hagargundgi2009-05-15-0/+1
| | | | | | | | | Add CONFIG_SYS_MONITOR_LEN macro to apollon board config. CONFIG_SYS_MONITOR_LEN defines the U-Boot image size. and is used by OneNAND ipl when reading U-Boot image. Signed-off-by: Rohit Hagargundgi <h.rohit at samsung.com> Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
* Schedule removal of non-CONFIG_NET_MULTI net driver APIBen Warren2009-05-15-0/+19
| | | | | | | This will make CONFIG_NET_MULTI the only net driver configuration and we'll be able to remove this option. Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
* powerpc/inka4x0: Remove left-over ide reset code.Detlev Zundel2009-05-15-34/+0
| | | | | | | The pin which was used in preliminary versions of the board for ide reset is really connected to the rtc clock. Signed-off-by: Detlev Zundel <dzu@denx.de>
* Add imls utility commandMarco Stornelli2009-05-15-0/+433
| | | | | | | | | This patch adds, under tools folder, a new command called imls. Its goal is the same of UBoot's imls but it can be used as Linux shell command. It reads from raw mtd partition and prints the list of the stored images. Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com>
* netloop: updates for NetLoopHeiko Schocher2009-05-15-7/+12
| | | | | | | | | | | | | Fix some issues introduced from commit: 2f70c49e5b9813635ad73666aa30f304c7fdeda9 suggested by Mike Frysinger. - added some comment for the env_id variable in common_cmd_nvedit.c - moved some variables in fn scope instead of file scope - NetInitLoop now static void Signed-off-by: Heiko Schocher <hs@denx.de> Acked-by: Ben Warren <biggerbadderben@gmail.com>
* 82xx, ids8247: added ids8247 board to MAKEALL scriptHeiko Schocher2009-05-15-0/+1
| | | | Signed-off-by: Heiko Schocher <hs@denx.de>
* arm/imx31_phycore: Fix bi_arch_numberDetlev Zundel2009-05-15-2/+2
| | | | | Signed-off-by: Detlev Zundel <dzu@denx.de> Cc: Sascha Hauer <s.hauer@pengutronix.de>
* remove myself as phycore/litekit MaintainerSascha Hauer2009-05-15-5/+0
| | | | | | | | I never acked a patch that adds me as phycore i.MX31 maintainer nor was it me who pushed the patches, so remove myself from the maintainer list so that other people do not longer wait for my ack. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* AFEB9260 network fixSergey Lapin2009-05-13-2/+2
| | | | | | | | AFEB9260 uses PA10, PA11 for ETX2 and ETX3. Also, due to extarnal pull-up on IRQ line, Micrel PHY ID is 1 after reset sequence, not 0. Signed-off-by: Sergey Lapin <slapin@ossfans.org>
* Blackfin: bf518f-ezbrd: reset ethernet PHY during initGraf Yang2009-05-06-4/+51
| | | | | | | | | | We don't know what state the ethernet PHY is in when starting up, so make sure we set it to a sane state. This fixes troubles seen when Linux boots up, configures the PHY is a non-default state, and then the system reboots into U-Boot which previously expected a reset state only. Signed-off-by: Graf Yang <graf.yang@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Blackfin: bf527-ezkit: fix SPI flash env paramsMike Frysinger2009-05-06-2/+2
| | | | | | | | The BF527-EZKIT settings for storing the environment in SPI flash wasn't using the correct sector settings for the SPI flash part that is actually on the board. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Blackfin: avoid get_sclk() with early serial debugMike Frysinger2009-05-06-5/+5
| | | | | | | | When the clock functions were changed to use cached values (and thereby avoiding expensive math functions), early serial debug broke because the baud programming is called before external memory is available. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Blackfin: fix booting with older bootroms (no EVT1)Mike Frysinger2009-05-06-3/+32
| | | | | | | | | | | When dropping jump block support, the assumption was that all bootroms supported entry point redirection via the EVT1 register. Unfortunately, this turned out to be incorrect for the oldest Blackfin parts (BF533-0.2 and older and BF561). No one really noticed earlier because these parts usually are booted by bypassing the bootrom entirely, and older BF533 parts are not supported at all (too many anomalies). Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Blackfin: recurse with early serial initcodeMike Frysinger2009-05-06-1/+1
| | | | | | | Make sure we recurse through serial_putc() rather than bang on the UART transmit register directly to avoid hardware overflows when using \n. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Prepare v2009.06-rc1v2009.06-rc1Wolfgang Denk2009-05-01-2/+34
| | | | | | Update CHANGELOG. Signed-off-by: Wolfgang Denk <wd@denx.de>
* at91: remove lowlevel_init.SJean-Christophe PLAGNIOL-VILLARD2009-05-01-62/+2
| | | | | | | | | | | | lowlevel_init.S is not used any more so remove it. As consequence, we also don't have to generate u-boot.lds but can use a static version as before. This also fixes the out-of-tree build problem introduced with commit f0a2c7b4 "at91: add support for the PM9263 board" Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
* Update CHANGELOG; minor coding style cleanup.Wolfgang Denk2009-05-01-2/+478
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* OMAP3: Fix timer handling to 1ms and CONFIG_SYS_HZ to 1000Manikandan Pillai2009-04-30-83/+56
| | | | | Signed-off-by: Dirk Behme <dirk.behme@googlemail.com> Signed-off-by: Manikandan Pillai <mani.pillai@ti.com>
* Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2009-04-30-8/+21
|\
| * OMAP3: Beagle: Set pinmux conditionally for Rev C boardsDirk Behme2009-04-30-8/+21
| | | | | | | | | | | | | | The Beagle Rev C boards pull UART2 from an alternate set of balls. Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
* | ubifs: BUG: Blocks commpressed with zlibRicardo Ribalda Delgado2009-04-30-3/+5
| | | | | | | | | | | | | | | | Blocks compressed with zlib dont have the full gzip header. Without this patch, block compressed with zlib cannot be readed! Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@uam.es>
* | lib_generic: gunzip: New function zunzipRicardo Ribalda Delgado2009-04-30-7/+20
|/ | | | | | | | | | | | | | | | | | | | Separate gunzip in gunzip: Find the end of the header and call zunzip. zunzip: Inflate gunzip block without header. UBI fs blocks can be compresed in lzo, zlib or no-compression. The current implementation of u-boot supported all the compressions but there was a bug in the implementation of the zlib blocks. UBIFS's Zlib blocks do not have header but they were compressed using gunzip, a function used to decompress gunzip files/sectors with a header. This patch adds a new function zunzip that uncompress a zlib block with no header. Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@uam.es>
* Merge branch 'master' of git://git.denx.de/u-boot-armWolfgang Denk2009-04-30-324/+181
|\
| * at91: fixed plla calc when no USB support is activeDaniel Gorsulowski2009-04-29-1/+1
| | | | | | | | | | Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * arm925t: Fix CONFIG_SYS_HZ to 1000Ladislav Michl2009-04-29-75/+35
| | | | | | | | | | | | | | | | | | | | | | Let CONFIG_SYS_HZ to have value of 1000 effectively fixing all users of get_timer. Changes since original version: * Set PTV=2 (divisor 8) for boards using 12MHz timer clock source to improve timer resolution. Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
generated by cgit v1.1 at 2024-11-19 19:43:52 +0000