From f37446a68dc7d2e66575fb5ed22182475487d335 Mon Sep 17 00:00:00 2001 From: Kichan Kwon Date: Wed, 1 Nov 2017 14:46:42 +0900 Subject: [PATCH] Remove SS_RECOVERYRAMDISK - All targets are using ramdisk-recovery to upgrade Change-Id: Ib2a95e3bf04c9e8a880f910b5a83ea72f21f0bfd Signed-off-by: Kichan Kwon --- src/ua.c | 14 -------------- src/ua.h | 1 - 2 files changed, 15 deletions(-) diff --git a/src/ua.c b/src/ua.c index e0c315a..958cce9 100755 --- a/src/ua.c +++ b/src/ua.c @@ -383,7 +383,6 @@ int update_Delta_IMG(int part_idx, unsigned long ui32Operation) return ret; } -#ifdef SS_RECOVERYRAMDISK int verify_RecoveryDelta_IMG(int part_idx, int update_type) { int ret = SUCCESS; @@ -433,7 +432,6 @@ int update_RecoveryDelta_IMG(int part_idx, int update_type) } return ret; } -#endif /*----------------------------------------------------------------------------- @@ -716,11 +714,7 @@ int update_all() else if (update_type == DELTA_FS) ret = verify_Delta_FS(part_idx); else if (update_type == EXTRA) -#ifdef SS_RECOVERYRAMDISK ret = verify_RecoveryDelta_IMG(part_idx, FULL_IMG); -#else - ret = -1; -#endif else ret = -1; @@ -763,11 +757,7 @@ int update_all() else if (update_type == DELTA_FS) ret = update_Delta_FS(part_idx, ui32Operation); else if (update_type == EXTRA) //TOTA -#ifdef SS_RECOVERYRAMDISK ret = update_RecoveryDelta_IMG(part_idx, FULL_IMG); -#else - ret = -1; -#endif else ret = -1; @@ -1214,11 +1204,7 @@ int fota_configure_update(void) if (!part_name) return -1; -#ifdef SS_RECOVERYRAMDISK if ((update_type != EXTRA) || (0 == strcmp(part_name, "RAMDISK2"))) { -#else - if (update_type != EXTRA) { -#endif s_part_info[line_num].ua_parti_name = part_name; s_part_info[line_num].ua_subject_name = subj_name; s_part_info[line_num].ua_blk_name = blk_name; diff --git a/src/ua.h b/src/ua.h index f1221dd..2d2ea4d 100755 --- a/src/ua.h +++ b/src/ua.h @@ -84,7 +84,6 @@ #define UP_STATUS_FILE "UP.STATUS" #define UP_START_NONE 0 -#define SS_RECOVERYRAMDISK enum { UA_OP_MODE_FG = 0, UA_OP_MODE_BG -- 2.7.4