diff options
author | wdenk <wdenk> | 2004-04-18 17:39:38 +0000 |
---|---|---|
committer | wdenk <wdenk> | 2004-04-18 17:39:38 +0000 |
commit | 6e5923851ec5c11a36136abc77160d834537c4dd (patch) | |
tree | 1d324917e695bf3aadc0041d220304d07d09027a /disk | |
parent | c26e454dfc6650428854fa2db3b1ed7f19e0ba0e (diff) | |
download | u-boot-6e5923851ec5c11a36136abc77160d834537c4dd.tar.gz u-boot-6e5923851ec5c11a36136abc77160d834537c4dd.tar.xz u-boot-6e5923851ec5c11a36136abc77160d834537c4dd.zip |
* Cleanup, minor fixes
* Patch by Rune Torgersen, 16 Apr 2004:
LBA48 fixes
* Patches by Pantelis Antoniou, 16 Apr 2004:
- Fix some compile problems;
add "once" functionality for the netretry variable
Diffstat (limited to 'disk')
-rw-r--r-- | disk/part.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/disk/part.c b/disk/part.c index 90d6644ae4..0e9ddbd9f8 100644 --- a/disk/part.c +++ b/disk/part.c @@ -87,12 +87,8 @@ void dev_print (block_dev_desc_t *dev_desc) if ((dev_desc->lba * dev_desc->blksz)>0L) { ulong mb, mb_quot, mb_rem, gb, gb_quot, gb_rem; lbaint_t lba; -#ifdef CONFIG_LBA48 - if (dev_desc->lba48support) - lba = dev_desc->lba48; - else -#endif - lba = dev_desc->lba; + + lba = dev_desc->lba; lba512 = (lba * (dev_desc->blksz/512)); mb = (10 * lba512) / 2048; /* 2048 = (1024 * 1024) / 512 MB */ @@ -104,7 +100,7 @@ void dev_print (block_dev_desc_t *dev_desc) gb_quot = gb / 10; gb_rem = gb - (10 * gb_quot); #ifdef CONFIG_LBA48 - if (dev_desc->lba48support) + if (dev_desc->lba48) printf (" Supports 48-bit addressing\n"); #endif #if defined(CFG_64BIT_LBA) && defined(CFG_64BIT_VSPRINTF) |