msm8974: Change the product name from copper to msm8974
fastboot flash all command looks for target name from the build
& bootloaders. If the product names do not match the flash all
command fails. Fix by changing the name of the product in the
bootloader to match that of the complete build.
CRs-Fixed: 442910
Change-Id: I3d8ac2660dc9cc9bdcfe471593401b96b2afac6b
diff --git a/AndroidBoot.mk b/AndroidBoot.mk
index b51344f..6836163 100644
--- a/AndroidBoot.mk
+++ b/AndroidBoot.mk
@@ -7,15 +7,12 @@
SIGNED_KERNEL := SIGNED_KERNEL=0
endif
-ifneq ($(strip $(TARGET_BOOTLOADER_PLATFORM_OVERRIDE)),)
- BOOTLOADER_PLATFORM := $(TARGET_BOOTLOADER_PLATFORM_OVERRIDE)
+ifeq ($(call is-board-platform,msm8660),true)
+ BOOTLOADER_PLATFORM := msm8660_surf
else
- ifeq ($(call is-board-platform,msm8660),true)
- BOOTLOADER_PLATFORM := msm8660_surf
- else
- BOOTLOADER_PLATFORM := $(TARGET_BOARD_PLATFORM)
- endif
+ BOOTLOADER_PLATFORM := $(TARGET_BOARD_PLATFORM)
endif
+
# NAND variant output
TARGET_NAND_BOOTLOADER := $(PRODUCT_OUT)/appsboot.mbn
NAND_BOOTLOADER_OUT := $(TARGET_OUT_INTERMEDIATES)/NAND_BOOTLOADER_OBJ
diff --git a/dev/panel/msm/rules.mk b/dev/panel/msm/rules.mk
index c2bb53f..4b596f6 100644
--- a/dev/panel/msm/rules.mk
+++ b/dev/panel/msm/rules.mk
@@ -21,7 +21,7 @@
$(LOCAL_DIR)/lcdc_truly_hvga.o
endif
-ifeq ($(PLATFORM),copper)
+ifeq ($(PLATFORM),msm8974)
OBJS += \
$(LOCAL_DIR)/mipi_toshiba_video_720p.o
-endif
\ No newline at end of file
+endif
diff --git a/platform/copper/acpuclock.c b/platform/msm8974/acpuclock.c
similarity index 100%
rename from platform/copper/acpuclock.c
rename to platform/msm8974/acpuclock.c
diff --git a/platform/copper/gpio.c b/platform/msm8974/gpio.c
similarity index 100%
rename from platform/copper/gpio.c
rename to platform/msm8974/gpio.c
diff --git a/platform/copper/include/platform/clock.h b/platform/msm8974/include/platform/clock.h
similarity index 100%
rename from platform/copper/include/platform/clock.h
rename to platform/msm8974/include/platform/clock.h
diff --git a/platform/copper/include/platform/gpio.h b/platform/msm8974/include/platform/gpio.h
similarity index 100%
rename from platform/copper/include/platform/gpio.h
rename to platform/msm8974/include/platform/gpio.h
diff --git a/platform/copper/include/platform/iomap.h b/platform/msm8974/include/platform/iomap.h
similarity index 100%
rename from platform/copper/include/platform/iomap.h
rename to platform/msm8974/include/platform/iomap.h
diff --git a/platform/copper/include/platform/irqs.h b/platform/msm8974/include/platform/irqs.h
similarity index 100%
rename from platform/copper/include/platform/irqs.h
rename to platform/msm8974/include/platform/irqs.h
diff --git a/platform/copper/copper-clock.c b/platform/msm8974/msm8974-clock.c
similarity index 100%
rename from platform/copper/copper-clock.c
rename to platform/msm8974/msm8974-clock.c
diff --git a/platform/copper/platform.c b/platform/msm8974/platform.c
similarity index 100%
rename from platform/copper/platform.c
rename to platform/msm8974/platform.c
diff --git a/platform/copper/rules.mk b/platform/msm8974/rules.mk
similarity index 94%
rename from platform/copper/rules.mk
rename to platform/msm8974/rules.mk
index 35cbe7b..9b4f78e 100644
--- a/platform/copper/rules.mk
+++ b/platform/msm8974/rules.mk
@@ -20,7 +20,7 @@
OBJS += \
$(LOCAL_DIR)/platform.o \
$(LOCAL_DIR)/acpuclock.o \
- $(LOCAL_DIR)/copper-clock.o \
+ $(LOCAL_DIR)/msm8974-clock.o \
$(LOCAL_DIR)/gpio.o
LINKER_SCRIPT += $(BUILDDIR)/system-onesegment.ld
diff --git a/platform/msm_shared/rules.mk b/platform/msm_shared/rules.mk
index 6a226bd..d1dcd53 100644
--- a/platform/msm_shared/rules.mk
+++ b/platform/msm_shared/rules.mk
@@ -59,7 +59,7 @@
$(LOCAL_DIR)/nand.o
endif
-ifeq ($(PLATFORM),copper)
+ifeq ($(PLATFORM),msm8974)
OBJS += $(LOCAL_DIR)/qgic.o \
$(LOCAL_DIR)/qtimer.o \
$(LOCAL_DIR)/qtimer_mmap.o \
diff --git a/project/copper.mk b/project/msm8974.mk
similarity index 93%
rename from project/copper.mk
rename to project/msm8974.mk
index 00c7c5f..f8dd988 100644
--- a/project/copper.mk
+++ b/project/msm8974.mk
@@ -2,7 +2,7 @@
#
LOCAL_DIR := $(GET_LOCAL_DIR)
-TARGET := copper
+TARGET := msm8974
MODULES += app/aboot
diff --git a/target/copper/include/target/display.h b/target/msm8974/include/target/display.h
similarity index 100%
rename from target/copper/include/target/display.h
rename to target/msm8974/include/target/display.h
diff --git a/target/copper/init.c b/target/msm8974/init.c
similarity index 100%
rename from target/copper/init.c
rename to target/msm8974/init.c
diff --git a/target/copper/meminfo.c b/target/msm8974/meminfo.c
similarity index 100%
rename from target/copper/meminfo.c
rename to target/msm8974/meminfo.c
diff --git a/target/copper/rules.mk b/target/msm8974/rules.mk
similarity index 97%
rename from target/copper/rules.mk
rename to target/msm8974/rules.mk
index 0d35f49..e2acd10 100644
--- a/target/copper/rules.mk
+++ b/target/msm8974/rules.mk
@@ -2,7 +2,7 @@
INCLUDES += -I$(LOCAL_DIR)/include -I$(LK_TOP_DIR)/platform/msm_shared
-PLATFORM := copper
+PLATFORM := msm8974
MEMBASE := 0x0F900000 # SDRAM
MEMSIZE := 0x00100000 # 1MB
diff --git a/target/copper/target_display.c b/target/msm8974/target_display.c
similarity index 100%
rename from target/copper/target_display.c
rename to target/msm8974/target_display.c
diff --git a/target/copper/tools/makefile b/target/msm8974/tools/makefile
similarity index 100%
rename from target/copper/tools/makefile
rename to target/msm8974/tools/makefile
diff --git a/target/copper/tools/mkheader.c b/target/msm8974/tools/mkheader.c
similarity index 100%
rename from target/copper/tools/mkheader.c
rename to target/msm8974/tools/mkheader.c