Mercurial > flash_v2

changeset 1252:4dfb5c337649

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove conflicting constraint.
author gthomas
date Sun, 28 Sep 2003 11:23:14 +0000
parents dc8c964619a0
children 9ecd8873f657
files packages/hal/powerpc/moab/current/ChangeLog packages/hal/powerpc/moab/current/cdl/hal_powerpc_moab.cdl
diffstat 2 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/packages/hal/powerpc/moab/current/ChangeLog
+++ b/packages/hal/powerpc/moab/current/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-28  Gary Thomas  <gary@mlbassoc.com>
+
+	* cdl/hal_powerpc_moab.cdl: Remove conflicting constraint - prevented
+	non-RedBoot builds.
+
 2003-09-26  Gary Thomas  <gary@mlbassoc.com>
 
 	* include/plf_io.h: PCI IRQ mapping is platform dependent - moved here.
--- a/packages/hal/powerpc/moab/current/cdl/hal_powerpc_moab.cdl
+++ b/packages/hal/powerpc/moab/current/cdl/hal_powerpc_moab.cdl
@@ -74,7 +74,6 @@ cdl_package CYGPKG_HAL_POWERPC_MOAB {
 # 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) &&
@@ -131,13 +130,10 @@ cdl_package CYGPKG_HAL_POWERPC_MOAB {
     cdl_component CYGNUM_HAL_EEPROM_SIZE {
         display       "Size of EEPROM device"
         flavor        data
-        legal_values  { 1024 2048 4192 }
+        legal_values  { 1024 2048 4096 }
         default_value { 2048 }
         description   "
-           This option is used to control where the application program will
-           run, either from RAM or ROM (flash) memory.  ROM based applications
-           must be self contained, while RAM applications will typically assume
-           the existence of a debug environment, such as GDB stubs."
+           This option indicates the size (and type) of EEPROM fitted on the board"
     }
 
     cdl_component CYGSEM_HAL_IDE_SUPPORT {