Merge branch 'u-boot/master' into 'u-boot-arm/master'

[oweals/u-boot.git] / board / freescale / mpc8349emds / ddr.c

diff --git a/board/freescale/mpc8349emds/ddr.c b/board/freescale/mpc8349emds/ddr.c
index c66750e2e398a09c9b054c475ea4863c2080b3d3..aae003d1210517a859eea3273534cb91045369fa 100644 (file)
--- a/board/freescale/mpc8349emds/ddr.c
+++ b/board/freescale/mpc8349emds/ddr.c
@@ -6,8 +6,8 @@
 
 #include <common.h>
 
-#include <asm/fsl_ddr_sdram.h>
-#include <asm/fsl_ddr_dimm_params.h>
+#include <fsl_ddr_sdram.h>
+#include <fsl_ddr_dimm_params.h>
 
 struct board_specific_parameters {
        u32 n_ranks;
@@ -15,7 +15,7 @@ struct board_specific_parameters {
        u32 clk_adjust;
        u32 cpo;
        u32 write_data_delay;
-       u32 force_2T;
+       u32 force_2t;
 };
 
 /*
@@ -70,7 +70,7 @@ void fsl_ddr_board_options(memctl_options_t *popts,
                                popts->cpo_override = pbsp->cpo;
                                popts->write_data_delay =
                                        pbsp->write_data_delay;
-                               popts->twoT_en = pbsp->force_2T;
+                               popts->twot_en = pbsp->force_2t;
                                goto found;
                        }
                        pbsp_highest = pbsp;
@@ -86,7 +86,7 @@ void fsl_ddr_board_options(memctl_options_t *popts,
                popts->clk_adjust = pbsp_highest->clk_adjust;
                popts->cpo_override = pbsp_highest->cpo;
                popts->write_data_delay = pbsp_highest->write_data_delay;
-               popts->twoT_en = pbsp_highest->force_2T;
+               popts->twot_en = pbsp_highest->force_2t;
        } else {
                panic("DIMM is not supported by this board");
        }
@@ -97,5 +97,5 @@ found:
         *      - number of DIMMs installed
         */
        popts->half_strength_driver_enable = 0;
-       popts->DQS_config = 0;  /* only true DQS signal is used on board */
+       popts->dqs_config = 0;  /* only true DQS signal is used on board */
 }