This is the mail archive of the ecos-patches@sources.redhat.com mailing list for the eCos project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: hal_powerpc_moab.cdl


On Sat, 2003-09-27 at 20:02, Bill Siegmund wrote:
> When run on Windows 2000
> on the version of Cygwin on the eCos 2.0 CD,
> ecosconfig complains about an unresolved conflict
> and points at the "requires" constraint at line 77
> of hal_powerpc_moab.cdl r1.3 of 2003/09/22
> 

The attached patch [already applied] has the same effect and
is a bit cleaner.  There was just an extra constraint left in.

-- 
Gary Thomas <gary@mlbassoc.com>
MLB Associates
Index: hal/powerpc/moab/current/ChangeLog
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/hal/powerpc/moab/current/ChangeLog,v
retrieving revision 1.6
diff -u -5 -p -r1.6 ChangeLog
--- hal/powerpc/moab/current/ChangeLog	26 Sep 2003 10:40:38 -0000	1.6
+++ hal/powerpc/moab/current/ChangeLog	28 Sep 2003 11:21:21 -0000
@@ -1,5 +1,10 @@
+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.
 
 2003-09-24  Gary Thomas  <gary@mlbassoc.com>
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.3
diff -u -5 -p -r1.3 hal_powerpc_moab.cdl
--- hal/powerpc/moab/current/cdl/hal_powerpc_moab.cdl	22 Sep 2003 17:35:53 -0000	1.3
+++ hal/powerpc/moab/current/cdl/hal_powerpc_moab.cdl	28 Sep 2003 11:20:38 -0000
@@ -72,11 +72,10 @@ 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)) }
@@ -129,17 +128,14 @@ 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 {
         display       "HAL support for IDE disks"
         flavor        bool

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]