2008-08-10 09:54:20 +00:00
|
|
|
diff --git a/Makefile b/Makefile
|
|
|
|
index f3e2065..3cc474a 100644
|
2006-06-13 14:18:29 +00:00
|
|
|
--- a/Makefile
|
|
|
|
+++ b/Makefile
|
2008-08-10 09:54:20 +00:00
|
|
|
@@ -193,25 +193,6 @@ export KBUILD_BUILDHOST := $(SUBARCH)
|
2006-09-22 17:17:09 +00:00
|
|
|
ARCH ?= $(SUBARCH)
|
|
|
|
CROSS_COMPILE ?=
|
|
|
|
|
|
|
|
-# Architecture as present in compile.h
|
2007-11-29 11:12:14 +00:00
|
|
|
-UTS_MACHINE := $(ARCH)
|
|
|
|
-SRCARCH := $(ARCH)
|
|
|
|
-
|
|
|
|
-# Additional ARCH settings for x86
|
|
|
|
-ifeq ($(ARCH),i386)
|
|
|
|
- SRCARCH := x86
|
|
|
|
-endif
|
|
|
|
-ifeq ($(ARCH),x86_64)
|
|
|
|
- SRCARCH := x86
|
|
|
|
-endif
|
2008-08-10 08:35:53 +00:00
|
|
|
-
|
|
|
|
-# Where to locate arch specific headers
|
|
|
|
-ifeq ($(ARCH),sparc64)
|
|
|
|
- hdr-arch := sparc
|
|
|
|
-else
|
|
|
|
- hdr-arch := $(SRCARCH)
|
|
|
|
-endif
|
2006-09-22 17:17:09 +00:00
|
|
|
-
|
|
|
|
KCONFIG_CONFIG ?= .config
|
|
|
|
|
|
|
|
# SHELL used by kbuild
|
2008-08-10 09:54:20 +00:00
|
|
|
@@ -329,6 +310,27 @@ CFLAGS_KERNEL =
|
|
|
|
AFLAGS_KERNEL =
|
|
|
|
|
2006-06-13 14:18:29 +00:00
|
|
|
|
|
|
|
+-include .kernelvariables
|
2006-09-22 17:17:09 +00:00
|
|
|
+
|
|
|
|
+# Architecture as present in compile.h
|
2007-11-29 11:12:14 +00:00
|
|
|
+UTS_MACHINE := $(ARCH)
|
|
|
|
+SRCARCH := $(ARCH)
|
|
|
|
+
|
|
|
|
+# Additional ARCH settings for x86
|
|
|
|
+ifeq ($(ARCH),i386)
|
|
|
|
+ SRCARCH := x86
|
|
|
|
+endif
|
|
|
|
+ifeq ($(ARCH),x86_64)
|
|
|
|
+ SRCARCH := x86
|
|
|
|
+endif
|
2008-08-10 08:35:53 +00:00
|
|
|
+
|
|
|
|
+# Where to locate arch specific headers
|
|
|
|
+ifeq ($(ARCH),sparc64)
|
|
|
|
+ hdr-arch := sparc
|
|
|
|
+else
|
|
|
|
+ hdr-arch := $(SRCARCH)
|
|
|
|
+endif
|
2006-06-13 14:18:29 +00:00
|
|
|
+
|
2008-08-10 09:54:20 +00:00
|
|
|
# Use LINUXINCLUDE when you must reference the include/ directory.
|
|
|
|
# Needed to be compatible with the O= option
|
|
|
|
LINUXINCLUDE := -Iinclude \
|