kernel/u-boot.git
15 years agommc: check find_mmc_device return value
Rabin Vincent [Sun, 5 Apr 2009 08:00:53 +0000 (13:30 +0530)]
mmc: check find_mmc_device return value

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>
15 years agommc: clean up help texts
Rabin Vincent [Sun, 5 Apr 2009 08:00:52 +0000 (13:30 +0530)]
mmc: clean up help texts

Remove some repeated words and superfluous newlines in the mmc command
help entries.

Signed-off-by: Rabin Vincent <rabin@rab.in>
15 years agoMerge branch 'master' of git://git.denx.de/u-boot-blackfin
Wolfgang Denk [Thu, 28 May 2009 19:27:51 +0000 (21:27 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-blackfin

15 years agojffs2/mtdparts: Fix problem with usage from JFFS2 and MTDPARTS together
Stefan Roese [Sat, 16 May 2009 10:04:22 +0000 (12:04 +0200)]
jffs2/mtdparts: Fix problem with usage from JFFS2 and MTDPARTS together

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>
15 years agoBlackfin: bf518f-ezbrd: setup portmux for async flash
Graf Yang [Sun, 24 May 2009 06:34:34 +0000 (02:34 -0400)]
Blackfin: bf518f-ezbrd: setup portmux for async flash

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>
15 years agonand: Fix problem with ECC ordering for PPC4xx NDFC platforms
Stefan Roese [Wed, 20 May 2009 08:58:03 +0000 (10:58 +0200)]
nand: Fix problem with ECC ordering for PPC4xx NDFC platforms

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>
15 years agoppc4xx: Fix problem with ECC ordering for PPC4xx NDFC platforms
Stefan Roese [Wed, 20 May 2009 08:58:02 +0000 (10:58 +0200)]
ppc4xx: Fix problem with ECC ordering for PPC4xx NDFC platforms

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>
15 years agoppc4xx: Move definition for PPC4xx NAND FLASH controller to header
Stefan Roese [Wed, 20 May 2009 08:58:01 +0000 (10:58 +0200)]
ppc4xx: Move definition for PPC4xx NAND FLASH controller to header

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>
15 years agoMerge branch 'master' of git://git.denx.de/u-boot-ubi
Wolfgang Denk [Wed, 20 May 2009 20:42:04 +0000 (22:42 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-ubi

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-blackfin
Wolfgang Denk [Wed, 20 May 2009 20:40:44 +0000 (22:40 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-blackfin

15 years agocommon: fix inline--weak error spotted by gcc 4.4
Kim Phillips [Tue, 19 May 2009 17:53:36 +0000 (12:53 -0500)]
common: fix inline--weak error spotted by gcc 4.4

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>
15 years agoTQM834x: remove defines causing gcc4.4 warnings
Kim Phillips [Tue, 19 May 2009 17:53:32 +0000 (12:53 -0500)]
TQM834x: remove defines causing gcc4.4 warnings

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>
15 years agoUBI: fix return code in ubi_volume_read
Andreas Huber [Tue, 19 May 2009 09:06:30 +0000 (11:06 +0200)]
UBI: fix return code in ubi_volume_read

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>
15 years agoBlackfin: fix timer_init()/timer_reset()
Graf Yang [Tue, 19 May 2009 08:40:08 +0000 (04:40 -0400)]
Blackfin: fix timer_init()/timer_reset()

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>
15 years agoMIPS: lib_mips/board.c: Remove unused variables
Shinya Kuribayashi [Sat, 16 May 2009 00:12:09 +0000 (09:12 +0900)]
MIPS: lib_mips/board.c: Remove unused variables

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>
15 years agoMIPS: Make all extern-ed functions in bitops.h static
Shinya Kuribayashi [Sat, 16 May 2009 00:12:09 +0000 (09:12 +0900)]
MIPS: Make all extern-ed functions in bitops.h static

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>
15 years agoMIPS: Implement ethernet halt for au1x00
Thomas Lange [Fri, 24 Apr 2009 14:22:16 +0000 (16:22 +0200)]
MIPS: Implement ethernet halt for au1x00

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>
15 years agoPrepare v2009.06-rc2 v2009.06-rc2
Wolfgang Denk [Fri, 15 May 2009 21:29:23 +0000 (23:29 +0200)]
Prepare v2009.06-rc2

Update CHANGELOG.

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoARM: fix PXA build by defining UP2OCR
Daniel Mack [Tue, 5 May 2009 10:48:29 +0000 (12:48 +0200)]
ARM: fix PXA build by defining UP2OCR

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>
15 years agoMinor Coding Style fix; update CHANGELOG.
Wolfgang Denk [Fri, 15 May 2009 20:32:57 +0000 (22:32 +0200)]
Minor Coding Style fix; update CHANGELOG.

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoIDE: bail out of dev_print() for unknown device types
Wolfgang Denk [Fri, 15 May 2009 07:27:58 +0000 (09:27 +0200)]
IDE: bail out of dev_print() for unknown device types

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>
15 years ago74xx_7xx: Fix rounding problem in CPU frequency calculation
Stefan Roese [Thu, 14 May 2009 05:25:13 +0000 (07:25 +0200)]
74xx_7xx: Fix rounding problem in CPU frequency calculation

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>
15 years agoconsole.h: remove unused prototype 'console_realloc'
Jean-Christophe PLAGNIOL-VILLARD [Wed, 13 May 2009 20:24:12 +0000 (22:24 +0200)]
console.h: remove unused prototype 'console_realloc'

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoapi: remove un-needed ifdef CONFIG_API already handle by the Makefile
Jean-Christophe PLAGNIOL-VILLARD [Wed, 13 May 2009 20:16:31 +0000 (22:16 +0200)]
api: remove un-needed ifdef CONFIG_API already handle by the Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoFix e-mail address of Gary Jennejohn.
Detlev Zundel [Wed, 13 May 2009 08:54:10 +0000 (10:54 +0200)]
Fix e-mail address of Gary Jennejohn.

Signed-off-by: Detlev Zundel <dzu@denx.de>
15 years agoRemove inline qualifier from show_boot_progress()
Emil Medve [Tue, 12 May 2009 18:48:32 +0000 (13:48 -0500)]
Remove inline qualifier from show_boot_progress()

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>
15 years agoMPC8260: fixup device tree by property instead of path
Wolfgang Denk [Tue, 12 May 2009 13:17:35 +0000 (15:17 +0200)]
MPC8260: fixup device tree by property instead of path

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>
15 years agoFix OneNAND ipl to read CONFIG_SYS_MONITOR_LEN
Rohit Hagargundgi [Mon, 9 Mar 2009 14:15:46 +0000 (19:45 +0530)]
Fix OneNAND ipl to read CONFIG_SYS_MONITOR_LEN

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>
15 years agoSchedule removal of non-CONFIG_NET_MULTI net driver API
Ben Warren [Wed, 29 Apr 2009 00:04:51 +0000 (17:04 -0700)]
Schedule removal of non-CONFIG_NET_MULTI net driver API

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>
15 years agopowerpc/inka4x0: Remove left-over ide reset code.
Detlev Zundel [Tue, 5 May 2009 14:04:06 +0000 (16:04 +0200)]
powerpc/inka4x0: Remove left-over ide reset code.

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>
15 years agoAdd imls utility command
Marco Stornelli [Tue, 28 Apr 2009 17:04:02 +0000 (19:04 +0200)]
Add imls utility command

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>
15 years agonetloop: updates for NetLoop
Heiko Schocher [Tue, 28 Apr 2009 06:36:11 +0000 (08:36 +0200)]
netloop: updates for NetLoop

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>
15 years ago82xx, ids8247: added ids8247 board to MAKEALL script
Heiko Schocher [Tue, 28 Apr 2009 05:48:39 +0000 (07:48 +0200)]
82xx, ids8247: added ids8247 board to MAKEALL script

Signed-off-by: Heiko Schocher <hs@denx.de>
15 years agoarm/imx31_phycore: Fix bi_arch_number
Detlev Zundel [Thu, 7 May 2009 11:08:55 +0000 (13:08 +0200)]
arm/imx31_phycore: Fix bi_arch_number

Signed-off-by: Detlev Zundel <dzu@denx.de>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
15 years agoremove myself as phycore/litekit Maintainer
Sascha Hauer [Fri, 15 May 2009 08:21:33 +0000 (10:21 +0200)]
remove myself as phycore/litekit Maintainer

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>
15 years agoAFEB9260 network fix
Sergey Lapin [Tue, 12 May 2009 08:25:14 +0000 (12:25 +0400)]
AFEB9260 network fix

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>
15 years agoBlackfin: bf518f-ezbrd: reset ethernet PHY during init
Graf Yang [Tue, 5 May 2009 06:26:27 +0000 (02:26 -0400)]
Blackfin: bf518f-ezbrd: reset ethernet PHY during init

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>
15 years agoBlackfin: bf527-ezkit: fix SPI flash env params
Mike Frysinger [Tue, 5 May 2009 05:35:41 +0000 (01:35 -0400)]
Blackfin: bf527-ezkit: fix SPI flash env params

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>
15 years agoBlackfin: avoid get_sclk() with early serial debug
Mike Frysinger [Sat, 25 Apr 2009 03:54:19 +0000 (23:54 -0400)]
Blackfin: avoid get_sclk() with early serial debug

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>
15 years agoBlackfin: fix booting with older bootroms (no EVT1)
Mike Frysinger [Sat, 25 Apr 2009 03:39:41 +0000 (23:39 -0400)]
Blackfin: fix booting with older bootroms (no EVT1)

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>
15 years agoBlackfin: recurse with early serial initcode
Mike Frysinger [Sat, 25 Apr 2009 03:22:48 +0000 (23:22 -0400)]
Blackfin: recurse with early serial initcode

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>
15 years agoPrepare v2009.06-rc1 v2009.06-rc1
Wolfgang Denk [Fri, 1 May 2009 19:59:12 +0000 (21:59 +0200)]
Prepare v2009.06-rc1

Update CHANGELOG.

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoat91: remove lowlevel_init.S
Jean-Christophe PLAGNIOL-VILLARD [Fri, 1 May 2009 13:38:06 +0000 (15:38 +0200)]
at91: remove lowlevel_init.S

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>
15 years agoUpdate CHANGELOG; minor coding style cleanup.
Wolfgang Denk [Thu, 30 Apr 2009 22:16:11 +0000 (00:16 +0200)]
Update CHANGELOG; minor coding style cleanup.

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoOMAP3: Fix timer handling to 1ms and CONFIG_SYS_HZ to 1000
Manikandan Pillai [Tue, 21 Apr 2009 15:29:05 +0000 (17:29 +0200)]
OMAP3: Fix timer handling to 1ms and CONFIG_SYS_HZ to 1000

Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
Signed-off-by: Manikandan Pillai <mani.pillai@ti.com>
15 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Thu, 30 Apr 2009 21:54:07 +0000 (23:54 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

15 years agoOMAP3: Beagle: Set pinmux conditionally for Rev C boards
Dirk Behme [Fri, 17 Apr 2009 12:27:56 +0000 (14:27 +0200)]
OMAP3: Beagle: Set pinmux conditionally for Rev C boards

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>
15 years agoubifs: BUG: Blocks commpressed with zlib
Ricardo Ribalda Delgado [Mon, 27 Apr 2009 16:33:33 +0000 (18:33 +0200)]
ubifs: BUG: Blocks commpressed with zlib

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>
15 years agolib_generic: gunzip: New function zunzip
Ricardo Ribalda Delgado [Mon, 27 Apr 2009 16:33:32 +0000 (18:33 +0200)]
lib_generic: gunzip: New function zunzip

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>
15 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Thu, 30 Apr 2009 21:01:08 +0000 (23:01 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-cfi-flash
Wolfgang Denk [Thu, 30 Apr 2009 20:59:45 +0000 (22:59 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-video
Wolfgang Denk [Thu, 30 Apr 2009 20:58:17 +0000 (22:58 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-video

15 years agoat91: fixed plla calc when no USB support is active
Daniel Gorsulowski [Thu, 23 Apr 2009 13:37:16 +0000 (15:37 +0200)]
at91: fixed plla calc when no USB support is active

Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoarm925t: Fix CONFIG_SYS_HZ to 1000
Ladislav Michl [Tue, 21 Apr 2009 23:12:04 +0000 (01:12 +0200)]
arm925t: Fix CONFIG_SYS_HZ to 1000

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>
15 years agoOMAP3: Remove legacy NAND defines
Dirk Behme [Tue, 14 Apr 2009 18:15:17 +0000 (20:15 +0200)]
OMAP3: Remove legacy NAND defines

Remove remaining legacy NAND defines for Beagle, EVM, Overo and Pandora.

Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
15 years agoOMAP3: Print correct silicon revision
Sanjeev Premi [Mon, 27 Apr 2009 15:57:54 +0000 (21:27 +0530)]
OMAP3: Print correct silicon revision

The function display_board_info() displays incorrect
silicon revision - based on the return value from
function get_cpu_rev().

This patch fixes the problem.

Signed-off-by: Sanjeev Premi <premi@ti.com>
15 years agoOMAP3: Remove unused board-types
Sanjeev Premi [Mon, 27 Apr 2009 15:57:44 +0000 (21:27 +0530)]
OMAP3: Remove unused board-types

The board-types defined in struct omap3_sysinfo seem to be
unused. The function display_board_info() is passed
board type as an argument; which is ignored.

This patch removes all uses of board-type, related definitions
and functions.

Signed-off-by: Sanjeev Premi <premi@ti.com>
15 years agoOMAP3: Use functions print_cpuinfo() and checkboard()
Sanjeev Premi [Mon, 27 Apr 2009 15:57:27 +0000 (21:27 +0530)]
OMAP3: Use functions print_cpuinfo() and checkboard()

Use the functions print_cpuinfo() and checkboard() to
display the cpu and board specific information.

These functions reuse content from the existing function
display_board_info() - which has been removed.

Also, updated the existig OMAP3 configurations to
define:
 - CONFIG_DISPLAY_CPUINFO
 - CONFIG_DISPLAY_BOARDINFO

Signed-off-by: Sanjeev Premi <premi@ti.com>
15 years agoMTD: Change cfi-mtd to accept non-uniform sector sizes
Stefan Roese [Wed, 18 Mar 2009 10:17:37 +0000 (11:17 +0100)]
MTD: Change cfi-mtd to accept non-uniform sector sizes

With this patch non-uniform NOR FLASH chips (chips with multiple erase
regions) can be exported via the cfi-mtd layer and therefor used by UBI.
We select the largest sector size as erasesize. The cfi driver will make
sure that the smaller sectors are handled correctly.

Signed-off-by: Stefan Roese <sr@denx.de>
15 years agovideo: fix bug in cfb_console.c code
Anatolij Gustschin [Thu, 23 Apr 2009 10:35:22 +0000 (12:35 +0200)]
video: fix bug in cfb_console.c code

Fix bug in drawing long version/info strings:
U-Boot version string like
"U-Boot 2009.03-05647-g7c51e06 (Apr 23 2009 - 12:40:00) MPC83XX"
is long and doesn't wrap around correctly while drawing
beside the logo. Such long strings partially overwrite
the logo. This patch is an attempt to fix it.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
15 years agocmd_ext2.c: fix compile warnings
Wolfgang Denk [Tue, 28 Apr 2009 06:50:31 +0000 (08:50 +0200)]
cmd_ext2.c: fix compile warnings

Get rid of these warnings:

cmd_ext2.c:247: warning: format '%ld' expects type 'long int', but argument 2 has type 'int'
cmd_ext2.c:248: warning: format '%lX' expects type 'long unsigned int', but argument 3 has type 'int'

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoids8247: Remove legacy NAND defines
Heiko Schocher [Mon, 27 Apr 2009 08:48:20 +0000 (10:48 +0200)]
ids8247: Remove legacy NAND defines

because legacy NAND support is deprecated converting to current
NAND interface. !This just compile, because I have no more the
hardware to test it.

Signed-off-by: Heiko Schocher <hs@denx.de>
15 years agoubifs: BUG realpath string must be ended with NULL
Ricardo Ribalda Delgado [Mon, 27 Apr 2009 07:13:31 +0000 (09:13 +0200)]
ubifs: BUG realpath string must be ended with NULL

If the memory used to copy the link_make is "dirty" the string wont
be ended with NULL, throwing out multiple memory bugs.

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@uam.es>
Acked-by: Stefan Roese <sr@denx.de>
15 years agobmp_logo: Check return value of fread()
Peter Tyser [Fri, 24 Apr 2009 20:59:56 +0000 (15:59 -0500)]
bmp_logo: Check return value of fread()

Add basic error handling to fread() function calls.  This prevents
compililation warnings such as:

bmp_logo.c: In function ‘main’:
bmp_logo.c:71: warning: ignoring return value of ‘fread’, declared with
attribute warn_unused_result
...

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
15 years agoncb: Check return value of write()
Peter Tyser [Fri, 24 Apr 2009 20:59:46 +0000 (15:59 -0500)]
ncb: Check return value of write()

This prevents the compilation warning:

ncb.c: In function 'main':
ncb.c:32: warning: ignoring return value of ‘write’, declared with
attribute warn_unused_result

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
15 years agomtd: nand/onenand: Register mtd device upon device scanning
Stefan Roese [Fri, 24 Apr 2009 13:59:35 +0000 (15:59 +0200)]
mtd: nand/onenand: Register mtd device upon device scanning

With this patch the NAND and OneNAND devices are registered in the MTD
subsystem and can then be referenced by the mtdcore code (e.g.
get_mtd_device_nm()). This is needed for the new "ubi part" command
syntax without the flash type parameter (nor|nand|onenand).

Signed-off-by: Stefan Roese <sr@denx.de>
15 years agomtd: nand: Include linux/mtd/partitions.h in nand_base.h
Stefan Roese [Fri, 24 Apr 2009 13:58:33 +0000 (15:58 +0200)]
mtd: nand: Include linux/mtd/partitions.h in nand_base.h

This patch removes this compilation warning when CONFIG_MTD_PARTITIONS is
defined:

nand_base.c: In function 'nand_release':
nand_base.c:2922: warning: implicit declaration of function 'del_mtd_partitions'

Signed-off-by: Stefan Roese <sr@denx.de>
15 years agoubi: Remove flash selection parameter (nor|nand|onenand) from "ubi part"
Stefan Roese [Fri, 24 Apr 2009 18:24:19 +0000 (20:24 +0200)]
ubi: Remove flash selection parameter (nor|nand|onenand) from "ubi part"

This patch removes the now unnecessary flash type parameter from the
"ubi part" command. Currently the user has to define the type of flash
he will be using UBI on. Example:

=> ubi part nor partition1

With this patch this type parameter is not needed anymore. The user can
now select the partition directly without the flash type paramter.
Example:

=> ubi part partition1

This breaks backward compatibility right now because of the change in the
command syntax. But UBI support is still quite fresh and the advantage of
this new command is syntax big enough for this change. Additionally the
code is much cleaner now.

Signed-off-by: Stefan Roese <sr@denx.de>
CC: Kyungmin Park <kyungmin.park@samsung.com>
15 years agomips/vcth: Use generic 16550 uart driver
Detlev Zundel [Thu, 23 Apr 2009 11:14:20 +0000 (13:14 +0200)]
mips/vcth: Use generic 16550 uart driver

As the common code also handles baudrate switching, which the board
specific vct.c driver did not support, this is one of the rare
occassions where deleting code actually adds a feature :)

Signed-off-by: Detlev Zundel <dzu@denx.de>
Acked-by: Stefan Roese <sr@denx.de>
Acked-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
15 years agoSeparate mtdparts command from jffs2
Ladislav Michl [Tue, 21 Apr 2009 00:26:31 +0000 (02:26 +0200)]
Separate mtdparts command from jffs2

On Thu, Mar 19, 2009 at 01:30:36PM +0100, Stefan Roese wrote:
> Currently the mtdparts commands are included in the jffs2 command support.
> This doesn't make sense anymore since other commands (e.g. UBI) use this
> infrastructure as well now. This patch separates the mtdparts commands from
> the jffs2 commands making it possible to only select mtdparts when no JFFS2
> support is needed.

One more leftover... Let nboot command know about partitions even if JFFS2
support is not enabled.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Acked-by: Stefan Roese <sr@denx.de>
15 years agocmd_ide: Remove unused AmigaOneG3SE code
Peter Tyser [Mon, 20 Apr 2009 16:22:13 +0000 (11:22 -0500)]
cmd_ide: Remove unused AmigaOneG3SE code

The output_data_short() and input_data_short() functions for the
AmigaOneG3SE are unused and result in compiler warnings.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
15 years agoAmigaOneG3SE: Fix CONFIG_CMD_CONSOLE definition
Peter Tyser [Mon, 20 Apr 2009 16:21:40 +0000 (11:21 -0500)]
AmigaOneG3SE: Fix CONFIG_CMD_CONSOLE definition

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
15 years agoReplace __asm references with __asm__
Peter Tyser [Mon, 20 Apr 2009 16:09:05 +0000 (11:09 -0500)]
Replace __asm references with __asm__

__asm__ follows gcc's documented syntax and is generally more common
than __asm.  This change is only asthetic and should not affect
functionality.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
15 years agoReplace __attribute references with __attribute__
Peter Tyser [Mon, 20 Apr 2009 16:08:46 +0000 (11:08 -0500)]
Replace __attribute references with __attribute__

__attribute__ follows gcc's documented syntax and is generally more
common than __attribute.  This change is only asthetic and should not
affect functionality.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
15 years agomtdpart command: align output columns
David Brownell [Fri, 17 Apr 2009 02:55:48 +0000 (19:55 -0700)]
mtdpart command: align output columns

Make the headers in the "mtdparts" command output line up
with their columns ... strike the extra TAB character.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
15 years agoRemove sa1100.h
Shinya Kuribayashi [Thu, 16 Apr 2009 01:51:03 +0000 (10:51 +0900)]
Remove sa1100.h

sa1100.h is not used anywhere, then remove it.

$ find . -name '*.h' -empty -print
./include/sa1100.h
$ git grep 'sa1100.h' .
$

Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoUBIFS: Remove tnc_commit.c which is not used in the read-only version
Stefan Roese [Tue, 14 Apr 2009 15:51:21 +0000 (17:51 +0200)]
UBIFS: Remove tnc_commit.c which is not used in the read-only version

I missed removing this file while implementing the UBIFS support. It's
not referenced at all, so let's remove it. Thanks to Artem Bityutskiy
for spotting.

Signed-off-by: Stefan Roese <sr@denx.de>
15 years agoUBIFS: fix recovery bug
Adrian Hunter [Tue, 14 Apr 2009 15:50:38 +0000 (17:50 +0200)]
UBIFS: fix recovery bug

UBIFS did not recovery in a situation in which it could
have. The relevant function assumed there could not be
more nodes in an eraseblock after a corrupted node, but
in fact the last (NAND) page written might contain anything.
The correct approach is to check for empty space (0xFF bytes)
from then on.

Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Signed-off-by: Stefan Roese <sr@denx.de>
15 years agofs: Fix the wrong type of var
Gao Guanhua [Tue, 14 Apr 2009 06:37:35 +0000 (14:37 +0800)]
fs: Fix the wrong type of var

The filelen should be signed type, not unsigned type.
otherwise, The condition as below never take.
if (filelen < 0)

Signed-off-by: Gao Guanhua <B22826@freescale.com>
Signed-off-by: Dave Liu <daveliu@freescale.com>
15 years agoUpdate CHANGELOG
Wolfgang Denk [Mon, 27 Apr 2009 22:29:34 +0000 (00:29 +0200)]
Update CHANGELOG

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agodm9000 EEPROM reading bugfix
David Brownell [Fri, 17 Apr 2009 06:15:15 +0000 (23:15 -0700)]
dm9000 EEPROM reading bugfix

Make the U-Boot dm9000 driver read addresses from EEPROM just
like Linux does ... read six bytes, instead of reading twelve
bytes and then discarding every other one.

Using the right Ethernet address is a big win.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Ben Warren <biggerbadderben@gmail.com>
15 years agortl8169: fix cache coherency problem
Yoshihiro Shimoda [Wed, 25 Feb 2009 05:27:24 +0000 (14:27 +0900)]
rtl8169: fix cache coherency problem

Fix the problem that cannot access actual data when CPU data cache enabled.

Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
Tested-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Acked-by: Ben Warren <biggerbadderben@gmail.com>
15 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Wolfgang Denk [Mon, 27 Apr 2009 21:41:01 +0000 (23:41 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

15 years agoOMAP3: Fix changed mmc init command
Dirk Behme [Tue, 21 Apr 2009 15:30:51 +0000 (17:30 +0200)]
OMAP3: Fix changed mmc init command

In recent U-Boot mmcinit changed to mmc init.

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
15 years agolib_arm/board.c: remove misleading "test-only" comment.
Wolfgang Denk [Sun, 26 Apr 2009 18:39:26 +0000 (20:39 +0200)]
lib_arm/board.c: remove misleading "test-only" comment.

For a long time, the print_cpuinfo() declaration in lib_arm/board.c
had been marked as "test-only", which is plain wrong considering
current usage.  Delete this misleading comment.

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agominor DaVinci clock cleanup
David Brownell [Sun, 12 Apr 2009 22:40:16 +0000 (15:40 -0700)]
minor DaVinci clock cleanup

Minor cleanup to clock-related defines for DaVinci DM6446 boards:

 - CONFIG_SYS_CLK_FREQ is unused; remove it.

 - CONFIG_SYS_NS16550_CLK must be the same as CONFIG_SYS_HZ_CLOCK

On DM6446 both of those peripheral clocks actually come from the
same source, the primary oscillator.  Having them use the same
symbol avoids bugs in the clone'n'modify development cycle.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
15 years agos3c64xx: remove unnecessary definition
Minkyu Kang [Mon, 6 Apr 2009 10:59:29 +0000 (19:59 +0900)]
s3c64xx: remove unnecessary definition

CONFIG_S3C6400 is must defined at config header file
That definition is unnecessary at this file

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
15 years ago83xx: searching "muram-data" by compatible property
Heiko Schocher [Fri, 24 Apr 2009 04:50:45 +0000 (06:50 +0200)]
83xx: searching "muram-data" by compatible property

if using CONFIG_BOOTCOUNT_LIMIT feature on a MPC8360 CPU
in the muram-data node, the reg entry needs to be updated.
This is done in fdt_fixup_muram(), but we should use
the compatible "fsl,qe-muram-data" for searching the
node instead of searching the muram-data node with
an absolute path.

Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
15 years agoMerge branch 'master' of git://git.denx.de/u-boot-net
Wolfgang Denk [Fri, 24 Apr 2009 11:36:08 +0000 (13:36 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-net

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-at91
Wolfgang Denk [Fri, 24 Apr 2009 11:31:02 +0000 (13:31 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-at91

15 years agompc83xx: MPC8360ERDK: fix environment offset configuration bug
Anatolij Gustschin [Thu, 23 Apr 2009 19:29:34 +0000 (21:29 +0200)]
mpc83xx: MPC8360ERDK: fix environment offset configuration bug

The size of U-Boot binary for MPC8360ERDK increased
(> 2 flash sectors now), so 'saveenv' will partially
overwrite U-Boot in flash and will brick the board.
This patch moves environment offset to fourth flash
sector and also fixes CONFIG_SYS_MONITOR_LEN.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
15 years agoNetLoop initialization bug
Michael Zaidman [Fri, 3 Apr 2009 22:43:00 +0000 (01:43 +0300)]
NetLoop initialization bug

The patch fixes the bug of partial initialization of global network
parameters.

Upon u-boot's start up the first ping command causes a failure of the
consequent TFTP command. It happens in the recently added mechanism of
the NetLoop initialization where initialization of global network
parameters is separated in the NetInitLoop routine which is called per
env_id change. Thus, ping request will initialize the network parameters
necessary for ping operation only, afterwards the env_changed_id will be
set to the env_id that will prevent all following initialization requests
from other protocols.
The problem is that the initialized by ping subset of network parameters
is not sufficient for other protocols and particularly for TFTP which
requires the NetServerIp also.

Signed-off-by: Michael Zaidman <michael.zaidman@gmail.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
15 years agonet: fix ULI 526x macro usage in netdev.h
Timur Tabi [Thu, 9 Apr 2009 15:27:05 +0000 (10:27 -0500)]
net: fix ULI 526x macro usage in netdev.h

Change netdev.h to use CONFIG_ULI526X instead of CONFIG_ULI526.  CONFIG_ULI526X
is used everywhere else, so that's the correct macro name.  Without this fix,
Ethernet will not work on the Freescale MPC8610 HPCD.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
15 years agofix DaVinci NS16550_REG_SIZE regression
David Brownell [Sun, 12 Apr 2009 22:38:06 +0000 (15:38 -0700)]
fix DaVinci NS16550_REG_SIZE regression

Update the DaVinci DM6446 boards to use the new convention
for CONFIG_SYS_NS16550_REG_SIZE ... the size hasn't changed
from the original 4 bytes, but these chips are little-endian.

(Resolves a regression added recently by the include/ns16550.h
patch to "Unify structure declaration for registers".  The code
previously worked just fine because the registers were accessed
as host-endian words, not as bytes.)

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
15 years agocmd_nand: drop duplicate NULL ptr check
Mike Frysinger [Mon, 13 Apr 2009 02:29:20 +0000 (22:29 -0400)]
cmd_nand: drop duplicate NULL ptr check

The first if statement checks for NULL ptrs, so there is no need to check
it again in later else cases (such as .oob).

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
CC: Scott Wood <scottwood@freescale.com>
15 years agoCMD_UBI != MTD_PARTITIONS
David Brownell [Mon, 13 Apr 2009 15:03:38 +0000 (08:03 -0700)]
CMD_UBI != MTD_PARTITIONS

Fix dependency goofage:  it should certainly be possible to have the
partition support without bringing in UBI commands.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Acked-by: Stefan Roese <sr@denx.de>
15 years agoat91sam9/at91cap: fix CONFIG_SYS_HZ to 1000
Jean-Christophe PLAGNIOL-VILLARD [Thu, 16 Apr 2009 19:30:48 +0000 (21:30 +0200)]
at91sam9/at91cap: fix CONFIG_SYS_HZ to 1000

The timer has been rewrote with a precision at ~0,18%

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Tested-by: Sergey Lapin <slapin@ossfans.org>
Tested-by: Eric BENARD <ebenard@free.fr>
15 years agoat91: add support for the PM9263 board of Ronetix GmbH
Ilko Iliev [Thu, 16 Apr 2009 19:30:48 +0000 (21:30 +0200)]
at91: add support for the PM9263 board of Ronetix GmbH

The PM9263 board is based on the AT91SAM9263-EK board.

Here is the page on Ronetix website:
http://www.ronetix.at/starter_kit_9263.html

Signed-off-by: Ilko Iliev <iliev@ronetix.at>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoat91sam9/at91cap: improve clock framework
Jean-Christophe PLAGNIOL-VILLARD [Thu, 16 Apr 2009 19:30:44 +0000 (21:30 +0200)]
at91sam9/at91cap: improve clock framework

calculate dynamically the clock rate and pllb setting for usb

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoppc4xx: Disable POST memory test on NAND-booting Kilauea
Stefan Roese [Wed, 15 Apr 2009 12:08:48 +0000 (14:08 +0200)]
ppc4xx: Disable POST memory test on NAND-booting Kilauea

Don't run the memory POST on the NAND-booting version. It will
overwrite part of the U-Boot image which is already loaded from NAND
to SDRAM. We were just lucky that it booted at all with this SDRAM
test enabled.

Signed-off-by: Stefan Roese <sr@denx.de>