From 3adbb7f4a32dd34993ebe3829c69694f0c5fc85b Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sat, 16 Oct 2010 10:11:22 +0200 Subject: [PATCH 1/8] x86: Add platform directory x86 has finally arrived in the embedded nightmare and will rapidly grow SoC platform support in various flavours. So we need a place for the platform support files. That also allows us to clean up the dumpground which arch/x86/kernel has become over time. Signed-off-by: Thomas Gleixner --- arch/x86/Kbuild | 1 + arch/x86/platform/Makefile | 1 + 2 files changed, 2 insertions(+) create mode 100644 arch/x86/platform/Makefile diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild index ad8ec356fb363..0e103236b754f 100644 --- a/arch/x86/Kbuild +++ b/arch/x86/Kbuild @@ -14,3 +14,4 @@ obj-y += crypto/ obj-y += vdso/ obj-$(CONFIG_IA32_EMULATION) += ia32/ +obj-y += platform/ diff --git a/arch/x86/platform/Makefile b/arch/x86/platform/Makefile new file mode 100644 index 0000000000000..fdf4113befba1 --- /dev/null +++ b/arch/x86/platform/Makefile @@ -0,0 +1 @@ +# Platform specific code goes here From 937f961a6539b0ac5ebf31472b90810bc1f02200 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sat, 16 Oct 2010 10:16:59 +0200 Subject: [PATCH 2/8] x86: Move sfi to platform Signed-off-by: Thomas Gleixner Cc: Len Brown Cc: Alan Cox --- arch/x86/kernel/Makefile | 1 - arch/x86/platform/Makefile | 1 + arch/x86/platform/sfi/Makefile | 1 + arch/x86/{kernel => platform/sfi}/sfi.c | 0 4 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 arch/x86/platform/sfi/Makefile rename arch/x86/{kernel => platform/sfi}/sfi.c (100%) diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 2c833d8c41418..d9067d10c6af4 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -58,7 +58,6 @@ obj-$(CONFIG_INTEL_TXT) += tboot.o obj-$(CONFIG_STACKTRACE) += stacktrace.o obj-y += cpu/ obj-y += acpi/ -obj-$(CONFIG_SFI) += sfi.o obj-y += reboot.o obj-$(CONFIG_MCA) += mca_32.o obj-$(CONFIG_X86_MSR) += msr.o diff --git a/arch/x86/platform/Makefile b/arch/x86/platform/Makefile index fdf4113befba1..a964fa3c08685 100644 --- a/arch/x86/platform/Makefile +++ b/arch/x86/platform/Makefile @@ -1 +1,2 @@ # Platform specific code goes here +obj-y += sfi/ diff --git a/arch/x86/platform/sfi/Makefile b/arch/x86/platform/sfi/Makefile new file mode 100644 index 0000000000000..cc5db1168a5ec --- /dev/null +++ b/arch/x86/platform/sfi/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_SFI) += sfi.o diff --git a/arch/x86/kernel/sfi.c b/arch/x86/platform/sfi/sfi.c similarity index 100% rename from arch/x86/kernel/sfi.c rename to arch/x86/platform/sfi/sfi.c From b17ed48040d9e8b6ae35bc492015bf0fe1c8bae4 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sat, 16 Oct 2010 10:19:54 +0200 Subject: [PATCH 3/8] x86: Move efi to platform Signed-off-by: Thomas Gleixner Cc: Huang Ying --- arch/x86/kernel/Makefile | 1 - arch/x86/platform/Makefile | 1 + arch/x86/platform/efi/Makefile | 1 + arch/x86/{kernel => platform/efi}/efi.c | 0 arch/x86/{kernel => platform/efi}/efi_32.c | 0 arch/x86/{kernel => platform/efi}/efi_64.c | 0 arch/x86/{kernel => platform/efi}/efi_stub_32.S | 0 arch/x86/{kernel => platform/efi}/efi_stub_64.S | 0 8 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 arch/x86/platform/efi/Makefile rename arch/x86/{kernel => platform/efi}/efi.c (100%) rename arch/x86/{kernel => platform/efi}/efi_32.c (100%) rename arch/x86/{kernel => platform/efi}/efi_64.c (100%) rename arch/x86/{kernel => platform/efi}/efi_stub_32.S (100%) rename arch/x86/{kernel => platform/efi}/efi_stub_64.S (100%) diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index d9067d10c6af4..b01c7b1ac1bab 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -81,7 +81,6 @@ obj-$(CONFIG_KEXEC) += relocate_kernel_$(BITS).o crash.o obj-$(CONFIG_CRASH_DUMP) += crash_dump_$(BITS).o obj-$(CONFIG_KPROBES) += kprobes.o obj-$(CONFIG_MODULES) += module.o -obj-$(CONFIG_EFI) += efi.o efi_$(BITS).o efi_stub_$(BITS).o obj-$(CONFIG_DOUBLEFAULT) += doublefault_32.o obj-$(CONFIG_KGDB) += kgdb.o obj-$(CONFIG_VM86) += vm86_32.o diff --git a/arch/x86/platform/Makefile b/arch/x86/platform/Makefile index a964fa3c08685..99e95b32ae7db 100644 --- a/arch/x86/platform/Makefile +++ b/arch/x86/platform/Makefile @@ -1,2 +1,3 @@ # Platform specific code goes here +obj-y += efi/ obj-y += sfi/ diff --git a/arch/x86/platform/efi/Makefile b/arch/x86/platform/efi/Makefile new file mode 100644 index 0000000000000..73b8be0f3675e --- /dev/null +++ b/arch/x86/platform/efi/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_EFI) += efi.o efi_$(BITS).o efi_stub_$(BITS).o diff --git a/arch/x86/kernel/efi.c b/arch/x86/platform/efi/efi.c similarity index 100% rename from arch/x86/kernel/efi.c rename to arch/x86/platform/efi/efi.c diff --git a/arch/x86/kernel/efi_32.c b/arch/x86/platform/efi/efi_32.c similarity index 100% rename from arch/x86/kernel/efi_32.c rename to arch/x86/platform/efi/efi_32.c diff --git a/arch/x86/kernel/efi_64.c b/arch/x86/platform/efi/efi_64.c similarity index 100% rename from arch/x86/kernel/efi_64.c rename to arch/x86/platform/efi/efi_64.c diff --git a/arch/x86/kernel/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S similarity index 100% rename from arch/x86/kernel/efi_stub_32.S rename to arch/x86/platform/efi/efi_stub_32.S diff --git a/arch/x86/kernel/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S similarity index 100% rename from arch/x86/kernel/efi_stub_64.S rename to arch/x86/platform/efi/efi_stub_64.S From c4e72ad6bbbbbf1f826df3a5d3e3c4af2f4d48c9 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sat, 16 Oct 2010 10:33:09 +0200 Subject: [PATCH 4/8] x86: Move visws to platform Signed-off-by: Thomas Gleixner --- arch/x86/kernel/Makefile | 1 - arch/x86/platform/Makefile | 1 + arch/x86/platform/visws/Makefile | 1 + arch/x86/{kernel => platform/visws}/visws_quirks.c | 0 4 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 arch/x86/platform/visws/Makefile rename arch/x86/{kernel => platform/visws}/visws_quirks.c (100%) diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index b01c7b1ac1bab..28c4f3f2e97dc 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -36,7 +36,6 @@ obj-y += traps.o irq.o irq_$(BITS).o dumpstack_$(BITS).o obj-y += time.o ioport.o ldt.o dumpstack.o obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o obj-$(CONFIG_IRQ_WORK) += irq_work.o -obj-$(CONFIG_X86_VISWS) += visws_quirks.o obj-$(CONFIG_X86_32) += probe_roms_32.o obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o diff --git a/arch/x86/platform/Makefile b/arch/x86/platform/Makefile index 99e95b32ae7db..e629d7a428cb4 100644 --- a/arch/x86/platform/Makefile +++ b/arch/x86/platform/Makefile @@ -1,3 +1,4 @@ # Platform specific code goes here obj-y += efi/ obj-y += sfi/ +obj-y += visws/ diff --git a/arch/x86/platform/visws/Makefile b/arch/x86/platform/visws/Makefile new file mode 100644 index 0000000000000..91bc17ab2fd50 --- /dev/null +++ b/arch/x86/platform/visws/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_X86_VISWS) += visws_quirks.o diff --git a/arch/x86/kernel/visws_quirks.c b/arch/x86/platform/visws/visws_quirks.c similarity index 100% rename from arch/x86/kernel/visws_quirks.c rename to arch/x86/platform/visws/visws_quirks.c From 3b3da9d25ae9d8cac99302ad66834499cf324d08 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sat, 16 Oct 2010 10:35:51 +0200 Subject: [PATCH 5/8] x86: Move scx200 to platform Signed-off-by: Thomas Gleixner --- arch/x86/kernel/Makefile | 3 --- arch/x86/platform/Makefile | 1 + arch/x86/platform/scx200/Makefile | 2 ++ arch/x86/{kernel => platform/scx200}/scx200_32.c | 0 4 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 arch/x86/platform/scx200/Makefile rename arch/x86/{kernel => platform/scx200}/scx200_32.c (100%) diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 28c4f3f2e97dc..f57eeea4bc161 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -101,9 +101,6 @@ obj-$(CONFIG_PARAVIRT_CLOCK) += pvclock.o obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o -obj-$(CONFIG_SCx200) += scx200.o -scx200-y += scx200_32.o - obj-$(CONFIG_OLPC) += olpc.o obj-$(CONFIG_OLPC_XO1) += olpc-xo1.o obj-$(CONFIG_OLPC_OPENFIRMWARE) += olpc_ofw.o diff --git a/arch/x86/platform/Makefile b/arch/x86/platform/Makefile index e629d7a428cb4..1191989e9f00e 100644 --- a/arch/x86/platform/Makefile +++ b/arch/x86/platform/Makefile @@ -1,4 +1,5 @@ # Platform specific code goes here obj-y += efi/ +obj-y += scx200/ obj-y += sfi/ obj-y += visws/ diff --git a/arch/x86/platform/scx200/Makefile b/arch/x86/platform/scx200/Makefile new file mode 100644 index 0000000000000..762b4c7f43143 --- /dev/null +++ b/arch/x86/platform/scx200/Makefile @@ -0,0 +1,2 @@ +obj-$(CONFIG_SCx200) += scx200.o +scx200-y += scx200_32.o diff --git a/arch/x86/kernel/scx200_32.c b/arch/x86/platform/scx200/scx200_32.c similarity index 100% rename from arch/x86/kernel/scx200_32.c rename to arch/x86/platform/scx200/scx200_32.c From 9694d4afc1ebe1e46cacfb78b107cd8f9fb550ba Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sat, 16 Oct 2010 10:38:13 +0200 Subject: [PATCH 6/8] x86: Move mrst to platform Signed-off-by: Thomas Gleixner Cc: Jacob Pan Cc: Alan Cox --- arch/x86/kernel/Makefile | 1 - arch/x86/platform/Makefile | 1 + arch/x86/platform/mrst/Makefile | 1 + arch/x86/{kernel => platform/mrst}/mrst.c | 0 4 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 arch/x86/platform/mrst/Makefile rename arch/x86/{kernel => platform/mrst}/mrst.c (100%) diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index f57eeea4bc161..4e1f862dd688a 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -104,7 +104,6 @@ obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o obj-$(CONFIG_OLPC) += olpc.o obj-$(CONFIG_OLPC_XO1) += olpc-xo1.o obj-$(CONFIG_OLPC_OPENFIRMWARE) += olpc_ofw.o -obj-$(CONFIG_X86_MRST) += mrst.o microcode-y := microcode_core.o microcode-$(CONFIG_MICROCODE_INTEL) += microcode_intel.o diff --git a/arch/x86/platform/Makefile b/arch/x86/platform/Makefile index 1191989e9f00e..06761ed537479 100644 --- a/arch/x86/platform/Makefile +++ b/arch/x86/platform/Makefile @@ -1,5 +1,6 @@ # Platform specific code goes here obj-y += efi/ +obj-y += mrst/ obj-y += scx200/ obj-y += sfi/ obj-y += visws/ diff --git a/arch/x86/platform/mrst/Makefile b/arch/x86/platform/mrst/Makefile new file mode 100644 index 0000000000000..efbbc552fa953 --- /dev/null +++ b/arch/x86/platform/mrst/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_X86_MRST) += mrst.o diff --git a/arch/x86/kernel/mrst.c b/arch/x86/platform/mrst/mrst.c similarity index 100% rename from arch/x86/kernel/mrst.c rename to arch/x86/platform/mrst/mrst.c From 329b84e42e3ee348b114fd0bfe4b2421e6139257 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sat, 23 Oct 2010 11:23:37 +0200 Subject: [PATCH 7/8] x86: Move uv to platform Signed-off-by: Thomas Gleixner Cc: Mike Travis --- arch/x86/kernel/Makefile | 1 - arch/x86/platform/Makefile | 1 + arch/x86/platform/uv/Makefile | 1 + arch/x86/{kernel => platform/uv}/bios_uv.c | 0 arch/x86/{kernel => platform/uv}/tlb_uv.c | 0 arch/x86/{kernel => platform/uv}/uv_irq.c | 0 arch/x86/{kernel => platform/uv}/uv_sysfs.c | 0 arch/x86/{kernel => platform/uv}/uv_time.c | 0 8 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 arch/x86/platform/uv/Makefile rename arch/x86/{kernel => platform/uv}/bios_uv.c (100%) rename arch/x86/{kernel => platform/uv}/tlb_uv.c (100%) rename arch/x86/{kernel => platform/uv}/uv_irq.c (100%) rename arch/x86/{kernel => platform/uv}/uv_sysfs.c (100%) rename arch/x86/{kernel => platform/uv}/uv_time.c (100%) diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 4e1f862dd688a..08e2e4bf83988 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -117,7 +117,6 @@ obj-$(CONFIG_SWIOTLB) += pci-swiotlb.o ### # 64 bit specific files ifeq ($(CONFIG_X86_64),y) - obj-$(CONFIG_X86_UV) += tlb_uv.o bios_uv.o uv_irq.o uv_sysfs.o uv_time.o obj-$(CONFIG_AUDIT) += audit_64.o obj-$(CONFIG_GART_IOMMU) += pci-gart_64.o aperture_64.o diff --git a/arch/x86/platform/Makefile b/arch/x86/platform/Makefile index 06761ed537479..8519b01f1acb3 100644 --- a/arch/x86/platform/Makefile +++ b/arch/x86/platform/Makefile @@ -4,3 +4,4 @@ obj-y += mrst/ obj-y += scx200/ obj-y += sfi/ obj-y += visws/ +obj-y += uv/ diff --git a/arch/x86/platform/uv/Makefile b/arch/x86/platform/uv/Makefile new file mode 100644 index 0000000000000..6c40995fefb81 --- /dev/null +++ b/arch/x86/platform/uv/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_X86_UV) += tlb_uv.o bios_uv.o uv_irq.o uv_sysfs.o uv_time.o diff --git a/arch/x86/kernel/bios_uv.c b/arch/x86/platform/uv/bios_uv.c similarity index 100% rename from arch/x86/kernel/bios_uv.c rename to arch/x86/platform/uv/bios_uv.c diff --git a/arch/x86/kernel/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c similarity index 100% rename from arch/x86/kernel/tlb_uv.c rename to arch/x86/platform/uv/tlb_uv.c diff --git a/arch/x86/kernel/uv_irq.c b/arch/x86/platform/uv/uv_irq.c similarity index 100% rename from arch/x86/kernel/uv_irq.c rename to arch/x86/platform/uv/uv_irq.c diff --git a/arch/x86/kernel/uv_sysfs.c b/arch/x86/platform/uv/uv_sysfs.c similarity index 100% rename from arch/x86/kernel/uv_sysfs.c rename to arch/x86/platform/uv/uv_sysfs.c diff --git a/arch/x86/kernel/uv_time.c b/arch/x86/platform/uv/uv_time.c similarity index 100% rename from arch/x86/kernel/uv_time.c rename to arch/x86/platform/uv/uv_time.c From 8654b1c2de1465120974899fc1c8aa00e91d4b7e Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sat, 23 Oct 2010 11:28:42 +0200 Subject: [PATCH 8/8] x86: Move olpc to platform Signed-off-by: Thomas Gleixner Cc: Andres Salomon --- arch/x86/kernel/Makefile | 4 ---- arch/x86/platform/Makefile | 1 + arch/x86/platform/olpc/Makefile | 3 +++ arch/x86/{kernel => platform/olpc}/olpc-xo1.c | 0 arch/x86/{kernel => platform/olpc}/olpc.c | 0 arch/x86/{kernel => platform/olpc}/olpc_ofw.c | 0 6 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 arch/x86/platform/olpc/Makefile rename arch/x86/{kernel => platform/olpc}/olpc-xo1.c (100%) rename arch/x86/{kernel => platform/olpc}/olpc.c (100%) rename arch/x86/{kernel => platform/olpc}/olpc_ofw.c (100%) diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 08e2e4bf83988..9e13763b60924 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -101,10 +101,6 @@ obj-$(CONFIG_PARAVIRT_CLOCK) += pvclock.o obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o -obj-$(CONFIG_OLPC) += olpc.o -obj-$(CONFIG_OLPC_XO1) += olpc-xo1.o -obj-$(CONFIG_OLPC_OPENFIRMWARE) += olpc_ofw.o - microcode-y := microcode_core.o microcode-$(CONFIG_MICROCODE_INTEL) += microcode_intel.o microcode-$(CONFIG_MICROCODE_AMD) += microcode_amd.o diff --git a/arch/x86/platform/Makefile b/arch/x86/platform/Makefile index 8519b01f1acb3..7bf70b812fa2a 100644 --- a/arch/x86/platform/Makefile +++ b/arch/x86/platform/Makefile @@ -1,6 +1,7 @@ # Platform specific code goes here obj-y += efi/ obj-y += mrst/ +obj-y += olpc/ obj-y += scx200/ obj-y += sfi/ obj-y += visws/ diff --git a/arch/x86/platform/olpc/Makefile b/arch/x86/platform/olpc/Makefile new file mode 100644 index 0000000000000..c31b8fcb5a865 --- /dev/null +++ b/arch/x86/platform/olpc/Makefile @@ -0,0 +1,3 @@ +obj-$(CONFIG_OLPC) += olpc.o +obj-$(CONFIG_OLPC_XO1) += olpc-xo1.o +obj-$(CONFIG_OLPC_OPENFIRMWARE) += olpc_ofw.o diff --git a/arch/x86/kernel/olpc-xo1.c b/arch/x86/platform/olpc/olpc-xo1.c similarity index 100% rename from arch/x86/kernel/olpc-xo1.c rename to arch/x86/platform/olpc/olpc-xo1.c diff --git a/arch/x86/kernel/olpc.c b/arch/x86/platform/olpc/olpc.c similarity index 100% rename from arch/x86/kernel/olpc.c rename to arch/x86/platform/olpc/olpc.c diff --git a/arch/x86/kernel/olpc_ofw.c b/arch/x86/platform/olpc/olpc_ofw.c similarity index 100% rename from arch/x86/kernel/olpc_ofw.c rename to arch/x86/platform/olpc/olpc_ofw.c