From b5d65fa442f2ee9a995424c3480ab59b217a3daa Mon Sep 17 00:00:00 2001 From: Peter Mitsis Date: Tue, 14 Apr 2015 14:20:53 -0400 Subject: [PATCH] Remove VIRT_ADDR_xxx macros The VIRT_ADDR_xxx macros are no longer used. Signed-off-by: Peter Mitsis --- arch/x86/generic_pc/board.h | 3 --- arch/x86/quark/board.h | 3 --- include/linker-defs.h | 2 +- include/nanokernel/x86/addr_types.h | 3 +-- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/arch/x86/generic_pc/board.h b/arch/x86/generic_pc/board.h index 4d882f977ff..b9f8a09063a 100644 --- a/arch/x86/generic_pc/board.h +++ b/arch/x86/generic_pc/board.h @@ -152,9 +152,6 @@ the 'generic_pc' BSP. NANO_CPU_INT_REGISTER(s, INT_VEC_IRQ0 + (irq), 0) #endif -/* Start of the 4 MB virtual address space */ -#define VIRT_ADDR_START 0x00000000 - #ifndef _ASMLANGUAGE /* * Device drivers utilize the macros PLB_BYTE_REG_WRITE() and diff --git a/arch/x86/quark/board.h b/arch/x86/quark/board.h index d231a2873b2..66540772a7f 100644 --- a/arch/x86/quark/board.h +++ b/arch/x86/quark/board.h @@ -137,9 +137,6 @@ the 'Quark' BSP. NANO_CPU_INT_REGISTER(s, INT_VEC_IRQ0 + (irq), 0) #endif -/* Start of the 4 MB virtual address space */ -#define VIRT_ADDR_START 0x00000000 - /* PCI definitions */ #define PCI_CTRL_ADDR_REG 0xCF8 #define PCI_CTRL_DATA_REG 0xCFC diff --git a/include/linker-defs.h b/include/linker-defs.h index b1509d124b9..d8108c8f932 100644 --- a/include/linker-defs.h +++ b/include/linker-defs.h @@ -100,7 +100,7 @@ extern int __data_num_words[]; /* C FILES: declaration defined by the linker script */ #ifdef VXMICRO_ARCH_x86 -#include /* VIRT_ADDR, PHYS_ADDR */ +#include #endif /* VXMICRO_ARCH_x86 */ /* end address of image. */ diff --git a/include/nanokernel/x86/addr_types.h b/include/nanokernel/x86/addr_types.h index 558e6317c1a..1f4de7b6bf8 100644 --- a/include/nanokernel/x86/addr_types.h +++ b/include/nanokernel/x86/addr_types.h @@ -35,9 +35,8 @@ typedef unsigned int PHYS_ADDR; typedef unsigned int VIRT_ADDR; + #define PHYS_ADDR_NONE (PHYS_ADDR)(-1) -#define VIRT_ADDR_NONE (VIRT_ADDR)(-1) #define PHYS_ADDR_ANY (PHYS_ADDR)(0) -#define VIRT_ADDR_ANY (VIRT_ADDR)(0) #endif /* _x86_addr_types__h_ */