diff options
| -rw-r--r-- | payloads/libpayload/arch/mips/Makefile.inc | 1 | ||||
| -rw-r--r-- | payloads/libpayload/arch/mips/virtual.c | 28 | ||||
| -rw-r--r-- | payloads/libpayload/include/mips/arch/virtual.h | 20 |
3 files changed, 12 insertions, 37 deletions
diff --git a/payloads/libpayload/arch/mips/Makefile.inc b/payloads/libpayload/arch/mips/Makefile.inc index 223b3df4f9..a6c4bd1c86 100644 --- a/payloads/libpayload/arch/mips/Makefile.inc +++ b/payloads/libpayload/arch/mips/Makefile.inc @@ -36,4 +36,3 @@ libc-y += sysinfo.c libc-y += string.c libc-y += timer.c libc-y += util.S -libc-y += virtual.c diff --git a/payloads/libpayload/arch/mips/virtual.c b/payloads/libpayload/arch/mips/virtual.c deleted file mode 100644 index 5c110d0f21..0000000000 --- a/payloads/libpayload/arch/mips/virtual.c +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of the libpayload project. - * - * Copyright (C) 2014 Imagination Technologies - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include <unistd.h> - -unsigned long virt_to_phys_offset = 0; -unsigned long virt_to_bus_offset = 0x60000000; - -int getpagesize(void) -{ - return 4096; -}; diff --git a/payloads/libpayload/include/mips/arch/virtual.h b/payloads/libpayload/include/mips/arch/virtual.h index f470393b35..8c645e6b10 100644 --- a/payloads/libpayload/include/mips/arch/virtual.h +++ b/payloads/libpayload/include/mips/arch/virtual.h @@ -20,15 +20,19 @@ #ifndef __MIPS_ARCH_VIRTUAL_H #define __MIPS_ARCH_VIRTUAL_H -extern unsigned long virt_to_phys_offset; -extern unsigned long virt_to_bus_offset; +#define KSEG0_BASE 0x80000000 +#define KSEG1_BASE 0xA0000000 -#define virt_to_phys(virt) ((unsigned long) (virt) + virt_to_phys_offset) -#define phys_to_virt(phys) ((void *) ((unsigned long) (phys) - \ - virt_to_phys_offset)) +#define kseg0_to_phys(virt) ((unsigned long)(virt) - KSEG0_BASE) +#define phys_to_kseg0(phys) ((void *)((unsigned long)(phys) + KSEG0_BASE)) -#define virt_to_bus(virt) ((unsigned long) (virt) + virt_to_bus_offset) -#define bus_to_virt(phys) ((void *) ((unsigned long) (phys) - \ - virt_to_bus_offset)) +#define kseg1_to_phys(virt) ((unsigned long)(virt) - KSEG1_BASE) +#define phys_to_kseg1(phys) ((void *)((unsigned long)(phys) + KSEG1_BASE)) + +#define virt_to_phys(virt) ((unsigned long)(virt)) +#define phys_to_virt(phys) ((void *)(unsigned long)(phys)) + +#define virt_to_bus(virt) kseg1_to_phys(virt) +#define bus_to_virt(phys) phys_to_kseg1(phys) #endif |