Changeset c913e456 in mainline

Timestamp:

2005-08-11T14:39:20Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f79e357

Parents:

04b1b8a

Message:

remove cyclic including, change linker script path

Files:

• arch/ppc/Makefile.inc (modified) (2 diffs)
• arch/ppc/include/mm/page.h (modified) (2 diffs)
• src/mm/page.c (modified) (1 diff)

arch/ppc/Makefile.inc

@@ -1 @@
-MIPS_CC_DIR=/usr/local/ppc/bin
-CC=$(MIPS_CC_DIR)/ppc-linux-gnu-gcc
-AS=$(MIPS_CC_DIR)/ppc-linux-gnu-as
-LD=$(MIPS_CC_DIR)/ppc-linux-gnu-ld
+PPC_CC_DIR=/usr/local/ppc/bin
+CC=$(PPC_CC_DIR)/ppc-linux-gnu-gcc
+AS=$(PPC_CC_DIR)/ppc-linux-gnu-as
+LD=$(PPC_CC_DIR)/ppc-linux-gnu-ld
 
 ASFLAGS=
@@ -9 +9 @@
 CPPFLAGS=$(DEFS) -nostdinc -I../include
 CFLAGS=$(CPPFLAGS) -nostdlib -fno-builtin -Wmissing-prototypes -Werror -O2
-LFLAGS=-M -no-check-sections -T ../arch/mips/_link.ld
+LFLAGS=-M -no-check-sections -T ../arch/ppc/_link.ld
 
 arch_sources= \

arch/ppc/include/mm/page.h

@@ -30 +30 @@
 #define __ppc_PAGE_H__
 
+
+
 #include <mm/page.h>
 #include <arch/mm/frame.h>
 #include <arch/types.h>
-#include <arch.h>
 
 #define PAGE_SIZE       FRAME_SIZE
@@ -45 +46 @@
 #define PTL3_INDEX_ARCH(vaddr)          0
 
-#define GET_PTL0_ADDRESS_ARCH()
+#define GET_PTL0_ADDRESS_ARCH()         0
 #define SET_PTL0_ADDRESS_ARCH(ptl0)
 

src/mm/page.c

@@ -77 +77 @@
         __address newpt;
 
-        ptl0 = (pte_t *) PA2KA(root ? root : (__address) GET_PTL0_ADDRESS());
+//      ptl0 = (pte_t *) PA2KA(root ? root : (__address) GET_PTL0_ADDRESS());
 
         if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT) {