random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-11-04 05:50:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge git://www.denx.de/git/u-boot

Browse Source
This commit is contained in:
Michal Simek 2007-10-14 14:33:32 +02:00
commit e58ade3a5c
46 changed files with 3332 additions and 442 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

514
CHANGELOG
View File

@ -1,3 +1,210 @@
commit 68f14f77ca5fe5f9cc025c8cae101671f628309f
Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Sat Sep 29 13:41:37 2007 +0200
Fix warning differ in signedness in cpu/pxa/mmc.c
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
commit fc19e36f741e8bc727c0a330170b3b5db90399ef
Author: Wolfgang Denk <wd@denx.de>
Date: Sat Oct 13 23:51:14 2007 +0200
Fix warning differ in signedness in board/mpl/vcma9/vcma9.c
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>
commit de74b9eeacccaf0a42e5ecc9ae79a88f7a311296
Author: Wolfgang Denk <wd@denx.de>
Date: Sat Oct 13 21:15:39 2007 +0200
Coding Style cleanup.
Signed-off-by: Wolfgang Denk <wd@denx.de>
commit e1893815b0999410d7a327589611c7b38e95299e
Author: Wolfgang Denk <wd@denx.de>
Date: Fri Oct 12 15:49:39 2007 +0200
GP3 SSA: enable RTC
Signed-off-by: Wolfgang Denk <wd@denx.de>
commit 8002012041f1ff9f997a5727abe5015f70cd2e46
Author: Grzegorz Bernacki <gjb@semihalf.com>
Date: Tue Oct 9 13:58:24 2007 +0200
[ads5121] EEPROM support added.
Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
commit 7b624ad254b97e5a25dca2304a398b64aeedaffe
Author: Haavard Skinnemoen <hskinnemoen@atmel.com>
Date: Sat Oct 6 18:55:35 2007 +0200
AVR32: Initialize bi_flash* in board_init_r
The ATSTK1000-specific flash driver intializes bi_flashstart,
bi_flashsize and bi_flashoffset, but other flash drivers, like the CFI
driver, don't.
Initialize these in board_init_r instead so that things will still be
set up correctly when we switch to the CFI driver.
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
commit 2b2a587d6d3076387d22ac740f44044bf46e2cb8
Author: Marian Balakowicz <m8@semihalf.com>
Date: Fri Oct 5 10:40:54 2007 +0200
tqm5200: Fix CONFIG_CMD_PCI typo in board config file.
Signed-off-by: Marian Balakowicz <m8@semihalf.com>
commit 92869195ef8210758d2176230c0a36897afd50ed
Author: Bartlomiej Sieka <tur@semihalf.com>
Date: Fri Oct 5 09:46:06 2007 +0200
CM5200: Fix missing null-termination in hostname manipulation code
Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
commit 9add9884b1fddc34ca186e00a2f868ccd5d02d87
Author: Haavard Skinnemoen <hskinnemoen@atmel.com>
Date: Tue Oct 2 19:09:01 2007 +0200
Fix memtest breakage
CFG_MEMTEST_START uses weird magic involving gd, which fails to
compile. Use hardcoded values instead (we actually know how much RAM
we have on board.)
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
commit 738815c0cc44aa329097f868dc1efc49ede9c5ba
Author: Stefan Roese <sr@denx.de>
Date: Tue Oct 2 11:44:46 2007 +0200
ppc4xx: Coding style cleanup
Signed-off-by: Stefan Roese <sr@denx.de>
commit 87c1833a39e944db66385286fd5e28f9b3fcdd50
Author: Stefan Roese <sr@denx.de>
Date: Tue Oct 2 11:44:19 2007 +0200
ppc4xx: lwmon5: Remove watchdog for now, since not fully tested yet
Signed-off-by: Stefan Roese <sr@denx.de>
commit 2db64784061bfc34f4ba70ef1d2fbe7133b55670
Author: Grzegorz Bernacki <gjb@semihalf.com>
Date: Mon Oct 1 09:51:50 2007 +0200
Program EPLD to force full duplex mode for PHY.
EPLD forces modes of PHY operation. By default full duplex is turned off.
This fix turns it on.
Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
commit 86ec86c04326c3913178a7679aa910de071da75d
Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Thu Sep 27 23:27:47 2007 +0200
Fix missing DECLARE_GLOBAL_DATA_PTR on CONFIG_LPC2292 in serial
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
commit 3e954beb614b5b190d7f4f4c3b641437a0132e35
Author: Stefan Roese <sr@denx.de>
Date: Tue Sep 11 14:12:55 2007 +0200
ppc4xx: lwmon5: Change GPIO 58 to default to low (watchdog test)
Signed-off-by: Stefan Roese <sr@denx.de>
commit 0d38effc6e359e6b1b0c78d66e8bc1a4dc15a2ae
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Sep 25 15:48:05 2007 -0600
Fpga: fix incorrect test of CFG_FPGA_XILINX macro
CFG_FPGA_XILINX is a bit value used to test against the value in
CONFIG_FPGA. Testing for a value will always return TRUE. I don't
think that is the intention in this code.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit 853643d8cf2ca80cb2e25c53ad5dc580abafe166
Author: Michal Simek <monstr@monstr.eu>
Date: Mon Sep 24 00:41:30 2007 +0200
[FIX] change command handling and removing code violation
commit f240356507038e5ce55e8a24cb2607e9eae6d10c
Author: Michal Simek <monstr@monstr.eu>
Date: Mon Sep 24 00:36:06 2007 +0200
[FIX] change sets of commands
because changing of command handling brings
compilation problems
commit cb1bc63b75a232571eb69aa2c8aa919321655845
Author: Michal Simek <monstr@monstr.eu>
Date: Mon Sep 24 00:30:42 2007 +0200
[FIX] Email reparation & Copyright
Both codes are written by myself without any
support from CTU
commit 0731cbae6c2feab93b244d83fd6a43f5cc9bf852
Author: Michal Simek <monstr@monstr.eu>
Date: Mon Sep 24 00:25:11 2007 +0200
[PATCH] Change macro name for UartLite
because PowerPC 405 can use UartLite as console
commit 1c1100d2fcf46b9d11dcf78d6e5aea75e2e8b716
Author: Michal Simek <monstr@monstr.eu>
Date: Mon Sep 24 00:21:19 2007 +0200
[PATCH] Add support for design without interrupt controller
Polling timer
commit 0731933ec8ec45d02ba89b52df673d526873cdde
Author: Michal Simek <monstr@monstr.eu>
Date: Mon Sep 24 00:19:48 2007 +0200
[FIX] resolve problem with cpu without barrel shifter
commit db14d77995ce515b728b178b63f82babe60e3d56
Author: Michal Simek <monstr@monstr.eu>
Date: Mon Sep 24 00:18:46 2007 +0200
[FIX] repair email address
commit 481d4328618804add1f818a6c96296121cd0528e
Author: Michal Simek <monstr@monstr.eu>
Date: Mon Sep 24 00:17:42 2007 +0200
[FIX] repair MFSL commands
commit b90c045f035c3cc9b5d2edaed6048dfb74e40763
Author: Michal Simek <monstr@monstr.eu>
Date: Mon Sep 24 00:08:37 2007 +0200
synchronizition with mainline
commit 66dcad3a9a53e0766d90e0084123bd8529522fb0
Author: Wolfgang Denk <wd@denx.de>
Date: Thu Sep 20 00:04:14 2007 +0200
v1.3.0-rc2
Signed-off-by: Wolfgang Denk <wd@denx.de>
commit 135e19bc2773ebca487e9a8371f67e1ba202313a commit 135e19bc2773ebca487e9a8371f67e1ba202313a
Author: Wolfgang Denk <wd@denx.de> Author: Wolfgang Denk <wd@denx.de>
Date: Tue Sep 18 21:36:35 2007 +0200 Date: Tue Sep 18 21:36:35 2007 +0200
@ -38,6 +245,92 @@ Date: Tue Sep 18 17:40:27 2007 +0200
Signed-off-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Wolfgang Denk <wd@denx.de>
commit bd86220f58b99d6896198c385fda132f0c980915
Author: Peter Pearse <peter.pearse@arm.com>
Date: Tue Sep 18 13:07:54 2007 +0100
Move coloured led API to status_led.h
Improve indentation in drivers/at45.c
commit e80e585b00fbbab7ad1bf71619741f2c5b029ab7
Author: Eirik Aanonsen <eaa@wprmedical.com>
Date: Tue Sep 18 08:47:20 2007 +0200
Update atstk1002 bootargs.
Updates to atstk1002 U-Boot header file:
- Changed bootargs:
* Set the bootargs for at1002 to point to the SD-card partition instead
* ... of the boot flash.
* Removing the rootfstype since that argument are not needed.
Signed-off-by: Eirik Aanonsen <eaa@wprmedical.com>
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
commit a4f3aab6dfbed6c29367c688bfb8a47eef62c225
Author: Eirik Aanonsen <eaa@wprmedical.com>
Date: Wed Sep 12 13:32:37 2007 +0200
Add some comments to clocks in atstk1002.h
This patch applies some clarifying comments to how the different
clocks are setup according to atstk1002.h Some of the previous
comments where stating wrongful information.
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
commit 97213f32416ead885deafea86774e912ffd60ad0
Author: David Saada <David.Saada@ecitele.com>
Date: Mon Sep 17 17:04:47 2007 +0200
Description: Add NEC's PCI OHCI module ID to the USB OHCI driver
Signed-off-by: David Saada <david.saada@ecitele.com>
commit 30363e98fa470fbecea5e8bc0f1443352754f303
Author: Stefan Roese <sr@denx.de>
Date: Mon Sep 17 08:20:47 2007 +0200
Small whitespace cleanup of OneNAND patch
Signed-off-by: Stefan Roese <sr@denx.de>
commit d7e8ce101a4a45ed6ed45739fc2de5f87b13f7f1
Author: Kyungmin Park <kmpark@infradead.org>
Date: Mon Sep 10 17:15:14 2007 +0900
OneNAND support (take #2)
[PATCH 3/3] OneNAND support (take #2)
OneNAND support at U-Boot
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
commit 17aa2800457df0c06b41516f46f126712c196219
Author: Kyungmin Park <kmpark@infradead.org>
Date: Mon Sep 10 17:14:34 2007 +0900
OneNAND support (take #2)
[PATCH 2/3] OneNAND support (take #2)
OneNAND support at U-Boot
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
commit 916527f4809a7bcd811f1f1daf34af184e31dd8c
Author: Kyungmin Park <kmpark@infradead.org>
Date: Mon Sep 10 17:13:49 2007 +0900
OneNAND support (take #2)
[PATCH 1/3] OneNAND support (take #2)
OneNAND support at U-Boot
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
commit 67c31036acaaaa992fc346cc89db0909a7e733c4 commit 67c31036acaaaa992fc346cc89db0909a7e733c4
Author: Wolfgang Denk <wd@denx.de> Author: Wolfgang Denk <wd@denx.de>
Date: Sun Sep 16 17:10:04 2007 +0200 Date: Sun Sep 16 17:10:04 2007 +0200
@ -193,6 +486,18 @@ Date: Thu Sep 13 18:21:48 2007 +0200
Signed-off-by: Marian Balakowicz <m8@semihalf.com> Signed-off-by: Marian Balakowicz <m8@semihalf.com>
commit e1f601b572db5de9aa81a0b77c68a86994fe24c4
Author: Bartlomiej Sieka <tur@semihalf.com>
Date: Thu Sep 13 16:33:59 2007 +0200
tqm5200: Restore customary env. variable boot commands for powerpc kernels
- update default definitions of kernel_addr and fdt_addr env. variables
- make arch/powerpc booting the default scenario
- update MTD partition layout to match the above
Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
commit f34024d4a328e6edd906456da98d2c537155c4f7 commit f34024d4a328e6edd906456da98d2c537155c4f7
Author: Wolfgang Denk <wd@denx.de> Author: Wolfgang Denk <wd@denx.de>
Date: Wed Sep 12 00:48:57 2007 +0200 Date: Wed Sep 12 00:48:57 2007 +0200
@ -201,6 +506,12 @@ Date: Wed Sep 12 00:48:57 2007 +0200
Signed-off-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Wolfgang Denk <wd@denx.de>
commit d94c79e47011af5e8dd10ed6163c09b4cfc743cc
Author: Peter Pearse <peter.pearse@arm.com>
Date: Tue Sep 11 15:35:01 2007 +0100
Final tidy
commit 38ad82da0c1180ecdeb212a8f4245e945bcc546e commit 38ad82da0c1180ecdeb212a8f4245e945bcc546e
Author: Grzegorz Bernacki <gjb@semihalf.com> Author: Grzegorz Bernacki <gjb@semihalf.com>
Date: Tue Sep 11 15:42:11 2007 +0200 Date: Tue Sep 11 15:42:11 2007 +0200
@ -222,6 +533,12 @@ Date: Tue Sep 11 12:57:52 2007 +0200
Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com> Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
commit d45963854eff39d575124d859419bb4953ce2c87
Author: Michal Simek <monstr@monstr.eu>
Date: Tue Sep 11 00:37:04 2007 +0200
[FIX] Microblaze ML401 - repare FLASH handling
commit 38c1ef728d19950414a8ab1ccfc53767848fa346 commit 38c1ef728d19950414a8ab1ccfc53767848fa346
Author: Sean MCGOOGAN <sean.mcgoogan@st.com> Author: Sean MCGOOGAN <sean.mcgoogan@st.com>
Date: Mon Sep 10 16:55:59 2007 +0100 Date: Mon Sep 10 16:55:59 2007 +0100
@ -507,6 +824,14 @@ Date: Thu Sep 6 09:46:17 2007 -0600
Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit 80767a6cead9990d9e77e62be947843c2c72f469
Author: Peter Pearse <peter.pearse@arm.com>
Date: Wed Sep 5 16:04:41 2007 +0100
Changed API name to coloured_led.h
Removed code using deprecated ifdef CONFIG_BOOTBINFUNC
Tidied other cpu/arm920t/start.S code
commit 56a9270521baaa00e12639a978302a67f61ef060 commit 56a9270521baaa00e12639a978302a67f61ef060
Author: Kumar Gala <galak@kernel.crashing.org> Author: Kumar Gala <galak@kernel.crashing.org>
Date: Thu Aug 30 16:18:18 2007 -0500 Date: Thu Aug 30 16:18:18 2007 -0500
@ -532,6 +857,31 @@ Date: Thu Aug 30 01:58:48 2007 -0500
Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com> Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
commit 9f5c3d3720e777a572dcdc8af2008b44c7243885
Author: Peter Pearse <peter.pearse@arm.com>
Date: Tue Sep 4 16:18:38 2007 +0100
Add coloured led interface for ARM boards.
Use it in cpu/arm920t/start.S to indicate U-Boot code has been entered.
commit 7462fe0d5a9d40cde083fb1a3cd73911996b5ecb
Author: Peter Pearse <peter.pearse@arm.com>
Date: Tue Sep 4 14:49:28 2007 +0100
Move include/led.h to board/at91rm9200dk
commit 6e4bf9b24e57c15abc6542e685d06380bc64af27
Author: Peter Pearse <peter.pearse@arm.com>
Date: Tue Sep 4 14:25:51 2007 +0100
Ran Lindent on drivers/at45.c
commit 557ab89d294f08dd532f21d19861b40093200a33
Author: Peter Pearse <peter.pearse@arm.com>
Date: Tue Sep 4 14:23:50 2007 +0100
Rename CONFIG_CMD_MUX to CONFIG_CMD_AT91_SPIMUX
commit 81b73dec16fd1227369a191e725e10044a9d56b8 commit 81b73dec16fd1227369a191e725e10044a9d56b8
Author: Gary Jennejohn <garyj@denx.de> Author: Gary Jennejohn <garyj@denx.de>
Date: Fri Aug 31 15:21:46 2007 +0200 Date: Fri Aug 31 15:21:46 2007 +0200
@ -572,6 +922,24 @@ Date: Fri Aug 31 10:01:51 2007 +0200
Signed-off-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Wolfgang Denk <wd@denx.de>
commit 696dd1307cd8e73a10e9bb3c51731bfd6f837bee
Author: Hans-Christian Egtvedt <hcegtvedt@atmel.com>
Date: Thu Aug 30 15:03:05 2007 +0200
Reduce BOOTDELAY variable to 1 second by default for STK1002
Signed-off-by: Hans-Christian Egtvedt <hcegtvedt@atmel.com>
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
commit c88b6e1cbf9a8ae2a34fb602f78a1bf4e6692b6a
Author: Hans-Christian Egtvedt <hcegtvedt@atmel.com>
Date: Thu Aug 30 15:03:04 2007 +0200
Remove double quotation marks around MAC address for STK1002
Signed-off-by: Hans-Christian Egtvedt <hcegtvedt@atmel.com>
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
commit ff13ac8c7bbebb238e339592de765c546dba1073 commit ff13ac8c7bbebb238e339592de765c546dba1073
Author: Wolfgang Denk <wd@denx.de> Author: Wolfgang Denk <wd@denx.de>
Date: Thu Aug 30 14:42:15 2007 +0200 Date: Thu Aug 30 14:42:15 2007 +0200
@ -607,6 +975,20 @@ Date: Wed Aug 29 18:26:24 2007 -0600
Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit 04625764cc93ce8a61625ac19d7fe2a2ceee8143
Author: Stefan Roese <sr@denx.de>
Date: Wed Aug 29 16:31:18 2007 +0200
ppc4xx: Change lwmon5 default environment to support Linux RTC
The Linux PCF8563 RTC driver doesn't do autoprobing, so we need
to supply the RTC I2C address as bootline parameter. This patch
adds support for this rtc probing parameter to the bootargs:
"rtc-pcf8563.probe=0,0x51"
Signed-off-by: Stefan Roese <sr@denx.de>
commit 2602a5c40ae37ab965a4e240854fdaffb51328a4 commit 2602a5c40ae37ab965a4e240854fdaffb51328a4
Author: Kim Phillips <kim.phillips@freescale.com> Author: Kim Phillips <kim.phillips@freescale.com>
Date: Wed Aug 29 09:06:05 2007 -0500 Date: Wed Aug 29 09:06:05 2007 -0500
@ -820,6 +1202,15 @@ Date: Tue Aug 28 17:39:14 2007 +0200
Signed-off-by: Heiko Schocher <hs@denx.de> Signed-off-by: Heiko Schocher <hs@denx.de>
commit 2c05fd125744981e5f2828d24e66ccc20a77d25d
Author: Semih Hazar <semih.hazar@indefia.com>
Date: Mon Aug 20 19:00:01 2007 +0300
AVR32: Change prototype of memset
Signed-off-by: Semih Hazar <semih.hazar@indefia.com>
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
commit 9c02defc29b57945b600714cf61ddfd02b02fb14 commit 9c02defc29b57945b600714cf61ddfd02b02fb14
Author: Yuri Tikhonov <yur@emcraft.com> Author: Yuri Tikhonov <yur@emcraft.com>
Date: Sat Aug 25 05:07:16 2007 +0200 Date: Sat Aug 25 05:07:16 2007 +0200
@ -1345,6 +1736,18 @@ Date: Fri Jun 22 17:32:28 2007 +0200
Signed-off-by: Reinhard Arlt <reinhard.arlt@esd-electronics.com> Signed-off-by: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
Signed-off-by: Stefan Roese <sr@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
commit 78cff50edba6b1508eb15c2f53ce966ac891eb9e
Author: Michal Simek <monstr@monstr.eu>
Date: Thu Aug 16 10:46:28 2007 +0200
[FIX] Changes for bios_emulator code for others architecture
commit 6e0e2253f039344f8ebd2787285fdba90e6714e8
Author: Michal Simek <monstr@monstr.eu>
Date: Thu Aug 16 10:45:09 2007 +0200
[FIX] Remove unused include file
commit 9de469bd960cc1870bb40d6672ed42726b8b50d7 commit 9de469bd960cc1870bb40d6672ed42726b8b50d7
Author: Stefan Roese <sr@denx.de> Author: Stefan Roese <sr@denx.de>
Date: Thu Aug 16 10:18:33 2007 +0200 Date: Thu Aug 16 10:18:33 2007 +0200
@ -1440,6 +1843,25 @@ Date: Wed Aug 15 22:30:05 2007 -0500
Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
commit 5b4de9309d7a03aa1db2e5391ab696363391f460
Author: Michal Simek <monstr@monstr.eu>
Date: Wed Aug 15 21:15:05 2007 +0200
[FIX] Resolve problem with warnings
microblaze toolchain don't support PRAGMA PACK.
commit d1ed28cf36ab6b1d4c479809de7252bf53d2f2d4
Author: Michal Simek <monstr@monstr.eu>
Date: Wed Aug 15 21:05:07 2007 +0200
[FIX] Correction command setting for Microblaze boards
commit 7aa63d8cd30ab20ac2fd1ab86e60471de8b1f1e5
Author: Michal Simek <monstr@monstr.eu>
Date: Wed Aug 15 21:03:41 2007 +0200
[FIX] Correction command definition
commit 30b52df9e906bf0e465916c2c6bb5192b438e0b8 commit 30b52df9e906bf0e465916c2c6bb5192b438e0b8
Author: Jon Loeliger <jdl@freescale.com> Author: Jon Loeliger <jdl@freescale.com>
Date: Wed Aug 15 11:55:35 2007 -0500 Date: Wed Aug 15 11:55:35 2007 -0500
@ -2920,6 +3342,24 @@ Date: Tue Aug 7 16:02:13 2007 +0200
Signed-off-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Wolfgang Denk <wd@denx.de>
commit 706714d97a0d08d59eda4de2268c39f504688329
Author: Michal Simek <monstr@monstr.eu>
Date: Mon Aug 6 23:41:53 2007 +0200
[FIX] remove cute code
commit f500d9fdeb576288656dac427052ad2c5ca0ad1a
Author: Michal Simek <monstr@monstr.eu>
Date: Mon Aug 6 23:35:26 2007 +0200
[FIX] Fix romfs code
commit ab4b956d3143f8f8174089053f5dfabbb04762b0
Author: Michal Simek <monstr@monstr.eu>
Date: Mon Aug 6 23:31:49 2007 +0200
[FIX] Coding style cleanup - Wolfgang's suggestions
commit 6c33c78557ca6f8da68c01ce33e278695197d3f4 commit 6c33c78557ca6f8da68c01ce33e278695197d3f4
Author: Wolfgang Denk <wd@denx.de> Author: Wolfgang Denk <wd@denx.de>
Date: Mon Aug 6 23:21:05 2007 +0200 Date: Mon Aug 6 23:21:05 2007 +0200
@ -3044,6 +3484,32 @@ Date: Thu Aug 2 14:09:49 2007 -0500
Signed-off-by: Zhang Wei <wei.zhang@freescale.com> Signed-off-by: Zhang Wei <wei.zhang@freescale.com>
Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit a274ca4f6d68830e7c916f897561cff8c4101c38
Author: Michal Simek <monstr@monstr.eu>
Date: Sun Aug 5 22:33:05 2007 +0200
[FIX] Coding style cleanup
commit af8377d4eb3a0ac5a831830d5ce63fbf65fecb7f
Author: Michal Simek <monstr@monstr.eu>
Date: Sun Aug 5 16:13:31 2007 +0200
[FIX] Xilinx Uartlite driver
Because PPC405 can use UARTLITE serial interface and
Microblaze can use Uart16550 serial interface not only Uartlite.
commit 98889edd50aadf862071eb5664747ad0d568a20e
Author: Michal Simek <monstr@monstr.eu>
Date: Sun Aug 5 15:54:53 2007 +0200
[FIX] Change configuration for XUPV2P Microblaze board
commit 537091b4eed9302865d03fef3f7212b4fe5cf28f
Author: Michal Simek <monstr@monstr.eu>
Date: Sun Aug 5 15:53:50 2007 +0200
[PATCH] Added support for Xilinx Emac community driver
commit 86b116b1b1e165ca4840daefed36d2e3b8460173 commit 86b116b1b1e165ca4840daefed36d2e3b8460173
Author: Bartlomiej Sieka <tur@semihalf.com> Author: Bartlomiej Sieka <tur@semihalf.com>
Date: Fri Aug 3 12:08:16 2007 +0200 Date: Fri Aug 3 12:08:16 2007 +0200
@ -3344,6 +3810,12 @@ Date: Mon Jul 16 08:53:51 2007 +0200
Signed-off-by: Stefan Roese <sr@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
commit 0c0a9cda1bde37106520476ed486bd67eb8d30ae
Author: Michal Simek <monstr@monstr.eu>
Date: Mon Jul 16 00:31:07 2007 +0200
[PATCH] Support for Xilinx EmacLite controller
commit 3a6cab844cf74f76639d795e0be8717e02c86af7 commit 3a6cab844cf74f76639d795e0be8717e02c86af7
Author: Wolfgang Denk <wd@denx.de> Author: Wolfgang Denk <wd@denx.de>
Date: Sat Jul 14 22:51:02 2007 +0200 Date: Sat Jul 14 22:51:02 2007 +0200
@ -3352,12 +3824,42 @@ Date: Sat Jul 14 22:51:02 2007 +0200
Signed-off-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Wolfgang Denk <wd@denx.de>
commit 5280f352c8da33b1d7fbf448768717d9e16ff9a1
Author: Michal Simek <monstr@monstr.eu>
Date: Sat Jul 14 13:11:28 2007 +0200
[FIX] support for simply measuring time
commit 91bb4ca665d2e0cf7f60c4b5b370990250ec0c43
Author: Michal Simek <monstr@monstr.eu>
Date: Sat Jul 14 12:41:23 2007 +0200
[FS] Added support for ROMFS
commit 011595307731a7a67a7445d107c279d031e8ab97 commit 011595307731a7a67a7445d107c279d031e8ab97
Author: Heiko Schocher <hs@pollux.denx.de> Author: Heiko Schocher <hs@pollux.denx.de>
Date: Sat Jul 14 01:06:58 2007 +0200 Date: Sat Jul 14 01:06:58 2007 +0200
[PCS440EP] - fix compile error, if BUILD_DIR is used [PCS440EP] - fix compile error, if BUILD_DIR is used
commit 5a2f1098d81ad58b309e5e558d0492643166a799
Author: Michal Simek <monstr@monstr.eu>
Date: Sat Jul 14 00:18:48 2007 +0200
[PATCH] Support time without timer
commit a476ca2ac2217ddd05a2bf0c514075814b10a3c0
Author: Michal Simek <monstr@monstr.eu>
Date: Fri Jul 13 21:43:55 2007 +0200
[PATCH] Remove problem with disabled BARREL SHIFTER
commit 55e26ad62107d2f14f757de3ae0b14b9aa7aed94
Author: Michal Simek <monstr@monstr.eu>
Date: Fri Jul 13 21:41:44 2007 +0200
[FIX] correct help for rspr
commit fad63407154f46246ce80d53a9c669a44362ac67 commit fad63407154f46246ce80d53a9c669a44362ac67
Author: Heiko Schocher <hs@pollux.denx.de> Author: Heiko Schocher <hs@pollux.denx.de>
Date: Fri Jul 13 09:54:17 2007 +0200 Date: Fri Jul 13 09:54:17 2007 +0200
@ -5542,6 +6044,18 @@ Date: Mon Jun 18 13:50:13 2007 -0500
Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com> Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
commit 093172f08d6afb3f34d8a2f26ee0ee874261cf27
Author: Michal Simek <monstr@monstr.eu>
Date: Sun Jun 17 19:04:11 2007 +0200
[fix] email reparation
commit 3666afffe7baf859c6ae0ce2bebbc8ab7e512ddc
Author: Michal Simek <monstr@monstr.eu>
Date: Sun Jun 17 19:03:21 2007 +0200
[FIX] fix microblaze file permitission
commit e73846b7cf1e29ae635bf9bb5570269663df2ee5 commit e73846b7cf1e29ae635bf9bb5570269663df2ee5
Author: Stefan Roese <sr@denx.de> Author: Stefan Roese <sr@denx.de>
Date: Fri Jun 15 11:33:41 2007 +0200 Date: Fri Jun 15 11:33:41 2007 +0200

5
Makefile
View File

@ -1,5 +1,5 @@
# #
# (C) Copyright 2000-2006 # (C) Copyright 2000-2007
# Wolfgang Denk, DENX Software Engineering, wd@denx.de. # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
# #
# See file CREDITS for list of people who contributed to this # See file CREDITS for list of people who contributed to this
@ -24,7 +24,7 @@
VERSION = 1 VERSION = 1
PATCHLEVEL = 3 PATCHLEVEL = 3
SUBLEVEL = 0 SUBLEVEL = 0
EXTRAVERSION = -rc2 EXTRAVERSION = -rc3
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
VERSION_FILE = $(obj)include/version_autogenerated.h VERSION_FILE = $(obj)include/version_autogenerated.h
@ -211,6 +211,7 @@ LIBS += drivers/libdrivers.a
LIBS += drivers/bios_emulator/libatibiosemu.a LIBS += drivers/bios_emulator/libatibiosemu.a
LIBS += drivers/nand/libnand.a LIBS += drivers/nand/libnand.a
LIBS += drivers/nand_legacy/libnand_legacy.a LIBS += drivers/nand_legacy/libnand_legacy.a
LIBS += drivers/onenand/libonenand.a
LIBS += drivers/net/libnet.a LIBS += drivers/net/libnet.a
ifeq ($(CPU),mpc83xx) ifeq ($(CPU),mpc83xx)
LIBS += drivers/qe/qe.a LIBS += drivers/qe/qe.a

17
board/amcc/luan/luan.c
View File

@ -39,8 +39,6 @@ extern flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
************************************************************************/ ************************************************************************/
int board_early_init_f(void) int board_early_init_f(void)
{ {
volatile epld_t *x = (epld_t *) CFG_EPLD_BASE;
mtebc( pb0ap, 0x03800000 ); /* set chip selects */ mtebc( pb0ap, 0x03800000 ); /* set chip selects */
mtebc( pb0cr, 0xffc58000 ); /* ebc0_b0cr, 4MB at 0xffc00000 CS0 */ mtebc( pb0cr, 0xffc58000 ); /* ebc0_b0cr, 4MB at 0xffc00000 CS0 */
mtebc( pb1ap, 0x03800000 ); mtebc( pb1ap, 0x03800000 );
@ -66,8 +64,6 @@ int board_early_init_f(void)
mtdcr( uic0sr, 0x00000000 ); /* clear all interrupts */ mtdcr( uic0sr, 0x00000000 ); /* clear all interrupts */
mtdcr( uic0sr, 0xffffffff ); mtdcr( uic0sr, 0xffffffff );
x->ethuart &= ~EPLD2_RESET_ETH_N; /* put Ethernet+PHY in reset */
return 0; return 0;
} }
@ -79,7 +75,18 @@ int board_early_init_f(void)
int misc_init_r(void) int misc_init_r(void)
{ {
volatile epld_t *x = (epld_t *) CFG_EPLD_BASE; volatile epld_t *x = (epld_t *) CFG_EPLD_BASE;
x->ethuart |= EPLD2_RESET_ETH_N; /* take Ethernet+PHY out of reset */
/* set modes of operation */
x->ethuart |= EPLD2_ETH_MODE_10 | EPLD2_ETH_MODE_100 |
EPLD2_ETH_MODE_1000 | EPLD2_ETH_DUPLEX_MODE;
/* clear ETHERNET_AUTO_NEGO bit to turn on autonegotiation */
x->ethuart &= ~EPLD2_ETH_AUTO_NEGO;
/* put Ethernet+PHY in reset */
x->ethuart &= ~EPLD2_RESET_ETH_N;
udelay(10000);
/* take Ethernet+PHY out of reset */
x->ethuart |= EPLD2_RESET_ETH_N;
return 0; return 0;
} }

2
board/at91rm9200dk/led.c
View File

@ -66,7 +66,7 @@ void red_LED_off(void)
} }
void LED_init (void) void coloured_LED_init (void)
{ {
AT91PS_PIO PIOB = AT91C_BASE_PIOB; AT91PS_PIO PIOB = AT91C_BASE_PIOB;
AT91PS_PMC PMC = AT91C_BASE_PMC; AT91PS_PMC PMC = AT91C_BASE_PMC;

4
board/atmel/atstk1000/flash.c
View File

@ -55,10 +55,6 @@ unsigned long flash_init(void)
unsigned long addr; unsigned long addr;
unsigned int i; unsigned int i;
gd->bd->bi_flashstart = CFG_FLASH_BASE;
gd->bd->bi_flashsize = CFG_FLASH_SIZE;
gd->bd->bi_flashoffset = _edata - _text;
flash_info[0].size = CFG_FLASH_SIZE; flash_info[0].size = CFG_FLASH_SIZE;
flash_info[0].sector_count = 135; flash_info[0].sector_count = 135;

1
board/cm5200/cm5200.c
View File

@ -397,6 +397,7 @@ int misc_init_r(void)
"operational\n"); "operational\n");
/* set the hostname appropriate to the module we're running on */ /* set the hostname appropriate to the module we're running on */
hostname[0] = 0x00;
compose_hostname(hw_id, hostname); compose_hostname(hw_id, hostname);
setenv("hostname", hostname); setenv("hostname", hostname);

4
board/mpl/vcma9/vcma9.c
View File

@ -288,7 +288,7 @@ int dram_init(void)
int checkboard(void) int checkboard(void)
{ {
unsigned char s[50]; char s[50];
int i; int i;
backup_t *b = (backup_t *) s; backup_t *b = (backup_t *) s;
@ -337,7 +337,7 @@ int overwrite_console(void)
************************************************************************/ ************************************************************************/
void print_vcma9_info(void) void print_vcma9_info(void)
{ {
unsigned char s[50]; char s[50];
int i; int i;
if ((i = getenv_r("serial#", s, 32)) < 0) { if ((i = getenv_r("serial#", s, 32)) < 0) {

3
common/Makefile
View File

@ -37,13 +37,14 @@ COBJS = main.o ACEX1K.o altera.o bedbug.o circbuf.o cmd_autoscript.o \
cmd_load.o cmd_log.o \ cmd_load.o cmd_log.o \
cmd_mem.o cmd_mii.o cmd_misc.o cmd_mmc.o \ cmd_mem.o cmd_mii.o cmd_misc.o cmd_mmc.o \
cmd_nand.o cmd_net.o cmd_nvedit.o \ cmd_nand.o cmd_net.o cmd_nvedit.o \
cmd_onenand.o \
cmd_pci.o cmd_pcmcia.o cmd_portio.o \ cmd_pci.o cmd_pcmcia.o cmd_portio.o \
cmd_reginfo.o cmd_reiser.o cmd_sata.o cmd_scsi.o cmd_spi.o \ cmd_reginfo.o cmd_reiser.o cmd_sata.o cmd_scsi.o cmd_spi.o \
cmd_universe.o cmd_usb.o cmd_vfd.o \ cmd_universe.o cmd_usb.o cmd_vfd.o \
command.o console.o cyclon2.o devices.o dlmalloc.o docecc.o \ command.o console.o cyclon2.o devices.o dlmalloc.o docecc.o \
environment.o env_common.o \ environment.o env_common.o \
env_nand.o env_dataflash.o env_flash.o env_eeprom.o \ env_nand.o env_dataflash.o env_flash.o env_eeprom.o \
env_nvram.o env_nowhere.o \ env_onenand.o env_nvram.o env_nowhere.o \
exports.o \ exports.o \
fdt_support.o flash.o fpga.o ft_build.o \ fdt_support.o flash.o fpga.o ft_build.o \
hush.o kgdb.o lcd.o lists.o lynxkdi.o \ hush.o kgdb.o lcd.o lists.o lynxkdi.o \

2
common/cmd_fpga.c
View File

@ -60,6 +60,7 @@ static int fpga_get_op (char *opstr);
/* Convert bitstream data and load into the fpga */ /* Convert bitstream data and load into the fpga */
int fpga_loadbitstream(unsigned long dev, char* fpgadata, size_t size) int fpga_loadbitstream(unsigned long dev, char* fpgadata, size_t size)
{ {
#if (CONFIG_FPGA & CFG_FPGA_XILINX)
unsigned int length; unsigned int length;
unsigned char* swapdata; unsigned char* swapdata;
unsigned int swapsize; unsigned int swapsize;
@ -72,7 +73,6 @@ int fpga_loadbitstream(unsigned long dev, char* fpgadata, size_t size)
dataptr = (unsigned char *)fpgadata; dataptr = (unsigned char *)fpgadata;
#if CFG_FPGA_XILINX
/* skip the first bytes of the bitsteam, their meaning is unknown */ /* skip the first bytes of the bitsteam, their meaning is unknown */
length = (*dataptr << 8) + *(dataptr+1); length = (*dataptr << 8) + *(dataptr+1);
dataptr+=2; dataptr+=2;

16
common/cmd_mfsl.c
View File

@ -355,19 +355,18 @@ int do_rspr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
unsigned int reg = 0; unsigned int reg = 0;
unsigned int val = 0; unsigned int val = 0;
reg = (unsigned int)simple_strtoul (argv[1], NULL, 16); if (argc < 2) {
val = (unsigned int)simple_strtoul (argv[2], NULL, 16);
if (argc < 1) {
printf ("Usage:\n%s\n", cmdtp->usage); printf ("Usage:\n%s\n", cmdtp->usage);
return 1; return 1;
} }
reg = (unsigned int)simple_strtoul (argv[1], NULL, 16);
val = (unsigned int)simple_strtoul (argv[2], NULL, 16);
switch (reg) { switch (reg) {
case 0x1: case 0x1:
if (argc > 2) { if (argc > 2) {
MTS (val, rmsr); MTS (val, rmsr);
NOP; NOP;
MFS (val, rmsr); MFS (val, rmsr);
} else { } else {
MFS (val, rmsr); MFS (val, rmsr);
} }
@ -382,6 +381,7 @@ int do_rspr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
puts ("ESR"); puts ("ESR");
break; break;
default: default:
puts ("Unsupported register\n");
return 1; return 1;
} }
printf (": 0x%08lx\n", val); printf (": 0x%08lx\n", val);
@ -408,10 +408,10 @@ U_BOOT_CMD (fwr, 4, 1, do_fwr,
" 3 - blocking control write\n"); " 3 - blocking control write\n");
U_BOOT_CMD (rspr, 3, 1, do_rspr, U_BOOT_CMD (rspr, 3, 1, do_rspr,
"rmsr - read/write special purpose register\n", "rspr - read/write special purpose register\n",
"- reg_num [write value] read/write special purpose register\n" "- reg_num [write value] read/write special purpose register\n"
" 0 - MSR - Machine status register\n" " 1 - MSR - Machine status register\n"
" 1 - EAR - Exception address register\n" " 3 - EAR - Exception address register\n"
" 2 - ESR - Exception status register\n"); " 5 - ESR - Exception status register\n");
#endif #endif

9
common/cmd_nvedit.c
View File

@ -57,8 +57,9 @@ DECLARE_GLOBAL_DATA_PTR;
!defined(CFG_ENV_IS_IN_FLASH) && \ !defined(CFG_ENV_IS_IN_FLASH) && \
!defined(CFG_ENV_IS_IN_DATAFLASH) && \ !defined(CFG_ENV_IS_IN_DATAFLASH) && \
!defined(CFG_ENV_IS_IN_NAND) && \ !defined(CFG_ENV_IS_IN_NAND) && \
!defined(CFG_ENV_IS_IN_ONENAND) && \
!defined(CFG_ENV_IS_NOWHERE) !defined(CFG_ENV_IS_NOWHERE)
# error Define one of CFG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|NOWHERE} # error Define one of CFG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|NOWHERE}
#endif #endif
#define XMK_STR(x) #x #define XMK_STR(x) #x
@ -553,7 +554,8 @@ int getenv_r (char *name, char *buf, unsigned len)
#if defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM) \ #if defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM) \
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \ || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))
int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{ {
extern char * env_name_spec; extern char * env_name_spec;
@ -608,7 +610,8 @@ U_BOOT_CMD(
#if defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM) \ #if defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM) \
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \ || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))
U_BOOT_CMD( U_BOOT_CMD(
saveenv, 1, 0, do_saveenv, saveenv, 1, 0, do_saveenv,
"saveenv - save environment variables to persistent storage\n", "saveenv - save environment variables to persistent storage\n",

155
common/cmd_onenand.c Normal file
View File

@ -0,0 +1,155 @@
/*
* U-Boot command for OneNAND support
*
* Copyright (C) 2005-2007 Samsung Electronics
* Kyungmin Park <kyungmin.park@samsung.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#include <common.h>
#include <command.h>
#ifdef CONFIG_CMD_ONENAND
#include <linux/mtd/compat.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/onenand.h>
#include <asm/io.h>
extern struct mtd_info onenand_mtd;
extern struct onenand_chip onenand_chip;
int do_onenand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
{
int ret = 0;
switch (argc) {
case 0:
case 1:
printf("Usage:\n%s\n", cmdtp->usage);
return 1;
case 2:
if (strncmp(argv[1], "open", 4) == 0) {
onenand_init();
return 0;
}
onenand_print_device_info(onenand_chip.device_id, 1);
return 0;
default:
/* At least 4 args */
if (strncmp(argv[1], "erase", 5) == 0) {
struct erase_info instr;
ulong start, end;
ulong block;
start = simple_strtoul(argv[2], NULL, 10);
end = simple_strtoul(argv[3], NULL, 10);
start -= (unsigned long)onenand_chip.base;
end -= (unsigned long)onenand_chip.base;
if (!end || end < 0)
end = start;
printf("Erase block from %d to %d\n", start, end);
for (block = start; block <= end; block++) {
instr.addr = block << onenand_chip.erase_shift;
instr.len = 1 << onenand_chip.erase_shift;
ret = onenand_erase(&onenand_mtd, &instr);
if (ret) {
printf("erase failed %d\n", block);
break;
}
}
return 0;
}
if (strncmp(argv[1], "read", 4) == 0) {
ulong addr = simple_strtoul(argv[2], NULL, 16);
ulong ofs = simple_strtoul(argv[3], NULL, 16);
size_t len = simple_strtoul(argv[4], NULL, 16);
size_t retlen = 0;
int oob = strncmp(argv[1], "read.oob", 8) ? 0 : 1;
ofs -= (unsigned long)onenand_chip.base;
if (oob)
onenand_read_oob(&onenand_mtd, ofs, len,
&retlen, (u_char *) addr);
else
onenand_read(&onenand_mtd, ofs, len, &retlen,
(u_char *) addr);
printf("Done\n");
return 0;
}
if (strncmp(argv[1], "write", 5) == 0) {
ulong addr = simple_strtoul(argv[2], NULL, 16);
ulong ofs = simple_strtoul(argv[3], NULL, 16);
size_t len = simple_strtoul(argv[4], NULL, 16);
size_t retlen = 0;
ofs -= (unsigned long)onenand_chip.base;
onenand_write(&onenand_mtd, ofs, len, &retlen,
(u_char *) addr);
printf("Done\n");
return 0;
}
if (strncmp(argv[1], "block", 5) == 0) {
ulong addr = simple_strtoul(argv[2], NULL, 16);
ulong block = simple_strtoul(argv[3], NULL, 10);
ulong page = simple_strtoul(argv[4], NULL, 10);
size_t len = simple_strtol(argv[5], NULL, 10);
size_t retlen = 0;
ulong ofs;
int oob = strncmp(argv[1], "block.oob", 9) ? 0 : 1;
ofs = block << onenand_chip.erase_shift;
if (page)
ofs += page << onenand_chip.page_shift;
if (!len) {
if (oob)
len = 64;
else
len = 512;
}
if (oob)
onenand_read_oob(&onenand_mtd, ofs, len,
&retlen, (u_char *) addr);
else
onenand_read(&onenand_mtd, ofs, len, &retlen,
(u_char *) addr);
return 0;
}
break;
}
return 0;
}
U_BOOT_CMD(
onenand, 6, 1, do_onenand,
"onenand - OneNAND sub-system\n",
"info - show available OneNAND devices\n"
"onenand read[.oob] addr ofs len - read data at ofs with len to addr\n"
"onenand write addr ofs len - write data at ofs with len from addr\n"
"onenand erase saddr eaddr - erase block start addr to end addr\n"
"onenand block[.oob] addr block [page] [len] - "
"read data with (block [, page]) to addr"
);
#endif /* CONFIG_CMD_ONENAND */

134
common/env_onenand.c Normal file
View File

@ -0,0 +1,134 @@
/*
* (C) Copyright 2005-2007 Samsung Electronics
* Kyungmin Park <kyungmin.park@samsung.com>
*
* See file CREDITS for list of people who contributed to this
* project.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/
#include <common.h>
#if defined(CFG_ENV_IS_IN_ONENAND) /* Environment is in OneNAND */
#include <command.h>
#include <environment.h>
#include <linux/stddef.h>
#include <malloc.h>
#include <linux/mtd/compat.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/onenand.h>
extern struct mtd_info onenand_mtd;
extern struct onenand_chip onenand_chip;
/* References to names in env_common.c */
extern uchar default_environment[];
#define ONENAND_ENV_SIZE(mtd) (mtd.oobblock - ENV_HEADER_SIZE)
char *env_name_spec = "OneNAND";
#ifdef ENV_IS_EMBEDDED
extern uchar environment[];
env_t *env_ptr = (env_t *) (&environment[0]);
#else /* ! ENV_IS_EMBEDDED */
static unsigned char onenand_env[MAX_ONENAND_PAGESIZE];
env_t *env_ptr = (env_t *) onenand_env;
#endif /* ENV_IS_EMBEDDED */
uchar env_get_char_spec(int index)
{
DECLARE_GLOBAL_DATA_PTR;
return (*((uchar *) (gd->env_addr + index)));
}
void env_relocate_spec(void)
{
DECLARE_GLOBAL_DATA_PTR;
unsigned long env_addr;
int use_default = 0;
int retlen;
env_addr = CFG_ENV_ADDR;
env_addr -= (unsigned long)onenand_chip.base;
/* Check OneNAND exist */
if (onenand_mtd.oobblock)
/* Ignore read fail */
onenand_read(&onenand_mtd, env_addr, onenand_mtd.oobblock,
&retlen, (u_char *) env_ptr);
else
onenand_mtd.oobblock = MAX_ONENAND_PAGESIZE;
if (crc32(0, env_ptr->data, ONENAND_ENV_SIZE(onenand_mtd)) !=
env_ptr->crc)
use_default = 1;
if (use_default) {
memcpy(env_ptr->data, default_environment,
ONENAND_ENV_SIZE(onenand_mtd));
env_ptr->crc =
crc32(0, env_ptr->data, ONENAND_ENV_SIZE(onenand_mtd));
}
gd->env_addr = (ulong) & env_ptr->data;
gd->env_valid = 1;
}
int saveenv(void)
{
unsigned long env_addr = CFG_ENV_ADDR;
struct erase_info instr;
int retlen;
instr.len = CFG_ENV_SIZE;
instr.addr = env_addr;
instr.addr -= (unsigned long)onenand_chip.base;
if (onenand_erase(&onenand_mtd, &instr)) {
printf("OneNAND: erase failed at 0x%08x\n", env_addr);
return 1;
}
/* update crc */
env_ptr->crc =
crc32(0, env_ptr->data, onenand_mtd.oobblock - ENV_HEADER_SIZE);
env_addr -= (unsigned long)onenand_chip.base;
if (onenand_write(&onenand_mtd, env_addr, onenand_mtd.oobblock, &retlen,
(u_char *) env_ptr)) {
printf("OneNAND: write failed at 0x%08x\n", instr.addr);
return 2;
}
return 0;
}
int env_init(void)
{
DECLARE_GLOBAL_DATA_PTR;
/* use default */
gd->env_addr = (ulong) & default_environment[0];
gd->env_valid = 1;
return 0;
}
#endif /* CFG_ENV_IS_IN_ONENAND */

2
cpu/arm720t/serial.c
View File

@ -125,6 +125,8 @@ serial_puts (const char *s)
#elif defined(CONFIG_LPC2292) #elif defined(CONFIG_LPC2292)
DECLARE_GLOBAL_DATA_PTR;
#include <asm/arch/hardware.h> #include <asm/arch/hardware.h>
void serial_setbrg (void) void serial_setbrg (void)

128
cpu/arm920t/start.S
View File

@ -27,9 +27,7 @@
#include <config.h> #include <config.h>
#include <version.h> #include <version.h>
#if defined(CONFIG_AT91RM9200DK) || defined(CONFIG_AT91RM9200EK) || defined(CONFIG_AT91RM9200DF) #include <status_led.h>
#include <led.h>
#endif
/* /*
************************************************************************* *************************************************************************
@ -41,7 +39,7 @@
.globl _start .globl _start
_start: b reset _start: b start_code
ldr pc, _undefined_instruction ldr pc, _undefined_instruction
ldr pc, _software_interrupt ldr pc, _software_interrupt
ldr pc, _prefetch_abort ldr pc, _prefetch_abort
@ -64,7 +62,7 @@ _fiq: .word fiq
/* /*
************************************************************************* *************************************************************************
* *
* Startup Code (reset vector) * Startup Code (called from the ARM reset exception vector)
* *
* do important init only if we don't start from memory! * do important init only if we don't start from memory!
* relocate armboot to ram * relocate armboot to ram
@ -106,10 +104,10 @@ FIQ_STACK_START:
/* /*
* the actual reset code * the actual start code
*/ */
reset: start_code:
/* /*
* set the cpu to SVC32 mode * set the cpu to SVC32 mode
*/ */
@ -118,58 +116,12 @@ reset:
orr r0,r0,#0xd3 orr r0,r0,#0xd3
msr cpsr,r0 msr cpsr,r0
#if CONFIG_AT91RM9200 bl coloured_LED_init
#if defined(CONFIG_AT91RM9200DK) || defined(CONFIG_AT91RM9200EK) || defined(CONFIG_AT91RM9200DF)
bl LED_init
bl red_LED_on bl red_LED_on
#endif
#ifdef CONFIG_BOOTBINFUNC #if defined(CONFIG_AT91RM9200DK) || defined(CONFIG_AT91RM9200EK) || defined(CONFIG_AT91RM9200DF)
/* code based on entry.S from ATMEL */
#define AT91C_BASE_CKGR 0xFFFFFC20
#define CKGR_MOR 0
/* Get the CKGR Base Address */
ldr r1, =AT91C_BASE_CKGR
/* Main oscillator Enable register APMC_MOR : Enable main oscillator , OSCOUNT = 0xFF */
/* ldr r0, = AT91C_CKGR_MOSCEN:OR:AT91C_CKGR_OSCOUNT */
ldr r0, =0x0000FF01
str r0, [r1, #CKGR_MOR]
/* Add loop to compensate Main Oscillator startup time */
ldr r0, =0x00000010
LoopOsc:
subs r0, r0, #1
bhi LoopOsc
/* scratch stack */
ldr r1, =0x00204000
/* Insure word alignment */
bic r1, r1, #3
/* Init stack SYS */
mov sp, r1
/* /*
* This does a lot more than just set up the memory, which * relocate exception table
* is why it's called lowlevelinit
*/
bl lowlevelinit /* in memsetup.S */
bl icache_enable;
/* ------------------------------------
* Read/modify/write CP15 control register
* -------------------------------------
* read cp15 control register (cp15 r1) in r0
* ------------------------------------
*/
mrc p15, 0, r0, c1, c0, 0
/* Reset bit :Little Endian end fast bus mode */
ldr r3, =0xC0000080
/* Set bit :Asynchronous clock mode, Not Fast Bus */
ldr r4, =0xC0000000
bic r0, r0, r3
orr r0, r0, r4
/* write r0 in cp15 control register (cp15 r1) */
mcr p15, 0, r0, c1, c0, 0
#endif /* CONFIG_BOOTBINFUNC */
/*
* relocate exeception table
*/ */
ldr r0, =_start ldr r0, =_start
ldr r1, =0x0 ldr r1, =0x0
@ -181,19 +133,20 @@ copyex:
bne copyex bne copyex
#endif #endif
/* turn off the watchdog */
#if defined(CONFIG_S3C2400)
# define pWTCON 0x15300000
# define INTMSK 0x14400008 /* Interupt-Controller base addresses */
# define CLKDIVN 0x14800014 /* clock divisor register */
#elif defined(CONFIG_S3C2410)
# define pWTCON 0x53000000
# define INTMSK 0x4A000008 /* Interupt-Controller base addresses */
# define INTSUBMSK 0x4A00001C
# define CLKDIVN 0x4C000014 /* clock divisor register */
#endif
#if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) #if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410)
/* turn off the watchdog */
# if defined(CONFIG_S3C2400)
# define pWTCON 0x15300000
# define INTMSK 0x14400008 /* Interupt-Controller base addresses */
# define CLKDIVN 0x14800014 /* clock divisor register */
#else
# define pWTCON 0x53000000
# define INTMSK 0x4A000008 /* Interupt-Controller base addresses */
# define INTSUBMSK 0x4A00001C
# define CLKDIVN 0x4C000014 /* clock divisor register */
# endif
ldr r0, =pWTCON ldr r0, =pWTCON
mov r1, #0x0 mov r1, #0x0
str r1, [r0] str r1, [r0]
@ -226,25 +179,7 @@ copyex:
#endif #endif
#ifdef CONFIG_AT91RM9200 #ifdef CONFIG_AT91RM9200
#ifdef CONFIG_BOOTBINFUNC
relocate: /* relocate U-Boot to RAM */
adr r0, _start /* r0 <- current position of code */
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
cmp r0, r1 /* don't reloc during debug */
beq stack_setup
ldr r2, _armboot_start
ldr r3, _bss_start
sub r2, r3, r2 /* r2 <- size of armboot */
add r2, r0, r2 /* r2 <- source end address */
copy_loop:
ldmia r0!, {r3-r10} /* copy from source address [r0] */
stmia r1!, {r3-r10} /* copy to target address [r1] */
cmp r0, r2 /* until source end addreee [r2] */
ble copy_loop
#endif /* CONFIG_BOOTBINFUNC */
#else
#ifndef CONFIG_SKIP_RELOCATE_UBOOT #ifndef CONFIG_SKIP_RELOCATE_UBOOT
relocate: /* relocate U-Boot to RAM */ relocate: /* relocate U-Boot to RAM */
adr r0, _start /* r0 <- current position of code */ adr r0, _start /* r0 <- current position of code */
@ -284,27 +219,6 @@ clbss_l:str r2, [r0] /* clear loop... */
cmp r0, r1 cmp r0, r1
ble clbss_l ble clbss_l
#if 0
/* try doing this stuff after the relocation */
ldr r0, =pWTCON
mov r1, #0x0
str r1, [r0]
/*
* mask all IRQs by setting all bits in the INTMR - default
*/
mov r1, #0xffffffff
ldr r0, =INTMR
str r1, [r0]
/* FCLK:HCLK:PCLK = 1:2:4 */
/* default FCLK is 120 MHz ! */
ldr r0, =CLKDIVN
mov r1, #3
str r1, [r0]
/* END stuff after relocation */
#endif
ldr pc, _start_armboot ldr pc, _start_armboot
_start_armboot: .word start_armboot _start_armboot: .word start_armboot

2
cpu/microblaze/cache.c
View File

@ -1,7 +1,7 @@
/* /*
* (C) Copyright 2007 Michal Simek * (C) Copyright 2007 Michal Simek
* *
* Michal SIMEK <moonstr@monstr.eu> * Michal SIMEK <monstr@monstr.eu>
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
* project. * project.

6
cpu/microblaze/start.S
View File

@ -33,15 +33,13 @@ _start:
addi r1, r0, CFG_INIT_SP_OFFSET addi r1, r0, CFG_INIT_SP_OFFSET
addi r1, r1, -4 /* Decrement SP to top of memory */ addi r1, r1, -4 /* Decrement SP to top of memory */
/* add opcode instruction for 32bit jump - 2 instruction imm & brai*/ /* add opcode instruction for 32bit jump - 2 instruction imm & brai*/
addi r6, r0, 0xb000 /* hex b000 opcode imm */ addi r6, r0, 0xb0000000 /* hex b000 opcode imm */
bslli r6, r6, 16 /* shift */
swi r6, r0, 0x0 /* reset address */ swi r6, r0, 0x0 /* reset address */
swi r6, r0, 0x8 /* user vector exception */ swi r6, r0, 0x8 /* user vector exception */
swi r6, r0, 0x10 /* interrupt */ swi r6, r0, 0x10 /* interrupt */
swi r6, r0, 0x20 /* hardware exception */ swi r6, r0, 0x20 /* hardware exception */
addi r6, r0, 0xb808 /* hew b808 opcode brai*/ addi r6, r0, 0xb8080000 /* hew b808 opcode brai*/
bslli r6, r6, 16
swi r6, r0, 0x4 /* reset address */ swi r6, r0, 0x4 /* reset address */
swi r6, r0, 0xC /* user vector exception */ swi r6, r0, 0xC /* user vector exception */
swi r6, r0, 0x14 /* interrupt */ swi r6, r0, 0x14 /* interrupt */

7
cpu/microblaze/timer.c
View File

@ -33,10 +33,17 @@ void reset_timer (void)
timestamp = 0; timestamp = 0;
} }
#ifdef CFG_TIMER_0
ulong get_timer (ulong base) ulong get_timer (ulong base)
{ {
return (timestamp - base); return (timestamp - base);
} }
#else
ulong get_timer (ulong base)
{
return (timestamp++ - base);
}
#endif
void set_timer (ulong t) void set_timer (ulong t)
{ {

16
cpu/ppc4xx/4xx_enet.c
View File

@ -138,7 +138,8 @@
#define BI_PHYMODE_MII 7 #define BI_PHYMODE_MII 7
#endif #endif
#if defined(CONFIG_440SPE) || defined(CONFIG_440EPX) || defined(CONFIG_440GRX) #if defined(CONFIG_440SPE) || defined(CONFIG_440EPX) || \
defined(CONFIG_440GRX) || defined(CONFIG_440SP)
#define SDR0_MFR_ETH_CLK_SEL_V(n) ((0x01<<27) / (n+1)) #define SDR0_MFR_ETH_CLK_SEL_V(n) ((0x01<<27) / (n+1))
#endif #endif
@ -408,7 +409,8 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis)
int ethgroup = -1; int ethgroup = -1;
#endif #endif
#endif #endif
#if defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || defined(CONFIG_440SPE) #if defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \
defined(CONFIG_440SP) || defined(CONFIG_440SPE)
unsigned long mfr; unsigned long mfr;
#endif #endif
@ -500,7 +502,8 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis)
__asm__ volatile ("eieio"); __asm__ volatile ("eieio");
/* reset emac so we have access to the phy */ /* reset emac so we have access to the phy */
#if defined(CONFIG_440SPE) || defined(CONFIG_440EPX) || defined(CONFIG_440GRX) #if defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \
defined(CONFIG_440SP) || defined(CONFIG_440SPE)
/* provide clocks for EMAC internal loopback */ /* provide clocks for EMAC internal loopback */
mfsdr (sdr_mfr, mfr); mfsdr (sdr_mfr, mfr);
mfr |= SDR0_MFR_ETH_CLK_SEL_V(devnum); mfr |= SDR0_MFR_ETH_CLK_SEL_V(devnum);
@ -518,7 +521,8 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis)
if (failsafe <= 0) if (failsafe <= 0)
printf("\nProblem resetting EMAC!\n"); printf("\nProblem resetting EMAC!\n");
#if defined(CONFIG_440SPE) || defined(CONFIG_440EPX) || defined(CONFIG_440GRX) #if defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \
defined(CONFIG_440SP) || defined(CONFIG_440SPE)
/* remove clocks for EMAC internal loopback */ /* remove clocks for EMAC internal loopback */
mfsdr (sdr_mfr, mfr); mfsdr (sdr_mfr, mfr);
mfr &= ~SDR0_MFR_ETH_CLK_SEL_V(devnum); mfr &= ~SDR0_MFR_ETH_CLK_SEL_V(devnum);
@ -920,8 +924,8 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis)
/* set speed */ /* set speed */
if (speed == _1000BASET) { if (speed == _1000BASET) {
#if defined(CONFIG_440SP) || defined(CONFIG_440SPE) || \ #if defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \
defined(CONFIG_440EPX) || defined(CONFIG_440GRX) defined(CONFIG_440SP) || defined(CONFIG_440SPE)
unsigned long pfc1; unsigned long pfc1;
mfsdr (sdr_pfc1, pfc1); mfsdr (sdr_pfc1, pfc1);

6
cpu/pxa/mmc.c
View File

@ -438,11 +438,11 @@ mmc_init(int verbose)
/* FIXME fill in the correct size (is set to 32MByte) */ /* FIXME fill in the correct size (is set to 32MByte) */
mmc_dev.blksz = 512; mmc_dev.blksz = 512;
mmc_dev.lba = 0x10000; mmc_dev.lba = 0x10000;
sprintf(mmc_dev.vendor,"Man %02x%02x%02x Snr %02x%02x%02x", sprintf((char*)mmc_dev.vendor,"Man %02x%02x%02x Snr %02x%02x%02x",
cid->id[0], cid->id[1], cid->id[2], cid->id[0], cid->id[1], cid->id[2],
cid->sn[0], cid->sn[1], cid->sn[2]); cid->sn[0], cid->sn[1], cid->sn[2]);
sprintf(mmc_dev.product,"%s",cid->name); sprintf((char*)mmc_dev.product,"%s",cid->name);
sprintf(mmc_dev.revision,"%x %x",cid->hwrev, cid->fwrev); sprintf((char*)mmc_dev.revision,"%x %x",cid->hwrev, cid->fwrev);
mmc_dev.removable = 0; mmc_dev.removable = 0;
mmc_dev.block_read = mmc_bread; mmc_dev.block_read = mmc_bread;

316
drivers/at45.c Executable file → Normal file
View File

@ -27,33 +27,31 @@
/* /*
* spi.c API * spi.c API
*/ */
extern unsigned int AT91F_SpiWrite (AT91PS_DataflashDesc pDesc); extern unsigned int AT91F_SpiWrite(AT91PS_DataflashDesc pDesc);
extern void AT91F_SpiEnable(int cs); extern void AT91F_SpiEnable(int cs);
#define AT91C_TIMEOUT_WRDY 200000 #define AT91C_TIMEOUT_WRDY 200000
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
/* \fn AT91F_DataFlashSendCommand */ /* \fn AT91F_DataFlashSendCommand */
/* \brief Generic function to send a command to the dataflash */ /* \brief Generic function to send a command to the dataflash */
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
AT91S_DataFlashStatus AT91F_DataFlashSendCommand( AT91S_DataFlashStatus AT91F_DataFlashSendCommand(AT91PS_DataFlash pDataFlash,
AT91PS_DataFlash pDataFlash, unsigned char OpCode,
unsigned char OpCode, unsigned int CmdSize,
unsigned int CmdSize, unsigned int DataflashAddress)
unsigned int DataflashAddress)
{ {
unsigned int adr; unsigned int adr;
if ( (pDataFlash->pDataFlashDesc->state) != IDLE) if ((pDataFlash->pDataFlashDesc->state) != IDLE)
return DATAFLASH_BUSY; return DATAFLASH_BUSY;
/* process the address to obtain page address and byte address */ /* process the address to obtain page address and byte address */
adr = ((DataflashAddress / (pDataFlash->pDevice->pages_size)) << adr = ((DataflashAddress / (pDataFlash->pDevice->pages_size)) <<
pDataFlash->pDevice->page_offset) + (DataflashAddress % pDataFlash->pDevice->page_offset) +
(pDataFlash->pDevice->pages_size)); (DataflashAddress % (pDataFlash->pDevice->pages_size));
/* fill the command buffer */ /* fill the command buffer */
pDataFlash->pDataFlashDesc->command[0] = OpCode; pDataFlash->pDataFlashDesc->command[0] = OpCode;
if (pDataFlash->pDevice->pages_number >= 16384) { if (pDataFlash->pDevice->pages_number >= 16384) {
pDataFlash->pDataFlashDesc->command[1] = pDataFlash->pDataFlashDesc->command[1] =
@ -78,16 +76,16 @@ AT91S_DataFlashStatus AT91F_DataFlashSendCommand(
pDataFlash->pDataFlashDesc->command[7] = 0; pDataFlash->pDataFlashDesc->command[7] = 0;
/* Initialize the SpiData structure for the spi write fuction */ /* Initialize the SpiData structure for the spi write fuction */
pDataFlash->pDataFlashDesc->tx_cmd_pt = pDataFlash->pDataFlashDesc->tx_cmd_pt =
pDataFlash->pDataFlashDesc->command; pDataFlash->pDataFlashDesc->command;
pDataFlash->pDataFlashDesc->tx_cmd_size = CmdSize; pDataFlash->pDataFlashDesc->tx_cmd_size = CmdSize;
pDataFlash->pDataFlashDesc->rx_cmd_pt = pDataFlash->pDataFlashDesc->rx_cmd_pt =
pDataFlash->pDataFlashDesc->command; pDataFlash->pDataFlashDesc->command;
pDataFlash->pDataFlashDesc->rx_cmd_size = CmdSize; pDataFlash->pDataFlashDesc->rx_cmd_size = CmdSize;
/* send the command and read the data */ /* send the command and read the data */
return AT91F_SpiWrite (pDataFlash->pDataFlashDesc); } return AT91F_SpiWrite(pDataFlash->pDataFlashDesc);
}
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
/* \fn AT91F_DataFlashGetStatus */ /* \fn AT91F_DataFlashGetStatus */
@ -98,50 +96,49 @@ AT91S_DataFlashStatus AT91F_DataFlashGetStatus(AT91PS_DataflashDesc pDesc)
AT91S_DataFlashStatus status; AT91S_DataFlashStatus status;
/* if a transfert is in progress ==> return 0 */ /* if a transfert is in progress ==> return 0 */
if( (pDesc->state) != IDLE) if ((pDesc->state) != IDLE)
return DATAFLASH_BUSY; return DATAFLASH_BUSY;
/* first send the read status command (D7H) */ /* first send the read status command (D7H) */
pDesc->command[0] = DB_STATUS; pDesc->command[0] = DB_STATUS;
pDesc->command[1] = 0; pDesc->command[1] = 0;
pDesc->DataFlash_state = GET_STATUS; pDesc->DataFlash_state = GET_STATUS;
pDesc->tx_data_size = 0; /* Transmit the command */ pDesc->tx_data_size = 0; /* Transmit the command */
/* and receive response */ /* and receive response */
pDesc->tx_cmd_pt = pDesc->command; pDesc->tx_cmd_pt = pDesc->command;
pDesc->rx_cmd_pt = pDesc->command; pDesc->rx_cmd_pt = pDesc->command;
pDesc->rx_cmd_size = 2; pDesc->rx_cmd_size = 2;
pDesc->tx_cmd_size = 2; pDesc->tx_cmd_size = 2;
status = AT91F_SpiWrite (pDesc); status = AT91F_SpiWrite(pDesc);
pDesc->DataFlash_state = *( (unsigned char *) (pDesc->rx_cmd_pt) +1); pDesc->DataFlash_state = *((unsigned char *)(pDesc->rx_cmd_pt) + 1);
return status; return status;
} }
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
/* \fn AT91F_DataFlashWaitReady */ /* \fn AT91F_DataFlashWaitReady */
/* \brief wait for dataflash ready (bit7 of the status register == 1) */ /* \brief wait for dataflash ready (bit7 of the status register == 1) */
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
AT91S_DataFlashStatus AT91F_DataFlashWaitReady(AT91PS_DataflashDesc AT91S_DataFlashStatus AT91F_DataFlashWaitReady(AT91PS_DataflashDesc
pDataFlashDesc, unsigned int timeout) pDataFlashDesc,
unsigned int timeout)
{ {
pDataFlashDesc->DataFlash_state = IDLE; pDataFlashDesc->DataFlash_state = IDLE;
do { do {
AT91F_DataFlashGetStatus(pDataFlashDesc); AT91F_DataFlashGetStatus(pDataFlashDesc);
timeout--; timeout--;
} while( ((pDataFlashDesc->DataFlash_state & 0x80) != 0x80) && } while (((pDataFlashDesc->DataFlash_state & 0x80) != 0x80) &&
(timeout > 0) ); (timeout > 0));
if((pDataFlashDesc->DataFlash_state & 0x80) != 0x80) if ((pDataFlashDesc->DataFlash_state & 0x80) != 0x80)
return DATAFLASH_ERROR; return DATAFLASH_ERROR;
return DATAFLASH_OK; return DATAFLASH_OK;
} }
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
/* Function Name : AT91F_DataFlashContinuousRead */ /* Function Name : AT91F_DataFlashContinuousRead */
/* Object : Continuous stream Read */ /* Object : Continuous stream Read */
@ -151,17 +148,17 @@ pDataFlashDesc, unsigned int timeout)
/* : <sizeToRead> = data buffer size */ /* : <sizeToRead> = data buffer size */
/* Return value : State of the dataflash */ /* Return value : State of the dataflash */
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
AT91S_DataFlashStatus AT91F_DataFlashContinuousRead ( AT91S_DataFlashStatus AT91F_DataFlashContinuousRead(
AT91PS_DataFlash pDataFlash, AT91PS_DataFlash pDataFlash,
int src, int src,
unsigned char *dataBuffer, unsigned char *dataBuffer,
int sizeToRead ) int sizeToRead)
{ {
AT91S_DataFlashStatus status; AT91S_DataFlashStatus status;
/* Test the size to read in the device */ /* Test the size to read in the device */
if ( (src + sizeToRead) > if ((src + sizeToRead) >
(pDataFlash->pDevice->pages_size * (pDataFlash->pDevice->pages_size *
(pDataFlash->pDevice->pages_number))) (pDataFlash->pDevice->pages_number)))
return DATAFLASH_MEMORY_OVERFLOW; return DATAFLASH_MEMORY_OVERFLOW;
pDataFlash->pDataFlashDesc->rx_data_pt = dataBuffer; pDataFlash->pDataFlashDesc->rx_data_pt = dataBuffer;
@ -169,13 +166,12 @@ AT91S_DataFlashStatus AT91F_DataFlashContinuousRead (
pDataFlash->pDataFlashDesc->tx_data_pt = dataBuffer; pDataFlash->pDataFlashDesc->tx_data_pt = dataBuffer;
pDataFlash->pDataFlashDesc->tx_data_size = sizeToRead; pDataFlash->pDataFlashDesc->tx_data_size = sizeToRead;
status = AT91F_DataFlashSendCommand status = AT91F_DataFlashSendCommand(
(pDataFlash, DB_CONTINUOUS_ARRAY_READ, 8, src); pDataFlash, DB_CONTINUOUS_ARRAY_READ, 8, src);
/* Send the command to the dataflash */ /* Send the command to the dataflash */
return(status); return (status);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Function Name : AT91F_DataFlashPagePgmBuf */ /* Function Name : AT91F_DataFlashPagePgmBuf */
/* Object : Main memory page program thru buffer 1 or buffer 2 */ /* Object : Main memory page program thru buffer 1 or buffer 2 */
@ -185,11 +181,10 @@ AT91S_DataFlashStatus AT91F_DataFlashContinuousRead (
/* : <SizeToWrite> = data buffer size */ /* : <SizeToWrite> = data buffer size */
/* Return value : State of the dataflash */ /* Return value : State of the dataflash */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
AT91S_DataFlashStatus AT91F_DataFlashPagePgmBuf( AT91S_DataFlashStatus AT91F_DataFlashPagePgmBuf(AT91PS_DataFlash pDataFlash,
AT91PS_DataFlash pDataFlash, unsigned char *src,
unsigned char *src, unsigned int dest,
unsigned int dest, unsigned int SizeToWrite)
unsigned int SizeToWrite)
{ {
int cmdsize; int cmdsize;
pDataFlash->pDataFlashDesc->tx_data_pt = src; pDataFlash->pDataFlashDesc->tx_data_pt = src;
@ -201,9 +196,9 @@ AT91S_DataFlashStatus AT91F_DataFlashPagePgmBuf(
/* Send the command to the dataflash */ /* Send the command to the dataflash */
if (pDataFlash->pDevice->pages_number >= 16384) if (pDataFlash->pDevice->pages_number >= 16384)
cmdsize = 5; cmdsize = 5;
return(AT91F_DataFlashSendCommand (pDataFlash, DB_PAGE_PGM_BUF1, return (AT91F_DataFlashSendCommand(
cmdsize, dest)); } pDataFlash, DB_PAGE_PGM_BUF1, cmdsize, dest));
}
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Function Name : AT91F_MainMemoryToBufferTransfert */ /* Function Name : AT91F_MainMemoryToBufferTransfert */
@ -214,26 +209,29 @@ cmdsize, dest)); }
/* Return value : State of the dataflash */ /* Return value : State of the dataflash */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
AT91S_DataFlashStatus AT91F_MainMemoryToBufferTransfert( AT91S_DataFlashStatus AT91F_MainMemoryToBufferTransfert(
AT91PS_DataFlash pDataFlash, AT91PS_DataFlash
unsigned char BufferCommand, pDataFlash,
unsigned int page) unsigned char
BufferCommand,
unsigned int page)
{ {
int cmdsize; int cmdsize;
/* Test if the buffer command is legal */ /* Test if the buffer command is legal */
if ((BufferCommand != DB_PAGE_2_BUF1_TRF) if ((BufferCommand != DB_PAGE_2_BUF1_TRF) &&
&& (BufferCommand != DB_PAGE_2_BUF2_TRF)) (BufferCommand != DB_PAGE_2_BUF2_TRF)) {
return DATAFLASH_BAD_COMMAND; return DATAFLASH_BAD_COMMAND;
}
/* no data to transmit or receive */ /* no data to transmit or receive */
pDataFlash->pDataFlashDesc->tx_data_size = 0; pDataFlash->pDataFlashDesc->tx_data_size = 0;
cmdsize = 4; cmdsize = 4;
if (pDataFlash->pDevice->pages_number >= 16384) if (pDataFlash->pDevice->pages_number >= 16384)
cmdsize = 5; cmdsize = 5;
return(AT91F_DataFlashSendCommand (pDataFlash, BufferCommand, cmdsize, return (AT91F_DataFlashSendCommand(
page*pDataFlash->pDevice->pages_size)); pDataFlash, BufferCommand, cmdsize,
page * pDataFlash->pDevice->pages_size));
} }
/*-------------------------------------------------------------------------- */ /*-------------------------------------------------------------------------- */
/* Function Name : AT91F_DataFlashWriteBuffer */ /* Function Name : AT91F_DataFlashWriteBuffer */
/* Object : Write data to the internal sram buffer 1 or 2 */ /* Object : Write data to the internal sram buffer 1 or 2 */
@ -244,58 +242,61 @@ page*pDataFlash->pDevice->pages_size));
/* : <SizeToWrite> = data buffer size */ /* : <SizeToWrite> = data buffer size */
/* Return value : State of the dataflash */ /* Return value : State of the dataflash */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
AT91S_DataFlashStatus AT91F_DataFlashWriteBuffer ( AT91S_DataFlashStatus AT91F_DataFlashWriteBuffer(
AT91PS_DataFlash pDataFlash, AT91PS_DataFlash pDataFlash,
unsigned char BufferCommand, unsigned char BufferCommand,
unsigned char *dataBuffer, unsigned char *dataBuffer,
unsigned int bufferAddress, unsigned int bufferAddress,
int SizeToWrite ) int SizeToWrite)
{ {
int cmdsize; int cmdsize;
/* Test if the buffer command is legal */ /* Test if the buffer command is legal */
if ((BufferCommand != DB_BUF1_WRITE) if ((BufferCommand != DB_BUF1_WRITE) &&
&& (BufferCommand != DB_BUF2_WRITE)) (BufferCommand != DB_BUF2_WRITE)) {
return DATAFLASH_BAD_COMMAND; return DATAFLASH_BAD_COMMAND;
}
/* buffer address must be lower than page size */ /* buffer address must be lower than page size */
if (bufferAddress > pDataFlash->pDevice->pages_size) if (bufferAddress > pDataFlash->pDevice->pages_size)
return DATAFLASH_BAD_ADDRESS; return DATAFLASH_BAD_ADDRESS;
if ( (pDataFlash->pDataFlashDesc->state) != IDLE) if ((pDataFlash->pDataFlashDesc->state) != IDLE)
return DATAFLASH_BUSY; return DATAFLASH_BUSY;
/* Send first Write Command */ /* Send first Write Command */
pDataFlash->pDataFlashDesc->command[0] = BufferCommand; pDataFlash->pDataFlashDesc->command[0] = BufferCommand;
pDataFlash->pDataFlashDesc->command[1] = 0; pDataFlash->pDataFlashDesc->command[1] = 0;
if (pDataFlash->pDevice->pages_number >= 16384) { if (pDataFlash->pDevice->pages_number >= 16384) {
pDataFlash->pDataFlashDesc->command[2] = 0; pDataFlash->pDataFlashDesc->command[2] = 0;
pDataFlash->pDataFlashDesc->command[3] = pDataFlash->pDataFlashDesc->command[3] =
(unsigned char)(((unsigned int)(bufferAddress & (unsigned char)(((unsigned int)(bufferAddress &
pDataFlash->pDevice->byte_mask)) >> 8); pDataFlash->pDevice->
pDataFlash->pDataFlashDesc->command[4] = byte_mask)) >> 8);
(unsigned char)((unsigned int)bufferAddress & 0x00FF); pDataFlash->pDataFlashDesc->command[4] =
(unsigned char)((unsigned int)bufferAddress & 0x00FF);
cmdsize = 5; cmdsize = 5;
} else { } else {
pDataFlash->pDataFlashDesc->command[2] = pDataFlash->pDataFlashDesc->command[2] =
(unsigned char)(((unsigned int)(bufferAddress & (unsigned char)(((unsigned int)(bufferAddress &
pDataFlash->pDevice->byte_mask)) >> 8); pDataFlash->pDevice->
pDataFlash->pDataFlashDesc->command[3] = byte_mask)) >> 8);
(unsigned char)((unsigned int)bufferAddress & 0x00FF); pDataFlash->pDataFlashDesc->command[3] =
pDataFlash->pDataFlashDesc->command[4] = 0; (unsigned char)((unsigned int)bufferAddress & 0x00FF);
pDataFlash->pDataFlashDesc->command[4] = 0;
cmdsize = 4; cmdsize = 4;
} }
pDataFlash->pDataFlashDesc->tx_cmd_pt = pDataFlash->pDataFlashDesc->tx_cmd_pt =
pDataFlash->pDataFlashDesc->command; pDataFlash->pDataFlashDesc->command;
pDataFlash->pDataFlashDesc->tx_cmd_size = cmdsize; pDataFlash->pDataFlashDesc->tx_cmd_size = cmdsize;
pDataFlash->pDataFlashDesc->rx_cmd_pt = pDataFlash->pDataFlashDesc->rx_cmd_pt =
pDataFlash->pDataFlashDesc->command; pDataFlash->pDataFlashDesc->command;
pDataFlash->pDataFlashDesc->rx_cmd_size = cmdsize; pDataFlash->pDataFlashDesc->rx_cmd_size = cmdsize;
pDataFlash->pDataFlashDesc->rx_data_pt = dataBuffer; pDataFlash->pDataFlashDesc->rx_data_pt = dataBuffer;
pDataFlash->pDataFlashDesc->tx_data_pt = dataBuffer; pDataFlash->pDataFlashDesc->tx_data_pt = dataBuffer;
pDataFlash->pDataFlashDesc->rx_data_size = SizeToWrite; pDataFlash->pDataFlashDesc->rx_data_size = SizeToWrite;
pDataFlash->pDataFlashDesc->tx_data_size = SizeToWrite; pDataFlash->pDataFlashDesc->tx_data_size = SizeToWrite;
return AT91F_SpiWrite(pDataFlash->pDataFlashDesc); return AT91F_SpiWrite(pDataFlash->pDataFlashDesc);
} }
@ -309,22 +310,22 @@ AT91S_DataFlashStatus AT91F_DataFlashWriteBuffer (
/* Return value : State of the dataflash */ /* Return value : State of the dataflash */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
AT91S_DataFlashStatus AT91F_PageErase( AT91S_DataFlashStatus AT91F_PageErase(
AT91PS_DataFlash pDataFlash, AT91PS_DataFlash pDataFlash,
unsigned int page) unsigned int page)
{ {
int cmdsize; int cmdsize;
/* Test if the buffer command is legal */ /* Test if the buffer command is legal */
/* no data to transmit or receive */ /* no data to transmit or receive */
pDataFlash->pDataFlashDesc->tx_data_size = 0; pDataFlash->pDataFlashDesc->tx_data_size = 0;
cmdsize = 4; cmdsize = 4;
if (pDataFlash->pDevice->pages_number >= 16384) if (pDataFlash->pDevice->pages_number >= 16384)
cmdsize = 5; cmdsize = 5;
return(AT91F_DataFlashSendCommand (pDataFlash, DB_PAGE_ERASE, cmdsize, return (AT91F_DataFlashSendCommand(pDataFlash,
page*pDataFlash->pDevice->pages_size)); DB_PAGE_ERASE, cmdsize,
page * pDataFlash->pDevice->pages_size));
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Function Name : AT91F_BlockErase */ /* Function Name : AT91F_BlockErase */
/* Object : Erase a Block */ /* Object : Erase a Block */
@ -334,18 +335,19 @@ page*pDataFlash->pDevice->pages_size));
/* Return value : State of the dataflash */ /* Return value : State of the dataflash */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
AT91S_DataFlashStatus AT91F_BlockErase( AT91S_DataFlashStatus AT91F_BlockErase(
AT91PS_DataFlash pDataFlash, AT91PS_DataFlash pDataFlash,
unsigned int block) unsigned int block)
{ {
int cmdsize; int cmdsize;
/* Test if the buffer command is legal */ /* Test if the buffer command is legal */
/* no data to transmit or receive */ /* no data to transmit or receive */
pDataFlash->pDataFlashDesc->tx_data_size = 0; pDataFlash->pDataFlashDesc->tx_data_size = 0;
cmdsize = 4; cmdsize = 4;
if (pDataFlash->pDevice->pages_number >= 16384) if (pDataFlash->pDevice->pages_number >= 16384)
cmdsize = 5; cmdsize = 5;
return(AT91F_DataFlashSendCommand (pDataFlash, DB_BLOCK_ERASE,cmdsize, return (AT91F_DataFlashSendCommand(pDataFlash, DB_BLOCK_ERASE, cmdsize,
block*8*pDataFlash->pDevice->pages_size)); block * 8 *
pDataFlash->pDevice->pages_size));
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -356,17 +358,16 @@ block*8*pDataFlash->pDevice->pages_size));
/* : <dest> = main memory address */ /* : <dest> = main memory address */
/* Return value : State of the dataflash */ /* Return value : State of the dataflash */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
AT91S_DataFlashStatus AT91F_WriteBufferToMain ( AT91S_DataFlashStatus AT91F_WriteBufferToMain(AT91PS_DataFlash pDataFlash,
AT91PS_DataFlash pDataFlash, unsigned char BufferCommand,
unsigned char BufferCommand, unsigned int dest)
unsigned int dest )
{ {
int cmdsize; int cmdsize;
/* Test if the buffer command is correct */ /* Test if the buffer command is correct */
if ((BufferCommand != DB_BUF1_PAGE_PGM) && if ((BufferCommand != DB_BUF1_PAGE_PGM) &&
(BufferCommand != DB_BUF1_PAGE_ERASE_PGM) && (BufferCommand != DB_BUF1_PAGE_ERASE_PGM) &&
(BufferCommand != DB_BUF2_PAGE_PGM) && (BufferCommand != DB_BUF2_PAGE_PGM) &&
(BufferCommand != DB_BUF2_PAGE_ERASE_PGM) ) (BufferCommand != DB_BUF2_PAGE_ERASE_PGM))
return DATAFLASH_BAD_COMMAND; return DATAFLASH_BAD_COMMAND;
/* no data to transmit or receive */ /* no data to transmit or receive */
@ -376,9 +377,9 @@ AT91S_DataFlashStatus AT91F_WriteBufferToMain (
if (pDataFlash->pDevice->pages_number >= 16384) if (pDataFlash->pDevice->pages_number >= 16384)
cmdsize = 5; cmdsize = 5;
/* Send the command to the dataflash */ /* Send the command to the dataflash */
return(AT91F_DataFlashSendCommand (pDataFlash, BufferCommand, cmdsize, return (AT91F_DataFlashSendCommand(pDataFlash, BufferCommand,
dest)); } cmdsize, dest));
}
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Function Name : AT91F_PartialPageWrite */ /* Function Name : AT91F_PartialPageWrite */
@ -387,11 +388,10 @@ AT91S_DataFlashStatus AT91F_WriteBufferToMain (
/* : <AdrInpage> = adr to begin the fading */ /* : <AdrInpage> = adr to begin the fading */
/* : <length> = Number of bytes to erase */ /* : <length> = Number of bytes to erase */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
AT91S_DataFlashStatus AT91F_PartialPageWrite ( AT91S_DataFlashStatus AT91F_PartialPageWrite(AT91PS_DataFlash pDataFlash,
AT91PS_DataFlash pDataFlash, unsigned char *src,
unsigned char *src, unsigned int dest,
unsigned int dest, unsigned int size)
unsigned int size)
{ {
unsigned int page; unsigned int page;
unsigned int AdrInPage; unsigned int AdrInPage;
@ -400,10 +400,9 @@ AT91S_DataFlashStatus AT91F_PartialPageWrite (
AdrInPage = dest % (pDataFlash->pDevice->pages_size); AdrInPage = dest % (pDataFlash->pDevice->pages_size);
/* Read the contents of the page in the Sram Buffer */ /* Read the contents of the page in the Sram Buffer */
AT91F_MainMemoryToBufferTransfert(pDataFlash, AT91F_MainMemoryToBufferTransfert(pDataFlash, DB_PAGE_2_BUF1_TRF, page);
DB_PAGE_2_BUF1_TRF, page);
AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc,
AT91C_TIMEOUT_WRDY); AT91C_TIMEOUT_WRDY);
/*Update the SRAM buffer */ /*Update the SRAM buffer */
AT91F_DataFlashWriteBuffer(pDataFlash, DB_BUF1_WRITE, src, AT91F_DataFlashWriteBuffer(pDataFlash, DB_BUF1_WRITE, src,
AdrInPage, size); AdrInPage, size);
@ -416,12 +415,13 @@ AT91S_DataFlashStatus AT91F_PartialPageWrite (
AT91F_PageErase(pDataFlash, page); AT91F_PageErase(pDataFlash, page);
/* Rewrite the modified Sram Buffer in the main memory */ /* Rewrite the modified Sram Buffer in the main memory */
AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc,
AT91C_TIMEOUT_WRDY); AT91C_TIMEOUT_WRDY);
} }
/* Rewrite the modified Sram Buffer in the main memory */ /* Rewrite the modified Sram Buffer in the main memory */
return(AT91F_WriteBufferToMain(pDataFlash, DB_BUF1_PAGE_ERASE_PGM, return (AT91F_WriteBufferToMain(pDataFlash, DB_BUF1_PAGE_ERASE_PGM,
(page*pDataFlash->pDevice->pages_size))); (page *
pDataFlash->pDevice->pages_size)));
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -431,11 +431,9 @@ AT91S_DataFlashStatus AT91F_PartialPageWrite (
/* : <dest> = dataflash adress */ /* : <dest> = dataflash adress */
/* : <size> = data buffer size */ /* : <size> = data buffer size */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
AT91S_DataFlashStatus AT91F_DataFlashWrite( AT91S_DataFlashStatus AT91F_DataFlashWrite(AT91PS_DataFlash pDataFlash,
AT91PS_DataFlash pDataFlash, unsigned char *src,
unsigned char *src, int dest, int size)
int dest,
int size )
{ {
unsigned int length; unsigned int length;
unsigned int page; unsigned int page;
@ -443,26 +441,24 @@ AT91S_DataFlashStatus AT91F_DataFlashWrite(
AT91F_SpiEnable(pDataFlash->pDevice->cs); AT91F_SpiEnable(pDataFlash->pDevice->cs);
if ( (dest + size) > (pDataFlash->pDevice->pages_size * if ((dest + size) > (pDataFlash->pDevice->pages_size *
(pDataFlash->pDevice->pages_number))) (pDataFlash->pDevice->pages_number)))
return DATAFLASH_MEMORY_OVERFLOW; return DATAFLASH_MEMORY_OVERFLOW;
/* If destination does not fit a page start address */ /* If destination does not fit a page start address */
if ((dest % ((unsigned int)(pDataFlash->pDevice->pages_size))) != 0 ) if ((dest % ((unsigned int)(pDataFlash->pDevice->pages_size))) != 0) {
{ length =
length = pDataFlash->pDevice->pages_size - pDataFlash->pDevice->pages_size -
(dest % (dest % ((unsigned int)(pDataFlash->pDevice->pages_size)));
((unsigned int)
(pDataFlash->pDevice->pages_size)));
if (size < length) if (size < length)
length = size; length = size;
if(!AT91F_PartialPageWrite(pDataFlash,src, dest, length)) if (!AT91F_PartialPageWrite(pDataFlash, src, dest, length))
return DATAFLASH_ERROR; return DATAFLASH_ERROR;
AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc,
AT91C_TIMEOUT_WRDY); AT91C_TIMEOUT_WRDY);
/* Update size, source and destination pointers */ /* Update size, source and destination pointers */
size -= length; size -= length;
@ -470,78 +466,77 @@ AT91S_DataFlashStatus AT91F_DataFlashWrite(
src += length; src += length;
} }
while (( size - pDataFlash->pDevice->pages_size ) >= 0 ) { while ((size - pDataFlash->pDevice->pages_size) >= 0) {
/* program dataflash page */ /* program dataflash page */
page = (unsigned int)dest / (pDataFlash->pDevice->pages_size); page = (unsigned int)dest / (pDataFlash->pDevice->pages_size);
status = AT91F_DataFlashWriteBuffer(pDataFlash, status = AT91F_DataFlashWriteBuffer(pDataFlash,
DB_BUF1_WRITE, src, 0, DB_BUF1_WRITE, src, 0,
pDataFlash->pDevice->pages_size); pDataFlash->pDevice->
pages_size);
AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc,
AT91C_TIMEOUT_WRDY); AT91C_TIMEOUT_WRDY);
status = AT91F_PageErase(pDataFlash, page); status = AT91F_PageErase(pDataFlash, page);
AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc,
AT91C_TIMEOUT_WRDY); AT91C_TIMEOUT_WRDY);
if (!status) if (!status)
return DATAFLASH_ERROR; return DATAFLASH_ERROR;
status = AT91F_WriteBufferToMain (pDataFlash, status = AT91F_WriteBufferToMain(pDataFlash,
DB_BUF1_PAGE_PGM, dest); DB_BUF1_PAGE_PGM, dest);
if(!status) if (!status)
return DATAFLASH_ERROR; return DATAFLASH_ERROR;
AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc,
AT91C_TIMEOUT_WRDY); AT91C_TIMEOUT_WRDY);
/* Update size, source and destination pointers */ /* Update size, source and destination pointers */
size -= pDataFlash->pDevice->pages_size; size -= pDataFlash->pDevice->pages_size;
dest += pDataFlash->pDevice->pages_size; dest += pDataFlash->pDevice->pages_size;
src += pDataFlash->pDevice->pages_size; src += pDataFlash->pDevice->pages_size;
} }
/* If still some bytes to read */ /* If still some bytes to read */
if ( size > 0 ) { if (size > 0) {
/* program dataflash page */ /* program dataflash page */
if(!AT91F_PartialPageWrite(pDataFlash, src, dest, size) ) if (!AT91F_PartialPageWrite(pDataFlash, src, dest, size))
return DATAFLASH_ERROR; return DATAFLASH_ERROR;
AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc,
AT91C_TIMEOUT_WRDY); AT91C_TIMEOUT_WRDY);
} }
return DATAFLASH_OK; return DATAFLASH_OK;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Function Name : AT91F_DataFlashRead */ /* Function Name : AT91F_DataFlashRead */
/* Object : Read a block in dataflash */ /* Object : Read a block in dataflash */
/* Input Parameters : */ /* Input Parameters : */
/* Return value : */ /* Return value : */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
int AT91F_DataFlashRead( int AT91F_DataFlashRead(AT91PS_DataFlash pDataFlash,
AT91PS_DataFlash pDataFlash, unsigned long addr, unsigned long size, char *buffer)
unsigned long addr,
unsigned long size,
char *buffer)
{ {
unsigned long SizeToRead; unsigned long SizeToRead;
AT91F_SpiEnable(pDataFlash->pDevice->cs); AT91F_SpiEnable(pDataFlash->pDevice->cs);
if(AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, if (AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc,
AT91C_TIMEOUT_WRDY) != DATAFLASH_OK) AT91C_TIMEOUT_WRDY) != DATAFLASH_OK)
return -1; return -1;
while (size) { while (size) {
SizeToRead = (size < 0x8000)? size:0x8000; SizeToRead = (size < 0x8000) ? size : 0x8000;
if (AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, if (AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc,
AT91C_TIMEOUT_WRDY) != DATAFLASH_OK) AT91C_TIMEOUT_WRDY) !=
DATAFLASH_OK)
return -1; return -1;
if (AT91F_DataFlashContinuousRead (pDataFlash, addr, if (AT91F_DataFlashContinuousRead(pDataFlash, addr,
(uchar *) buffer, SizeToRead) != DATAFLASH_OK) (uchar *) buffer,
SizeToRead) != DATAFLASH_OK)
return -1; return -1;
size -= SizeToRead; size -= SizeToRead;
@ -558,9 +553,10 @@ int AT91F_DataFlashRead(
/* Input Parameters : */ /* Input Parameters : */
/* Return value : Dataflash status register */ /* Return value : Dataflash status register */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
int AT91F_DataflashProbe(int cs, AT91PS_DataflashDesc pDesc) { int AT91F_DataflashProbe(int cs, AT91PS_DataflashDesc pDesc)
{
AT91F_SpiEnable(cs); AT91F_SpiEnable(cs);
AT91F_DataFlashGetStatus(pDesc); AT91F_DataFlashGetStatus(pDesc);
return((pDesc->command[1] == 0xFF)? 0: pDesc->command[1] & 0x3C); return ((pDesc->command[1] == 0xFF) ? 0 : pDesc->command[1] & 0x3C);
} }
#endif #endif

44
drivers/onenand/Makefile Normal file
View File

@ -0,0 +1,44 @@
#
# Copyright (C) 2005-2007 Samsung Electronics.
# Kyungmin Park <kyungmin.park@samsung.com>
#
# See file CREDITS for list of people who contributed to this
# project.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation; either version 2 of
# the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307 USA
#
include $(TOPDIR)/config.mk
LIB := $(obj)libonenand.a
COBJS := onenand_base.o onenand_bbt.o
SRCS := $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
all: $(LIB)
$(LIB): $(obj).depend $(OBJS)
$(AR) $(ARFLAGS) $@ $(OBJS)
#########################################################################
include $(SRCTREE)/rules.mk
sinclude $(obj).depend
#########################################################################

1294
drivers/onenand/onenand_base.c Normal file
View File

File diff suppressed because it is too large Load Diff

265
drivers/onenand/onenand_bbt.c Normal file
View File

@ -0,0 +1,265 @@
/*
* linux/drivers/mtd/onenand/onenand_bbt.c
*
* Bad Block Table support for the OneNAND driver
*
* Copyright(c) 2005-2007 Samsung Electronics
* Kyungmin Park <kyungmin.park@samsung.com>
*
* TODO:
* Split BBT core and chip specific BBT.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#include <common.h>
#ifdef CONFIG_CMD_ONENAND
#include <linux/mtd/compat.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/onenand.h>
#include <malloc.h>
#include <asm/errno.h>
/**
* check_short_pattern - [GENERIC] check if a pattern is in the buffer
* @param buf the buffer to search
* @param len the length of buffer to search
* @param paglen the pagelength
* @param td search pattern descriptor
*
* Check for a pattern at the given place. Used to search bad block
* tables and good / bad block identifiers. Same as check_pattern, but
* no optional empty check and the pattern is expected to start
* at offset 0.
*/
static int check_short_pattern(uint8_t * buf, int len, int paglen,
struct nand_bbt_descr *td)
{
int i;
uint8_t *p = buf;
/* Compare the pattern */
for (i = 0; i < td->len; i++) {
if (p[i] != td->pattern[i])
return -1;
}
return 0;
}
/**
* create_bbt - [GENERIC] Create a bad block table by scanning the device
* @param mtd MTD device structure
* @param buf temporary buffer
* @param bd descriptor for the good/bad block search pattern
* @param chip create the table for a specific chip, -1 read all chips.
* Applies only if NAND_BBT_PERCHIP option is set
*
* Create a bad block table by scanning the device
* for the given good/bad block identify pattern
*/
static int create_bbt(struct mtd_info *mtd, uint8_t * buf,
struct nand_bbt_descr *bd, int chip)
{
struct onenand_chip *this = mtd->priv;
struct bbm_info *bbm = this->bbm;
int i, j, numblocks, len, scanlen;
int startblock;
loff_t from;
size_t readlen, ooblen;
printk(KERN_INFO "Scanning device for bad blocks\n");
len = 1;
/* We need only read few bytes from the OOB area */
scanlen = ooblen = 0;
readlen = bd->len;
/* chip == -1 case only */
/* Note that numblocks is 2 * (real numblocks) here;
* see i += 2 below as it makses shifting and masking less painful
*/
numblocks = mtd->size >> (bbm->bbt_erase_shift - 1);
startblock = 0;
from = 0;
for (i = startblock; i < numblocks;) {
int ret;
for (j = 0; j < len; j++) {
size_t retlen;
/* No need to read pages fully,
* just read required OOB bytes */
ret = onenand_read_oob(mtd,
from + j * mtd->oobblock +
bd->offs, readlen, &retlen,
&buf[0]);
if (ret && ret != -EAGAIN) {
printk("ret = %d\n", ret);
return ret;
}
if (check_short_pattern
(&buf[j * scanlen], scanlen, mtd->oobblock, bd)) {
bbm->bbt[i >> 3] |= 0x03 << (i & 0x6);
printk(KERN_WARNING
"Bad eraseblock %d at 0x%08x\n", i >> 1,
(unsigned int)from);
break;
}
}
i += 2;
from += (1 << bbm->bbt_erase_shift);
}
return 0;
}
/**
* onenand_memory_bbt - [GENERIC] create a memory based bad block table
* @param mtd MTD device structure
* @param bd descriptor for the good/bad block search pattern
*
* The function creates a memory based bbt by scanning the device
* for manufacturer / software marked good / bad blocks
*/
static inline int onenand_memory_bbt(struct mtd_info *mtd,
struct nand_bbt_descr *bd)
{
unsigned char data_buf[MAX_ONENAND_PAGESIZE];
bd->options &= ~NAND_BBT_SCANEMPTY;
return create_bbt(mtd, data_buf, bd, -1);
}
/**
* onenand_isbad_bbt - [OneNAND Interface] Check if a block is bad
* @param mtd MTD device structure
* @param offs offset in the device
* @param allowbbt allow access to bad block table region
*/
static int onenand_isbad_bbt(struct mtd_info *mtd, loff_t offs, int allowbbt)
{
struct onenand_chip *this = mtd->priv;
struct bbm_info *bbm = this->bbm;
int block;
uint8_t res;
/* Get block number * 2 */
block = (int)(offs >> (bbm->bbt_erase_shift - 1));
res = (bbm->bbt[block >> 3] >> (block & 0x06)) & 0x03;
DEBUG(MTD_DEBUG_LEVEL2,
"onenand_isbad_bbt: bbt info for offs 0x%08x: (block %d) 0x%02x\n",
(unsigned int)offs, block >> 1, res);
switch ((int)res) {
case 0x00:
return 0;
case 0x01:
return 1;
case 0x02:
return allowbbt ? 0 : 1;
}
return 1;
}
/**
* onenand_scan_bbt - [OneNAND Interface] scan, find, read and maybe create bad block table(s)
* @param mtd MTD device structure
* @param bd descriptor for the good/bad block search pattern
*
* The function checks, if a bad block table(s) is/are already
* available. If not it scans the device for manufacturer
* marked good / bad blocks and writes the bad block table(s) to
* the selected place.
*
* The bad block table memory is allocated here. It must be freed
* by calling the onenand_free_bbt function.
*
*/
int onenand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd)
{
struct onenand_chip *this = mtd->priv;
struct bbm_info *bbm = this->bbm;
int len, ret = 0;
len = mtd->size >> (this->erase_shift + 2);
/* Allocate memory (2bit per block) */
bbm->bbt = malloc(len);
if (!bbm->bbt) {
printk(KERN_ERR "onenand_scan_bbt: Out of memory\n");
return -ENOMEM;
}
/* Clear the memory bad block table */
memset(bbm->bbt, 0x00, len);
/* Set the bad block position */
bbm->badblockpos = ONENAND_BADBLOCK_POS;
/* Set erase shift */
bbm->bbt_erase_shift = this->erase_shift;
if (!bbm->isbad_bbt)
bbm->isbad_bbt = onenand_isbad_bbt;
/* Scan the device to build a memory based bad block table */
if ((ret = onenand_memory_bbt(mtd, bd))) {
printk(KERN_ERR
"onenand_scan_bbt: Can't scan flash and build the RAM-based BBT\n");
free(bbm->bbt);
bbm->bbt = NULL;
}
return ret;
}
/*
* Define some generic bad / good block scan pattern which are used
* while scanning a device for factory marked good / bad blocks.
*/
static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
static struct nand_bbt_descr largepage_memorybased = {
.options = 0,
.offs = 0,
.len = 2,
.pattern = scan_ff_pattern,
};
/**
* onenand_default_bbt - [OneNAND Interface] Select a default bad block table for the device
* @param mtd MTD device structure
*
* This function selects the default bad block table
* support for the device and calls the onenand_scan_bbt function
*/
int onenand_default_bbt(struct mtd_info *mtd)
{
struct onenand_chip *this = mtd->priv;
struct bbm_info *bbm;
this->bbm = malloc(sizeof(struct bbm_info));
if (!this->bbm)
return -ENOMEM;
bbm = this->bbm;
memset(bbm, 0, sizeof(struct bbm_info));
/* 1KB page has same configuration as 2KB page */
if (!bbm->badblock_pattern)
bbm->badblock_pattern = &largepage_memorybased;
return onenand_scan_bbt(mtd, bbm->badblock_pattern);
}
#endif /* CFG_CMD_ONENAND */

2
drivers/serial_xuartlite.c
View File

@ -24,7 +24,7 @@
#include <config.h> #include <config.h>
#ifdef CONFIG_MICROBLAZE #ifdef CONFIG_XILINX_UARTLITE
#include <asm/serial_xuartlite.h> #include <asm/serial_xuartlite.h>

1
drivers/usb_ohci.c
View File

@ -93,6 +93,7 @@
#ifdef CONFIG_PCI_OHCI #ifdef CONFIG_PCI_OHCI
static struct pci_device_id ohci_pci_ids[] = { static struct pci_device_id ohci_pci_ids[] = {
{0x10b9, 0x5237}, /* ULI1575 PCI OHCI module ids */ {0x10b9, 0x5237}, /* ULI1575 PCI OHCI module ids */
{0x1033, 0x0035}, /* NEC PCI OHCI module ids */
/* Please add supported PCI OHCI controller ids here */ /* Please add supported PCI OHCI controller ids here */
{0, 0} {0, 0}
}; };

2
include/asm-avr32/string.h
View File

@ -23,6 +23,6 @@
#define __ASM_AVR32_STRING_H #define __ASM_AVR32_STRING_H
#define __HAVE_ARCH_MEMSET #define __HAVE_ARCH_MEMSET
extern void *memset(void *s, int c, size_t n); extern void *memset(void *s, int c, __kernel_size_t n);
#endif /* __ASM_AVR32_STRING_H */ #endif /* __ASM_AVR32_STRING_H */

3
include/config_cmd_all.h
View File

@ -59,6 +59,7 @@
#define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_NAND /* NAND support */
#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ #define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */
#define CONFIG_CMD_NFS /* NFS support */ #define CONFIG_CMD_NFS /* NFS support */
#define CONFIG_CMD_ONENAND /* OneNAND support */
#define CONFIG_CMD_PCI /* pciinfo */ #define CONFIG_CMD_PCI /* pciinfo */
#define CONFIG_CMD_PCMCIA /* PCMCIA support */ #define CONFIG_CMD_PCMCIA /* PCMCIA support */
#define CONFIG_CMD_PING /* ping support */ #define CONFIG_CMD_PING /* ping support */
@ -76,6 +77,6 @@
#define CONFIG_CMD_USB /* USB Support */ #define CONFIG_CMD_USB /* USB Support */
#define CONFIG_CMD_VFD /* VFD support (TRAB) */ #define CONFIG_CMD_VFD /* VFD support (TRAB) */
#define CONFIG_CMD_XIMG /* Load part of Multi Image */ #define CONFIG_CMD_XIMG /* Load part of Multi Image */
#define CONFIG_CMD_MUX /* AT91 MMC/SPI Mux Support */ #define CONFIG_CMD_AT91_SPIMUX /* AT91 MMC/SPI Mux Support */
#endif /* _CONFIG_CMD_ALL_H */ #endif /* _CONFIG_CMD_ALL_H */

41
include/configs/TQM5200.h
View File

@ -188,7 +188,7 @@
#endif #endif
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
#define CONFIG_CMD_CMD_PCI #define CONFIG_CMD_PCI
#endif #endif
#if defined(CONFIG_MINIFAP) || defined(CONFIG_STK52XX) || defined(CONFIG_FO300) #if defined(CONFIG_MINIFAP) || defined(CONFIG_STK52XX) || defined(CONFIG_FO300)
@ -238,13 +238,13 @@
"protect on FC000000 +${filesize}\0" "protect on FC000000 +${filesize}\0"
#endif #endif
#ifndef CONFIG_CAM5200 #if defined(CONFIG_TQM5200)
#define CUSTOM_ENV_SETTINGS \ #define CUSTOM_ENV_SETTINGS \
"hostname=tqm5200\0" \
"bootfile=/tftpboot/tqm5200/uImage\0" \ "bootfile=/tftpboot/tqm5200/uImage\0" \
"bootfile_fdt=/tftpboot/tqm5200/uImage_fdt\0" \
"fdt_file=/tftpboot/tqm5200/tqm5200.dtb\0" \ "fdt_file=/tftpboot/tqm5200/tqm5200.dtb\0" \
"u-boot=/tftpboot/tqm5200/u-boot.bin\0" "u-boot=/tftpboot/tqm5200/u-boot.bin\0"
#else #elif defined(CONFIG_CAM5200)
#define CUSTOM_ENV_SETTINGS \ #define CUSTOM_ENV_SETTINGS \
"bootfile=cam5200/uImage\0" \ "bootfile=cam5200/uImage\0" \
"u-boot=cam5200/u-boot.bin\0" \ "u-boot=cam5200/u-boot.bin\0" \
@ -252,11 +252,13 @@
#endif #endif
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"console=ttyS0\0" \
"kernel_addr=200000\0" \
"fdt_addr=400000\0" \
"hostname=tqm5200\0" \
"netdev=eth0\0" \ "netdev=eth0\0" \
"console=ttyPSC0\0" \
"fdt_addr=FC0A0000\0" \
"kernel_addr=FC0C0000\0" \
"ramdisk_addr=FC300000\0" \
"kernel_addr_r=200000\0" \
"fdt_addr_r=400000\0" \
"rootpath=/opt/eldk/ppc_6xx\0" \ "rootpath=/opt/eldk/ppc_6xx\0" \
"ramargs=setenv bootargs root=/dev/ram rw\0" \ "ramargs=setenv bootargs root=/dev/ram rw\0" \
"nfsargs=setenv bootargs root=/dev/nfs rw " \ "nfsargs=setenv bootargs root=/dev/nfs rw " \
@ -266,16 +268,20 @@
":${hostname}:${netdev}:off panic=1\0" \ ":${hostname}:${netdev}:off panic=1\0" \
"addcons=setenv bootargs ${bootargs} " \ "addcons=setenv bootargs ${bootargs} " \
"console=${console},${baudrate}\0" \ "console=${console},${baudrate}\0" \
"flash_self=run ramargs addip addcons;" \ "flash_self_old=sete console ttyS0; run ramargs addip addcons;" \
"bootm ${kernel_addr} ${ramdisk_addr}\0" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \
"flash_nfs=run nfsargs addip addcons;" \ "flash_self=run ramargs addip addcons;" \
"bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0" \
"flash_nfs_old=sete console ttyS0; run nfsargs addip addcons;" \
"bootm ${kernel_addr}\0" \ "bootm ${kernel_addr}\0" \
"net_nfs=tftp ${kernel_addr} ${bootfile};" \ "flash_nfs=run nfsargs addip addcons;" \
"run nfsargs addip addcons;bootm\0" \
"net_nfs_fdt=tftp ${kernel_addr} ${bootfile_fdt};" \
"tftp ${fdt_addr} ${fdt_file};setenv console ttyPSC0;" \
"run nfsargs addip addcons;" \
"bootm ${kernel_addr} - ${fdt_addr}\0" \ "bootm ${kernel_addr} - ${fdt_addr}\0" \
"net_nfs_old=tftp ${kernel_addr_r} ${bootfile};" \
"sete console ttyS0; run nfsargs addip addcons;bootm\0" \
"net_nfs=tftp ${kernel_addr_r} ${bootfile}; " \
"tftp ${fdt_addr_r} ${fdt_file}; " \
"run nfsargs addip addcons; " \
"bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
CUSTOM_ENV_SETTINGS \ CUSTOM_ENV_SETTINGS \
"load=tftp 200000 ${u-boot}\0" \ "load=tftp 200000 ${u-boot}\0" \
ENV_UPDT \ ENV_UPDT \
@ -408,11 +414,12 @@
# endif /* CFG_LOWBOOT */ # endif /* CFG_LOWBOOT */
# else /* !CONFIG_TQM5200_B */ # else /* !CONFIG_TQM5200_B */
# define MTDPARTS_DEFAULT "mtdparts=TQM5200-0:640k(firmware)," \ # define MTDPARTS_DEFAULT "mtdparts=TQM5200-0:640k(firmware)," \
"1408k(kernel)," \ "128k(dtb)," \
"2304k(kernel)," \
"2m(initrd)," \ "2m(initrd)," \
"4m(small-fs)," \ "4m(small-fs)," \
"8m(misc)," \ "8m(misc)," \
"16m(big-fs)" "15m(big-fs)"
# endif /* CONFIG_TQM5200_B */ # endif /* CONFIG_TQM5200_B */
#elif defined (CONFIG_CAM5200) #elif defined (CONFIG_CAM5200)
# define MTDPARTS_DEFAULT "mtdparts=TQM5200-0:768k(firmware)," \ # define MTDPARTS_DEFAULT "mtdparts=TQM5200-0:768k(firmware)," \

9
include/configs/ads5121.h
View File

@ -234,6 +234,14 @@
#define CFG_I2C_NOPROBES {{0,0x69}} * Don't probe these addrs */ #define CFG_I2C_NOPROBES {{0,0x69}} * Don't probe these addrs */
#endif #endif
/*
* EEPROM configuration
*/
#define CFG_I2C_EEPROM_ADDR_LEN 2 /* 16-bit EEPROM address */
#define CFG_I2C_EEPROM_ADDR 0x50 /* Atmel: AT24C32A-10TQ-2.7 */
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 /* 10ms of delay */
#define CFG_EEPROM_PAGE_WRITE_BITS 5 /* 32-Byte Page Write Mode */
/* /*
* Ethernet configuration * Ethernet configuration
*/ */
@ -275,6 +283,7 @@
#define CONFIG_CMD_NFS #define CONFIG_CMD_NFS
#define CONFIG_CMD_PING #define CONFIG_CMD_PING
#define CONFIG_CMD_REGINFO #define CONFIG_CMD_REGINFO
#define CONFIG_CMD_EEPROM
#if defined(CONFIG_PCI) #if defined(CONFIG_PCI)
#define CONFIG_CMD_PCI #define CONFIG_CMD_PCI

38
include/configs/atstk1002.h
View File

@ -39,8 +39,10 @@
#define CFG_HZ 1000 #define CFG_HZ 1000
/* /*
* Set up the PLL to run at 199.5 MHz, the CPU to run at 1/2 the PLL * Set up the PLL to run at 140 MHz, the CPU to run at the PLL
* frequency and the peripherals to run at 1/4 the PLL frequency. * frequency, the HSB and PBB at 1/2, and the PBA to run at 1/4 the
* PLL frequency.
* (CFG_OSC0_HZ * CFG_PLL0_MUL) / CFG_PLL0_DIV = PLL MHz
*/ */
#define CONFIG_PLL 1 #define CONFIG_PLL 1
#define CFG_POWER_MANAGER 1 #define CFG_POWER_MANAGER 1
@ -48,9 +50,25 @@
#define CFG_PLL0_DIV 1 #define CFG_PLL0_DIV 1
#define CFG_PLL0_MUL 7 #define CFG_PLL0_MUL 7
#define CFG_PLL0_SUPPRESS_CYCLES 16 #define CFG_PLL0_SUPPRESS_CYCLES 16
/*
* Set the CPU running at:
* PLL / (2^CFG_CLKDIV_CPU) = CPU MHz
*/
#define CFG_CLKDIV_CPU 0 #define CFG_CLKDIV_CPU 0
/*
* Set the HSB running at:
* PLL / (2^CFG_CLKDIV_HSB) = HSB MHz
*/
#define CFG_CLKDIV_HSB 1 #define CFG_CLKDIV_HSB 1
/*
* Set the PBA running at:
* PLL / (2^CFG_CLKDIV_PBA) = PBA MHz
*/
#define CFG_CLKDIV_PBA 2 #define CFG_CLKDIV_PBA 2
/*
* Set the PBB running at:
* PLL / (2^CFG_CLKDIV_PBB) = PBB MHz
*/
#define CFG_CLKDIV_PBB 1 #define CFG_CLKDIV_PBB 1
/* /*
@ -78,7 +96,7 @@
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
#define CONFIG_BOOTARGS \ #define CONFIG_BOOTARGS \
"console=ttyS0 root=/dev/mtdblock1 rootfstype=jffs2 fbmem=600k" "console=ttyS0 root=/dev/mmcblk0p1 fbmem=600k rootwait=1"
#define CONFIG_BOOTCOMMAND \ #define CONFIG_BOOTCOMMAND \
"fsload; bootm $(fileaddr)" "fsload; bootm $(fileaddr)"
@ -87,7 +105,7 @@
* Only interrupt autoboot if <space> is pressed. Otherwise, garbage * Only interrupt autoboot if <space> is pressed. Otherwise, garbage
* data on the serial line may interrupt the boot sequence. * data on the serial line may interrupt the boot sequence.
*/ */
#define CONFIG_BOOTDELAY 2 #define CONFIG_BOOTDELAY 1
#define CONFIG_AUTOBOOT 1 #define CONFIG_AUTOBOOT 1
#define CONFIG_AUTOBOOT_KEYED 1 #define CONFIG_AUTOBOOT_KEYED 1
#define CONFIG_AUTOBOOT_PROMPT \ #define CONFIG_AUTOBOOT_PROMPT \
@ -103,8 +121,8 @@
* generated and assigned to the environment variables "ethaddr" and * generated and assigned to the environment variables "ethaddr" and
* "eth1addr". * "eth1addr".
*/ */
#define CONFIG_ETHADDR "6a:87:71:14:cd:cb" #define CONFIG_ETHADDR 6a:87:71:14:cd:cb
#define CONFIG_ETH1ADDR "ca:f8:15:e6:3e:e6" #define CONFIG_ETH1ADDR ca:f8:15:e6:3e:e6
#define CONFIG_OVERWRITE_ETHADDR_ONCE 1 #define CONFIG_OVERWRITE_ETHADDR_ONCE 1
#define CONFIG_NET_MULTI 1 #define CONFIG_NET_MULTI 1
@ -182,12 +200,8 @@
#define CFG_PBSIZE (CFG_CBSIZE + sizeof(CFG_PROMPT) + 16) #define CFG_PBSIZE (CFG_CBSIZE + sizeof(CFG_PROMPT) + 16)
#define CFG_LONGHELP 1 #define CFG_LONGHELP 1
#define CFG_MEMTEST_START \ #define CFG_MEMTEST_START CFG_SDRAM_BASE
({ gd->bd->bi_dram[0].start; }) #define CFG_MEMTEST_END (CFG_MEMTEST_START + 0x700000)
#define CFG_MEMTEST_END \
({ \
gd->bd->bi_dram[0].start + gd->bd->bi_dram[0].size; \
})
#define CFG_BAUDRATE_TABLE { 115200, 38400, 19200, 9600, 2400 } #define CFG_BAUDRATE_TABLE { 115200, 38400, 19200, 9600, 2400 }
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */

16
include/configs/lwmon5.h
View File

@ -200,12 +200,13 @@
"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \ "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \
":${hostname}:${netdev}:off panic=1\0" \ ":${hostname}:${netdev}:off panic=1\0" \
"addtty=setenv bootargs ${bootargs} console=ttyS1,${baudrate}\0"\ "addtty=setenv bootargs ${bootargs} console=ttyS1,${baudrate}\0"\
"flash_nfs=run nfsargs addip addtty;" \ "addmisc=setenv bootargs ${bootargs} rtc-pcf8563.probe=0,0x51\0"\
"flash_nfs=run nfsargs addip addtty addmisc;" \
"bootm ${kernel_addr}\0" \ "bootm ${kernel_addr}\0" \
"flash_self=run ramargs addip addtty;" \ "flash_self=run ramargs addip addtty addmisc;" \
"bootm ${kernel_addr} ${ramdisk_addr}\0" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \
"net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;" \ "net_nfs=tftp 200000 ${bootfile};" \
"bootm\0" \ "run nfsargs addip addtty addmisc;bootm\0" \
"rootpath=/opt/eldk/ppc_4xxFP\0" \ "rootpath=/opt/eldk/ppc_4xxFP\0" \
"bootfile=/tftpboot/lwmon5/uImage\0" \ "bootfile=/tftpboot/lwmon5/uImage\0" \
"kernel_addr=FC000000\0" \ "kernel_addr=FC000000\0" \
@ -338,7 +339,12 @@
#define CFG_PCI_SUBSYS_VENDORID 0x10e8 /* AMCC */ #define CFG_PCI_SUBSYS_VENDORID 0x10e8 /* AMCC */
#define CFG_PCI_SUBSYS_ID 0xcafe /* Whatever */ #define CFG_PCI_SUBSYS_ID 0xcafe /* Whatever */
#if 0
/*
* ToDo: Watchdog is not test fully, so exclude it for now
*/
#define CONFIG_HW_WATCHDOG 1 /* Use external HW-Watchdog */ #define CONFIG_HW_WATCHDOG 1 /* Use external HW-Watchdog */
#endif
/* /*
* For booting Linux, the board info and command line data * For booting Linux, the board info and command line data
@ -472,7 +478,7 @@
{GPIO1_BASE, GPIO_OUT, GPIO_SEL , GPIO_OUT_1}, /* GPIO55 Unselect via TraceSelect Bit */ \ {GPIO1_BASE, GPIO_OUT, GPIO_SEL , GPIO_OUT_1}, /* GPIO55 Unselect via TraceSelect Bit */ \
{GPIO1_BASE, GPIO_OUT, GPIO_SEL , GPIO_OUT_0}, /* GPIO56 Unselect via TraceSelect Bit */ \ {GPIO1_BASE, GPIO_OUT, GPIO_SEL , GPIO_OUT_0}, /* GPIO56 Unselect via TraceSelect Bit */ \
{GPIO1_BASE, GPIO_OUT, GPIO_SEL , GPIO_OUT_1}, /* GPIO57 Unselect via TraceSelect Bit */ \ {GPIO1_BASE, GPIO_OUT, GPIO_SEL , GPIO_OUT_1}, /* GPIO57 Unselect via TraceSelect Bit */ \
{GPIO1_BASE, GPIO_OUT, GPIO_SEL , GPIO_OUT_1}, /* GPIO58 Unselect via TraceSelect Bit */ \ {GPIO1_BASE, GPIO_OUT, GPIO_SEL , GPIO_OUT_0}, /* GPIO58 Unselect via TraceSelect Bit */ \
{GPIO1_BASE, GPIO_OUT, GPIO_SEL , GPIO_OUT_0}, /* GPIO59 Unselect via TraceSelect Bit */ \ {GPIO1_BASE, GPIO_OUT, GPIO_SEL , GPIO_OUT_0}, /* GPIO59 Unselect via TraceSelect Bit */ \
{GPIO1_BASE, GPIO_OUT, GPIO_SEL , GPIO_OUT_0}, /* GPIO60 Unselect via TraceSelect Bit */ \ {GPIO1_BASE, GPIO_OUT, GPIO_SEL , GPIO_OUT_0}, /* GPIO60 Unselect via TraceSelect Bit */ \
{GPIO1_BASE, GPIO_IN , GPIO_SEL , GPIO_OUT_0}, /* GPIO61 Unselect via TraceSelect Bit */ \ {GPIO1_BASE, GPIO_IN , GPIO_SEL , GPIO_OUT_0}, /* GPIO61 Unselect via TraceSelect Bit */ \

53
include/configs/ml401.h
View File

@ -1,7 +1,7 @@
/* /*
* (C) Copyright 2007 Czech Technical University. * (C) Copyright 2007 Michal Simek
* *
* Michal SIMEK <monstr@seznam.cz> * Michal SIMEK <monstr@monstr.eu>
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
* project. * project.
@ -32,6 +32,7 @@
#define CONFIG_ML401 1 /* ML401 Board */ #define CONFIG_ML401 1 /* ML401 Board */
/* uart */ /* uart */
#define CONFIG_XILINX_UARTLITE
#define CONFIG_SERIAL_BASE XILINX_UART_BASEADDR #define CONFIG_SERIAL_BASE XILINX_UART_BASEADDR
#define CONFIG_BAUDRATE XILINX_UART_BAUDRATE #define CONFIG_BAUDRATE XILINX_UART_BAUDRATE
#define CFG_BAUDRATE_TABLE { CONFIG_BAUDRATE } #define CFG_BAUDRATE_TABLE { CONFIG_BAUDRATE }
@ -58,6 +59,7 @@
#define CFG_TIMER_0_IRQ XILINX_TIMER_IRQ #define CFG_TIMER_0_IRQ XILINX_TIMER_IRQ
#define FREQUENCE XILINX_CLOCK_FREQ #define FREQUENCE XILINX_CLOCK_FREQ
#define CFG_TIMER_0_PRELOAD ( FREQUENCE/1000 ) #define CFG_TIMER_0_PRELOAD ( FREQUENCE/1000 )
#define CONFIG_XILINX_CLOCK_FREQ XILINX_CLOCK_FREQ
/* FSL */ /* FSL */
#define CFG_FSL_2 #define CFG_FSL_2
@ -86,7 +88,7 @@
* 0x11FB_F000 CFG_MONITOR_BASE * 0x11FB_F000 CFG_MONITOR_BASE
* MONITOR_CODE 256kB Env * MONITOR_CODE 256kB Env
* 0x13FF_F000 CFG_GBL_DATA_OFFSET * 0x13FF_F000 CFG_GBL_DATA_OFFSET
* GLOBAL_DATA 4kB bd, gd * GLOBAL_DATA 4kB bd, gd
* 0x1400_0000 CFG_SDRAM_BASE + CFG_SDRAM_SIZE * 0x1400_0000 CFG_SDRAM_BASE + CFG_SDRAM_SIZE
*/ */
@ -99,7 +101,7 @@
/* global pointer */ /* global pointer */
#define CFG_GBL_DATA_SIZE 0x1000 /* size of global data */ #define CFG_GBL_DATA_SIZE 0x1000 /* size of global data */
/* start of global data */ /* start of global data */
#define CFG_GBL_DATA_OFFSET (CFG_SDRAM_BASE + CFG_SDRAM_SIZE - CFG_GBL_DATA_SIZE) #define CFG_GBL_DATA_OFFSET (CFG_SDRAM_BASE + CFG_SDRAM_SIZE - CFG_GBL_DATA_SIZE)
/* monitor code */ /* monitor code */
#define SIZE 0x40000 #define SIZE 0x40000
@ -145,6 +147,16 @@
#define CFG_FLASH_PROTECTION /* hardware flash protection */ #define CFG_FLASH_PROTECTION /* hardware flash protection */
#endif /* !FLASH */ #endif /* !FLASH */
/* system ace */
#ifdef XILINX_SYSACE_BASEADDR
#define CONFIG_SYSTEMACE
/* #define DEBUG_SYSTEMACE */
#define SYSTEMACE_CONFIG_FPGA
#define CFG_SYSTEMACE_BASE XILINX_SYSACE_BASEADDR
#define CFG_SYSTEMACE_WIDTH XILINX_SYSACE_MEM_WIDTH
#define CONFIG_DOS_PARTITION
#endif
/* /*
* BOOTP options * BOOTP options
*/ */
@ -153,28 +165,21 @@
#define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME #define CONFIG_BOOTP_HOSTNAME
/* /*
* Command line configuration. * Command line configuration.
*/ */
#include <config_cmd_default.h> #include <config_cmd_default.h>
#define CONFIG_CMD_ASKENV #define CONFIG_CMD_ASKENV
#define CONFIG_CMD_AUTOSCRIPT
#define CONFIG_CMD_BDI
#define CONFIG_CMD_CACHE #define CONFIG_CMD_CACHE
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_FAT
#define CONFIG_CMD_IMI
#define CONFIG_CMD_IRQ #define CONFIG_CMD_IRQ
#define CONFIG_CMD_LOADB
#define CONFIG_CMD_LOADS
#define CONFIG_CMD_MEMORY
#define CONFIG_CMD_MISC
#define CONFIG_CMD_MFSL #define CONFIG_CMD_MFSL
#define CONFIG_CMD_NET
#define CONFIG_CMD_PING #define CONFIG_CMD_PING
#define CONFIG_CMD_RUN
#if defined(CONFIG_SYSTEMACE)
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_FAT
#endif
#if defined(FLASH) #if defined(FLASH)
#define CONFIG_CMD_ECHO #define CONFIG_CMD_ECHO
@ -186,6 +191,8 @@
#define CONFIG_CMD_ENV #define CONFIG_CMD_ENV
#define CONFIG_CMD_SAVES #define CONFIG_CMD_SAVES
#endif #endif
#else
#undef CONFIG_CMD_FLASH
#endif #endif
#if defined(CONFIG_CMD_JFFS2) #if defined(CONFIG_CMD_JFFS2)
@ -210,24 +217,16 @@
#define CONFIG_BOOTDELAY 30 #define CONFIG_BOOTDELAY 30
#define CONFIG_BOOTARGS "root=romfs" #define CONFIG_BOOTARGS "root=romfs"
#define CONFIG_HOSTNAME "ml401" #define CONFIG_HOSTNAME "ml401"
#define CONFIG_BOOTCOMMAND "base 0;tftp 11000000 image.img;bootm" #define CONFIG_BOOTCOMMAND "base 0;tftp 11000000 image.img;bootm"
#define CONFIG_IPADDR 192.168.0.3 #define CONFIG_IPADDR 192.168.0.3
#define CONFIG_SERVERIP 192.168.0.5 #define CONFIG_SERVERIP 192.168.0.5
#define CONFIG_GATEWAYIP 192.168.0.1 #define CONFIG_GATEWAYIP 192.168.0.1
#define CONFIG_ETHADDR 00:E0:0C:00:00:FD #define CONFIG_ETHADDR 00:E0:0C:00:00:FD
/* architecture dependent code */ /* architecture dependent code */
#define CFG_USR_EXCEP /* user exception */ #define CFG_USR_EXCEP /* user exception */
#define CFG_HZ 1000 #define CFG_HZ 1000
/* system ace */
#define CONFIG_SYSTEMACE
/* #define DEBUG_SYSTEMACE */
#define SYSTEMACE_CONFIG_FPGA
#define CFG_SYSTEMACE_BASE XILINX_SYSACE_BASEADDR
#define CFG_SYSTEMACE_WIDTH XILINX_SYSACE_MEM_WIDTH
#define CONFIG_DOS_PARTITION
#define CONFIG_PREBOOT "echo U-BOOT for ML401;setenv preboot;echo" #define CONFIG_PREBOOT "echo U-BOOT for ML401;setenv preboot;echo"
#define CONFIG_EXTRA_ENV_SETTINGS "unlock=yes\0" /* hardware flash protection */\ #define CONFIG_EXTRA_ENV_SETTINGS "unlock=yes\0" /* hardware flash protection */\

20
include/configs/stxssa.h
View File

@ -189,20 +189,21 @@
#define CFG_PROMPT_HUSH_PS2 "> " #define CFG_PROMPT_HUSH_PS2 "> "
#endif #endif
/* I2C */ /*
* I2C
*/
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_FSL_I2C /* Use FSL common I2C driver */
#define CONFIG_HARD_I2C /* I2C with hardware support*/ #define CONFIG_HARD_I2C /* I2C with hardware support*/
#undef CONFIG_SOFT_I2C /* I2C bit-banged */ #undef CONFIG_SOFT_I2C /* I2C bit-banged */
#define CFG_I2C_SPEED 400000 /* I2C speed and slave address */ #define CFG_I2C_SPEED 400000 /* I2C speed and slave address */
#define CFG_I2C_SLAVE 0x7F #define CFG_I2C_SLAVE 0x7F
#if 0
#define CFG_I2C_NOPROBES {0x00} /* Don't probe these addrs */
#else
/* I did the 'if 0' so we could keep the syntax above if ever needed. */
#undef CFG_I2C_NOPROBES #undef CFG_I2C_NOPROBES
#endif
#define CFG_I2C_OFFSET 0x3000 #define CFG_I2C_OFFSET 0x3000
/* I2C RTC */
#define CONFIG_RTC_DS1337 /* This is really a DS1339 RTC */
#define CFG_I2C_RTC_ADDR 0x68 /* at address 0x68 */
/* I2C EEPROM. AT24C32, we keep our environment in here. /* I2C EEPROM. AT24C32, we keep our environment in here.
*/ */
#define CFG_I2C_EEPROM_ADDR 0x51 /* 1010001x */ #define CFG_I2C_EEPROM_ADDR 0x51 /* 1010001x */
@ -341,8 +342,13 @@
*/ */
#include <config_cmd_default.h> #include <config_cmd_default.h>
#define CONFIG_CMD_PING #define CONFIG_CMD_DATE
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_EEPROM
#define CONFIG_CMD_I2C #define CONFIG_CMD_I2C
#define CONFIG_CMD_NFS
#define CONFIG_CMD_PING
#define CONFIG_CMD_SNTP
#if defined(CONFIG_PCI) #if defined(CONFIG_PCI)
#define CONFIG_CMD_PCI #define CONFIG_CMD_PCI

19
include/configs/suzaku.h
View File

@ -48,6 +48,7 @@
#define CFG_MALLOC_LEN (256 << 10) /* Reserve 256 kB for malloc */ #define CFG_MALLOC_LEN (256 << 10) /* Reserve 256 kB for malloc */
#define CFG_MALLOC_BASE (CFG_MONITOR_BASE - (1024 * 1024)) #define CFG_MALLOC_BASE (CFG_MONITOR_BASE - (1024 * 1024))
#define CONFIG_XILINX_UARTLITE
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
#define CFG_BAUDRATE_TABLE { 115200 } #define CFG_BAUDRATE_TABLE { 115200 }
@ -55,21 +56,16 @@
#define MICROBLAZE_SYSREG_BASE_ADDR 0xFFFFA000 #define MICROBLAZE_SYSREG_BASE_ADDR 0xFFFFA000
#define MICROBLAZE_SYSREG_RECONFIGURE (1 << 0) #define MICROBLAZE_SYSREG_RECONFIGURE (1 << 0)
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
/* /*
* Command line configuration. * Command line configuration.
*/ */
#include <config_cmd_default.h> #include <config_cmd_default.h>
#undef CONFIG_CMD_BDI
#undef CONFIG_CMD_ENV
#undef CONFIG_CMD_MEMORY
#undef CONFIG_CMD_NET
#undef CONFIG_CMD_MISC
#define CFG_UART1_BASE (0xFFFF2000) #define CFG_UART1_BASE (0xFFFF2000)
#define CONFIG_SERIAL_BASE CFG_UART1_BASE #define CONFIG_SERIAL_BASE CFG_UART1_BASE
@ -108,4 +104,7 @@
#define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) #define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
#define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET #define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET
#define XILINX_CLOCK_FREQ 50000000
#define CONFIG_XILINX_CLOCK_FREQ XILINX_CLOCK_FREQ
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */

3
include/configs/xupv2p.h
View File

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2007 Czech Technical University. * (C) Copyright 2007 Michal Simek
* *
* Michal SIMEK <monstr@monstr.eu> * Michal SIMEK <monstr@monstr.eu>
* *
@ -31,6 +31,7 @@
#define CONFIG_XUPV2P 1 #define CONFIG_XUPV2P 1
/* uart */ /* uart */
#define CONFIG_XILINX_UARTLITE
#define CONFIG_SERIAL_BASE XILINX_UART_BASEADDR #define CONFIG_SERIAL_BASE XILINX_UART_BASEADDR
#define CONFIG_BAUDRATE XILINX_UART_BAUDRATE #define CONFIG_BAUDRATE XILINX_UART_BAUDRATE
#define CFG_BAUDRATE_TABLE { CONFIG_BAUDRATE } #define CFG_BAUDRATE_TABLE { CONFIG_BAUDRATE }

45
include/led.h
View File

@ -1,45 +0,0 @@
/*
* (C) Copyright 2006
* Atmel Nordic AB <www.atmel.com>
* Ulf Samuelsson <ulf@atmel.com>
*
* See file CREDITS for list of people who contributed to this
* project.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/
#ifndef __LED_H
#define __LED_H
#ifndef __ASSEMBLY__
extern void LED_init (void);
extern void red_LED_on(void);
extern void red_LED_off(void);
extern void green_LED_on(void);
extern void green_LED_off(void);
extern void yellow_LED_on(void);
extern void yellow_LED_off(void);
#else
.extern LED_init
.extern red_LED_on
.extern red_LED_off
.extern yellow_LED_on
.extern yellow_LED_off
.extern green_LED_on
.extern green_LED_off
#endif
#endif

127
include/linux/mtd/bbm.h Normal file
View File

@ -0,0 +1,127 @@
/*
* linux/include/linux/mtd/bbm.h
*
* NAND family Bad Block Management (BBM) header file
* - Bad Block Table (BBT) implementation
*
* Copyright (c) 2005-2007 Samsung Electronics
* Kyungmin Park <kyungmin.park@samsung.com>
*
* Copyright (c) 2000-2005
* Thomas Gleixner <tglx@linuxtronix.de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#ifndef __LINUX_MTD_BBM_H
#define __LINUX_MTD_BBM_H
/* The maximum number of NAND chips in an array */
#ifndef NAND_MAX_CHIPS
#define NAND_MAX_CHIPS 8
#endif
/**
* struct nand_bbt_descr - bad block table descriptor
* @param options options for this descriptor
* @param pages the page(s) where we find the bbt, used with
* option BBT_ABSPAGE when bbt is searched,
* then we store the found bbts pages here.
* Its an array and supports up to 8 chips now
* @param offs offset of the pattern in the oob area of the page
* @param veroffs offset of the bbt version counter in the oob are of the page
* @param version version read from the bbt page during scan
* @param len length of the pattern, if 0 no pattern check is performed
* @param maxblocks maximum number of blocks to search for a bbt. This number of
* blocks is reserved at the end of the device
* where the tables are written.
* @param reserved_block_code if non-0, this pattern denotes a reserved
* (rather than bad) block in the stored bbt
* @param pattern pattern to identify bad block table or factory marked
* good / bad blocks, can be NULL, if len = 0
*
* Descriptor for the bad block table marker and the descriptor for the
* pattern which identifies good and bad blocks. The assumption is made
* that the pattern and the version count are always located in the oob area
* of the first block.
*/
struct nand_bbt_descr {
int options;
int pages[NAND_MAX_CHIPS];
int offs;
int veroffs;
uint8_t version[NAND_MAX_CHIPS];
int len;
int maxblocks;
int reserved_block_code;
uint8_t *pattern;
};
/* Options for the bad block table descriptors */
/* The number of bits used per block in the bbt on the device */
#define NAND_BBT_NRBITS_MSK 0x0000000F
#define NAND_BBT_1BIT 0x00000001
#define NAND_BBT_2BIT 0x00000002
#define NAND_BBT_4BIT 0x00000004
#define NAND_BBT_8BIT 0x00000008
/* The bad block table is in the last good block of the device */
#define NAND_BBT_LASTBLOCK 0x00000010
/* The bbt is at the given page, else we must scan for the bbt */
#define NAND_BBT_ABSPAGE 0x00000020
/* The bbt is at the given page, else we must scan for the bbt */
#define NAND_BBT_SEARCH 0x00000040
/* bbt is stored per chip on multichip devices */
#define NAND_BBT_PERCHIP 0x00000080
/* bbt has a version counter at offset veroffs */
#define NAND_BBT_VERSION 0x00000100
/* Create a bbt if none axists */
#define NAND_BBT_CREATE 0x00000200
/* Search good / bad pattern through all pages of a block */
#define NAND_BBT_SCANALLPAGES 0x00000400
/* Scan block empty during good / bad block scan */
#define NAND_BBT_SCANEMPTY 0x00000800
/* Write bbt if neccecary */
#define NAND_BBT_WRITE 0x00001000
/* Read and write back block contents when writing bbt */
#define NAND_BBT_SAVECONTENT 0x00002000
/* Search good / bad pattern on the first and the second page */
#define NAND_BBT_SCAN2NDPAGE 0x00004000
/* The maximum number of blocks to scan for a bbt */
#define NAND_BBT_SCAN_MAXBLOCKS 4
/*
* Constants for oob configuration
*/
#define ONENAND_BADBLOCK_POS 0
/**
* struct bbt_info - [GENERIC] Bad Block Table data structure
* @param bbt_erase_shift [INTERN] number of address bits in a bbt entry
* @param badblockpos [INTERN] position of the bad block marker in the oob area
* @param bbt [INTERN] bad block table pointer
* @param badblock_pattern [REPLACEABLE] bad block scan pattern used for initial bad block scan
* @param priv [OPTIONAL] pointer to private bbm date
*/
struct bbm_info {
int bbt_erase_shift;
int badblockpos;
int options;
uint8_t *bbt;
int (*isbad_bbt) (struct mtd_info * mtd, loff_t ofs, int allowbbt);
/* TODO Add more NAND specific fileds */
struct nand_bbt_descr *badblock_pattern;
void *priv;
};
/* OneNAND BBT interface */
extern int onenand_scan_bbt (struct mtd_info *mtd, struct nand_bbt_descr *bd);
extern int onenand_default_bbt (struct mtd_info *mtd);
#endif /* __LINUX_MTD_BBM_H */

143
include/linux/mtd/onenand.h Normal file
View File

@ -0,0 +1,143 @@
/*
* linux/include/linux/mtd/onenand.h
*
* Copyright (C) 2005-2007 Samsung Electronics
* Kyungmin Park <kyungmin.park@samsung.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#ifndef __LINUX_MTD_ONENAND_H
#define __LINUX_MTD_ONENAND_H
#include <linux/mtd/onenand_regs.h>
/* Note: The header order is impoertant */
#include <onenand_uboot.h>
#include <linux/mtd/bbm.h>
#define MAX_BUFFERRAM 2
#define MAX_ONENAND_PAGESIZE (2048 + 64)
/* Scan and identify a OneNAND device */
extern int onenand_scan (struct mtd_info *mtd, int max_chips);
/* Free resources held by the OneNAND device */
extern void onenand_release (struct mtd_info *mtd);
/**
* onenand_state_t - chip states
* Enumeration for OneNAND flash chip state
*/
typedef enum {
FL_READY,
FL_READING,
FL_WRITING,
FL_ERASING,
FL_SYNCING,
FL_UNLOCKING,
FL_LOCKING,
} onenand_state_t;
/**
* struct onenand_bufferram - OneNAND BufferRAM Data
* @param block block address in BufferRAM
* @param page page address in BufferRAM
* @param valid valid flag
*/
struct onenand_bufferram {
int block;
int page;
int valid;
};
/**
* struct onenand_chip - OneNAND Private Flash Chip Data
* @param base [BOARDSPECIFIC] address to access OneNAND
* @param chipsize [INTERN] the size of one chip for multichip arrays
* @param device_id [INTERN] device ID
* @param verstion_id [INTERN] version ID
* @param options [BOARDSPECIFIC] various chip options. They can partly be set to inform onenand_scan about
* @param erase_shift [INTERN] number of address bits in a block
* @param page_shift [INTERN] number of address bits in a page
* @param ppb_shift [INTERN] number of address bits in a pages per block
* @param page_mask [INTERN] a page per block mask
* @param bufferam_index [INTERN] BufferRAM index
* @param bufferam [INTERN] BufferRAM info
* @param readw [REPLACEABLE] hardware specific function for read short
* @param writew [REPLACEABLE] hardware specific function for write short
* @param command [REPLACEABLE] hardware specific function for writing commands to the chip
* @param wait [REPLACEABLE] hardware specific function for wait on ready
* @param read_bufferram [REPLACEABLE] hardware specific function for BufferRAM Area
* @param write_bufferram [REPLACEABLE] hardware specific function for BufferRAM Area
* @param chip_lock [INTERN] spinlock used to protect access to this structure and the chip
* @param wq [INTERN] wait queue to sleep on if a OneNAND operation is in progress
* @param state [INTERN] the current state of the OneNAND device
* @param autooob [REPLACEABLE] the default (auto)placement scheme
* @param priv [OPTIONAL] pointer to private chip date
*/
struct onenand_chip {
void __iomem *base;
unsigned int chipsize;
unsigned int device_id;
unsigned int options;
unsigned int erase_shift;
unsigned int page_shift;
unsigned int ppb_shift; /* Pages per block shift */
unsigned int page_mask;
unsigned int bufferram_index;
struct onenand_bufferram bufferram[MAX_BUFFERRAM];
int (*command) (struct mtd_info * mtd, int cmd, loff_t address,
size_t len);
int (*wait) (struct mtd_info * mtd, int state);
int (*read_bufferram) (struct mtd_info * mtd, int area,
unsigned char *buffer, int offset, size_t count);
int (*write_bufferram) (struct mtd_info * mtd, int area,
const unsigned char *buffer, int offset,
size_t count);
unsigned short (*read_word) (void __iomem * addr);
void (*write_word) (unsigned short value, void __iomem * addr);
void (*mmcontrol) (struct mtd_info * mtd, int sync_read);
spinlock_t chip_lock;
wait_queue_head_t wq;
onenand_state_t state;
struct nand_oobinfo *autooob;
void *bbm;
void *priv;
};
#define ONENAND_CURRENT_BUFFERRAM(this) (this->bufferram_index)
#define ONENAND_NEXT_BUFFERRAM(this) (this->bufferram_index ^ 1)
#define ONENAND_SET_NEXT_BUFFERRAM(this) (this->bufferram_index ^= 1)
/*
* Options bits
*/
#define ONENAND_CONT_LOCK (0x0001)
/*
* OneNAND Flash Manufacturer ID Codes
*/
#define ONENAND_MFR_SAMSUNG 0xec
#define ONENAND_MFR_UNKNOWN 0x00
/**
* struct nand_manufacturers - NAND Flash Manufacturer ID Structure
* @param name: Manufacturer name
* @param id: manufacturer ID code of device.
*/
struct onenand_manufacturers {
int id;
char *name;
};
#endif /* __LINUX_MTD_ONENAND_H */

181
include/linux/mtd/onenand_regs.h Normal file
View File

@ -0,0 +1,181 @@
/*
* linux/include/linux/mtd/onenand_regs.h
*
* OneNAND Register header file
*
* Copyright (C) 2005-2007 Samsung Electronics
* Kyungmin Park <kyungmin.park@samsung.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#ifndef __ONENAND_REG_H
#define __ONENAND_REG_H
/* Memory Address Map Translation (Word order) */
#define ONENAND_MEMORY_MAP(x) ((x) << 1)
/*
* External BufferRAM area
*/
#define ONENAND_BOOTRAM ONENAND_MEMORY_MAP(0x0000)
#define ONENAND_DATARAM ONENAND_MEMORY_MAP(0x0200)
#define ONENAND_SPARERAM ONENAND_MEMORY_MAP(0x8010)
/*
* OneNAND Registers
*/
#define ONENAND_REG_MANUFACTURER_ID ONENAND_MEMORY_MAP(0xF000)
#define ONENAND_REG_DEVICE_ID ONENAND_MEMORY_MAP(0xF001)
#define ONENAND_REG_VERSION_ID ONENAND_MEMORY_MAP(0xF002)
#define ONENAND_REG_DATA_BUFFER_SIZE ONENAND_MEMORY_MAP(0xF003)
#define ONENAND_REG_BOOT_BUFFER_SIZE ONENAND_MEMORY_MAP(0xF004)
#define ONENAND_REG_NUM_BUFFERS ONENAND_MEMORY_MAP(0xF005)
#define ONENAND_REG_TECHNOLOGY ONENAND_MEMORY_MAP(0xF006)
#define ONENAND_REG_START_ADDRESS1 ONENAND_MEMORY_MAP(0xF100)
#define ONENAND_REG_START_ADDRESS2 ONENAND_MEMORY_MAP(0xF101)
#define ONENAND_REG_START_ADDRESS3 ONENAND_MEMORY_MAP(0xF102)
#define ONENAND_REG_START_ADDRESS4 ONENAND_MEMORY_MAP(0xF103)
#define ONENAND_REG_START_ADDRESS5 ONENAND_MEMORY_MAP(0xF104)
#define ONENAND_REG_START_ADDRESS6 ONENAND_MEMORY_MAP(0xF105)
#define ONENAND_REG_START_ADDRESS7 ONENAND_MEMORY_MAP(0xF106)
#define ONENAND_REG_START_ADDRESS8 ONENAND_MEMORY_MAP(0xF107)
#define ONENAND_REG_START_BUFFER ONENAND_MEMORY_MAP(0xF200)
#define ONENAND_REG_COMMAND ONENAND_MEMORY_MAP(0xF220)
#define ONENAND_REG_SYS_CFG1 ONENAND_MEMORY_MAP(0xF221)
#define ONENAND_REG_SYS_CFG2 ONENAND_MEMORY_MAP(0xF222)
#define ONENAND_REG_CTRL_STATUS ONENAND_MEMORY_MAP(0xF240)
#define ONENAND_REG_INTERRUPT ONENAND_MEMORY_MAP(0xF241)
#define ONENAND_REG_START_BLOCK_ADDRESS ONENAND_MEMORY_MAP(0xF24C)
#define ONENAND_REG_END_BLOCK_ADDRESS ONENAND_MEMORY_MAP(0xF24D)
#define ONENAND_REG_WP_STATUS ONENAND_MEMORY_MAP(0xF24E)
#define ONENAND_REG_ECC_STATUS ONENAND_MEMORY_MAP(0xFF00)
#define ONENAND_REG_ECC_M0 ONENAND_MEMORY_MAP(0xFF01)
#define ONENAND_REG_ECC_S0 ONENAND_MEMORY_MAP(0xFF02)
#define ONENAND_REG_ECC_M1 ONENAND_MEMORY_MAP(0xFF03)
#define ONENAND_REG_ECC_S1 ONENAND_MEMORY_MAP(0xFF04)
#define ONENAND_REG_ECC_M2 ONENAND_MEMORY_MAP(0xFF05)
#define ONENAND_REG_ECC_S2 ONENAND_MEMORY_MAP(0xFF06)
#define ONENAND_REG_ECC_M3 ONENAND_MEMORY_MAP(0xFF07)
#define ONENAND_REG_ECC_S3 ONENAND_MEMORY_MAP(0xFF08)
/*
* Device ID Register F001h (R)
*/
#define ONENAND_DEVICE_DENSITY_SHIFT (4)
#define ONENAND_DEVICE_IS_DDP (1 << 3)
#define ONENAND_DEVICE_IS_DEMUX (1 << 2)
#define ONENAND_DEVICE_VCC_MASK (0x3)
#define ONENAND_DEVICE_DENSITY_512Mb (0x002)
/*
* Version ID Register F002h (R)
*/
#define ONENAND_VERSION_PROCESS_SHIFT (8)
/*
* Start Address 1 F100h (R/W)
*/
#define ONENAND_DDP_SHIFT (15)
/*
* Start Address 8 F107h (R/W)
*/
#define ONENAND_FPA_MASK (0x3f)
#define ONENAND_FPA_SHIFT (2)
#define ONENAND_FSA_MASK (0x03)
/*
* Start Buffer Register F200h (R/W)
*/
#define ONENAND_BSA_MASK (0x03)
#define ONENAND_BSA_SHIFT (8)
#define ONENAND_BSA_BOOTRAM (0 << 2)
#define ONENAND_BSA_DATARAM0 (2 << 2)
#define ONENAND_BSA_DATARAM1 (3 << 2)
#define ONENAND_BSC_MASK (0x03)
/*
* Command Register F220h (R/W)
*/
#define ONENAND_CMD_READ (0x00)
#define ONENAND_CMD_READOOB (0x13)
#define ONENAND_CMD_PROG (0x80)
#define ONENAND_CMD_PROGOOB (0x1A)
#define ONENAND_CMD_UNLOCK (0x23)
#define ONENAND_CMD_LOCK (0x2A)
#define ONENAND_CMD_LOCK_TIGHT (0x2C)
#define ONENAND_CMD_ERASE (0x94)
#define ONENAND_CMD_RESET (0xF0)
#define ONENAND_CMD_READID (0x90)
/* NOTE: Those are not *REAL* commands */
#define ONENAND_CMD_BUFFERRAM (0x1978)
/*
* System Configuration 1 Register F221h (R, R/W)
*/
#define ONENAND_SYS_CFG1_SYNC_READ (1 << 15)
#define ONENAND_SYS_CFG1_BRL_7 (7 << 12)
#define ONENAND_SYS_CFG1_BRL_6 (6 << 12)
#define ONENAND_SYS_CFG1_BRL_5 (5 << 12)
#define ONENAND_SYS_CFG1_BRL_4 (4 << 12)
#define ONENAND_SYS_CFG1_BRL_3 (3 << 12)
#define ONENAND_SYS_CFG1_BRL_10 (2 << 12)
#define ONENAND_SYS_CFG1_BRL_9 (1 << 12)
#define ONENAND_SYS_CFG1_BRL_8 (0 << 12)
#define ONENAND_SYS_CFG1_BRL_SHIFT (12)
#define ONENAND_SYS_CFG1_BL_32 (4 << 9)
#define ONENAND_SYS_CFG1_BL_16 (3 << 9)
#define ONENAND_SYS_CFG1_BL_8 (2 << 9)
#define ONENAND_SYS_CFG1_BL_4 (1 << 9)
#define ONENAND_SYS_CFG1_BL_CONT (0 << 9)
#define ONENAND_SYS_CFG1_BL_SHIFT (9)
#define ONENAND_SYS_CFG1_NO_ECC (1 << 8)
#define ONENAND_SYS_CFG1_RDY (1 << 7)
#define ONENAND_SYS_CFG1_INT (1 << 6)
#define ONENAND_SYS_CFG1_IOBE (1 << 5)
#define ONENAND_SYS_CFG1_RDY_CONF (1 << 4)
/*
* Controller Status Register F240h (R)
*/
#define ONENAND_CTRL_ONGO (1 << 15)
#define ONENAND_CTRL_LOCK (1 << 14)
#define ONENAND_CTRL_LOAD (1 << 13)
#define ONENAND_CTRL_PROGRAM (1 << 12)
#define ONENAND_CTRL_ERASE (1 << 11)
#define ONENAND_CTRL_ERROR (1 << 10)
#define ONENAND_CTRL_RSTB (1 << 7)
/*
* Interrupt Status Register F241h (R)
*/
#define ONENAND_INT_MASTER (1 << 15)
#define ONENAND_INT_READ (1 << 7)
#define ONENAND_INT_WRITE (1 << 6)
#define ONENAND_INT_ERASE (1 << 5)
#define ONENAND_INT_RESET (1 << 4)
#define ONENAND_INT_CLEAR (0 << 0)
/*
* NAND Flash Write Protection Status Register F24Eh (R)
*/
#define ONENAND_WP_US (1 << 2)
#define ONENAND_WP_LS (1 << 1)
#define ONENAND_WP_LTS (1 << 0)
/*
* ECC Status Reigser FF00h (R)
*/
#define ONENAND_ECC_1BIT (1 << 0)
#define ONENAND_ECC_2BIT (1 << 1)
#define ONENAND_ECC_2BIT_ALL (0xAAAA)
#endif /* __ONENAND_REG_H */

39
include/onenand_uboot.h Normal file
View File

@ -0,0 +1,39 @@
/*
* Header file for OneNAND support for U-Boot
*
* Adaptation from kernel to U-Boot
*
* Copyright (C) 2005-2007 Samsung Electronics
* Kyungmin Park <kyungmin.park@samsung.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#ifndef __UBOOT_ONENAND_H
#define __UBOOT_ONENAND_H
struct kvec {
void *iov_base;
size_t iov_len;
};
typedef int spinlock_t;
typedef int wait_queue_head_t;
/* Functions */
extern void onenand_init(void);
extern int onenand_read(struct mtd_info *mtd, loff_t from, size_t len,
size_t * retlen, u_char * buf);
extern int onenand_read_oob(struct mtd_info *mtd, loff_t from, size_t len,
size_t * retlen, u_char * buf);
extern int onenand_write(struct mtd_info *mtd, loff_t from, size_t len,
size_t * retlen, const u_char * buf);
extern int onenand_erase(struct mtd_info *mtd, struct erase_info *instr);
extern int onenand_unlock(struct mtd_info *mtd, loff_t ofs, size_t len);
extern void onenand_print_device_info(int device, int verbose);
#endif /* __UBOOT_ONENAND_H */

21
include/status_led.h
View File

@ -383,6 +383,27 @@ extern void __led_set (led_id_t mask, int state);
# include <asm/status_led.h> # include <asm/status_led.h>
#endif #endif
/*
* Coloured LEDs API
*/
#ifndef __ASSEMBLY__
extern void coloured_LED_init (void);
extern void red_LED_on(void);
extern void red_LED_off(void);
extern void green_LED_on(void);
extern void green_LED_off(void);
extern void yellow_LED_on(void);
extern void yellow_LED_off(void);
#else
.extern LED_init
.extern red_LED_on
.extern red_LED_off
.extern yellow_LED_on
.extern yellow_LED_off
.extern green_LED_on
.extern green_LED_off
#endif
#endif /* CONFIG_STATUS_LED */ #endif /* CONFIG_STATUS_LED */
#endif /* _STATUS_LED_H_ */ #endif /* _STATUS_LED_H_ */

29
lib_arm/board.c
View File

@ -58,6 +58,10 @@ DECLARE_GLOBAL_DATA_PTR;
void nand_init (void); void nand_init (void);
#endif #endif
#if defined(CONFIG_CMD_ONENAND)
void onenand_init(void);
#endif
ulong monitor_flash_len; ulong monitor_flash_len;
#ifdef CONFIG_HAS_DATAFLASH #ifdef CONFIG_HAS_DATAFLASH
@ -111,6 +115,26 @@ void *sbrk (ptrdiff_t increment)
return ((void *) old); return ((void *) old);
} }
/************************************************************************
* Coloured LED functionality
************************************************************************
* May be supplied by boards if desired
*/
void inline __coloured_LED_init (void) {}
void inline coloured_LED_init (void) __attribute__((weak, alias("__coloured_LED_init")));
void inline __red_LED_on (void) {}
void inline red_LED_on (void) __attribute__((weak, alias("__red_LED_on")));
void inline __red_LED_off(void) {}
void inline red_LED_off(void) __attribute__((weak, alias("__red_LED_off")));
void inline __green_LED_on(void) {}
void inline green_LED_on(void) __attribute__((weak, alias("__green_LED_on")));
void inline __green_LED_off(void) {}
void inline green_LED_off(void)__attribute__((weak, alias("__green_LED_off")));
void inline __yellow_LED_on(void) {}
void inline yellow_LED_on(void)__attribute__((weak, alias("__yellow_LED_on")));
void inline __yellow_LED_off(void) {}
void inline yellow_LED_off(void)__attribute__((weak, alias("__yellow_LED_off")));
/************************************************************************ /************************************************************************
* Init Utilities * * Init Utilities *
************************************************************************ ************************************************************************
@ -185,7 +209,6 @@ static void display_flash_config (ulong size)
} }
#endif /* CFG_NO_FLASH */ #endif /* CFG_NO_FLASH */
/* /*
* Breathe some life into the board... * Breathe some life into the board...
* *
@ -301,6 +324,10 @@ void start_armboot (void)
nand_init(); /* go init the NAND */ nand_init(); /* go init the NAND */
#endif #endif
#if defined(CONFIG_CMD_ONENAND)
onenand_init();
#endif
#ifdef CONFIG_HAS_DATAFLASH #ifdef CONFIG_HAS_DATAFLASH
AT91F_DataflashInit(); AT91F_DataflashInit();
dataflash_print_info(); dataflash_print_info();

12
lib_avr32/board.c
View File

@ -310,10 +310,20 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
malloc_bin_reloc(); malloc_bin_reloc();
dma_alloc_init(); dma_alloc_init();
board_init_info(); board_init_info();
flash_init();
bd->bi_flashstart = 0;
bd->bi_flashsize = 0;
bd->bi_flashoffset = 0;
#ifndef CFG_NO_FLASH
bd->bi_flashstart = CFG_FLASH_BASE;
bd->bi_flashsize = flash_init();
bd->bi_flashoffset = (unsigned long)_edata - (unsigned long)_text;
if (bd->bi_flashsize) if (bd->bi_flashsize)
display_flash_config(); display_flash_config();
#endif
if (bd->bi_dram[0].size) if (bd->bi_dram[0].size)
display_dram_config(); display_dram_config();

8
lib_microblaze/time.c
View File

@ -26,9 +26,17 @@
#include <common.h> #include <common.h>
#ifdef CFG_TIMER_0
void udelay (unsigned long usec) void udelay (unsigned long usec)
{ {
int i; int i;
i = get_timer (0); i = get_timer (0);
while ((get_timer (0) - i) < (usec / 1000)) ; while ((get_timer (0) - i) < (usec / 1000)) ;
} }
#else
void udelay (unsigned long usec)
{
unsigned int i;
for (i = 0; i < (usec * CONFIG_XILINX_CLOCK_FREQ / 10000000); i++);
}
#endif