This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
RedBoot - fix compile error
- From: Gary Thomas <gary at mlbassoc dot com>
- To: eCos patches <ecos-patches at sources dot redhat dot com>
- Date: 22 Sep 2003 11:37:13 -0600
- Subject: RedBoot - fix compile error
- Organization: MLB Associates
If there was no FLASH defined. Sorry I let this one slip by.
Also update configury for MOAB, since it depends on this behaviour.
--
Gary Thomas <gary@mlbassoc.com>
MLB Associates
Index: redboot/current/ChangeLog
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/redboot/current/ChangeLog,v
retrieving revision 1.133
diff -u -5 -p -r1.133 ChangeLog
--- redboot/current/ChangeLog 21 Sep 2003 12:27:59 -0000 1.133
+++ redboot/current/ChangeLog 22 Sep 2003 17:34:50 -0000
@@ -1,5 +1,9 @@
+2003-09-22 Gary Thomas <gary@mlbassoc.com>
+
+ * cdl/redboot.cdl: Fix compile error for systems with no FLASH.
+
2003-09-21 Gary Thomas <gary@mlbassoc.com>
* cdl/redboot.cdl: Make DNS truly optional (remove from template).
BUG #57316
Index: redboot/current/cdl/redboot.cdl
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/redboot/current/cdl/redboot.cdl,v
retrieving revision 1.54
diff -u -5 -p -r1.54 redboot.cdl
--- redboot/current/cdl/redboot.cdl 21 Sep 2003 12:28:00 -0000 1.54
+++ redboot/current/cdl/redboot.cdl 22 Sep 2003 17:30:17 -0000
@@ -706,11 +706,11 @@ cdl_package CYGPKG_REDBOOT {
}
cdl_component CYGSEM_REDBOOT_FLASH_CONFIG {
display "Keep RedBoot configuration data in FLASH"
flavor bool
- default_value 1
+ default_value { CYGPKG_IO_FLASH != 0 }
compile fconfig.c
description "
When this option is enabled, RedBoot will keep configuration
data in a separate block of FLASH memory. This data will
include such items as the node IP address or startup scripts."
Index: hal/powerpc/moab/current/ChangeLog
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/hal/powerpc/moab/current/ChangeLog,v
retrieving revision 1.3
diff -u -5 -p -r1.3 ChangeLog
--- hal/powerpc/moab/current/ChangeLog 21 Sep 2003 12:27:58 -0000 1.3
+++ hal/powerpc/moab/current/ChangeLog 22 Sep 2003 17:35:16 -0000
@@ -1,5 +1,10 @@
+2003-09-22 Gary Thomas <gary@mlbassoc.com>
+
+ * cdl/hal_powerpc_moab.cdl: Need to force 'fconfig' since that is now
+ optional in RedBoot.
+
2003-09-21 Gary Thomas <gary@mlbassoc.com>
* misc/redboot_BOOT.ecm:
* misc/redboot_RAM+FLASH.ecm:
* misc/redboot_RAM.ecm:
Index: hal/powerpc/moab/current/cdl/hal_powerpc_moab.cdl
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/hal/powerpc/moab/current/cdl/hal_powerpc_moab.cdl,v
retrieving revision 1.2
diff -u -5 -p -r1.2 hal_powerpc_moab.cdl
--- hal/powerpc/moab/current/cdl/hal_powerpc_moab.cdl 20 Sep 2003 18:59:43 -0000 1.2
+++ hal/powerpc/moab/current/cdl/hal_powerpc_moab.cdl 22 Sep 2003 17:30:16 -0000
@@ -72,10 +72,11 @@ cdl_package CYGPKG_HAL_POWERPC_MOAB {
# basically, writethru mode is the only safe way to run this
requires { CYGSEM_HAL_DCACHE_STARTUP_MODE == "WRITETHRU" }
# having the MMU enabled just seems to cause no end of problems
requires { !CYGHWR_HAL_POWERPC_ENABLE_MMU }
#
+ requires { CYGSEM_REDBOOT_FLASH_CONFIG == 1 }
requires { !CYGSEM_REDBOOT_FLASH_CONFIG ||
((CYGHWR_REDBOOT_FLASH_CONFIG_MEDIA == "EEPROM") &&
(CYGNUM_REDBOOT_FLASH_CONFIG_SIZE == CYGNUM_HAL_EEPROM_SIZE) &&
(CYGNUM_REDBOOT_FLASH_STRING_SIZE == 64) &&
(CYGNUM_REDBOOT_FLASH_SCRIPT_SIZE == 256)) }