Reinhard Meyer [Tue, 27 Jul 2010 13:18:38 +0000 (15:18 +0200)]
AT91SAM9XE: add embedded flash support
Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
Reinhard Meyer [Tue, 27 Jul 2010 14:22:09 +0000 (16:22 +0200)]
AT91: add RTT and GPBR based RTC
Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
Reinhard Meyer [Fri, 13 Aug 2010 08:31:06 +0000 (10:31 +0200)]
AT91: MCI: add SD/MMC driver using mmc framework
Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
Jens Scharsig [Sat, 7 Aug 2010 17:49:42 +0000 (19:49 +0200)]
AT91 Fix: return value of get_tbclk
* Fix: return value of get_tbclk
* this fixes issue with prematurely restart/retry, if BOOT_RETRY_TIMEOUT is used
Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
Eric Bénard [Mon, 9 Aug 2010 09:50:46 +0000 (11:50 +0200)]
cpuat91: update defaut environement
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
Eric Bénard [Mon, 9 Aug 2010 09:50:45 +0000 (11:50 +0200)]
cpuat91: convert to new at91 soc architecture
convert the board to the new soc architecture
update default config
i2c upgrade taken from eb_cpux9k2.h & board/BuS/eb_cpux9k2/cpux9k2.c
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
Daniel Gorsulowski [Mon, 9 Aug 2010 09:17:15 +0000 (11:17 +0200)]
at91: Enabeling USB host on meesc board
There was an redesign, so USB is available now.
Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
Daniel Gorsulowski [Mon, 9 Aug 2010 09:17:14 +0000 (11:17 +0200)]
at91: Update meesc board to new SoC access
* convert meesc board to use c stucture SoC access
* change gpio access to at91_gpio syntax
* moved CONFIG_SYS_HZ below board and cpu defines (purely cosmetic)
Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
Daniel Gorsulowski [Mon, 9 Aug 2010 09:17:13 +0000 (11:17 +0200)]
at91: Defined main clock frequency on esd at91 boards
Autodetection is undesired now
Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
Wolfgang Denk [Wed, 18 Aug 2010 19:16:35 +0000 (21:16 +0200)]
Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
Sandeep Paulraj [Wed, 18 Aug 2010 14:45:54 +0000 (10:45 -0400)]
ARM: Update ARM mach-types
This patch updates the mach-types.h based on the latest linux kernel
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
Philippe De Muyter [Tue, 17 Aug 2010 16:40:25 +0000 (18:40 +0200)]
Work around bug in Numonyx P33/P30 256-Mbit 65nm flash chips.
I have "ported" U-boot to a in house made board with Numonyx Axcell P33/P30
256-Mbit 65nm flash chips.
After some time :( searching for bugs in our board or soft, we have
discovered that those chips have a small but annoying bug, documented in
"Numonyx Axcell P33/P30 256-Mbit Specification Update"
It states :
When customer uses [...] block unlock, the block lock status might be
altered inadvertently. Lock status might be set to either 01h or 03h
unexpectedly (00h as expected data), which leads to program/erase failure
on certain blocks.
A working workaround is given, which I have applied and tested with success :
Workaround: If the interval between 60h and its subsequent command
can be guaranteed within 20us, Option I is recommended,
otherwise Option II (involves hardware) should be selected.
Option I: The table below lists the detail command sequences:
Command
Data bus Address bus Remarks
Sequence
1 90h Block Address
Read Lock Status
2 Read Block Address + 02h
(2)(3) (1)
3 60h Block Address
(2)(3) (1) Lock/Unlock/RCR Configuration
4 D0h/01h/03h Block Address
Notes:
(1) Block Address refers to RCR configuration data only when the 60h
command sequence is used to set RCR register combined with 03h
subsequent command.
(2) For the third and fourth command sequences, the Block Address must
be the same.
(3) The interval between 60h command and its subsequent D0h/01h/2Fh/03h
commands should be less than 20us.
And here is a log comparison of a simple (destructive) flash test without
and with the workaround.
diff without-numonyx-workaround.log with-numonyx-workaround.log
-U-Boot
2010.06-00696-g22b002c-dirty (Aug 16 2010 - 15:07:47)
+U-Boot
2010.06-00696-g22b002c-dirty (Aug 16 2010 - 15:25:19)
CPU: Freescale MCF5484
CPU CLK 200 MHz BUS CLK 100 MHz
Board: Macq Electronique ME2060
I2C: ready
DRAM: 64 MiB
FLASH: 32 MiB
In: serial
Out: serial
Err: serial
Net: FEC0, FEC1
-> flinfo
Bank # 1: CFI conformant FLASH (16 x 16) Size: 32 MB in 259 Sectors
Intel Extended command set, Manufacturer ID: 0x89, Device ID: 0x8922
Erase timeout: 4096 ms, write timeout: 1 ms
Buffer write timeout: 5 ms, buffer size: 1024 bytes
Sector Start Addresses:
FE000000 RO
FE008000 RO
FE010000 RO
FE018000 RO
FE020000 RO
FE040000 RO
FE060000 RO
FE080000 RO
FE0A0000 RO
FE0C0000 RO
...
FFF80000 RO
FFFA0000 RO
FFFC0000 RO
FFFE0000 RO
-> protect off all
Un-Protect Flash Bank # 1
................... done
-> erase all
Erase Flash Bank # 1
................... done
-> cp.b
1000000 fe000000 2000000
-Copy to Flash... Flash not Erased
+Copy to Flash... done
->
Signed-off-by: Philippe De Muyter <phdm@macqel.be>
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese [Fri, 13 Aug 2010 07:36:36 +0000 (09:36 +0200)]
cfi_flash: Cleanup flash_print_info()
This patch does the following:
- Extract code to detect if sector is erased into function
sector_erased().
- Because of this, we don't have variable declarations inside the
sector loop in flash_print_info()
- Change "return" to "break" in the "if (ctrlc()) statement:
This fixes a problem with the resulting output. Before this
patch the output was:
Sector Start Addresses:
FC000000 FC020000 FC040000 =>
With this patch it is now:
Sector Start Addresses:
FC000000 FC020000 FC040000
=>
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Kim Phillips <kim.phillips@freescale.com>
Cc: Wolfgang Denk <wd@denx.de>
Philippe De Muyter [Tue, 10 Aug 2010 14:54:52 +0000 (16:54 +0200)]
Fix printing & reading of 16-bit CFI device identifiers
Fix reading and printing of CFI flashes 16-bit devices identifiers
Nowadays CFI flashes have a 16-bit device identifier. U-boot still
print them and read them as if they were only 8-bit wide. Fix that.
Before:
Intel Extended command set, Manufacturer ID: 0x89, Device ID: 0x1B
After:
Intel Extended command set, Manufacturer ID: 0x89, Device ID: 0x881B
Signed-off-by: Philippe De Muyter <phdm@macqel.be>
Signed-off-by: Stefan Roese <sr@denx.de>
Kim Phillips [Mon, 26 Jul 2010 23:35:39 +0000 (18:35 -0500)]
cfi_flash: flinfo: allow user interrupt in flash print info fn
flashes getting larger, users more impatient.
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Mike Frysinger [Thu, 12 Aug 2010 03:42:26 +0000 (23:42 -0400)]
env_nand: return error when no device is found
Currently, if there is an error probing the NAND chip and the env is based
in NAND, the readenv() function will use a NULL function pointer and thus
jump to address 0.
Here I just check for a non-zero value of blocksize as that shouldn't be
zero when a valid device is found, but perhaps there is a better way for
someone familiar with the NAND internals to suggest.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Tested-by: Ben Gardiner <bengardiner@nanometrics.ca>
Wolfgang Denk [Thu, 12 Aug 2010 21:05:22 +0000 (23:05 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-usb
Sergei Poselenov [Mon, 9 Aug 2010 12:01:42 +0000 (16:01 +0400)]
Fixed clobbered output of the "help usb" command
The "usb help" doesn't format the output correctly:
=> help usb
usb - USB sub-system
Usage:
usb reset - reset (rescan) USB controller
usb stop [f] - stop USB [f]=force stop
usb tree - show USB device tree
usb info [dev] - show available USB devices
usb storage - show details of USB storage devices
usb dev [dev] - show or set current USB storage device
usb part [dev] - print partition table of one or all USB storage devices
usb read addr blk# cnt - read `cnt' blocks starting at block `blk#'
to memory address `addr'usb write addr blk# cnt - write `cnt'
blocks starting at block `blk#' from memory address `addr'
=>
With fix below applied, the output is correct:
=> help usb
usb - USB sub-system
Usage:
usb reset - reset (rescan) USB controller
usb stop [f] - stop USB [f]=force stop
usb tree - show USB device tree
usb info [dev] - show available USB devices
usb storage - show details of USB storage devices
usb dev [dev] - show or set current USB storage device
usb part [dev] - print partition table of one or all USB storage devices
usb read addr blk# cnt - read `cnt' blocks starting at block `blk#'
to memory address `addr'
usb write addr blk# cnt - write `cnt' blocks starting at block `blk#'
from memory address `addr'
=>
Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
Ajay Kumar Gupta [Fri, 9 Jul 2010 06:13:50 +0000 (11:43 +0530)]
AM3517EVM: musb: add usb config
Enabling USB HOST in defconfig.
Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Ajay Kumar Gupta [Fri, 9 Jul 2010 06:13:49 +0000 (11:43 +0530)]
musb: am35x: Workaround for fifo read issue
AM35x supports only 32bit read operations so we need to have
workaround for 8bit and 16bit read operations.
Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Ajay Kumar Gupta [Fri, 9 Jul 2010 06:13:48 +0000 (11:43 +0530)]
musb: MSC host support for AM35x
Tested MSC Host on AM3517EVM.
Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Ajay Kumar Gupta [Fri, 9 Jul 2010 06:13:47 +0000 (11:43 +0530)]
AM35x: Adding SCM general register definitions
Adding general register structure of system control module (SCM)
of AM35x. This would be required to access devconf2 and ip_sw_reset
register in musb module.
Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Mike Frysinger [Mon, 9 Aug 2010 21:39:22 +0000 (17:39 -0400)]
Blackfin: re-use board data in cpu banner
The bi_cpu field of the board data is already set to the relevant cpu
string, so there is no need for us to use the define directly.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Mike Frysinger [Mon, 2 Aug 2010 20:30:39 +0000 (16:30 -0400)]
Blackfin: cm-bf548: increase monitor len
Recent features enabled by default require a larger monitor size for the
cm-bf548 port, so bump it up a bit.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Michael Hennerich [Fri, 7 Aug 2009 02:47:54 +0000 (02:47 +0000)]
Blackfin: shutdown video DMA when booting Linux
In case there is no frame buffer driver present in Linux to hand over the
PPI LCD DMA upon boot, the DMA initiated by u-boot to display the splash
screen runs unattended. Therefore always stop the video driver in u-boot
before starting Linux. If people don't want this behavior, then they can
simply stub out the video_stop() function in their board video driver.
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Sergei Trofimovich [Sun, 8 Aug 2010 12:05:39 +0000 (15:05 +0300)]
disk/part.c: 'usb storage' avoiding overflow when output capacity
Before:
Marvell>> usb storage
Device 0: Vendor: StoreJet Rev: Prod: Transcend
Type: Hard Disk
Capacity: 28759.9 MB = 28.0 GB (
488397168 x 512)
After:
Marvell>> usb storage
Device 0: Vendor: StoreJet Rev: Prod: Transcend
Type: Hard Disk
Capacity: 238475.1 MB = 232.8 GB (
488397168 x 512)
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Wolfgang Denk [Tue, 10 Aug 2010 21:03:15 +0000 (23:03 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Tue, 10 Aug 2010 20:57:54 +0000 (22:57 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-net
Wolfgang Denk [Tue, 10 Aug 2010 20:49:09 +0000 (22:49 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-imx
Albert Aribaud [Tue, 13 Jul 2010 07:04:26 +0000 (09:04 +0200)]
orion5x: allow overriding default mappings windows
Turn all ORION5X_DEF{ADR,SZ}_xxx macros into ORION5X_{ADR,SZ}_xxx
and allow defining them from board code to override defaults. This
is particularly useful for defining board-specific FLASH address
and size in board header file rather than having to tweak orion5x
code.
Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
Wolfgang Denk [Tue, 10 Aug 2010 20:37:27 +0000 (22:37 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-marvell
Wolfgang Denk [Tue, 10 Aug 2010 20:20:51 +0000 (22:20 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-ti
Wolfgang Denk [Tue, 10 Aug 2010 20:20:27 +0000 (22:20 +0200)]
Merge branch 'master' of ../master
Li Haibo [Tue, 10 Aug 2010 06:18:38 +0000 (14:18 +0800)]
MX51EVK: fix return value of get_timer_masked
get_timer_masked() should return current timestamp,
not current ticks from hardware register.
Tested on one custom board with NAND flash.
Without this patch, NAND write always TIMEOUT
because get_timer(0) return a big value.
This patch applies for u-boot-2010.06
Signed-off-by: Li Haibo <hbli@sinocastel.com>
Reinhard Meyer [Mon, 9 Aug 2010 15:30:51 +0000 (17:30 +0200)]
fix cmd_mmc.c, line 136 missing "
Remove warning for missing " at the end of line 136
Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
Ben Warren [Thu, 29 Jul 2010 19:56:11 +0000 (12:56 -0700)]
Fix compile warnings for const correctness
Commit
6e37b1a3a25004d3df5867de49fff6b3fc9c4f04 modifies several net calls
to take a (const char *) parameter instead of (char *), but in some cases
the modified functions call other functions taking (char *). The end result
is warnings about discarding the const qualifier.
This patch fixes these other function signatures.
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Mike Frysinger [Tue, 27 Jul 2010 22:35:10 +0000 (18:35 -0400)]
miiphy: leverage current_mii cache more
For code that uses miiphy_{read,write}, every call invokes a full look up
of the mii list. There is already a "current_mii" cache that is used by
some code, but have the miiphy_{read,write} function use it as well. This
does increase the code size slightly, but I think it's worth it.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Mike Frysinger [Tue, 27 Jul 2010 22:35:09 +0000 (18:35 -0400)]
miiphy: unify device list lookup
Rather than have every func re-implement the list walking code, do it one
local function. This shrinks the resulting object code a little while
making the source much more manageable.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Mike Frysinger [Tue, 27 Jul 2010 22:35:08 +0000 (18:35 -0400)]
miiphy: constify device name
The driver name does not need to be writable, so constify it.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Kim Phillips [Mon, 26 Jul 2010 23:34:57 +0000 (18:34 -0500)]
net: rename "FSL UECx" net interfaces "UECx"
continuation of commit
2ecc2262d66a286e3aac79005bcb5f461312dea8
"net ppc: fix ethernet device names with spaces" (currently in
u-boot-net.git) for QE based parts.
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Acked-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Heiko Schocher [Tue, 20 Jul 2010 15:45:02 +0000 (17:45 +0200)]
net ppc: fix ethernet device names with spaces
since commit
1384f3bb8a4f9066805b70c1418eda78ecb73fdd ethernet names
with spaces drop a
Warning: eth device name has a space!
message. This patch fix it for:
- "FEC ETHERNET" devices found on
mpc512x, mpc5xxx, mpc8xx and mpc8220 boards.
renamed to "FEC".
- "SCC ETHERNET" devices found on
mpc8xx, mpc82xx based boards. Renamed to "SCC".
- "HDLC ETHERNET" devices found on mpc8xx boards
Renamed to "HDLC"
- "FCC ETHERNET" devices found on mpc8260 and mpc85xx based
boards. Renamed to "FCC"
Tested on the kup4k board.
Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Stefano Babic [Tue, 20 Jul 2010 05:57:07 +0000 (07:57 +0200)]
net,fec: Shorten device name as done for other drivers
After discussion on the ML it is suggested to drop unrequired
and not useful characters from the device name.
This patch changes the name for the fec_mxc driver from
"FEC_MXC" to "FEC".
Signed-off-by: Stefano Babic <sbabic@denx.de>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Stefan Roese [Tue, 3 Aug 2010 08:29:50 +0000 (10:29 +0200)]
ppc4xx: Fix/Update katmai board header
This patch has the following fixes/changes:
- Set 'kernel_addr' and 'ramdisk_addr' to correct values and add
'fdt_addr' environment variable
- Remove 'kozio' environment variable
- Remove environmant variables to boot ancient arch/ppc Linux kernels
- Remove CONFIG_SYS_BOOTMAPSZ definition. It's already defined to
the same value in amcc-common.h
Signed-off-by: Stefan Roese <sr@denx.de>
Heiko Schocher [Tue, 27 Jul 2010 05:07:24 +0000 (07:07 +0200)]
ppc4xx: Fix building of sc3 board
Update image size after addition of new environment handling.
Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
Matthias Fuchs [Mon, 26 Jul 2010 15:17:53 +0000 (17:17 +0200)]
ppc4xx: Fix building of PMC440 board
Update image size and default environment
after addition of new environment handling.
Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
Matthias Fuchs [Mon, 26 Jul 2010 15:17:52 +0000 (17:17 +0200)]
ppc4xx: Fix building of CANBT board
Update image size after addition of new environment handling.
Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
Matthias Fuchs [Mon, 26 Jul 2010 15:17:51 +0000 (17:17 +0200)]
ppc4xx: Fix building of AR405 board
Update image size after addition of new environment handling.
Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
Wolfgang Denk [Fri, 23 Jul 2010 19:16:26 +0000 (21:16 +0200)]
ppc4xx: cleanup default environment for AMCC boards
None of the AMCC boards uses an embedded environment, so there is no
need to run "saveenv" after updating U-Boot. Drop the redundant
commands from the default environment.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
Marek Vasut [Sun, 8 Aug 2010 13:55:52 +0000 (15:55 +0200)]
PXA: Declare __io for vpac270 IDE
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Marek Vasut [Sun, 8 Aug 2010 13:55:51 +0000 (15:55 +0200)]
PXA: Fix missing includes
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Marek Vasut [Sun, 8 Aug 2010 13:55:50 +0000 (15:55 +0200)]
PXA: Fix off-the-tree build problems
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Mike Frysinger [Tue, 3 Aug 2010 23:17:38 +0000 (19:17 -0400)]
config.mk: avoid -traditional-cpp on OS X 10.5
Simply trying to include a basic header file like stdlib.h on OS X 10.5
and then building with -traditional-cpp fails with lots of errors like:
In file included from /usr/include/stdlib.h:63,
from test.c:3:
/usr/include/available.h:85: error: stray '#' in program
/usr/include/available.h:85: error: syntax error before numeric constant
/usr/include/available.h:86: error: stray '#' in program
In the past, I hadn't noticed because the old logic for these flags were
restricted to Darwin running on PowerPC systems while I'm running on an
Intel system. But after some recent clean ups and changes, the flag was
being applied to all Darwin systems and my host tools broke.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Feng Wang [Tue, 3 Aug 2010 14:22:43 +0000 (16:22 +0200)]
fdt: Fix bug in size calculation in fdt_resize() with initrd use
Original bug description from Feng (fdt_resize() bug caused "WARNING:
could not set linux, initrd-start FDT_ERR_NOSPACE."):
What I got is an error: "WARNING: could not set linux,initrd-start
FDT_ERR_NOSPACE." after loading Device Tree blob. This in turn caused
linux to miss init part.
After some digging, I found out the reason for this error, it is caused
by fdt_resize().
FDT blob got resized after filling in all board specific information of
PowerPC. (in boot_body_linux()). It reduced blob size with only extra
space for two fdt_reserve_entry, one for fdt itself, and one for initrd.
Then it's aligned to a 0x1000 page boundary. However, later in
fdt_initrd(), it could add two more properties, initrd-start AND
initrd-end, each one needs at least two fdt_reserve_entry sizes done by
_fdt_add_property() (name and value). Thus, the two fdt_reserve_entry
extra space is not sufficient.
So for some specific fdt size which is just under the page boundary
after resizing, this will cause an error of FDT_ERR_NOSPACE in
fdt_initrd() when setting those two properties, and failed to pass
initrd information to linux.
My fix is in fdt_resize(), leave at least 4 fdt_reserve_entry for
initrd. So instead of 2*sizeof(struct fdt_reserve_entry) for
actual_totalsize, use 5*sizeof(struc fdt_reserve_entry).
Stefan: I got this same error on katmai, when trying to boot with
initrd (run flash_self). This patch fixes this issue.
Signed-off-by: Feng Wang <fwang02@harris.com>
Tested-by: Stefan Roese <sr@denx.de>
Cc: Jerry Van Baren <gvb.uboot@gmail.com>
Acked-by: Gerald Van Baren <vanbaren@cideas.com>
Frans Meulenbroeks [Sun, 1 Aug 2010 08:10:41 +0000 (10:10 +0200)]
board/purple/flash.c: removed unneded variable
removed a variable that was not used
Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Frans Meulenbroeks [Sat, 31 Jul 2010 13:01:53 +0000 (15:01 +0200)]
various cmd_* files: fixed layout a little bit
Most of the files have U_BOOT_CMD on a separate line,
but a few didn't and had the first line on the same line
as U_BOOT_CMD.
This changes these files by adding a line break and a tab
Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Frans Meulenbroeks [Sat, 31 Jul 2010 13:01:52 +0000 (15:01 +0200)]
various cmd_* files: remove the command name from the help message
removed the command name from the help message as it is already printed.
for cmd_mmc also rewrote the message a little bit
Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Detlev Zundel [Fri, 30 Jul 2010 09:22:15 +0000 (11:22 +0200)]
tools/env/fw_printenv: Make redundant env work on locked flashes also
The invalidation of the old environment instance did not work for flashes
supporting hardware locking. Now we unlock/lock around this update also.
Signed-off-by: Detlev Zundel <dzu@denx.de>
Mike Frysinger [Thu, 29 Jul 2010 03:45:03 +0000 (23:45 -0400)]
flash_protect: check for NULL flash info
If a flash is unable to be detected, and then someone calls flash_protect
on it (like the common code does in flash_init), the flash_protect logic
will dereference a NULL pointer.
Since flash_protect already does sanity checking on the info structs, add
a NULL pointer check in there.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Wolfgang Denk [Sat, 24 Jul 2010 20:16:20 +0000 (22:16 +0200)]
getenv_f(): fix handling of too short buffers
Fix error handling in getenv_f() when the user provided buffer is too
short to hold the variable name; make sure to truncate and
NUL-terminate without overwriting the buffer limits.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Mike Frysinger [Thu, 29 Jul 2010 17:42:10 +0000 (13:42 -0400)]
dataflash mmc mux: use common cmd_usage function
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Mike Frysinger [Thu, 29 Jul 2010 17:42:29 +0000 (13:42 -0400)]
mflash: use common cmd_usage function
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Mike Frysinger [Fri, 23 Jul 2010 10:17:30 +0000 (06:17 -0400)]
print_buffer: optimize & shrink
Applying a little creative format string allows us to shrink the initial
data read & display loop by only calling printf once. Re-using the local
data buffer to generate the string we want to display then allows us to
output everything with just one printf call instead of multiple calls to
the putc function.
The local stack buffer needs increasing by 1 byte, but the resulting code
shrink and speed up is worth it I think.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Mike Frysinger [Fri, 23 Jul 2010 09:28:15 +0000 (05:28 -0400)]
cmd editing: optimize/shrink output blanking
No need to output spaces 1 char at a time in a loop when the printf code
can do the same thing with the right format string. This shrinks things
and gives a nice speed up when killing off lines more than a byte or two
as printf will send out the buffer in one big chunk.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Heiko Schocher [Mon, 19 Jul 2010 21:47:08 +0000 (23:47 +0200)]
8xx, kup4k/kup4x: add FDT support
Signed-off-by: Heiko Schocher <hs@denx.de>
Heiko Schocher [Mon, 19 Jul 2010 21:46:48 +0000 (23:46 +0200)]
8xx, kup4k/kup4x: configuration changes, code cleanup
- nfs-options removed
- hda->sda changed
- mtd parts added
- loadaddress changed
- cmd-line length increased
- lcd stuff removed
- code cleanup (use I/O accessors etc.)
Signed-off-by: Klaus Heydeck <heydeck@kieback-peter.de>
Stephan Linz [Fri, 25 Jun 2010 16:04:59 +0000 (18:04 +0200)]
fdt relocate: have more attention to use a bootmap or not
Platforms with flat device tree support can use a bootmap to relocate
the fdt_blob. This is not a must. That's why the relocation function
boot_relocate_fdt() should be use only if CONFIG_OF_LIBFDT was defined
together with CONFIG_SYS_BOOTMAPSZ (see common/cmd_bootm.c).
On MicroBlaze platforms there is no need to use a bootmap to relocate
a fdt blob. So we need a more precise focus on the compilation and usage
of boot_relocate_fdt().
In general it is valid to exclude the function boot_relocate_fdt() if
the bootmap size CONFIG_SYS_BOOTMAPSZ is not defined.
Signed-off-by: Stephan Linz <linz@li-pro.net>
Nobuhiro Iwamatsu [Wed, 16 Jun 2010 01:38:24 +0000 (10:38 +0900)]
Add mkimage manpage
Some Linux distributions include the "mkimage" as a package.
This commit provides a manual page for mkimage.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Added documentation for FIT images and examples.
Moved to doc/ directory.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Prafulla Wadaskar [Sat, 7 Aug 2010 12:14:25 +0000 (17:44 +0530)]
Kirkwood: openrd_base: Added SATA support
This patch enables mvsata driver and related filesystem support.
The patch is tested for ide reset and ext2ls operation for a disk drive connected on SATA port0.
This patch depends upon the patche-series http://lists.denx.de/pipermail/u-boot/2010-August/074908.html
Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
Prafulla Wadaskar [Sat, 7 Aug 2010 11:59:44 +0000 (17:29 +0530)]
cmd_ide: add support for Kirkwood
Added MVSATAC definitions to Kirkwood.
Added support for Kirkwood in cmd_ide.
Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
Albert Aribaud [Sat, 7 Aug 2010 23:47:06 +0000 (05:17 +0530)]
edminiv2: add mvsata_ide and cmd_ide support
Add mvsata_ide and cmd_ide configuration in edminiv2 config
Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
Albert Aribaud [Sat, 7 Aug 2010 23:47:06 +0000 (05:17 +0530)]
cmd_ide: add support for orion5x
Add MVSATAHC definitions to orion5x.
Add support for orion5x in cmd_ide.
Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
Albert Aribaud [Sat, 7 Aug 2010 23:47:06 +0000 (05:17 +0530)]
ide: add mvsata_ide driver
This driver only provides initialization code; actual driving
is done by cmd_ide.c using the ATA compatibility mode of the
Marvell SATAHC controller.
Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
Albert Aribaud [Sat, 7 Aug 2010 23:47:05 +0000 (05:17 +0530)]
ide: reorder object files alphabetically
Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
Albert Aribaud [Sat, 7 Aug 2010 23:47:05 +0000 (05:17 +0530)]
ide: add configuration
CONFIG_IDE_SWAP_IO
This configuration option replaces a complex conditional
in cmd_ide.c with an explicit define to be added to SoC or
board configs.
Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
Matthias Weisser [Thu, 5 Aug 2010 11:17:30 +0000 (13:17 +0200)]
LZMA and LZO causes compile error
If both LZMA and LZO compressions are used there is a compile error
in cmd_bootm.c
Signed-off-by: Matthias Weisser <weisserm@arcor.de>
Aaron Pace [Mon, 26 Jul 2010 20:24:44 +0000 (14:24 -0600)]
ext2fs: Fix optimization bug for doubly-indirect block pointers
Doubly-indirect block numbers are compared against the first-level
indirect block when checking for a cached copy. This is causing the
doubly-indirect block to be re-read each time it is accessed.
Repairing this reduces load time for a 70M file from 72 seconds
to 38 seconds.
Signed-off-by: Aaron Pace <Aaron.Pace@alcatel-lucent.com>
Marek Vasut [Thu, 22 Jul 2010 10:07:19 +0000 (12:07 +0200)]
ARM: Define __raw_readX and __raw_writeX
These functions are undefined on ARM when using __io. These are the commonly
used versions and can be redefined.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Wolfgang Denk [Sat, 7 Aug 2010 20:33:06 +0000 (22:33 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/master
Matthew McClintock [Thu, 8 Jul 2010 15:11:08 +0000 (10:11 -0500)]
Fix condition where bootm_size not set and wrong memory size reported
If the user sets bootm_low and does not set bootm_size, u-boot will
report the memory node in the flat device tree incorrectly. Instead
of reporting the remaining size of memory, it will report the total
available memory which is incorrect.
Specifically this fixes the situation when booting a relocatable
kernel and the memory is reported as an offset and size in the
device tree, and the size needs to be adjusted accordingly.
Signed-off-by: Matthew McClintock <msm@freescale.com>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Wolfgang Denk [Fri, 6 Aug 2010 22:32:50 +0000 (00:32 +0200)]
Replace CHANGELOG files by auto-generated "snapshot.commit"
Idea and implementation courtesy of Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>
Wolfgang Denk [Thu, 5 Aug 2010 19:31:54 +0000 (21:31 +0200)]
net 52xx: fix ethernet device names with spaces
Some commands (like 'mii') use this name to select devices, but they
break when those names contain spaces. So drop the space from
Ethernet driver names (cf. commit
1384f3bb).
Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Ben Warren <biggerbadderben@gmail.com>
Steve Sakoman [Wed, 7 Jul 2010 22:25:25 +0000 (15:25 -0700)]
ARMV7: Update default environment for OMAP4 boards
Specify vram on command line, remove erroneous call to nandboot
in the boot script, add CONFIG_BOOTDELAY
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Acked-by: Nishanth Menon <menon.nishanth@gmail.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
Steve Sakoman [Fri, 25 Jun 2010 19:52:01 +0000 (12:52 -0700)]
ARMV7: Enable musb driver and usbtty on OMAP4 Panda
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
Steve Sakoman [Fri, 25 Jun 2010 19:44:33 +0000 (12:44 -0700)]
ARMV7: Enable musb driver and usbtty on OMAP4430 SDP
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
Steve Sakoman [Fri, 25 Jun 2010 19:42:04 +0000 (12:42 -0700)]
ARMV7: Restructure omap3 musb driver to allow code sharing between OMAP3 and OMAP4
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
Steve Sakoman [Thu, 15 Jul 2010 19:53:42 +0000 (12:53 -0700)]
ARMV7: Add support for the TWL6030 I2C power chip used in OMAP4 systems
This patch add the basic infrastructure for the TWL6030 driver and enables
support in the two existing OMAP4 boards, Panda and OMAP4430 SDP
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
Steve Sakoman [Tue, 20 Jul 2010 03:31:55 +0000 (20:31 -0700)]
ARMV7: Modify i2c driver for more reliable operation on OMAP4
This patch modifies the init routine to follow the TRM
recommendations. It also modifies the i2c_read_byte function
to reflect subtle differences between the i2c controller in
OMAP3 and OMAP4.
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Acked-by: Nishanth Menon <menon.nishanth@gmail.com>
Acked-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
Steve Sakoman [Tue, 20 Jul 2010 21:56:07 +0000 (14:56 -0700)]
ARMV7: Fix udelay for OMAP4
The OMAP4 x-load code sets gptimer1 clock source to 32Khz. This isn't
acceptable for udelay. This patch changes from gptimer1 to gptimer2,
which uses sys_clk at 38.4 Mhz.
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
Steve Sakoman [Thu, 15 Jul 2010 20:43:10 +0000 (13:43 -0700)]
ARMV7: Add pad mux support for OMAP4
Add functional multiplexing support for OMAP4 pads.
Configure all the pads for the OMAP4430 SDP
and OMAP4 Panda boards
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Aneesh V <aneesh@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
Wolfgang Denk [Sat, 24 Jul 2010 19:55:43 +0000 (21:55 +0200)]
Rename getenv_r() into getenv_f()
While running from flash, i. e. before relocation, we have only a
limited C runtime environment without writable data segment. In this
phase, some configurations (for example with environment in EEPROM)
must not use the normal getenv(), but a special function. This
function had been called getenv_r(), with the idea that the "_r"
suffix would mean the same as in the _r_eentrant versions of some of
the C library functions (for example getdate vs. getdate_r, getgrent
vs. getgrent_r, etc.).
Unfortunately this was a misleading name, as in U-Boot the "_r"
generally means "running from RAM", i. e. _after_ relocation.
To avoid confusion, rename into getenv_f() [as "running from flash"]
Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Detlev Zundel <dzu@denx.de>
Mike Frysinger [Sun, 25 Jul 2010 19:54:17 +0000 (15:54 -0400)]
bootm: fix pointer warning with lzma
Avoid warning:
cmd_bootm.c: In function 'bootm_load_os':
cmd_bootm.c:394: warning: passing argument 2 of
'lzmaBuffToBuffDecompress' from incompatible pointer type
For 32 bit systems, this change shouldn't make a difference to code size
since sizeof(size_t) and sizeof(unsigned int) are equal. But it does fix
the warning.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Wolfgang Denk [Tue, 3 Aug 2010 22:35:10 +0000 (00:35 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-samsung
Wolfgang Denk [Tue, 3 Aug 2010 22:30:50 +0000 (00:30 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Tue, 3 Aug 2010 20:45:13 +0000 (22:45 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/master
Minkyu Kang [Tue, 6 Jul 2010 11:58:41 +0000 (20:58 +0900)]
s5p_goni: enable mmc0
Adds the board_mmc_init function and enable the mmc command
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Minkyu Kang [Tue, 6 Jul 2010 11:26:06 +0000 (20:26 +0900)]
S5P: support mmc driver
This patch adds support mmc driver for s5p SoC
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Kim Phillips [Thu, 15 Jul 2010 00:47:29 +0000 (19:47 -0500)]
powerpc/8xxx: query feature reporting register for num cores on unknown cpus
doing so helps avant garde users, such as those using simulators that
allow users to configure the number of cores, so as to not have to
manually adjust u-boot sources. h/w should also be reliably setting
FRR NCPU in the future.
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Kim Phillips [Thu, 15 Jul 2010 00:47:18 +0000 (19:47 -0500)]
powerpc/85xx: configure autocompletion support
because it's convenient.
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Kumar Gala [Thu, 15 Jul 2010 21:49:03 +0000 (16:49 -0500)]
powerpc/p4080: Add support for the P4080DS board
Add support for the P4080DS board, with the following features:
* 36-bit only
* Boots from NOR flash
* FMAN drivers NOT supported
* SPD DDR initialization
Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Signed-off-by: Emil Medve <Emilian.Medve@Freescale.com>
Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: Ashish Kalra <Ashish.Kalra@freescale.com>
Signed-off-by: Stuart Yoder <stuart.yoder@freescale.com>
Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Lan Chunhe-B25806 <b25806@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: York Sun <yorksun@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Mike Frysinger [Fri, 23 Jul 2010 08:24:46 +0000 (04:24 -0400)]
Blackfin: gpio: use common usage func
Signed-off-by: Mike Frysinger <vapier@gentoo.org>