Changes in kernel/arch/sparc64/Makefile.inc [95c4776:6d7f9bfe] in mainline

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/$(USARCH)/cpu.c \
+        arch/$(KARCH)/src/cpu/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 \
@@ -74 +62 @@
         arch/$(KARCH)/src/fpu_context.c \
         arch/$(KARCH)/src/dummy.s \
-        arch/$(KARCH)/src/mm/$(USARCH)/as.c \
-        arch/$(KARCH)/src/mm/$(USARCH)/frame.c \
+        arch/$(KARCH)/src/mm/as.c \
+        arch/$(KARCH)/src/mm/cache.S \
+        arch/$(KARCH)/src/mm/frame.c \
         arch/$(KARCH)/src/mm/page.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/mm/tlb.c \
+        arch/$(KARCH)/src/sparc64.c \
+        arch/$(KARCH)/src/start.S \
+        arch/$(KARCH)/src/proc/scheduler.c \
         arch/$(KARCH)/src/proc/thread.c \
-        arch/$(KARCH)/src/trap/$(USARCH)/mmu.S \
-        arch/$(KARCH)/src/trap/$(USARCH)/trap_table.S \
+        arch/$(KARCH)/src/trap/mmu.S \
+        arch/$(KARCH)/src/trap/trap_table.S \
         arch/$(KARCH)/src/trap/trap.c \
         arch/$(KARCH)/src/trap/exception.c \
@@ -92 +81 @@
         arch/$(KARCH)/src/drivers/sgcn.c \
         arch/$(KARCH)/src/drivers/pci.c \
-        arch/$(KARCH)/src/drivers/fhc.c \
-        arch/$(KARCH)/src/trap/$(USARCH)/interrupt.c
-
-ifeq ($(USARCH),sun4u)
-        ARCH_SOURCES += \
-                arch/$(KARCH)/src/mm/cache.S
-endif
-
-ifeq ($(USARCH),sun4v)
-        ARCH_SOURCES += \
-                arch/$(KARCH)/src/drivers/niagara.c \
-                arch/$(KARCH)/src/sun4v/md.c
-endif
+        arch/$(KARCH)/src/drivers/fhc.c
 
 ifeq ($(CONFIG_FB),y)
@@ -113 +90 @@
 ifeq ($(CONFIG_SMP),y)
         ARCH_SOURCES += \
-                arch/$(KARCH)/src/smp/$(USARCH)/smp.c \
-                arch/$(KARCH)/src/smp/$(USARCH)/ipi.c
+                arch/$(KARCH)/src/smp/ipi.c \
+                arch/$(KARCH)/src/smp/smp.c
 endif
 
 ifeq ($(CONFIG_TSB),y)
         ARCH_SOURCES += \
-                arch/$(KARCH)/src/mm/$(USARCH)/tsb.c
+                arch/$(KARCH)/src/mm/tsb.c
 endif