From bfaf531e05b3f024dc758ab5211ef9b067f60754 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Wed, 9 Feb 2011 16:10:11 -0800
Subject: Revert "Fix the case BOARD_FLASH_BLOCK_SIZE smaller than
 BOARD_NAND_PAGE_SIZE, eg generic_x86"

This reverts commit 279f3084bbb4781d872412f5e49c74f462f7844a.

Change-Id: I27069190503e586d3d77a933d92459a34eb55cb8
---
 core/definitions.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'core/definitions.mk')

diff --git a/core/definitions.mk b/core/definitions.mk
index ff4db40..6fd4b99 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1833,10 +1833,8 @@ endif
 # spare area for each page).
 # $(1): the partition data size
 define image-size-from-data-size
-$(strip $(eval _isfds_value := $(shell echo $$(($(1) / $(BOARD_NAND_PAGE_SIZE) * \
-  ($(BOARD_NAND_PAGE_SIZE)+$(BOARD_NAND_SPARE_SIZE))))))\
-$(if $(filter 0, $(_isfds_value)),$(shell echo $$(($(BOARD_NAND_PAGE_SIZE)+$(BOARD_NAND_SPARE_SIZE)))),$(_isfds_value))\
-$(eval _isfds_value :=))
+$(shell echo $$(($(1) / $(BOARD_NAND_PAGE_SIZE) * \
+  ($(BOARD_NAND_PAGE_SIZE)+$(BOARD_NAND_SPARE_SIZE)))))
 endef
 
 # $(1): The file(s) to check (often $@)
-- 
cgit v1.1