# HG changeset patch # User jld # Date 1240923971 0 # Node ID 5ae4b05913c1ce0dee889de2483758f2bec00528 # Parent 73f2982fdf46b1a855f537c028edbab801c86b63 * fs/fat/current/cdl/fatfs.cdl, fs/jffs2/current/cdl/jffs2.cdl, fs/ram/current/cdl/ramfs.cdl, fs/rom/current/cdl/romfs.cdl: Use CYGPKG_IO_FILEIO as the parent. * devs/watchdog/arm/at91/current/cdl/watchdog_at91.cdl, devs/watchdog/arm/at91wdtc/current/cdl/watchdog_at91wdtc.cdl, devs/watchdog/arm/lpc2xxx/current/cdl/watchdog_lpc2xxx.cdl: Give CYGIMP_WATCHDOG_HARDWARE a default value rather than a calculated value to accommodate other implementations of CYGINT_WATCHDOG_IMPLEMENTATIONS. * services/compress/zlib/current/cdl/compress_zlib.cdl: Fix display and description strings for LDFLAGS manipulation options. * io/disk/current/cdl/io_disk.cdl: Use CYGPKG_IO as the parent. * io/watchdog/current/cdl/watchdog.cdl: Move the CYGINT_WATCHDOG_IMPLEMENTATIONS constraint to the interface declaration itself to ensure that the eCos Configuration Tool presents implementators as radio buttons. diff --git a/packages/devs/watchdog/arm/at91/current/ChangeLog b/packages/devs/watchdog/arm/at91/current/ChangeLog --- a/packages/devs/watchdog/arm/at91/current/ChangeLog +++ b/packages/devs/watchdog/arm/at91/current/ChangeLog @@ -1,3 +1,9 @@ +2009-04-28 John Dallaway + + * cdl/watchdog_at91.cdl: Give CYGIMP_WATCHDOG_HARDWARE a default + value rather than a calculated value to accommodate other + implementations of CYGINT_WATCHDOG_IMPLEMENTATIONS. + 2004-10-4 Andrea Michelotti * src/watchdog_at91.cxx: @@ -16,7 +22,7 @@ 2002-08-06 Thomas Koeller + + * cdl/watchdog_at91wdtc.cdl: Give CYGIMP_WATCHDOG_HARDWARE a default + value rather than a calculated value to accommodate other + implementations of CYGINT_WATCHDOG_IMPLEMENTATIONS. + 2009-02-04 Bart Veer * src/watchdog_at91wdtc.cxx: switch init priority to diff --git a/packages/devs/watchdog/arm/at91wdtc/current/cdl/watchdog_at91wdtc.cdl b/packages/devs/watchdog/arm/at91wdtc/current/cdl/watchdog_at91wdtc.cdl --- a/packages/devs/watchdog/arm/at91wdtc/current/cdl/watchdog_at91wdtc.cdl +++ b/packages/devs/watchdog/arm/at91wdtc/current/cdl/watchdog_at91wdtc.cdl @@ -8,7 +8,7 @@ ## ####ECOSGPLCOPYRIGHTBEGIN#### ## ------------------------------------------- ## This file is part of eCos, the Embedded Configurable Operating System. -## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006 Free Software Foundation, Inc. +## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006, 2009 Free Software Foundation, Inc. ## ## eCos is free software; you can redistribute it and/or modify it under ## the terms of the GNU General Public License as published by the Free @@ -69,7 +69,7 @@ cdl_package CYGPKG_DEVICES_WATCHDOG_ARM_ cdl_option CYGIMP_WATCHDOG_HARDWARE { parent CYGPKG_IO_WATCHDOG_IMPLEMENTATION display "Hardware watchdog" - calculated 1 + default_value 1 implements CYGINT_WATCHDOG_IMPLEMENTATIONS } diff --git a/packages/devs/watchdog/arm/lpc2xxx/current/ChangeLog b/packages/devs/watchdog/arm/lpc2xxx/current/ChangeLog --- a/packages/devs/watchdog/arm/lpc2xxx/current/ChangeLog +++ b/packages/devs/watchdog/arm/lpc2xxx/current/ChangeLog @@ -1,3 +1,9 @@ +2009-04-28 John Dallaway + + * cdl/watchdog_lpc2xxx.cdl: Give CYGIMP_WATCHDOG_HARDWARE a default + value rather than a calculated value to accommodate other + implementations of CYGINT_WATCHDOG_IMPLEMENTATIONS. + 2009-02-09 Bart Veer * src/watchdog_lpc2xxx.cxx: switch init priority to diff --git a/packages/devs/watchdog/arm/lpc2xxx/current/cdl/watchdog_lpc2xxx.cdl b/packages/devs/watchdog/arm/lpc2xxx/current/cdl/watchdog_lpc2xxx.cdl --- a/packages/devs/watchdog/arm/lpc2xxx/current/cdl/watchdog_lpc2xxx.cdl +++ b/packages/devs/watchdog/arm/lpc2xxx/current/cdl/watchdog_lpc2xxx.cdl @@ -8,7 +8,7 @@ ## ####ECOSGPLCOPYRIGHTBEGIN#### ## ------------------------------------------- ## This file is part of eCos, the Embedded Configurable Operating System. -## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2009 Free Software Foundation, Inc. ## ## eCos is free software; you can redistribute it and/or modify it under ## the terms of the GNU General Public License as published by the Free @@ -67,7 +67,7 @@ cdl_package CYGPKG_DEVICES_WATCHDOG_ARM_ cdl_option CYGIMP_WATCHDOG_HARDWARE { parent CYGPKG_IO_WATCHDOG_IMPLEMENTATION display "Hardware watchdog" - calculated 1 + default_value 1 implements CYGINT_WATCHDOG_IMPLEMENTATIONS } diff --git a/packages/fs/fat/current/ChangeLog b/packages/fs/fat/current/ChangeLog --- a/packages/fs/fat/current/ChangeLog +++ b/packages/fs/fat/current/ChangeLog @@ -1,3 +1,7 @@ +2009-04-28 John Dallaway + + cdl/fatfs.cdl: Use CYGPKG_IO_FILEIO as the parent. + 2008-08-19 Andrew Lunn * cdl/fatfs.cdl: Add configury for the disk device names to be @@ -205,7 +209,7 @@ 2003-07-07 Savin Zlobec + + cdl/jffs2.cdl: Use CYGPKG_IO_FILEIO as the parent. + 2009-02-22 Andrew Lunn * cdl/jffs2.cdl: Add include-fixed to the system include files we @@ -512,7 +516,7 @@ 2000-08-28 Dominic Ostrowski (dominic.o // ####GPLCOPYRIGHTBEGIN#### // ------------------------------------------- // This file is part of eCos, the Embedded Configurable Operating System. -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc. +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2009 Free Software Foundation, Inc. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/packages/fs/jffs2/current/cdl/jffs2.cdl b/packages/fs/jffs2/current/cdl/jffs2.cdl --- a/packages/fs/jffs2/current/cdl/jffs2.cdl +++ b/packages/fs/jffs2/current/cdl/jffs2.cdl @@ -10,7 +10,7 @@ ## ####ECOSGPLCOPYRIGHTBEGIN#### ## ------------------------------------------- ## This file is part of eCos, the Embedded Configurable Operating System. -## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc. +## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2009 Free Software Foundation, Inc. ## ## eCos is free software; you can redistribute it and/or modify it under ## the terms of the GNU General Public License as published by the Free @@ -55,6 +55,7 @@ cdl_package CYGPKG_FS_JFFS2 { doc ref/fileio.html include_dir "" + parent CYGPKG_IO_FILEIO requires CYGPKG_IO_FILEIO requires CYGPKG_IO_FLASH requires CYGINT_ISO_MALLOC diff --git a/packages/fs/ram/current/ChangeLog b/packages/fs/ram/current/ChangeLog --- a/packages/fs/ram/current/ChangeLog +++ b/packages/fs/ram/current/ChangeLog @@ -1,3 +1,7 @@ +2009-04-28 John Dallaway + + cdl/ramfs.cdl: Use CYGPKG_IO_FILEIO as the parent. + 2008-04-02 Xinghua Yang Taiyun Wang @@ -131,7 +135,7 @@ 2000-08-18 Nick Garnett + + cdl/romfs.cdl: Use CYGPKG_IO_FILEIO as the parent. + 2009-02-07 John Dallaway * cdl/romfs.cdl: Pass file2c.tcl to tclsh directly. diff --git a/packages/fs/rom/current/cdl/romfs.cdl b/packages/fs/rom/current/cdl/romfs.cdl --- a/packages/fs/rom/current/cdl/romfs.cdl +++ b/packages/fs/rom/current/cdl/romfs.cdl @@ -53,6 +53,7 @@ cdl_package CYGPKG_FS_ROM { doc ref/fileio.html include_dir cyg/romfs + parent CYGPKG_IO_FILEIO requires CYGPKG_IO_FILEIO requires CYGPKG_ISOINFRA diff --git a/packages/io/disk/current/ChangeLog b/packages/io/disk/current/ChangeLog --- a/packages/io/disk/current/ChangeLog +++ b/packages/io/disk/current/ChangeLog @@ -1,3 +1,7 @@ +2009-04-28 John Dallaway + + cdl/io_disk.cdl: Use CYGPKG_IO as the parent. + 2006-09-21 Jonathan Larmour * include/disk.h (DISK_CHANNEL): No need for extra _part_dev @@ -139,7 +143,7 @@ 2003-09-01 Savin Zlobec + + * cdl/watchdog.cdl: Move the CYGINT_WATCHDOG_IMPLEMENTATIONS + constraint to the interface declaration itself to ensure that the + eCos Configuration Tool presents implementators as radio buttons. + 2009-02-04 Bart Veer * src/watchdog.cxx: switch to CYG_INIT_DEV_WATCHDOG init priority. diff --git a/packages/io/watchdog/current/cdl/watchdog.cdl b/packages/io/watchdog/current/cdl/watchdog.cdl --- a/packages/io/watchdog/current/cdl/watchdog.cdl +++ b/packages/io/watchdog/current/cdl/watchdog.cdl @@ -8,7 +8,7 @@ ## ####ECOSGPLCOPYRIGHTBEGIN#### ## ------------------------------------------- ## This file is part of eCos, the Embedded Configurable Operating System. -## Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, Inc. ## ## eCos is free software; you can redistribute it and/or modify it under ## the terms of the GNU General Public License as published by the Free @@ -52,7 +52,6 @@ cdl_package CYGPKG_IO_WATCHDOG { display "Watchdog IO device" define_header watchdog.h include_dir cyg/io - requires 1 == CYGINT_WATCHDOG_IMPLEMENTATIONS description " The watchdog IO device allows applications to make use of a timer facility. Depending on the underlying hardware device @@ -73,6 +72,7 @@ cdl_package CYGPKG_IO_WATCHDOG { cdl_interface CYGINT_WATCHDOG_IMPLEMENTATIONS { display "Number of watchdog implementations" no_define + requires 1 == CYGINT_WATCHDOG_IMPLEMENTATIONS } cdl_component CYGPKG_IO_WATCHDOG_IMPLEMENTATION { diff --git a/packages/services/compress/zlib/current/ChangeLog b/packages/services/compress/zlib/current/ChangeLog --- a/packages/services/compress/zlib/current/ChangeLog +++ b/packages/services/compress/zlib/current/ChangeLog @@ -1,3 +1,8 @@ +2009-04-28 John Dallaway + + * cdl/compress_zlib.cdl: Fix display and description strings for + LDFLAGS manipulation options. + 2009-03-09 John Dallaway * cdl/compress_zlib.cdl: Reference test executable filenames for diff --git a/packages/services/compress/zlib/current/cdl/compress_zlib.cdl b/packages/services/compress/zlib/current/cdl/compress_zlib.cdl --- a/packages/services/compress/zlib/current/cdl/compress_zlib.cdl +++ b/packages/services/compress/zlib/current/cdl/compress_zlib.cdl @@ -135,23 +135,23 @@ cdl_package CYGPKG_COMPRESS_ZLIB { } cdl_option CYGPKG_COMPRESS_ZLIB_LDFLAGS_ADD { - display "Additional compiler flags" + display "Additional linker flags" flavor data no_define default_value { "" } description " - This option modifies the set of compiler flags for + This option modifies the set of linker flags for building this package. These flags are used in addition to the set of global flags." } cdl_option CYGPKG_COMPRESS_ZLIB_LDFLAGS_REMOVE { - display "Suppressed compiler flags" + display "Suppressed linker flags" flavor data no_define default_value { "" } description " - This option modifies the set of compiler flags for + This option modifies the set of linker flags for building this package. These flags are removed from the set of global flags if present." }