From 297f18ac0fbeef30ba1c17fe131ca75f09a6e7cf Mon Sep 17 00:00:00 2001
From: Greg Ungerer <greg.ungerer@opengear.com>
Date: Fri, 9 Sep 2011 22:23:34 +1000
Subject: [PATCH] CM4000: fix broken flash base for OpenGear boards
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use _bss_start_ofs as the size of the boot loader code+data that we want
to protect in the flash. This replaces use of the no longer defined
_armboot_start.

Fixes:

flash.c: In function ‘flash_init’:
flash.c:75: error: ‘_bss_start’ undeclared (first use in this function)
flash.c:75: error: (Each undeclared identifier is reported only once
flash.c:75: error: for each function it appears in.)
flash.c:75: error: ‘_armboot_start’ undeclared (first use in this function)

Signed-off-by: <greg.ungerer@opengear.com>
---
 board/cm4008/flash.c | 2 +-
 board/cm41xx/flash.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/board/cm4008/flash.c b/board/cm4008/flash.c
index d6fd5195d30..2e1356f9f4a 100644
--- a/board/cm4008/flash.c
+++ b/board/cm4008/flash.c
@@ -72,7 +72,7 @@ unsigned long flash_init (void)
 	 */
 	flash_protect (FLAG_PROTECT_SET,
 		       CONFIG_SYS_FLASH_BASE,
-		       CONFIG_SYS_FLASH_BASE + _bss_start - _armboot_start,
+		       CONFIG_SYS_FLASH_BASE + _bss_start_ofs,
 		       &flash_info[0]);
 
 	return size;
diff --git a/board/cm41xx/flash.c b/board/cm41xx/flash.c
index d6fd5195d30..2e1356f9f4a 100644
--- a/board/cm41xx/flash.c
+++ b/board/cm41xx/flash.c
@@ -72,7 +72,7 @@ unsigned long flash_init (void)
 	 */
 	flash_protect (FLAG_PROTECT_SET,
 		       CONFIG_SYS_FLASH_BASE,
-		       CONFIG_SYS_FLASH_BASE + _bss_start - _armboot_start,
+		       CONFIG_SYS_FLASH_BASE + _bss_start_ofs,
 		       &flash_info[0]);
 
 	return size;
-- 
GitLab