made PAE enabled by accident and fixed libmagicrt.h

Change-Id: Ia09d8b9a68aa2e1522d66ed93453de9d7d802cb2
This commit is contained in:
rlfnb 2016-08-05 16:41:30 +02:00 committed by David van Moolenbroek
parent 3083d603ba
commit 3c71801e8e
2 changed files with 3 additions and 3 deletions

View File

@ -40,7 +40,7 @@ typedef struct _st_init_info_t {
typedef struct st_alloc_pages { typedef struct st_alloc_pages {
int num_pages; int num_pages;
void *virt_addr; void *virt_addr;
phys_bytes phys_addr; uint32_t phys_addr;
struct st_alloc_pages *previous; struct st_alloc_pages *previous;
} st_alloc_pages; } st_alloc_pages;

View File

@ -1268,7 +1268,7 @@ _MKVARS.yes+= \
MKSYSDEBUG MKLIVEUPDATE MKLWIP MKLLVMCMDS MKSYSDEBUG MKLIVEUPDATE MKLWIP MKLLVMCMDS
.if (${MACHINE_ARCH} == "i386") .if (${MACHINE_ARCH} == "i386")
_MKVARS.yes+= \ _MKVARS.yes+= \
MKWATCHDOG MKACPI MKPAE MKAPIC MKDEBUGREG MKINSTALLBOOT MKPCI MKWATCHDOG MKACPI MKAPIC MKDEBUGREG MKINSTALLBOOT MKPCI
.endif .endif
.for var in ${_MKVARS.yes} .for var in ${_MKVARS.yes}
@ -1306,7 +1306,7 @@ _MKVARS.no= \
#MINIX-specific vars #MINIX-specific vars
_MKVARS.no+= \ _MKVARS.no+= \
MKIMAGEONLY MKSMALL MKBITCODE MKMAGIC MKASR MKSRC MKIMAGEONLY MKSMALL MKBITCODE MKMAGIC MKPAE MKASR MKSRC
.if !empty(MACHINE_ARCH:Mearm*) .if !empty(MACHINE_ARCH:Mearm*)
_MKVARS.no+= \ _MKVARS.no+= \
MKWATCHDOG MKPAE MKACPI MKAPIC MKDEBUGREG MKINSTALLBOOT MKPCI MKWATCHDOG MKPAE MKACPI MKAPIC MKDEBUGREG MKINSTALLBOOT MKPCI