# HG changeset patch
# User bartv
# Date 1234212095 0
# Node ID 7dab99db1476510908914df0453e05c852eaaaa7
# Parent  0f319c78e3930535dd80afb2b099e6e26c279bb6
Fix some definitions for the SDRAM controller.

diff --git a/packages/hal/m68k/mcf52xx/var/current/ChangeLog b/packages/hal/m68k/mcf52xx/var/current/ChangeLog
--- a/packages/hal/m68k/mcf52xx/var/current/ChangeLog
+++ b/packages/hal/m68k/mcf52xx/var/current/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-09  Bart Veer  <bartv@ecoscentric.com>
+
+	* include/var_io.h (HAL_MCFxxxx_SDRAMC_DACRx_CBM_xx): fix
+	definitions.
+
 2008-11-18  Bart Veer  <bartv@ecoscentric.com>
 
 	* whole package. Replace the original M68K port.
diff --git a/packages/hal/m68k/mcf52xx/var/current/include/var_io.h b/packages/hal/m68k/mcf52xx/var/current/include/var_io.h
--- a/packages/hal/m68k/mcf52xx/var/current/include/var_io.h
+++ b/packages/hal/m68k/mcf52xx/var/current/include/var_io.h
@@ -11,7 +11,7 @@
 // ####ECOSGPLCOPYRIGHTBEGIN####                                            
 // -------------------------------------------                              
 // This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 2003, 2004, 2006, 2008 Free Software Foundation, Inc.      
+// Copyright (C) 2003, 2004, 2006, 2008, 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     
@@ -553,14 +553,14 @@
 # define HAL_MCFxxxx_SDRAMC_DACRx_CASL_SHIFT        12
 # define HAL_MCFxxxx_SDRAMC_DACRx_CBM_MASK          (0x07 << 8)
 # define HAL_MCFxxxx_SDRAMC_DACRx_CBM_SHIFT         8
-# define HAL_MCFxxxx_SDRAMC_DACRx_CBM_17            0x00
-# define HAL_MCFxxxx_SDRAMC_DACRx_CBM_18            0x01
-# define HAL_MCFxxxx_SDRAMC_DACRx_CBM_19            0x02
-# define HAL_MCFxxxx_SDRAMC_DACRx_CBM_20            0x03
-# define HAL_MCFxxxx_SDRAMC_DACRx_CBM_21            0x04
-# define HAL_MCFxxxx_SDRAMC_DACRx_CBM_22            0x05
-# define HAL_MCFxxxx_SDRAMC_DACRx_CBM_23            0x06
-# define HAL_MCFxxxx_SDRAMC_DACRx_CBM_24            0x07
+# define HAL_MCFxxxx_SDRAMC_DACRx_CBM_17            (0x00 << 8)
+# define HAL_MCFxxxx_SDRAMC_DACRx_CBM_18            (0x01 << 8)
+# define HAL_MCFxxxx_SDRAMC_DACRx_CBM_19            (0x02 << 8)
+# define HAL_MCFxxxx_SDRAMC_DACRx_CBM_20            (0x03 << 8)
+# define HAL_MCFxxxx_SDRAMC_DACRx_CBM_21            (0x04 << 8)
+# define HAL_MCFxxxx_SDRAMC_DACRx_CBM_22            (0x05 << 8)
+# define HAL_MCFxxxx_SDRAMC_DACRx_CBM_23            (0x06 << 8)
+# define HAL_MCFxxxx_SDRAMC_DACRx_CBM_24            (0x07 << 8)
 # define HAL_MCFxxxx_SDRAMC_DACRx_IMRS              (0x01 << 6)
 # define HAL_MCFxxxx_SDRAMC_DACRx_PS_MASK           (0x03 << 4)
 # define HAL_MCFxxxx_SDRAMC_DACRx_PS_SHIFT          4