Mercurial > ecos-v3_0-branch

changeset 2072:1a2e77f21cc1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* cdl/hal_arm_xscale_pxa2x0.cdl: Fix the last patch, logical OR not bitwise is needed.
author asl
date Mon, 19 Sep 2005 16:57:46 +0000
parents e2b325763b2d
children 0d2fa563e338
files packages/hal/arm/xscale/pxa2x0/current/ChangeLog packages/hal/arm/xscale/pxa2x0/current/cdl/hal_arm_xscale_pxa2x0.cdl
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/packages/hal/arm/xscale/pxa2x0/current/ChangeLog
+++ b/packages/hal/arm/xscale/pxa2x0/current/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-19  David Vrabel  <dvrabel@arcom.com>
+
+	* cdl/hal_arm_xscale_pxa2x0.cdl: Fix the last patch, logical OR
+	not bitwise is needed.
+
 2005-09-15  David Vrabel  <dvrabel@arcom.com>
 
 	* cdl/hal_arm_xscale_pxa2x0.cdl: Only build hal_diag.c if one of
--- a/packages/hal/arm/xscale/pxa2x0/current/cdl/hal_arm_xscale_pxa2x0.cdl
+++ b/packages/hal/arm/xscale/pxa2x0/current/cdl/hal_arm_xscale_pxa2x0.cdl
@@ -132,8 +132,8 @@ cdl_package CYGPKG_HAL_ARM_XSCALE_PXA2X0
     cdl_option CYGBLD_BUILD_HAL_ARM_XSCALE_PXA2X0_SERIAL_DIAG {
         display     "Include support for PXA2X0 serial diagnostic/debug channels"
         default_value { CYGHWR_HAL_ARM_PXA2X0_FFUART
-                      | CYGHWR_HAL_ARM_PXA2X0_BTUART
-                      | CYGHWR_HAL_ARM_PXA2X0_STUART }
+                      || CYGHWR_HAL_ARM_PXA2X0_BTUART
+                      || CYGHWR_HAL_ARM_PXA2X0_STUART }
 
         compile     hal_diag.c
     }