Changeset b473611 in mainline for kernel/arch/sparc64/Makefile.inc

Timestamp:

2010-02-13T23:56:33Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e3a3a619

Parents:

e70edd1 (diff), b86d436 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge the sparc branch.
Both sun4u and sun4v appear to work.
HM cleanup is pending.

File:

• kernel/arch/sparc64/Makefile.inc (modified) (4 diffs)

kernel/arch/sparc64/Makefile.inc

@@ -46 +46 @@
 ifeq ($(PROCESSOR),us)
         DEFS += -DUS
+        DEFS += -DSUN4U
+        USARCH = sun4u
 endif
 
 ifeq ($(PROCESSOR),us3)
         DEFS += -DUS3
+        DEFS += -DSUN4U
+        USARCH = sun4u
+endif
+
+ifeq ($(PROCESSOR),sun4v)
+        DEFS += -DSUN4V
+        USARCH = sun4v
+#MH
+        DEFS += -DUS
 endif
 
 ARCH_SOURCES = \
-        arch/$(KARCH)/src/cpu/cpu.c \
+        arch/$(KARCH)/src/cpu/$(USARCH)/cpu.c \
         arch/$(KARCH)/src/debug/stacktrace.c \
         arch/$(KARCH)/src/debug/stacktrace_asm.S \
         arch/$(KARCH)/src/asm.S \
+        arch/$(KARCH)/src/$(USARCH)/asm.S \
         arch/$(KARCH)/src/panic.S \
         arch/$(KARCH)/src/console.c \
@@ -62 +74 @@
         arch/$(KARCH)/src/fpu_context.c \
         arch/$(KARCH)/src/dummy.s \
-        arch/$(KARCH)/src/mm/as.c \
+        arch/$(KARCH)/src/mm/$(USARCH)/as.c \
         arch/$(KARCH)/src/mm/cache.S \
-        arch/$(KARCH)/src/mm/frame.c \
+        arch/$(KARCH)/src/mm/$(USARCH)/frame.c \
         arch/$(KARCH)/src/mm/page.c \
-        arch/$(KARCH)/src/mm/tlb.c \
-        arch/$(KARCH)/src/sparc64.c \
-        arch/$(KARCH)/src/start.S \
-        arch/$(KARCH)/src/proc/scheduler.c \
+        arch/$(KARCH)/src/mm/$(USARCH)/tlb.c \
+        arch/$(KARCH)/src/$(USARCH)/sparc64.c \
+        arch/$(KARCH)/src/$(USARCH)/start.S \
+        arch/$(KARCH)/src/proc/$(USARCH)/scheduler.c \
         arch/$(KARCH)/src/proc/thread.c \
-        arch/$(KARCH)/src/trap/mmu.S \
-        arch/$(KARCH)/src/trap/trap_table.S \
+        arch/$(KARCH)/src/trap/$(USARCH)/mmu.S \
+        arch/$(KARCH)/src/trap/$(USARCH)/trap_table.S \
         arch/$(KARCH)/src/trap/trap.c \
         arch/$(KARCH)/src/trap/exception.c \
@@ -82 +94 @@
         arch/$(KARCH)/src/drivers/pci.c \
         arch/$(KARCH)/src/drivers/fhc.c
+
+ifeq ($(USARCH),sun4v)
+        ARCH_SOURCES += \
+                arch/$(KARCH)/src/drivers/niagara.c \
+                arch/$(KARCH)/src/sun4v/md.c
+endif
 
 ifeq ($(CONFIG_FB),y)
@@ -96 +114 @@
 ifeq ($(CONFIG_TSB),y)
         ARCH_SOURCES += \
-                arch/$(KARCH)/src/mm/tsb.c
+                arch/$(KARCH)/src/mm/$(USARCH)/tsb.c
 endif