mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-11 07:34:31 +00:00
Merge with /home/stefan/git/u-boot/denx-merge-sr
This commit is contained in:
Stefan Roese
commit
c8556d0e0b
14 changed files with 617 additions and 83 deletions
440
CHANGELOG
440
CHANGELOG
|
|
@ -1,3 +1,443 @@
|
|||
commit 638dd1458bbdc2a55d4b9e25c5c4e1f838a5dc72
|
||||
Author: Sergei Poselenov <sposelenov@emcraft.com>
|
||||
Date: Tue Feb 27 12:40:16 2007 +0300
|
||||
|
||||
MCC200 update - add LCD Progress Indicator
|
||||
|
||||
commit 6c7cac8c4fce0ea2bf8e15ed8658d87974155b44
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Thu Feb 22 07:43:34 2007 +0100
|
||||
|
||||
[PATCH] get_dev() now unconditionally uses manual relocation
|
||||
|
||||
Since the relocation fix is not included yet and we're not sure how
|
||||
it will be added, this patch removes code that required relocation
|
||||
to be fixed for now.
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit 8274ec0bd01d2feb2c7f095eba78d42ea009798b
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Thu Feb 22 07:40:23 2007 +0100
|
||||
|
||||
[PATCH] Change systemace driver to select 8 & 16bit mode
|
||||
|
||||
As suggested by Grant Likely this patch enables the Xilinx SystemACE
|
||||
driver to select 8 or 16bit mode upon startup.
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit 3a197b2fe49d6fa03978e60af2394efe9c70b527
|
||||
Author: Haiying Wang <Haiying.Wang@freescale.com>
|
||||
Date: Wed Feb 21 16:52:31 2007 +0100
|
||||
|
||||
[PATCH v3] Add sync to ensure flash_write_cmd is fully finished
|
||||
|
||||
Some CPUs like PPC, BLACKFIN need sync() to ensure cfi flash write command
|
||||
is fully finished. The sync() is defined in each CPU's io.h file. For
|
||||
those CPUs which do not need sync for now, a dummy sync() is defined in
|
||||
their io.h as well.
|
||||
|
||||
Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
|
||||
|
||||
commit da04995c7dc6772013a9a0dc5c767f190c402478
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Wed Feb 21 13:44:34 2007 +0100
|
||||
|
||||
[PATCH] Fix problem in systemace driver (ace_writew instead of ace_write)
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit 751bb57107d78978ae08e697c3deba816f5be091
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Tue Feb 20 13:21:57 2007 +0100
|
||||
|
||||
[PATCH] Fix relocation problem with "new" get_dev() function
|
||||
|
||||
This patch enables the "new" get_dev() function for block devices
|
||||
introduced by Grant Likely to be used on systems that still suffer
|
||||
from the relocation problems (manual relocation neede because of
|
||||
problems with linker script).
|
||||
|
||||
Hopefully we can resolve this relocation issue soon for all platform
|
||||
so we don't need this additional code anymore.
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit d93e2212f962668b3dce091ff5edc33f2347fe37
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Tue Feb 20 13:17:42 2007 +0100
|
||||
|
||||
[PATCH] Update SystemACE driver for 16bit access
|
||||
|
||||
This patch removes some problems when the Xilinx SystemACE driver
|
||||
is used with 16bit access on an big endian platform (like the
|
||||
AMCC Katmai).
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit 874bb7b88fe9b4648e1288a387af2e31014a72f3
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Tue Feb 20 13:15:40 2007 +0100
|
||||
|
||||
[PATCH] Clean up Katmai (440SPe) linker script
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit 4745acaa1a603b67f6b9b7970365ebadd7d6586f
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Tue Feb 20 10:57:08 2007 +0100
|
||||
|
||||
[PATCH] Add support for the AMCC Katmai (440SPe) eval board
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit 0dc018ece13effc689e47479ea9ebf1c98a507f5
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Tue Feb 20 10:51:26 2007 +0100
|
||||
|
||||
[PATCH] I2C: Add support for multiple I2C busses for RTC & DTT
|
||||
|
||||
This patch switches to the desired I2C bus when the date/dtt
|
||||
commands are called. This can be configured using the
|
||||
CFG_RTC_BUS_NUM and/or CFG_DTT_BUS_NUM defines.
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit 4037ed3b63923cfcec27f784a89057c3cbabcedb
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Tue Feb 20 10:43:34 2007 +0100
|
||||
|
||||
[PATCH] PPC4xx: Add 440SP(e) DDR2 SPD DIMM support
|
||||
|
||||
This patch adds support for the DDR2 controller used on the
|
||||
440SP and 440SPe. It is tested on the Katmai (440SPe) eval
|
||||
board and works fine with the following DIMM modules:
|
||||
|
||||
- Corsair CM2X512-5400C4 (512MByte per DIMM)
|
||||
- Kingston ValueRAM KVR667D2N5/512 (512MByte per DIMM)
|
||||
- Kingston ValueRAM KVR667D2N5K2/2G (1GByte per DIMM)
|
||||
|
||||
This patch also adds the nice functionality to dynamically
|
||||
create the TLB entries for the SDRAM (tlb.c). So we should
|
||||
never run into such problems with wrong (too short) TLB
|
||||
initialization again on these platforms.
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit 36d830c9830379045f5daa9f542ac1c990c70068
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Tue Feb 20 10:35:42 2007 +0100
|
||||
|
||||
[PATCH] PPC4xx: Split 4xx SPD SDRAM init routines into 2 files
|
||||
|
||||
Since the existing 4xx SPD SDRAM initialization routines for the
|
||||
405 SDRAM controller and the 440 DDR controller don't have much in
|
||||
common this patch splits both drivers into different files.
|
||||
|
||||
This is in preparation for the 440 DDR2 controller support (440SP/e).
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit 79b2d0bb2eae09602448f7a7cb56530d2f31e6c6
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Tue Feb 20 10:27:08 2007 +0100
|
||||
|
||||
[PATCH] PPC4xx: Add support for multiple I2C busses
|
||||
|
||||
This patch adds support for multiple I2C busses on the PPC4xx
|
||||
platforms. Define CONFIG_I2C_MULTI_BUS in the board config file
|
||||
to make use of this feature.
|
||||
|
||||
It also merges the 405 and 440 i2c header files into one common
|
||||
file 4xx_i2c.h.
|
||||
|
||||
Also the 4xx i2c reset procedure is reworked since I experienced
|
||||
some problems with the first access on the 440SPe Katmai board.
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit eb867a76238fb38e952c37871b16d0d7fd61c95f
|
||||
Author: Grant Likely <grant.likely@secretlab.ca>
|
||||
Date: Tue Feb 20 09:05:45 2007 +0100
|
||||
|
||||
[PATCH 9_9] Use "void *" not "unsigned long *" for block dev read_write buffer pointers
|
||||
|
||||
Block device read/write is anonymous data; there is no need to use a
|
||||
typed pointer. void * is fine. Also add a hook for block_read functions
|
||||
|
||||
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
|
||||
|
||||
commit 53758fa20e935cc87eeb0519ed365df753a6f289
|
||||
Author: Grant Likely <grant.likely@secretlab.ca>
|
||||
Date: Tue Feb 20 09:05:38 2007 +0100
|
||||
|
||||
[PATCH 8_9] Add block_write hook to block_dev_desc_t
|
||||
|
||||
Preparation for future patches which support block device writing
|
||||
|
||||
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
|
||||
|
||||
commit f4852ebe6ca946a509667eb68be42026f837be76
|
||||
Author: Grant Likely <grant.likely@secretlab.ca>
|
||||
Date: Tue Feb 20 09:05:31 2007 +0100
|
||||
|
||||
[PATCH 7_9] Replace ace_readw_ace_writeb functions with macros
|
||||
|
||||
Register read/write does not need to be wrapped in a full function. The
|
||||
patch replaces them with macros.
|
||||
|
||||
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
|
||||
|
||||
commit 3a8ce9af6fcb5744a7851b4440c07688acc40844
|
||||
Author: Grant Likely <grant.likely@secretlab.ca>
|
||||
Date: Tue Feb 20 09:05:23 2007 +0100
|
||||
|
||||
[PATCH 6_9] Move common_cmd_ace.c to drivers_systemace.c
|
||||
|
||||
The code in this file is not a command; it is a device driver. Put it in
|
||||
the correct place. There are zero functional changes in this patch, it
|
||||
only moves the file.
|
||||
|
||||
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
|
||||
|
||||
commit 984618f3e7794c783ec8d1511e74c6ee2d69bfe4
|
||||
Author: Grant Likely <grant.likely@secretlab.ca>
|
||||
Date: Tue Feb 20 09:05:16 2007 +0100
|
||||
|
||||
[PATCH 5_9] Whitespace fixup on common_cmd_ace.c (using Lindent)
|
||||
|
||||
This patch is in preparation of additional changes to the sysace driver.
|
||||
May as well take this opportunity to fixup the inconsistent whitespace since
|
||||
this file is about to undergo major changes anyway.
|
||||
|
||||
There are zero functional changes in this patch. It only cleans up the
|
||||
the whitespace.
|
||||
|
||||
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
|
||||
|
||||
commit 80ba981d940471fe7e539e64fa3d2bd80002beda
|
||||
Author: Grant Likely <grant.likely@secretlab.ca>
|
||||
Date: Tue Feb 20 09:05:07 2007 +0100
|
||||
|
||||
[PATCH 4_4] Remove local implementation of isprint() in ft_build.c
|
||||
|
||||
isprint is already defined in ctype.c
|
||||
|
||||
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
|
||||
|
||||
commit c95c4280d751ca078c2ff58228d2f2b44ccf0600
|
||||
Author: Grant Likely <grant.likely@secretlab.ca>
|
||||
Date: Tue Feb 20 09:05:00 2007 +0100
|
||||
|
||||
[PATCH 3_9] Move buffer print code from md command to common function
|
||||
|
||||
Printing a buffer is a darn useful thing. Move the buffer print code
|
||||
into print_buffer() in lib_generic/
|
||||
|
||||
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
|
||||
|
||||
commit 99b0f0fd3fbf2572ae1a7723dd90cffc8e85130a
|
||||
Author: Grant Likely <grant.likely@secretlab.ca>
|
||||
Date: Tue Feb 20 09:04:52 2007 +0100
|
||||
|
||||
[PATCH 2_4] Use config.h, not xparameters.h, for xilinx targets
|
||||
|
||||
Change the xilinx device drivers and board code to include config.h
|
||||
instead of xparameters.h directly. config.h always includes the
|
||||
correct xparameters file. This change reduces the posibility of
|
||||
including the wrong file when adding a new xilinx board port
|
||||
|
||||
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
|
||||
|
||||
commit 735dd97b1b20e777d059c7b389fe9d70cd3f80c7
|
||||
Author: Grant Likely <grant.likely@secretlab.ca>
|
||||
Date: Tue Feb 20 09:04:34 2007 +0100
|
||||
|
||||
[PATCH 1_4] Merge common get_dev() routines for block devices
|
||||
|
||||
Each of the filesystem drivers duplicate the get_dev routine. This change
|
||||
merges them into a single function in part.c
|
||||
|
||||
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
|
||||
|
||||
commit f5fcc3c20b65554e98a165542c36ee0c610a2d81
|
||||
Author: Wolfgang Denk <wd@pollux.denx.de>
|
||||
Date: Mon Feb 19 23:09:51 2007 +0100
|
||||
|
||||
MCC200: Software Updater: allow both "ramdisk" and "filesystem" types
|
||||
as root file system images.
|
||||
|
||||
commit 489c696ae7211218961d159e43e722d74c36fcbc
|
||||
Author: Sergei Poselenov <sposelenov@emcraft.com>
|
||||
Date: Wed Feb 14 14:30:28 2007 +0300
|
||||
|
||||
MCC200: Extensions to Software Update Mechanism
|
||||
|
||||
Update / extend Software Update Mechanism for MCC200 board:
|
||||
|
||||
- Add support for rootfs image added. The environment variables
|
||||
"rootfs_st" and "rootfs_nd" can be used to override the default
|
||||
values of the image start and end.
|
||||
- Remove excessive key check code.
|
||||
- Code cleanup.
|
||||
|
||||
commit 4be23a12f23f1372634edc3215137b09768b7949
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Mon Feb 19 08:23:15 2007 +0100
|
||||
|
||||
[PATCH] Update Sequoia EBC configuration (NOR FLASH)
|
||||
|
||||
As spotted by Matthias Fuchs, the READY input should not be
|
||||
enabled for the NOR FLASH on the Sequoia board.
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit 497d012e5be0194e1084073d0081eb1a844796b2
|
||||
Author: Gary Jennejohn <garyj@pollux.denx.de>
|
||||
Date: Mon Feb 12 13:11:50 2007 +0100
|
||||
|
||||
LPC2292: patch from Siemens.
|
||||
|
||||
commit b0b1a920aebead0d44146e73676ae9d80fffc8e2
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Sat Feb 10 08:49:31 2007 +0100
|
||||
|
||||
[PATCH] Add missing p3mx.h file to repository (ups)
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit 53d4a4983fb9b3ae5f7b2f10c599aca2b1b4034a
|
||||
Author: Bartlomiej Sieka <tur@semihalf.com>
|
||||
Date: Fri Feb 9 10:45:42 2007 +0100
|
||||
|
||||
[Motion-PRO] Preliminary support for the Motion-PRO board.
|
||||
|
||||
commit 5a753f98c6a01bd1c61a9a3f95e8329a35f62994
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Wed Feb 7 16:51:08 2007 +0100
|
||||
|
||||
[PATCH] Update some AMCC 4xx board config files (set initrd_high)
|
||||
|
||||
Some boards that can have more than 768MBytes of SDRAM need to
|
||||
set "initrd_high", so that the initrd can be accessed by the
|
||||
Linux kernel.
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit 7372ca68227930d03cffa548310524cad5b96733
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Fri Feb 2 12:44:22 2007 +0100
|
||||
|
||||
[PATCH] Correctly display PCI arbiter en-/disabled on some 4xx boards
|
||||
|
||||
Previously the strapping DCR/SDR was read to determine if the internal PCI
|
||||
arbiter is enabled or not. This strapping bit can be overridden, so now
|
||||
the current status is read from the correct DCR/SDR register.
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit 2aa54f651a42d198673318f07a20c89a43e4d197
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Fri Feb 2 12:42:08 2007 +0100
|
||||
|
||||
[PATCH] Change configuration output of Sycamore, Yellowstone & Rainier
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit 23744d6b5bf17592eb6a0ef4f318f6089f55993b
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Thu Feb 1 13:22:41 2007 +0100
|
||||
|
||||
[PATCH] Remove PCI-PNP configuration from Sequoia/Rainier config file
|
||||
|
||||
When PCI PNP is enabled the pci pnp configuration routine is called
|
||||
which sets the PCI_CACHE_SIZE_LINE to 8. This seems to generate some
|
||||
problems with some PCI cards. For now disable the PCI PNP configuration.
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit 2902fadade3be7659467e8d074048c6b7068f5c0
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Wed Jan 31 16:56:10 2007 +0100
|
||||
|
||||
[PATCH] Update 440EPx/440GRx cpu detection
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit d5ea287b02a6945c3977410e364a879dd1a555c8
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Wed Jan 31 16:38:04 2007 +0100
|
||||
|
||||
[PATCH] Update esd cpci5200 files
|
||||
|
||||
Signed-off-by: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
|
||||
|
||||
commit 8b7d1f0ab7d7c4fe3160bbf74a7e9690d9f3a3ab
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Wed Jan 31 16:37:34 2007 +0100
|
||||
|
||||
[PATCH] Add support for esd mecp5200 board
|
||||
|
||||
Signed-off-by: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
|
||||
|
||||
commit 71a4e5fda8b60044ab9f46069fa1cfa26bdd07ff
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Wed Jan 31 12:38:50 2007 +0100
|
||||
|
||||
[PATCH] Remove unneccessary yellowstone board config file
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit e802594b6fa1b166308820c276b96dc0d7cc731c
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Tue Jan 30 17:06:10 2007 +0100
|
||||
|
||||
[PATCH] Update Sequoia (440EPx) config file
|
||||
|
||||
The config file now handles the 2nd target, the Rainier (440GRx)
|
||||
evaluation board better. Additionally the PPC input clock was
|
||||
adjusted to match the correct value of 33.0 MHz.
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit 700200c67e73b83751418abe7815840dca8fd6cb
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Tue Jan 30 17:04:19 2007 +0100
|
||||
|
||||
[PATCH] Merge Yosemite & Yellowstone board ports
|
||||
|
||||
Now the AMCC eval boards Yosemite (440EP) and Yellowstone (440GR)
|
||||
share one config file and all board specific files. This way we
|
||||
don't have to maintain two different sets of files for nearly
|
||||
identical boards.
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit 1bbf5eae322f5f1f6427ecc3ac13a0cb7dba8ad6
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Tue Jan 30 15:01:49 2007 +0100
|
||||
|
||||
[PATCH] Update Prodrive SCPU (PDNB3 variant) board
|
||||
|
||||
SCPU doesn't use redundant environment in flash.
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit 6304430ed642ea8fa15c9e5af965ac2e033eec45
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Tue Jan 30 12:51:07 2007 +0100
|
||||
|
||||
[PATCH] alpr: Update alpr board config file
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit f8db84f132b1e335f20f96138a1f09ed97b08664
|
||||
Author: Wolfgang Denk <wd@pollux.denx.de>
|
||||
Date: Tue Jan 30 00:50:40 2007 +0100
|
||||
|
||||
LPC2292 SODIMM port coding style cleanup.
|
||||
|
||||
commit 6bd2447ee47ee23c18d2b3c7ccd5a20f7626f5b3
|
||||
Author: Gary Jennejohn <garyj@pollux.denx.de>
|
||||
Date: Wed Jan 24 12:16:56 2007 +0100
|
||||
|
|
|
|||
|
|
@ -366,12 +366,12 @@ int misc_init_r ()
|
|||
dcache_lock ();
|
||||
#endif
|
||||
if (flash_info[3].size < CFG_FLASH_INCREMENT) {
|
||||
unsigned int flash_offset;
|
||||
unsigned int flash_offset;
|
||||
unsigned int l;
|
||||
|
||||
flash_offset = CFG_FLASH_INCREMENT - flash_info[3].size;
|
||||
for (l = 0; l < CFG_MAX_FLASH_SECT; l++) {
|
||||
if (flash_info[3].start[l] != 0) {
|
||||
if (flash_info[3].start[l] != 0) {
|
||||
flash_info[3].start[l] += flash_offset;
|
||||
}
|
||||
}
|
||||
|
|
@ -503,7 +503,7 @@ static void move64 (unsigned long long *src, unsigned long long *dest)
|
|||
{
|
||||
asm ("lfd 0, 0(3)\n\t" /* fpr0 = *scr */
|
||||
"stfd 0, 0(4)" /* *dest = fpr0 */
|
||||
: : : "fr0"); /* Clobbers fr0 */
|
||||
: : : "fr0"); /* Clobbers fr0 */
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -581,9 +581,9 @@ int mem_test_data (void)
|
|||
move64 (&(pattern[i]), pmem);
|
||||
move64 (pmem, &temp64);
|
||||
|
||||
/* hi = (temp64>>32) & 0xffffffff; */
|
||||
/* lo = temp64 & 0xffffffff; */
|
||||
/* printf("\ntemp64 = 0x%08x%08x", hi, lo); */
|
||||
/* hi = (temp64>>32) & 0xffffffff; */
|
||||
/* lo = temp64 & 0xffffffff; */
|
||||
/* printf("\ntemp64 = 0x%08x%08x", hi, lo); */
|
||||
|
||||
hi = (pattern[i] >> 32) & 0xffffffff;
|
||||
lo = pattern[i] & 0xffffffff;
|
||||
|
|
@ -856,11 +856,11 @@ int testdram (void)
|
|||
}
|
||||
#endif /* CFG_DRAM_TEST */
|
||||
|
||||
/* ronen - the below functions are used by the bootm function */
|
||||
/* ronen - the below functions are used by the bootm function */
|
||||
/* - we map the base register to fbe00000 (same mapping as in the LSP) */
|
||||
/* - we turn off the RX gig dmas - to prevent the dma from overunning */
|
||||
/* the kernel data areas. */
|
||||
/* - we diable and invalidate the icache and dcache. */
|
||||
/* the kernel data areas. */
|
||||
/* - we diable and invalidate the icache and dcache. */
|
||||
void my_remap_gt_regs_bootm (u32 cur_loc, u32 new_loc)
|
||||
{
|
||||
u32 temp;
|
||||
|
|
@ -911,13 +911,11 @@ int do_show_cfg(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
|
|||
GT_REG_READ(0x3d4, &reset_sample_high);
|
||||
printf("Reset configuration 0x%08x 0x%08x\n", reset_sample_low, reset_sample_high);
|
||||
|
||||
return(0);
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
||||
U_BOOT_CMD(
|
||||
show_cfg, 1, 1, do_show_cfg,
|
||||
"show_cfg- Show Marvell strapping register\n",
|
||||
"Show Marvell strapping register (ResetSampleLow ResetSampleHigh)\n"
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -106,6 +106,8 @@ struct flash_layout aufl_layout[AU_MAXFILES] = {
|
|||
{ AU_FL_ROOTFS_ST, AU_FL_ROOTFS_ND, },
|
||||
};
|
||||
|
||||
ulong totsize;
|
||||
|
||||
/* where to load files into memory */
|
||||
#define LOAD_ADDR ((unsigned char *)0x00200000)
|
||||
|
||||
|
|
@ -130,6 +132,11 @@ extern int flash_sect_erase(ulong, ulong);
|
|||
extern int flash_sect_protect (int, ulong, ulong);
|
||||
extern int flash_write (char *, ulong, ulong);
|
||||
extern int u_boot_hush_start(void);
|
||||
#ifdef CONFIG_PROGRESSBAR
|
||||
extern void show_progress(int, int);
|
||||
extern void lcd_puts (char *);
|
||||
extern void lcd_enable(void);
|
||||
#endif
|
||||
|
||||
int au_check_cksum_valid(int idx, long nbytes)
|
||||
{
|
||||
|
|
@ -168,10 +175,12 @@ int au_check_header_valid(int idx, long nbytes)
|
|||
#endif
|
||||
if (nbytes < sizeof(*hdr)) {
|
||||
printf ("Image %s bad header SIZE\n", aufile[idx]);
|
||||
ausize[idx] = 0;
|
||||
return -1;
|
||||
}
|
||||
if (ntohl(hdr->ih_magic) != IH_MAGIC || hdr->ih_arch != IH_CPU_PPC) {
|
||||
printf ("Image %s bad MAGIC or ARCH\n", aufile[idx]);
|
||||
ausize[idx] = 0;
|
||||
return -1;
|
||||
}
|
||||
/* check the hdr CRC */
|
||||
|
|
@ -180,22 +189,26 @@ int au_check_header_valid(int idx, long nbytes)
|
|||
|
||||
if (crc32 (0, (uchar *)hdr, sizeof(*hdr)) != checksum) {
|
||||
printf ("Image %s bad header checksum\n", aufile[idx]);
|
||||
ausize[idx] = 0;
|
||||
return -1;
|
||||
}
|
||||
hdr->ih_hcrc = htonl(checksum);
|
||||
/* check the type - could do this all in one gigantic if() */
|
||||
if ((idx == IDX_FIRMWARE) && (hdr->ih_type != IH_TYPE_FIRMWARE)) {
|
||||
printf ("Image %s wrong type\n", aufile[idx]);
|
||||
ausize[idx] = 0;
|
||||
return -1;
|
||||
}
|
||||
if ((idx == IDX_KERNEL) && (hdr->ih_type != IH_TYPE_KERNEL)) {
|
||||
printf ("Image %s wrong type\n", aufile[idx]);
|
||||
ausize[idx] = 0;
|
||||
return -1;
|
||||
}
|
||||
if ((idx == IDX_ROOTFS) &&
|
||||
( (hdr->ih_type != IH_TYPE_RAMDISK) || (hdr->ih_type != IH_TYPE_FILESYSTEM) )
|
||||
) {
|
||||
printf ("Image %s wrong type\n", aufile[idx]);
|
||||
ausize[idx] = 0;
|
||||
return -1;
|
||||
}
|
||||
/* recycle checksum */
|
||||
|
|
@ -203,13 +216,17 @@ int au_check_header_valid(int idx, long nbytes)
|
|||
/* for kernel and app the image header must also fit into flash */
|
||||
if (idx != IDX_FIRMWARE)
|
||||
checksum += sizeof(*hdr);
|
||||
|
||||
/* check the size does not exceed space in flash. HUSH scripts */
|
||||
/* all have ausize[] set to 0 */
|
||||
if ((ausize[idx] != 0) && (ausize[idx] < checksum)) {
|
||||
printf ("Image %s is bigger than FLASH\n", aufile[idx]);
|
||||
ausize[idx] = 0;
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
/* Update with the real filesize */
|
||||
ausize[idx] = (idx == IDX_FIRMWARE ? checksum + sizeof(*hdr) : checksum);
|
||||
|
||||
return checksum; /* return size to be written to flash */
|
||||
}
|
||||
|
||||
int au_do_update(int idx, long sz)
|
||||
|
|
@ -254,6 +271,10 @@ int au_do_update(int idx, long sz)
|
|||
debug ("flash_sect_erase(%lx, %lx);\n", start, end);
|
||||
flash_sect_erase(start, end);
|
||||
wait_ms(100);
|
||||
#ifdef CONFIG_PROGRESSBAR
|
||||
show_progress(end - start, totsize);
|
||||
#endif
|
||||
|
||||
/* strip the header - except for the kernel and ramdisk */
|
||||
if (hdr->ih_type == IH_TYPE_KERNEL || hdr->ih_type == IH_TYPE_RAMDISK) {
|
||||
addr = (char *)hdr;
|
||||
|
|
@ -278,6 +299,10 @@ int au_do_update(int idx, long sz)
|
|||
return -1;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PROGRESSBAR
|
||||
show_progress(nbytes, totsize);
|
||||
#endif
|
||||
|
||||
/* check the data CRC of the copy */
|
||||
if (crc32 (0, (uchar *)(start + off), ntohl(hdr->ih_size)) != ntohl(hdr->ih_dcrc)) {
|
||||
printf ("Image %s Bad Data Checksum after COPY\n", aufile[idx]);
|
||||
|
|
@ -300,7 +325,7 @@ int do_auto_update(void)
|
|||
{
|
||||
block_dev_desc_t *stor_dev;
|
||||
long sz;
|
||||
int i, res, bitmap_first, cnt, old_ctrlc, got_ctrlc;
|
||||
int i, res = 0, bitmap_first, cnt, old_ctrlc, got_ctrlc;
|
||||
char *env;
|
||||
long start, end;
|
||||
uchar keypad_status1[2] = {0,0}, keypad_status2[2] = {0,0};
|
||||
|
|
@ -319,6 +344,7 @@ int do_auto_update(void)
|
|||
(keypad_status1[1] != keypad_status2[1])) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
au_usb_stor_curr_dev = -1;
|
||||
/* start USB */
|
||||
if (usb_stop() < 0) {
|
||||
|
|
@ -403,23 +429,50 @@ int do_auto_update(void)
|
|||
old_ctrlc = disable_ctrlc(0);
|
||||
|
||||
bitmap_first = 0;
|
||||
/* just loop thru all the possible files */
|
||||
|
||||
/* validate the images first */
|
||||
for (i = 0; i < AU_MAXFILES; i++) {
|
||||
ulong imsize;
|
||||
/* just read the header */
|
||||
sz = file_fat_read(aufile[i], LOAD_ADDR, sizeof(image_header_t));
|
||||
debug ("read %s sz %ld hdr %d\n",
|
||||
aufile[i], sz, sizeof(image_header_t));
|
||||
if (sz <= 0 || sz < sizeof(image_header_t)) {
|
||||
debug ("%s not found\n", aufile[i]);
|
||||
ausize[i] = 0;
|
||||
continue;
|
||||
}
|
||||
if (au_check_header_valid(i, sz) < 0) {
|
||||
/* au_check_header_valid() updates ausize[] */
|
||||
if ((imsize = au_check_header_valid(i, sz)) < 0) {
|
||||
debug ("%s header not valid\n", aufile[i]);
|
||||
continue;
|
||||
}
|
||||
sz = file_fat_read(aufile[i], LOAD_ADDR, MAX_LOADSZ);
|
||||
/* totsize accounts for image size and flash erase size */
|
||||
totsize += (imsize + (aufl_layout[i].end - aufl_layout[i].start));
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PROGRESSBAR
|
||||
if (totsize) {
|
||||
lcd_puts(" Update in progress\n");
|
||||
lcd_enable();
|
||||
}
|
||||
#endif
|
||||
|
||||
/* just loop thru all the possible files */
|
||||
for (i = 0; i < AU_MAXFILES && totsize; i++) {
|
||||
if (!ausize[i]) {
|
||||
continue;
|
||||
}
|
||||
sz = file_fat_read(aufile[i], LOAD_ADDR, ausize[i]);
|
||||
|
||||
debug ("read %s sz %ld hdr %d\n",
|
||||
aufile[i], sz, sizeof(image_header_t));
|
||||
|
||||
if (sz != ausize[i]) {
|
||||
printf ("%s: size %d read %d?\n", aufile[i], ausize[i], sz);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (sz <= 0 || sz <= sizeof(image_header_t)) {
|
||||
debug ("%s not found\n", aufile[i]);
|
||||
continue;
|
||||
|
|
@ -452,6 +505,16 @@ int do_auto_update(void)
|
|||
usb_stop();
|
||||
/* restore the old state */
|
||||
disable_ctrlc(old_ctrlc);
|
||||
#ifdef CONFIG_PROGRESSBAR
|
||||
if (totsize) {
|
||||
if (!res) {
|
||||
lcd_puts("\n Update completed\n");
|
||||
} else {
|
||||
lcd_puts("\n Update error\n");
|
||||
}
|
||||
lcd_enable();
|
||||
}
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
#endif /* CONFIG_AUTO_UPDATE */
|
||||
|
|
|
|||
|
|
@ -24,13 +24,13 @@
|
|||
|
||||
#ifdef CONFIG_LCD
|
||||
|
||||
#define SWAPPED_LCD
|
||||
#undef SWAPPED_LCD /* For the previous h/w version */
|
||||
/*
|
||||
* The name of the device used for communication
|
||||
* with the PSoC.
|
||||
*/
|
||||
#define PSOC_PSC MPC5XXX_PSC2
|
||||
#define PSOC_BAUD 500000UL
|
||||
#define PSOC_BAUD 230400UL
|
||||
|
||||
#define RTS_ASSERT 1
|
||||
#define RTS_NEGATE 0
|
||||
|
|
@ -181,10 +181,35 @@ void lcd_enable (void)
|
|||
udelay (PSOC_WAIT_TIME);
|
||||
}
|
||||
if (!retries) {
|
||||
printf ("%s Error: PSoC doesn't respond on "
|
||||
printf ("%s Warning: PSoC doesn't respond on "
|
||||
"RTS NEGATE\n", __FUNCTION__);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
#ifdef CONFIG_PROGRESSBAR
|
||||
|
||||
#define FONT_WIDTH 8 /* the same as VIDEO_FONT_WIDTH in video_font.h */
|
||||
void show_progress (int size, int tot)
|
||||
{
|
||||
int cnt;
|
||||
int i;
|
||||
static int rc = 0;
|
||||
|
||||
rc += size;
|
||||
|
||||
cnt = ((LCD_WIDTH/FONT_WIDTH) * rc) / tot;
|
||||
|
||||
rc -= (cnt * tot) / (LCD_WIDTH/FONT_WIDTH);
|
||||
|
||||
for (i = 0; i < cnt; i++) {
|
||||
lcd_putc(0xdc);
|
||||
}
|
||||
|
||||
if (cnt) {
|
||||
lcd_enable(); /* MCC200-specific - send the framebuffer to PSoC */
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif /* CONFIG_LCD */
|
||||
|
|
|
|||
|
|
@ -141,11 +141,12 @@ long int initdram (int board_type)
|
|||
dramsize = 0;
|
||||
|
||||
/* set SDRAM CS0 size according to the amount of RAM found */
|
||||
if (dramsize > 0)
|
||||
if (dramsize > 0) {
|
||||
*(vu_long *)MPC5XXX_SDRAM_CS0CFG = 0x13 +
|
||||
__builtin_ffs(dramsize >> 20) - 1;
|
||||
else
|
||||
} else {
|
||||
*(vu_long *)MPC5XXX_SDRAM_CS0CFG = 0; /* disabled */
|
||||
}
|
||||
|
||||
/* let SDRAM CS1 start right after CS0 and disable it */
|
||||
*(vu_long *) MPC5XXX_SDRAM_CS1CFG = dramsize;
|
||||
|
|
|
|||
|
|
@ -31,4 +31,3 @@
|
|||
#define LED_ORANGE 4
|
||||
|
||||
#endif /* __P3MX_H__ */
|
||||
|
||||
|
|
|
|||
|
|
@ -48,10 +48,10 @@
|
|||
* Defines
|
||||
*-----------------------------------------------------------------------------*/
|
||||
#ifndef TRUE
|
||||
#define TRUE 1
|
||||
#define TRUE 1
|
||||
#endif
|
||||
#ifndef FALSE
|
||||
#define FALSE 0
|
||||
#define FALSE 0
|
||||
#endif
|
||||
|
||||
#define SDRAM_DDR1 1
|
||||
|
|
@ -199,9 +199,9 @@ static void program_DQS_calibration(unsigned long *dimm_populated,
|
|||
unsigned char *iic0_dimm_addr,
|
||||
unsigned long num_dimm_banks);
|
||||
#ifdef HARD_CODED_DQS /* calibration test with hardvalues */
|
||||
static void test(void);
|
||||
static void test(void);
|
||||
#else
|
||||
static void DQS_calibration_process(void);
|
||||
static void DQS_calibration_process(void);
|
||||
#endif
|
||||
#if defined(DEBUG)
|
||||
static void ppc440sp_sdram_register_dump(void);
|
||||
|
|
@ -354,12 +354,12 @@ static unsigned long sdram_memsize(void)
|
|||
* .data sections. It also cannot call routines that require these sections.
|
||||
*-----------------------------------------------------------------------------*/
|
||||
/*-----------------------------------------------------------------------------
|
||||
* Function: initdram
|
||||
* Function: initdram
|
||||
* Description: Configures SDRAM memory banks for DDR operation.
|
||||
* Auto Memory Configuration option reads the DDR SDRAM EEPROMs
|
||||
* via the IIC bus and then configures the DDR SDRAM memory
|
||||
* banks appropriately. If Auto Memory Configuration is
|
||||
* not used, it is assumed that no DIMM is plugged
|
||||
* Auto Memory Configuration option reads the DDR SDRAM EEPROMs
|
||||
* via the IIC bus and then configures the DDR SDRAM memory
|
||||
* banks appropriately. If Auto Memory Configuration is
|
||||
* not used, it is assumed that no DIMM is plugged
|
||||
*-----------------------------------------------------------------------------*/
|
||||
long int initdram(int board_type)
|
||||
{
|
||||
|
|
@ -589,10 +589,10 @@ static void get_spd_info(unsigned long *dimm_populated,
|
|||
#ifdef CONFIG_ADD_RAM_INFO
|
||||
void board_add_ram_info(int use_default)
|
||||
{
|
||||
if (is_ecc_enabled())
|
||||
puts(" (ECC enabled)");
|
||||
else
|
||||
puts(" (ECC not enabled)");
|
||||
if (is_ecc_enabled())
|
||||
puts(" (ECC enabled)");
|
||||
else
|
||||
puts(" (ECC not enabled)");
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -1165,7 +1165,7 @@ static void program_initplr(unsigned long *dimm_populated,
|
|||
|
||||
/******************************************************
|
||||
** Assumption: if more than one DIMM, all DIMMs are the same
|
||||
** as already checked in check_memory_type
|
||||
** as already checked in check_memory_type
|
||||
******************************************************/
|
||||
|
||||
if ((dimm_populated[0] == SDRAM_DDR1) || (dimm_populated[1] == SDRAM_DDR1)) {
|
||||
|
|
|
|||
|
|
@ -1859,11 +1859,11 @@ pll_wait:
|
|||
|
||||
#if defined(CONFIG_440)
|
||||
#define function_prolog(func_name) .text; \
|
||||
.align 2; \
|
||||
.globl func_name; \
|
||||
func_name:
|
||||
.align 2; \
|
||||
.globl func_name; \
|
||||
func_name:
|
||||
#define function_epilog(func_name) .type func_name,@function; \
|
||||
.size func_name,.-func_name
|
||||
.size func_name,.-func_name
|
||||
|
||||
/*----------------------------------------------------------------------------+
|
||||
| mttlb3.
|
||||
|
|
@ -1877,7 +1877,7 @@ pll_wait:
|
|||
| mftlb3.
|
||||
+----------------------------------------------------------------------------*/
|
||||
function_prolog(mftlb3)
|
||||
TLBRE(3,3,2)
|
||||
TLBRE(3,3,2)
|
||||
blr
|
||||
function_epilog(mftlb3)
|
||||
|
||||
|
|
@ -1893,7 +1893,7 @@ pll_wait:
|
|||
| mftlb2.
|
||||
+----------------------------------------------------------------------------*/
|
||||
function_prolog(mftlb2)
|
||||
TLBRE(3,3,1)
|
||||
TLBRE(3,3,1)
|
||||
blr
|
||||
function_epilog(mftlb2)
|
||||
|
||||
|
|
@ -1909,7 +1909,7 @@ pll_wait:
|
|||
| mftlb1.
|
||||
+----------------------------------------------------------------------------*/
|
||||
function_prolog(mftlb1)
|
||||
TLBRE(3,3,0)
|
||||
TLBRE(3,3,0)
|
||||
blr
|
||||
function_epilog(mftlb1)
|
||||
|
||||
|
|
|
|||
|
|
@ -37,8 +37,8 @@ typedef struct region {
|
|||
} region_t;
|
||||
|
||||
static int add_tlb_entry(unsigned long base_addr,
|
||||
unsigned long tlb_word0_size_value,
|
||||
unsigned long tlb_word2_i_value)
|
||||
unsigned long tlb_word0_size_value,
|
||||
unsigned long tlb_word2_i_value)
|
||||
{
|
||||
int i;
|
||||
unsigned long tlb_word0_value;
|
||||
|
|
@ -82,7 +82,7 @@ static int add_tlb_entry(unsigned long base_addr,
|
|||
}
|
||||
|
||||
static void program_tlb_addr(unsigned long base_addr, unsigned long mem_size,
|
||||
unsigned long tlb_word2_i_value)
|
||||
unsigned long tlb_word2_i_value)
|
||||
{
|
||||
int rc;
|
||||
int tlb_i;
|
||||
|
|
|
|||
|
|
@ -56,12 +56,12 @@
|
|||
#if (CFG_SYSTEMACE_WIDTH == 8)
|
||||
#if !defined(__BIG_ENDIAN)
|
||||
#define ace_readw(off) ((readb(CFG_SYSTEMACE_BASE+off)<<8) | \
|
||||
(readb(CFG_SYSTEMACE_BASE+off+1)))
|
||||
(readb(CFG_SYSTEMACE_BASE+off+1)))
|
||||
#define ace_writew(val, off) {writeb(val>>8, CFG_SYSTEMACE_BASE+off); \
|
||||
writeb(val, CFG_SYSTEMACE_BASE+off+1);}
|
||||
#else
|
||||
#define ace_readw(off) ((readb(CFG_SYSTEMACE_BASE+off)) | \
|
||||
(readb(CFG_SYSTEMACE_BASE+off+1)<<8))
|
||||
(readb(CFG_SYSTEMACE_BASE+off+1)<<8))
|
||||
#define ace_writew(val, off) {writeb(val, CFG_SYSTEMACE_BASE+off); \
|
||||
writeb(val>>8, CFG_SYSTEMACE_BASE+off+1);}
|
||||
#endif
|
||||
|
|
@ -73,7 +73,7 @@
|
|||
/* */
|
||||
|
||||
static unsigned long systemace_read(int dev, unsigned long start,
|
||||
unsigned long blkcnt, void *buffer);
|
||||
unsigned long blkcnt, void *buffer);
|
||||
|
||||
static block_dev_desc_t systemace_dev = { 0 };
|
||||
|
||||
|
|
@ -137,7 +137,7 @@ block_dev_desc_t *systemace_get_dev(int dev)
|
|||
* number of blocks read. A zero return indicates an error.
|
||||
*/
|
||||
static unsigned long systemace_read(int dev, unsigned long start,
|
||||
unsigned long blkcnt, void *buffer)
|
||||
unsigned long blkcnt, void *buffer)
|
||||
{
|
||||
int retry;
|
||||
unsigned blk_countdown;
|
||||
|
|
|
|||
|
|
@ -187,8 +187,7 @@ void hang (void) __attribute__ ((noreturn));
|
|||
long int initdram (int);
|
||||
int display_options (void);
|
||||
void print_size (ulong, const char *);
|
||||
int print_buffer (ulong addr, void* data, uint width, uint count,
|
||||
uint linelen);
|
||||
int print_buffer (ulong addr, void* data, uint width, uint count, uint linelen);
|
||||
|
||||
/* common/main.c */
|
||||
void main_loop (void);
|
||||
|
|
|
|||
|
|
@ -265,6 +265,7 @@
|
|||
*/
|
||||
#if !defined(CONFIG_PRS200)
|
||||
#define CONFIG_LCD 1
|
||||
#define CONFIG_PROGRESSBAR 1
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_LCD)
|
||||
|
|
|
|||
|
|
@ -88,10 +88,10 @@
|
|||
/* USB */
|
||||
#if 0
|
||||
#define CONFIG_USB_OHCI
|
||||
#define ADD_USB_CMD CFG_CMD_USB | CFG_CMD_FAT
|
||||
#define ADD_USB_CMD CFG_CMD_USB | CFG_CMD_FAT
|
||||
#define CONFIG_USB_STORAGE
|
||||
#else
|
||||
#define ADD_USB_CMD 0
|
||||
#define ADD_USB_CMD 0
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
@ -100,7 +100,7 @@
|
|||
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
|
||||
CFG_CMD_EEPROM | \
|
||||
CFG_CMD_FAT | \
|
||||
CFG_CMD_EXT2 | \
|
||||
CFG_CMD_EXT2 | \
|
||||
CFG_CMD_I2C | \
|
||||
CFG_CMD_IDE | \
|
||||
CFG_CMD_BSP | \
|
||||
|
|
@ -110,11 +110,11 @@
|
|||
#include <cmd_confdefs.h>
|
||||
|
||||
#if (TEXT_BASE == 0xFF000000) /* Boot low with 16 MB Flash */
|
||||
# define CFG_LOWBOOT 1
|
||||
# define CFG_LOWBOOT 1
|
||||
# define CFG_LOWBOOT16 1
|
||||
#endif
|
||||
#if (TEXT_BASE == 0xFF800000) /* Boot low with 8 MB Flash */
|
||||
# define CFG_LOWBOOT 1
|
||||
# define CFG_LOWBOOT 1
|
||||
# define CFG_LOWBOOT08 1
|
||||
#endif
|
||||
|
||||
|
|
@ -131,20 +131,20 @@
|
|||
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
"netdev=eth0\0" \
|
||||
"flash_vxworks0=run ata_vxworks_args;setenv loadaddr ff000000;bootvx\0" \
|
||||
"flash_vxworks1=run ata_vxworks_args;setenv loadaddr ff200000:bootvx\0" \
|
||||
"net_vxworks=tftp $(loadaddr) $(image);run vxworks_args;bootvx\0" \
|
||||
"vxworks_args=setenv bootargs fec(0,0)$(host):$(image) h=$(serverip) e=$(ipaddr) g=$(gatewayip) u=$(user) $(pass) tn=$(target) s=$(script)\0" \
|
||||
"ata_vxworks_args=setenv bootargs /ata0/vxWorks h=$(serverip) e=$(ipaddr) g=$(gatewayip) u=$(user) $(pass) tn=$(target) s=$(script) o=fec0 \0" \
|
||||
"loadaddr=01000000\0" \
|
||||
"serverip=192.168.2.99\0" \
|
||||
"gatewayip=10.0.0.79\0" \
|
||||
"user=mu\0" \
|
||||
"target=mecp5200.esd\0" \
|
||||
"script=mecp5200.bat\0" \
|
||||
"image=/tftpboot/vxWorks_mecp5200\0" \
|
||||
"ipaddr=10.0.13.196\0" \
|
||||
"netmask=255.255.0.0\0" \
|
||||
"flash_vxworks0=run ata_vxworks_args;setenv loadaddr ff000000;bootvx\0" \
|
||||
"flash_vxworks1=run ata_vxworks_args;setenv loadaddr ff200000:bootvx\0" \
|
||||
"net_vxworks=tftp $(loadaddr) $(image);run vxworks_args;bootvx\0" \
|
||||
"vxworks_args=setenv bootargs fec(0,0)$(host):$(image) h=$(serverip) e=$(ipaddr) g=$(gatewayip) u=$(user) $(pass) tn=$(target) s=$(script)\0" \
|
||||
"ata_vxworks_args=setenv bootargs /ata0/vxWorks h=$(serverip) e=$(ipaddr) g=$(gatewayip) u=$(user) $(pass) tn=$(target) s=$(script) o=fec0 \0" \
|
||||
"loadaddr=01000000\0" \
|
||||
"serverip=192.168.2.99\0" \
|
||||
"gatewayip=10.0.0.79\0" \
|
||||
"user=mu\0" \
|
||||
"target=mecp5200.esd\0" \
|
||||
"script=mecp5200.bat\0" \
|
||||
"image=/tftpboot/vxWorks_mecp5200\0" \
|
||||
"ipaddr=10.0.13.196\0" \
|
||||
"netmask=255.255.0.0\0" \
|
||||
""
|
||||
|
||||
#define CONFIG_BOOTCOMMAND "run flash_vxworks0"
|
||||
|
|
@ -171,12 +171,12 @@
|
|||
#define CFG_I2C_EEPROM_ADDR_LEN 2
|
||||
#define CFG_EEPROM_PAGE_WRITE_BITS 5
|
||||
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 20
|
||||
#define CFG_I2C_MULTI_EEPROMS 1
|
||||
#define CFG_I2C_MULTI_EEPROMS 1
|
||||
/*
|
||||
* Flash configuration
|
||||
*/
|
||||
#define CFG_FLASH_BASE 0xFFC00000
|
||||
#define CFG_FLASH_SIZE 0x00400000
|
||||
#define CFG_FLASH_SIZE 0x00400000
|
||||
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x003E0000)
|
||||
#define CFG_MAX_FLASH_BANKS 1 /* max num of memory banks */
|
||||
#define CFG_MAX_FLASH_SECT 512
|
||||
|
|
@ -200,15 +200,15 @@
|
|||
#define CONFIG_ENV_OVERWRITE 1
|
||||
#endif
|
||||
|
||||
#define CFG_FLASH_CFI_DRIVER 1 /* Flash is CFI conformant */
|
||||
#define CFG_FLASH_CFI 1 /* Flash is CFI conformant */
|
||||
#define CFG_FLASH_PROTECTION 1 /* use hardware protection */
|
||||
#define CFG_FLASH_CFI_DRIVER 1 /* Flash is CFI conformant */
|
||||
#define CFG_FLASH_CFI 1 /* Flash is CFI conformant */
|
||||
#define CFG_FLASH_PROTECTION 1 /* use hardware protection */
|
||||
#if 0
|
||||
#define CFG_FLASH_USE_BUFFER_WRITE 1 /* use buffered writes (20x faster) */
|
||||
#endif
|
||||
#define CFG_FLASH_INCREMENT 0x00400000 /* size of flash bank */
|
||||
#define CFG_FLASH_INCREMENT 0x00400000 /* size of flash bank */
|
||||
#define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE }
|
||||
#define CFG_FLASH_EMPTY_INFO 1 /* show if bank is empty */
|
||||
#define CFG_FLASH_EMPTY_INFO 1 /* show if bank is empty */
|
||||
|
||||
|
||||
/*
|
||||
|
|
@ -272,7 +272,7 @@
|
|||
|
||||
#define CFG_LOAD_ADDR 0x100000 /* default load address */
|
||||
|
||||
#define CFG_HZ 1000 /* decrementer freq: 1 ms ticks */
|
||||
#define CFG_HZ 1000 /* decrementer freq: 1 ms ticks */
|
||||
|
||||
#define CFG_VXWORKS_MAC_PTR 0x00000000 /* Pass Ethernet MAC to VxWorks */
|
||||
|
||||
|
|
@ -339,7 +339,7 @@
|
|||
/* Offset for alternate registers */
|
||||
#define CFG_ATA_ALT_OFFSET (0x005C)
|
||||
|
||||
/* Interval between registers */
|
||||
#define CFG_ATA_STRIDE 4
|
||||
/* Interval between registers */
|
||||
#define CFG_ATA_STRIDE 4
|
||||
|
||||
#endif /* __CONFIG_H */
|
||||
|
|
|
|||
|
|
@ -56,6 +56,14 @@
|
|||
#define I2C_SET_BUS(a)
|
||||
#endif
|
||||
|
||||
/* define the I2C bus number for RTC and DTT if not already done */
|
||||
#if !defined(CFG_RTC_BUS_NUM)
|
||||
#define CFG_RTC_BUS_NUM 0
|
||||
#endif
|
||||
#if !defined(CFG_DTT_BUS_NUM)
|
||||
#define CFG_DTT_BUS_NUM 0
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Initialization, must be called once on start up, may be called
|
||||
* repeatedly to change the speed and slave addresses.
|
||||
|
|
|
|||
Loading…
Reference in a new issue