diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2008-08-19 17:49:53 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2008-08-19 17:49:53 +0000 |
| commit | 99c085690365fa7af18863be292d7ada32fcf53a (patch) | |
| tree | 8c305cfb60e6cb7e95bfe99321070528c7a5e649 /payloads/libpayload/i386 | |
| parent | addf443e1206f04e46828ac4f19a04788a8046fc (diff) | |
make all drivers relocatable. Per default, an 1:1 mapping is assumed.
Patch to add relocation to libpayload will follow.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Jordan Crouse <jordan.crouse@amd.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3524 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'payloads/libpayload/i386')
| -rw-r--r-- | payloads/libpayload/i386/Makefile.inc | 3 | ||||
| -rw-r--r-- | payloads/libpayload/i386/coreboot.c | 4 | ||||
| -rw-r--r-- | payloads/libpayload/i386/virtual.c | 32 |
3 files changed, 36 insertions, 3 deletions
diff --git a/payloads/libpayload/i386/Makefile.inc b/payloads/libpayload/i386/Makefile.inc index f12511f3e1..bb6bcb5a11 100644 --- a/payloads/libpayload/i386/Makefile.inc +++ b/payloads/libpayload/i386/Makefile.inc @@ -29,4 +29,5 @@ TARGETS-y += i386/head.S.o i386/main.o i386/sysinfo.o TARGETS-y += i386/timer.o i386/coreboot.o i386/util.S.o -TARGETS-y += i386/exec.S.o +TARGETS-y += i386/exec.S.o i386/virtual.o + diff --git a/payloads/libpayload/i386/coreboot.c b/payloads/libpayload/i386/coreboot.c index af76f182fc..d27e0f3abb 100644 --- a/payloads/libpayload/i386/coreboot.c +++ b/payloads/libpayload/i386/coreboot.c @@ -152,10 +152,10 @@ static int cb_parse_header(void *addr, int len, struct sysinfo_t *info) int get_coreboot_info(struct sysinfo_t *info) { - int ret = cb_parse_header((void *)0x0, 0x1000, info); + int ret = cb_parse_header(phys_to_virt(0x00000000), 0x1000, info); if (ret != 1) - ret = cb_parse_header((void *)0xf0000, 0x1000, info); + ret = cb_parse_header(phys_to_virt(0x000f0000), 0x1000, info); return (ret == 1) ? 0 : -1; } diff --git a/payloads/libpayload/i386/virtual.c b/payloads/libpayload/i386/virtual.c new file mode 100644 index 0000000000..cff26117dc --- /dev/null +++ b/payloads/libpayload/i386/virtual.c @@ -0,0 +1,32 @@ +/* + * This file is part of the libpayload project. + * + * Copyright (C) 2008 coresystems GmbH + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + + +unsigned long virtual_offset = 0; + |