Loading arch/sh/Makefile +18 −8 Original line number Diff line number Diff line Loading @@ -91,7 +91,6 @@ LDFLAGS_vmlinux += --defsym 'jiffies=jiffies_64+4' LDFLAGS += -EB endif head-y := arch/sh/kernel/init_task.o head-$(CONFIG_SUPERH32) += arch/sh/kernel/head_32.o head-$(CONFIG_SUPERH64) += arch/sh/kernel/head_64.o Loading Loading @@ -134,11 +133,22 @@ endif # Companion chips core-$(CONFIG_HD6446X_SERIES) += arch/sh/cchips/hd6446x/ cpuincdir-$(CONFIG_CPU_SH2) := cpu-sh2 cpuincdir-$(CONFIG_CPU_SH2A) := cpu-sh2a cpuincdir-$(CONFIG_CPU_SH3) := cpu-sh3 cpuincdir-$(CONFIG_CPU_SH4) := cpu-sh4 cpuincdir-$(CONFIG_CPU_SH5) := cpu-sh5 # # CPU header paths # # These are ordered by optimization level. A CPU family that is a subset # of another (ie, SH-2A / SH-2), is picked up first, with increasing # levels of genericness if nothing more suitable is situated in the # hierarchy. # # As an example, in order of preference, SH-2A > SH-2 > common definitions. # cpuincdir-$(CONFIG_CPU_SH2A) += cpu-sh2a cpuincdir-$(CONFIG_CPU_SH2) += cpu-sh2 cpuincdir-$(CONFIG_CPU_SH3) += cpu-sh3 cpuincdir-$(CONFIG_CPU_SH4) += cpu-sh4 cpuincdir-$(CONFIG_CPU_SH5) += cpu-sh5 cpuincdir-y += cpu-common # Must be last libs-$(CONFIG_SUPERH32) := arch/sh/lib/ $(libs-y) libs-$(CONFIG_SUPERH64) := arch/sh/lib64/ $(libs-y) Loading @@ -149,8 +159,8 @@ drivers-$(CONFIG_OPROFILE) += arch/sh/oprofile/ boot := arch/sh/boot cflags-y += -Iarch/sh/include/$(cpuincdir-y) cflags-y += $(foreach d, $(machdir-y), -Iarch/sh/include/$(d)) cflags-y += $(foreach d, $(cpuincdir-y), -Iarch/sh/include/$(d)) \ $(foreach d, $(machdir-y), -Iarch/sh/include/$(d)) KBUILD_CFLAGS += -pipe $(cflags-y) KBUILD_CPPFLAGS += $(cflags-y) Loading arch/sh/include/cpu-sh2/cpu/addrspace.h→arch/sh/include/cpu-common/cpu/addrspace.h +0 −0 File moved. View file arch/sh/include/cpu-sh2/cpu/cacheflush.h→arch/sh/include/cpu-common/cpu/cacheflush.h +2 −2 Original line number Diff line number Diff line Loading @@ -40,5 +40,5 @@ #define flush_cache_sigtramp(vaddr) do { } while (0) #define p3_cache_init() do { } while (0) #endif /* __ASM_CPU_SH2_CACHEFLUSH_H */ #endif /* __ASM_CPU_SH2_CACHEFLUSH_H */ arch/sh/include/cpu-sh2/cpu/mmu_context.h→arch/sh/include/cpu-common/cpu/mmu_context.h +0 −0 File moved. View file arch/sh/include/cpu-sh2/cpu/sigcontext.h→arch/sh/include/cpu-common/cpu/sigcontext.h +0 −0 File moved. View file Loading
arch/sh/Makefile +18 −8 Original line number Diff line number Diff line Loading @@ -91,7 +91,6 @@ LDFLAGS_vmlinux += --defsym 'jiffies=jiffies_64+4' LDFLAGS += -EB endif head-y := arch/sh/kernel/init_task.o head-$(CONFIG_SUPERH32) += arch/sh/kernel/head_32.o head-$(CONFIG_SUPERH64) += arch/sh/kernel/head_64.o Loading Loading @@ -134,11 +133,22 @@ endif # Companion chips core-$(CONFIG_HD6446X_SERIES) += arch/sh/cchips/hd6446x/ cpuincdir-$(CONFIG_CPU_SH2) := cpu-sh2 cpuincdir-$(CONFIG_CPU_SH2A) := cpu-sh2a cpuincdir-$(CONFIG_CPU_SH3) := cpu-sh3 cpuincdir-$(CONFIG_CPU_SH4) := cpu-sh4 cpuincdir-$(CONFIG_CPU_SH5) := cpu-sh5 # # CPU header paths # # These are ordered by optimization level. A CPU family that is a subset # of another (ie, SH-2A / SH-2), is picked up first, with increasing # levels of genericness if nothing more suitable is situated in the # hierarchy. # # As an example, in order of preference, SH-2A > SH-2 > common definitions. # cpuincdir-$(CONFIG_CPU_SH2A) += cpu-sh2a cpuincdir-$(CONFIG_CPU_SH2) += cpu-sh2 cpuincdir-$(CONFIG_CPU_SH3) += cpu-sh3 cpuincdir-$(CONFIG_CPU_SH4) += cpu-sh4 cpuincdir-$(CONFIG_CPU_SH5) += cpu-sh5 cpuincdir-y += cpu-common # Must be last libs-$(CONFIG_SUPERH32) := arch/sh/lib/ $(libs-y) libs-$(CONFIG_SUPERH64) := arch/sh/lib64/ $(libs-y) Loading @@ -149,8 +159,8 @@ drivers-$(CONFIG_OPROFILE) += arch/sh/oprofile/ boot := arch/sh/boot cflags-y += -Iarch/sh/include/$(cpuincdir-y) cflags-y += $(foreach d, $(machdir-y), -Iarch/sh/include/$(d)) cflags-y += $(foreach d, $(cpuincdir-y), -Iarch/sh/include/$(d)) \ $(foreach d, $(machdir-y), -Iarch/sh/include/$(d)) KBUILD_CFLAGS += -pipe $(cflags-y) KBUILD_CPPFLAGS += $(cflags-y) Loading
arch/sh/include/cpu-sh2/cpu/addrspace.h→arch/sh/include/cpu-common/cpu/addrspace.h +0 −0 File moved. View file
arch/sh/include/cpu-sh2/cpu/cacheflush.h→arch/sh/include/cpu-common/cpu/cacheflush.h +2 −2 Original line number Diff line number Diff line Loading @@ -40,5 +40,5 @@ #define flush_cache_sigtramp(vaddr) do { } while (0) #define p3_cache_init() do { } while (0) #endif /* __ASM_CPU_SH2_CACHEFLUSH_H */ #endif /* __ASM_CPU_SH2_CACHEFLUSH_H */
arch/sh/include/cpu-sh2/cpu/mmu_context.h→arch/sh/include/cpu-common/cpu/mmu_context.h +0 −0 File moved. View file
arch/sh/include/cpu-sh2/cpu/sigcontext.h→arch/sh/include/cpu-common/cpu/sigcontext.h +0 −0 File moved. View file