summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | SMC911x driver fixed for NFS bootManikandan Pillai2009-06-081-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eth_halt() function in the smc911x drivers used to call the smc911x_reset() function. eth_halt() used to be called after tftp transfers. This used to put the ethernet chip in reset while the linux boots up resulting in the ethernet driver not coming up. NFS boot used to fail as a result. This patch calls smc911x_shutdown() instead of smc911x_reset(). Some comments received has also been fixed. Signed-off-by: Manikandan Pillai <mani.pillai@ti.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
* | | Add config option for disabling DM9000-SROM support.Remy Bohmer2009-06-084-15/+36
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some boards do not have SROM support for the DM9000 network adapter. Instead of listing these board names in the driver code, make this option configurable from the board config file. It also removes a build warning for the at91sam9261ek board: 'dm9000x.c:545: warning: 'read_srom_word' defined but not used' And it repaires the trizepsiv board build which was broken around the same routines Signed-off-by: Remy Bohmer <linux@bohmer.net> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
* | smc911x: write back the manually set MAC addressDaniel Mack2009-06-071-2/+7
|/ | | | | | | | | If the MAX address is given by the environment, write it back to the hardware. Signed-off-by: Daniel Mack <daniel@caiaq.de> Cc: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
* Merge branch 'master' of git://git.denx.de/u-boot-mmcWolfgang Denk2009-06-044-41/+52
|\
| * mmc: Fix decoding of SCR & function switch data on little-endian machinesYauhen Kharuzhy2009-06-021-5/+5
| | | | | | | | | | | | | | | | SCR & switch data are read from card as big-endian words and should be converted to CPU byte order. Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
| * mmc: Remove return from mmc_init for non SD 2.0 compatible cards.Yauhen Kharuzhy2009-06-021-4/+0
| | | | | | | | | | | | | | | | | | Cards which are not compatible with SD 2.0 standard, may return response for CMD8 command, but it will be invalid in terms of SD 2.0. We should accept this case as admissible, just like Linux does. Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
| * mmc: drop unnecessary castsRabin Vincent2009-06-022-15/+15
| | | | | | | | | | | | Now that response is a uint, we can drop all the casts. Signed-off-by: Rabin Vincent <rabin@rab.in>
| * mmc: fix response decoding on little endianRabin Vincent2009-06-022-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mmc code defines the response as an array of chars. However, it access the response bytes both as (i) an array of four uints (with casts) and (ii) as individual chars. The former case is used more often, including by the driver when it assigns the response. The char-wise accesses are broken on little endian systems because they assume that the bytes in the uints are in big endian byte order. This patch fixes this by changing the response to be an array of four uints and replacing the char-wise accesses with equivalent uint-wise accesses. Signed-off-by: Rabin Vincent <rabin@rab.in>
| * mmc: use lldiv to fix arm eabi buildRabin Vincent2009-06-021-3/+4
| | | | | | | | | | | | | | The generic MMC core uses direct long long divisions, which do not build with ARM EABI toolchains. Use lldiv() instead, which works everywhere. Signed-off-by: Rabin Vincent <rabin@rab.in>
| * mmc: check find_mmc_device return valueRabin Vincent2009-06-022-1/+10
| | | | | | | | | | | | | | find_mmc_device returns NULL if an invalid device number is specified. Check for this to avoid dereferencing NULL pointers. Signed-off-by: Rabin Vincent <rabin@rab.in>
| * mmc: clean up help textsRabin Vincent2009-06-021-4/+5
| | | | | | | | | | | | | | Remove some repeated words and superfluous newlines in the mmc command help entries. Signed-off-by: Rabin Vincent <rabin@rab.in>
* | Redundant Environment: protect full sector sizeWolfgang Denk2009-06-0415-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several boards used different ways to specify the size of the protected area when enabling flash write protection for the sectors holding the environment variables: some used CONFIG_ENV_SIZE and CONFIG_ENV_SIZE_REDUND, some used CONFIG_ENV_SECT_SIZE, and some even a mix of both for the "normal" and the "redundant" areas. Normally, this makes no difference at all. However, things are different when you have to deal with boards that can come with different types of flash chips, which may have different sector sizes. Here we may have to chose CONFIG_ENV_SECT_SIZE such that it fits the biggest sector size, which may include several sectors on boards using the smaller sector flash types. In such a case, using CONFIG_ENV_SIZE or CONFIG_ENV_SIZE_REDUND to enable the protection may lead to the case that only the first of these sectors get protected, while the following ones aren't. This is no real problem, but it can be confusing for the user - especially on boards that use CONFIG_ENV_SECT_SIZE to protect the "normal" areas, while using CONFIG_ENV_SIZE_REDUND for the "redundant" area. To avoid such inconsistencies, I changed all sucn boards that I found to consistently use CONFIG_ENV_SECT_SIZE for protection. This should not cause any functional changes to the code. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Paul Ruhland Cc: Pantelis Antoniou <panto@intracom.gr> Cc: Stefan Roese <sr@denx.de> Cc: Gary Jennejohn <garyj@denx.de> Cc: Dave Ellis <DGE@sixnetio.com> Acked-by: Stefan Roese <sr@denx.de>
* | mmc: it's safe to ignore mmc_send_if_cond() return valueIlya Yanok2009-06-041-4/+0
| | | | | | | | | | | | | | Return value of mmc_send_if_cond() can be safely ignored (as it is done in Linux). This makes older cards work with MXC MCI controller. Signed-off-by: Ilya Yanok <yanok@emcraft.com>
* | cfi_mtd: Fix bug in last sector detectionStefan Roese2009-06-031-2/+7
| | | | | | | | | | | | | | This patch now enabled this cfi-mtd wrapper to correctly detect and erase the last sector in an NOR FLASH device. Signed-off-by: Stefan Roese <sr@denx.de>
* | Blackfin: spi: fix pin handling of SPI0 SSEL4Mike Frysinger2009-05-291-1/+1
| | | | | | | | | | | | | | CS4 on SPI0 has a dedicated PH8 pin which needs to be enabled as a peripheral in order to work. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Blackfin: fix if() logic in bootrom evt1 checkMike Frysinger2009-05-291-1/+1
|/ | | | | | | A missing set of parenthesis caused the silicon revision to apply only to the BF533 and not the BF531/BF532 variants. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Merge branch 'master' of git://git.denx.de/u-boot-blackfinWolfgang Denk2009-05-282-0/+17
|\
| * Blackfin: bf518f-ezbrd: setup portmux for async flashGraf Yang2009-05-252-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-282-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-231-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-231-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-232-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-201-1/+1
|\
| * UBI: fix return code in ubi_volume_readAndreas Huber2009-05-201-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-201-2/+3
|\ \
| * | Blackfin: fix timer_init()/timer_reset()Graf Yang2009-05-191-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-201-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-201-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-161-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-161-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-161-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-rc2Wolfgang Denk2009-05-152-1/+26
| | | | | | Update CHANGELOG. Signed-off-by: Wolfgang Denk <wd@denx.de>
* ARM: fix PXA build by defining UP2OCRDaniel Mack2009-05-151-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-152-2/+273
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* IDE: bail out of dev_print() for unknown device typesWolfgang Denk2009-05-151-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-151-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-151-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-155-23/+0
| | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* Fix e-mail address of Gary Jennejohn.Detlev Zundel2009-05-15135-135/+135
| | | | Signed-off-by: Detlev Zundel <dzu@denx.de>
* Remove inline qualifier from show_boot_progress()Emil Medve2009-05-151-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-151-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-151-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-151-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-152-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-153-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-153-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-151-0/+1
| | | | Signed-off-by: Heiko Schocher <hs@denx.de>
* arm/imx31_phycore: Fix bi_arch_numberDetlev Zundel2009-05-151-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-151-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-132-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>
OpenPOWER on IntegriCloud