[Feature][ZXW-130]merge P50U02 version
Only Configure: No
Affected branch: master
Affected module: unknow
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No
Change-Id: I4f29ec5bb7c59385f23738d2b7ca84e67c100f69
diff --git a/boot/common/scripts/Makefile b/boot/common/scripts/Makefile
index f9e743a..f71c564 100755
--- a/boot/common/scripts/Makefile
+++ b/boot/common/scripts/Makefile
@@ -100,41 +100,17 @@
ram_text=0x21EF0000
endif
-ifeq ($(strip $(board)),$(filter $(board),mdl_ab))
- key_path=$(subst _ab,,$(board))
-endif
-
ifeq ($(strip $(board)),$(filter $(board),vehicle_dc))
- key_path=mdl
-endif
-
+ key_path=key/RSA_2048/private.k
+else
ifeq ($(strip $(board)),$(filter $(board),vehicle_dc_ref))
- key_path=mdl
+ key_path=key/RSA_2048/private.k
+else
+ key_path=key/RSA_1024/private.k -t md5
+endif
endif
-ifeq ($(strip $(board)),$(filter $(board),mdl_mini mifi_mini ufi_mini))
- key_path=$(subst _mini,,$(board))
-endif
-ifeq ($(strip $(board)),$(filter $(board),mifi_mini_xr819))
- key_path=$(subst _mini_xr819,,$(board))
-endif
-
-ifeq ($(strip $(board)),$(filter $(board),mdl_mini_64 mifi_mini_64))
- key_path=$(subst _mini_64,,$(board))
-endif
-
-ifeq ($(strip $(board)),$(filter $(board),watch_cap))
- key_path=$(subst _cap,,$(board))
-endif
-
-ifeq ($(strip $(board)),$(filter $(board),cpe_switch))
- key_path=$(subst _switch,,$(board))
-endif
-
-ifeq ($(strip $(board)),$(filter $(board),cpe evb fwp mdl mifi phone watch))
- key_path=$(board)
-endif
export chip board key_path ram_text V3T_RAM_TEXT_64M_UBOOT
@@ -152,7 +128,6 @@
tloader:
chmod -R 777 ../../../$(SRCROOT)
- cp -rf $(BOOTLOADER_PRJ_PATH)/../../tools/SignImage/test_key/$(key_path)/key.h $(BOOTLOADER_PATH)/src/loader/include
cd $(BOOTLOADER_PATH)/scripts/build && sh ./build_tloader.sh
@cp $(BOOTLOADER_PATH)/src/loader/z-load $(BOOTLOADER_PRJ_PATH)/$(chip)/$(board)/bin/z-load
@cp $(BOOTLOADER_PATH)/src/loader/z-load.map $(BOOTLOADER_PRJ_PATH)/$(chip)/$(board)/bin/z-load.map
@@ -161,7 +136,6 @@
zloader:
chmod -R 777 ../../../$(SRCROOT)
- cp -rf $(BOOTLOADER_PRJ_PATH)/../../tools/SignImage/test_key/$(key_path)/key.h $(BOOTLOADER_PATH)/src/loader/include
cd $(BOOTLOADER_PATH)/scripts/build && sh ./build_zloader_dlon.sh
@cp $(BOOTLOADER_PATH)/src/loader/z-load $(BOOTLOADER_PRJ_PATH)/$(chip)/$(board)/bin/dl_on/z-load
@cp $(BOOTLOADER_PATH)/src/loader/z-load.map $(BOOTLOADER_PRJ_PATH)/$(chip)/$(board)/bin/dl_on/z-load.map