aboutsummaryrefslogtreecommitdiff
path: root/disk/part.c
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2007-02-22 07:43:34 +0100
committerStefan Roese <sr@denx.de>2007-02-22 07:43:34 +0100
commit6c7cac8c4fce0ea2bf8e15ed8658d87974155b44 (patch)
tree7476129d5e2353171e7c81b9b1d315d0d82c8fd1 /disk/part.c
parent8274ec0bd01d2feb2c7f095eba78d42ea009798b (diff)
downloadu-boot-linaro-natty-6c7cac8c4fce0ea2bf8e15ed8658d87974155b44.tar.gz
[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>
Diffstat (limited to 'disk/part.c')
-rw-r--r--disk/part.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/disk/part.c b/disk/part.c
index 37bba77dd..9e8bd4fb8 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -64,25 +64,17 @@ static const struct block_drvr block_drvr[] = {
{ },
};
-#ifndef CFG_FIXUP_RELOCATION
DECLARE_GLOBAL_DATA_PTR;
-#endif
block_dev_desc_t *get_dev(char* ifname, int dev)
{
const struct block_drvr *drvr = block_drvr;
+ block_dev_desc_t* (*reloc_get_dev)(int dev);
while (drvr->name) {
-#ifndef CFG_FIXUP_RELOCATION
- block_dev_desc_t* (*reloc_get_dev)(int dev);
-
reloc_get_dev = drvr->get_dev + gd->reloc_off;
if (strncmp(ifname, drvr->name, strlen(drvr->name)) == 0)
return reloc_get_dev(dev);
-#else
- if (strncmp(ifname, drvr->name, strlen(drvr->name)) == 0)
- return drvr->get_dev(dev);
-#endif
drvr++;
}
return NULL;