From 751bb57107d78978ae08e697c3deba816f5be091 Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Tue, 20 Feb 2007 13:21:57 +0100 Subject: [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 --- disk/part.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'disk') diff --git a/disk/part.c b/disk/part.c index f1026c5ef..37bba77dd 100644 --- a/disk/part.c +++ b/disk/part.c @@ -64,13 +64,25 @@ 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; 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; -- cgit v1.2.3