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
msm8916-mainline · Feb 11, 2013 · 49c6696 · 49c6696
1 parent 493370f
commit 49c6696
Show file tree

Hide file tree

Showing 20 changed files with 10 additions and 13 deletions.
diff --git a/AndroidBoot.mk b/AndroidBoot.mk
@@ -7,15 +7,12 @@ else
   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
@@ -21,7 +21,7 @@ OBJS += \
 	$(LOCAL_DIR)/lcdc_truly_hvga.o
 endif
 
-ifeq ($(PLATFORM),copper)
+ifeq ($(PLATFORM),msm8974)
 OBJS += \
 	$(LOCAL_DIR)/mipi_toshiba_video_720p.o
-endif
+endif
diff --git a/platform/copper/acpuclock.c → platform/msm8974/acpuclock.c b/platform/copper/acpuclock.c → platform/msm8974/acpuclock.c
diff --git a/platform/copper/gpio.c → platform/msm8974/gpio.c b/platform/copper/gpio.c → platform/msm8974/gpio.c
diff --git a/platform/copper/include/platform/clock.h → platform/msm8974/include/platform/clock.h b/platform/copper/include/platform/clock.h → platform/msm8974/include/platform/clock.h
diff --git a/platform/copper/include/platform/gpio.h → platform/msm8974/include/platform/gpio.h b/platform/copper/include/platform/gpio.h → platform/msm8974/include/platform/gpio.h
diff --git a/platform/copper/include/platform/iomap.h → platform/msm8974/include/platform/iomap.h b/platform/copper/include/platform/iomap.h → platform/msm8974/include/platform/iomap.h
diff --git a/platform/copper/include/platform/irqs.h → platform/msm8974/include/platform/irqs.h b/platform/copper/include/platform/irqs.h → platform/msm8974/include/platform/irqs.h
diff --git a/platform/copper/copper-clock.c → platform/msm8974/msm8974-clock.c b/platform/copper/copper-clock.c → platform/msm8974/msm8974-clock.c
diff --git a/platform/copper/platform.c → platform/msm8974/platform.c b/platform/copper/platform.c → platform/msm8974/platform.c
diff --git a/platform/copper/rules.mk → platform/msm8974/rules.mk b/platform/copper/rules.mk → platform/msm8974/rules.mk
@@ -20,7 +20,7 @@ MODULES += dev/fbcon
 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
@@ -59,7 +59,7 @@ ifeq ($(PLATFORM),msm8960)
 			$(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 → project/msm8974.mk b/project/copper.mk → 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 → target/msm8974/include/target/display.h b/target/copper/include/target/display.h → target/msm8974/include/target/display.h
diff --git a/target/copper/init.c → target/msm8974/init.c b/target/copper/init.c → target/msm8974/init.c
diff --git a/target/copper/meminfo.c → target/msm8974/meminfo.c b/target/copper/meminfo.c → target/msm8974/meminfo.c
diff --git a/target/copper/rules.mk → target/msm8974/rules.mk b/target/copper/rules.mk → target/msm8974/rules.mk
@@ -2,7 +2,7 @@ LOCAL_DIR := $(GET_LOCAL_DIR)
 
 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 → target/msm8974/target_display.c b/target/copper/target_display.c → target/msm8974/target_display.c
diff --git a/target/copper/tools/makefile → target/msm8974/tools/makefile b/target/copper/tools/makefile → target/msm8974/tools/makefile
diff --git a/target/copper/tools/mkheader.c → target/msm8974/tools/mkheader.c b/target/copper/tools/mkheader.c → target/msm8974/tools/mkheader.c