diff options
| author | wdenk <wdenk> | 2003-10-15 23:53:47 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-10-15 23:53:47 +0000 |
| commit | 42d1f0394bef0624fc9664714d54bb137931d6a6 (patch) | |
| tree | 892a4130507484d25faf9a72e019cf88cfb3e3d9 /board/icecube | |
| parent | 2d5b561e2bfdee8552a99b2cf93016cce2a74895 (diff) | |
| download | talos-obmc-uboot-42d1f0394bef0624fc9664714d54bb137931d6a6.tar.gz talos-obmc-uboot-42d1f0394bef0624fc9664714d54bb137931d6a6.zip | |
* Patches by Xianghua Xiao, 15 Oct 2003:
- Added Motorola CPU 8540/8560 support (cpu/85xx)
- Added Motorola MPC8540ADS board support (board/mpc8540ads)
- Added Motorola MPC8560ADS board support (board/mpc8560ads)
* Minor code cleanup
Diffstat (limited to 'board/icecube')
| -rw-r--r-- | board/icecube/flash.c | 4 | ||||
| -rw-r--r-- | board/icecube/icecube.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/board/icecube/flash.c b/board/icecube/flash.c index 07879ffb07..4ae71e661c 100644 --- a/board/icecube/flash.c +++ b/board/icecube/flash.c @@ -123,7 +123,7 @@ static flash_info_t *flash_get_info(ulong base) for (i = 0; i < CFG_MAX_FLASH_BANKS; i ++) { info = & flash_info[i]; - if (info->size && + if (info->size && info->start[0] <= base && base <= info->start[0] + info->size - 1) break; } @@ -260,7 +260,7 @@ ulong flash_get_size (FPWV *addr, flash_info_t *info) addr2 = (FPW *)((ulong)addr | 0x800000); if (addr2 != addr && ((addr2[0] & 0xff) == (addr[0] & 0xff)) && ((FPW)addr2[1] == (FPW)addr[1])) { - /* Seems 2 banks are the same space (8Mb chip is installed, + /* Seems 2 banks are the same space (8Mb chip is installed, * J24 in default position (CS0)). Disable this (first) bank. */ info->flash_id = FLASH_UNKNOWN; diff --git a/board/icecube/icecube.c b/board/icecube/icecube.c index 965ca6b59c..26cce5d0bc 100644 --- a/board/icecube/icecube.c +++ b/board/icecube/icecube.c @@ -174,9 +174,9 @@ void flash_preinit(void) void flash_afterinit(ulong size) { if (size == 0x800000) { /* adjust mapping */ - *(vu_long *)MPC5XXX_BOOTCS_START = *(vu_long *)MPC5XXX_CS0_START = + *(vu_long *)MPC5XXX_BOOTCS_START = *(vu_long *)MPC5XXX_CS0_START = START_REG(CFG_BOOTCS_START | size); - *(vu_long *)MPC5XXX_BOOTCS_STOP = *(vu_long *)MPC5XXX_CS0_STOP = + *(vu_long *)MPC5XXX_BOOTCS_STOP = *(vu_long *)MPC5XXX_CS0_STOP = STOP_REG(CFG_BOOTCS_START | size, size); } } |
