summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPankaj Bharadiya <pankaj.bharadiya@ti.com>2012-10-18 11:49:26 +0530
committerPankaj Bharadiya <pankaj.bharadiya@ti.com>2012-10-18 11:51:57 +0530
commit5b02452c45dc96df1ff57b7d43435c87116c17d9 (patch)
tree6eb5ccef0be94ac9e9380feb8f1aaf5ccb53bdb8
parentfd286ea3401fb751eeec763d521eddc4f0c16e66 (diff)
downloadsgx-5b02452c45dc96df1ff57b7d43435c87116c17d9.tar.gz
Fix build error
SGX build fails when built with linaro android sources since kernel sources and kernel built object files are in seperate directory. Correct KERNEL_INSTALL_DIR path and include paths to build SGX with Linaro Android sources. Signed-off-by: Pankaj Bharadiya <pankaj.bharadiya@ti.com>
-rwxr-xr-xRules.make2
-rw-r--r--eurasiacon/build/linux2/kbuild/Makefile.template3
2 files changed, 3 insertions, 2 deletions
diff --git a/Rules.make b/Rules.make
index ee66c87..fc1eba7 100755
--- a/Rules.make
+++ b/Rules.make
@@ -15,7 +15,7 @@ CSTOOL_PATH=$(dir $(TARGET_TOOLS_PREFIX))
CSTOOL_PREFIX=$(notdir $(TARGET_TOOLS_PREFIX))
#set the kernel installation path
-KERNEL_INSTALL_DIR=$(ANDROID_ROOT_DIR)/kernel
+KERNEL_INSTALL_DIR=$(ANDROID_ROOT_DIR)/out/target/product/$(TARGET_PRODUCT)/obj/kernel
#set filesystem path
TARGETFS_INSTALL_DIR=$(ANDROID_ROOT_DIR)/out/target/product/$(TARGET_PRODUCT)/
diff --git a/eurasiacon/build/linux2/kbuild/Makefile.template b/eurasiacon/build/linux2/kbuild/Makefile.template
index 9d51668..1f4e0d8 100644
--- a/eurasiacon/build/linux2/kbuild/Makefile.template
+++ b/eurasiacon/build/linux2/kbuild/Makefile.template
@@ -77,7 +77,8 @@ ccflags-y += -D__linux__ -include $(OUT)/config_kernel.h \
-I$(TOP)/services4/srvkm/common \
-I$(TOP)/services4/srvkm/devices/sgx \
-I$(TOP)/services4/srvkm/env/linux \
- -I$(TOP)/services4/srvkm/include
+ -I$(TOP)/services4/srvkm/include \
+ -I/datalocal/pankaj/linaro/android/kernel/drivers/video/omap2
ifeq ($(PVR_LOCAL_HWDEFS),)
ccflags-y += -I$(TOP)/services4/srvkm/hwdefs