# HG changeset patch
# User jld
# Date 1376251768 0
# Node ID 8ecac279f33c0854cb769926baca9fe5832c905e
# Parent  b44dec9cc8b9bcf8e3d260e176973aafa898c19f
* cdl/hal_cortexm_stm32_stm32f4discovery.cdl: Merge CDL goal expressions
  to avoid confusing the eCos Configuration Tool during  initial inference
  of STM32 variant HAL options.

diff --git a/packages/hal/cortexm/stm32/stm32f4discovery/current/ChangeLog b/packages/hal/cortexm/stm32/stm32f4discovery/current/ChangeLog
--- a/packages/hal/cortexm/stm32/stm32f4discovery/current/ChangeLog
+++ b/packages/hal/cortexm/stm32/stm32f4discovery/current/ChangeLog
@@ -1,3 +1,9 @@
+2013-08-09  John Dallaway  <john@dallaway.org.uk>
+
+	* cdl/hal_cortexm_stm32_stm32f4discovery.cdl: Merge CDL goal
+	expressions to avoid confusing the eCos Configuration Tool during
+	initial inference of STM32 variant HAL options.
+
 2013-06-09  John Dallaway  <john@dallaway.org.uk>
 
 	* cdl/hal_cortexm_stm32_stm32f4discovery.cdl,
diff --git a/packages/hal/cortexm/stm32/stm32f4discovery/current/cdl/hal_cortexm_stm32_stm32f4discovery.cdl b/packages/hal/cortexm/stm32/stm32f4discovery/current/cdl/hal_cortexm_stm32_stm32f4discovery.cdl
--- a/packages/hal/cortexm/stm32/stm32f4discovery/current/cdl/hal_cortexm_stm32_stm32f4discovery.cdl
+++ b/packages/hal/cortexm/stm32/stm32f4discovery/current/cdl/hal_cortexm_stm32_stm32f4discovery.cdl
@@ -52,8 +52,8 @@ cdl_package CYGPKG_HAL_CORTEXM_STM32_STM
     parent        CYGPKG_HAL_CORTEXM_STM32
 
     requires      { CYGHWR_HAL_CORTEXM == "M4" }
-    requires      { CYGHWR_HAL_CORTEXM_STM32_FAMILY == "F4" }
-    requires      { CYGHWR_HAL_CORTEXM_STM32_F4 == "F407VG" }
+    requires      { CYGHWR_HAL_CORTEXM_STM32_FAMILY == "F4" &&
+                    CYGHWR_HAL_CORTEXM_STM32_F4 == "F407VG" }
     requires      { CYGHWR_HAL_CORTEXM_STM32_CLOCK_PLL_SOURCE == "HSE" }
     requires      { CYGHWR_HAL_CORTEXM_STM32_CLOCK_PLL_PREDIV == 8 }
     requires      { CYGHWR_HAL_CORTEXM_STM32_CLOCK_PLL_MUL == 336 }