From 2454f7265a17afa73273dc09019adb90f77c0007 Mon Sep 17 00:00:00 2001 From: Alexander Tarasikov Date: Mon, 2 Jul 2012 12:55:22 +0400 Subject: Update firmware loader to the latest version, fix makefiles for maguro/galaxys2 --- Android.mk | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 8ccda02..c761cde 100644 --- a/Android.mk +++ b/Android.mk @@ -10,14 +10,14 @@ LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS += -Iexternal/openssl/include LOCAL_LDFLAGS += -lcrypto -ifeq ($(TARGET_DEVICE),maguro) +ifeq ($(TARGET_DEVICE),crespo) LOCAL_CFLAGS += -DDEVICE_IPC_V4 - samsung-ipc_device := xmm6260 + samsung-ipc_device := crespo endif -ifeq ($(TARGET_DEVICE),crespo) +ifeq ($(TARGET_DEVICE),galaxys2) LOCAL_CFLAGS += -DDEVICE_IPC_V4 - samsung-ipc_device := crespo + samsung-ipc_device := galaxys2 endif ifeq ($(TARGET_DEVICE),galaxysmtd) @@ -34,6 +34,11 @@ ifeq ($(TARGET_DEVICE),h1) LOCAL_CFLAGS += -DDEVICE_H1 endif +ifeq ($(TARGET_DEVICE),maguro) + LOCAL_CFLAGS += -DDEVICE_IPC_V4 + samsung-ipc_device := maguro +endif + ifeq ($(DEBUG),true) LOCAL_CFLAGS += -DDEBUG LOCAL_CFLAGS += -DLOG_STDOUT @@ -53,12 +58,12 @@ samsung-ipc_files := \ samsung-ipc/device/h1/h1_ipc.c \ samsung-ipc/device/crespo/crespo_ipc.c \ samsung-ipc/device/aries/aries_ipc.c \ - samsung-ipc/device/xmm6260/xmm6260_ipc.c \ samsung-ipc/device/xmm6260/fwloader_i9100.c \ samsung-ipc/device/xmm6260/fwloader_i9250.c \ samsung-ipc/device/xmm6260/io_helpers.c \ samsung-ipc/device/xmm6260/log.c \ - samsung-ipc/device/xmm6260/modemctl_common.c + samsung-ipc/device/xmm6260/modemctl_common.c \ + samsung-ipc/device/xmm6260/xmm6260_ipc.c LOCAL_SRC_FILES := $(samsung-ipc_files) LOCAL_CFLAGS += -DIPC_DEVICE_EXPLICIT=\"$(samsung-ipc_device)\" @@ -76,14 +81,14 @@ include $(CLEAR_VARS) LOCAL_MODULE := ipc-modemctrl LOCAL_MODULE_TAGS := optional -ifeq ($(TARGET_DEVICE),maguro) +ifeq ($(TARGET_DEVICE),crespo) LOCAL_CFLAGS += -DDEVICE_IPC_V4 - samsung-ipc_device := xmm6260 + samsung-ipc_device := crespo endif -ifeq ($(TARGET_DEVICE),crespo) +ifeq ($(TARGET_DEVICE),galaxys2) LOCAL_CFLAGS += -DDEVICE_IPC_V4 - samsung-ipc_device := crespo + samsung-ipc_device := galaxys2 endif ifeq ($(TARGET_DEVICE),galaxysmtd) @@ -100,6 +105,11 @@ ifeq ($(TARGET_DEVICE),h1) LOCAL_CFLAGS += -DDEVICE_H1 endif +ifeq ($(TARGET_DEVICE),maguro) + LOCAL_CFLAGS += -DDEVICE_IPC_V4 + samsung-ipc_device := maguro +endif + ifeq ($(DEBUG),true) LOCAL_CFLAGS += -DDEBUG LOCAL_CFLAGS += -DLOG_STDOUT -- cgit v1.1