Commit 47a62db5 authored by Martin J. Bligh's avatar Martin J. Bligh Committed by Patrick Mochel

[PATCH] x86 subarch header files

Patch from John Stultz.

This reorganises the subarch files to put all the headers under the
include dir, instead of mixing them up with the C files.  The only
interesting part is the top section where he makes it fall back from the
subarch dir to the default dir if there's no .h file under the subarch
dir.

This means we can create multiple subarches without copying every single
file that any subarch wants into all the directories.  And is much
tidier, IMHO.
parent 52a150d8
......@@ -48,25 +48,31 @@ cflags-$(CONFIG_MCYRIXIII) += $(call check_gcc,-falign-functions=0 -falign-jumps
CFLAGS += $(cflags-y)
ifdef CONFIG_VISWS
MACHINE := mach-visws
else
MACHINE := mach-generic
endif
#default subarch .c files
mcore-y := mach-default
#VISWS subarch support
mflags-$(CONFIG_VISWS) := -Iinclude/asm-i386/mach-visws
mcore-$(CONFIG_VISWS) := mach-visws
#add other subarch support here
#default subarch .h files
mflags-y += -Iinclude/asm-i386/mach-default
HEAD := arch/i386/kernel/head.o arch/i386/kernel/init_task.o
libs-y += arch/i386/lib/
core-y += arch/i386/kernel/ \
arch/i386/mm/ \
arch/i386/$(MACHINE)/
arch/i386/$(mcore-y)/
drivers-$(CONFIG_MATH_EMULATION) += arch/i386/math-emu/
drivers-$(CONFIG_PCI) += arch/i386/pci/
# FIXME: is drivers- right ?
drivers-$(CONFIG_OPROFILE) += arch/i386/oprofile/
CFLAGS += -Iarch/i386/$(MACHINE)
AFLAGS += -Iarch/i386/$(MACHINE)
CFLAGS += $(mflags-y)
AFLAGS += $(mflags-y)
makeboot =$(Q)$(MAKE) -f scripts/Makefile.build obj=arch/i386/boot $(1)
......
......@@ -31,7 +31,8 @@
#include <asm/pgalloc.h>
#include <asm/desc.h>
#include <asm/arch_hooks.h>
#include "mach_apic.h"
#include <mach_apic.h>
void __init apic_intr_init(void)
{
......
......@@ -35,7 +35,8 @@
#include <asm/io.h>
#include <asm/smp.h>
#include <asm/desc.h>
#include "mach_apic.h"
#include <mach_apic.h>
#undef APIC_LOCKUP_DEBUG
......
......@@ -30,7 +30,8 @@
#include <asm/mpspec.h>
#include <asm/pgalloc.h>
#include <asm/io_apic.h>
#include "mach_apic.h"
#include <mach_apic.h>
/* Have we found an MP table */
int smp_found_config;
......
......@@ -51,7 +51,8 @@
#include <asm/desc.h>
#include <asm/arch_hooks.h>
#include "smpboot_hooks.h"
#include "mach_apic.h"
#include <mach_apic.h>
/* Set if we find a B stepping CPU */
static int __initdata smp_b_stepping;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment