diff options
| author | Stefano Babic <sbabic@denx.de> | 2015-11-12 17:13:26 +0100 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-11-12 17:13:26 +0100 |
| commit | 5f5620ab2679608f94b3a77e51c77d0a770103bd (patch) | |
| tree | ec983c06d2f62384909968bb870add121b8a1502 /drivers/ddr | |
| parent | 78e9ca52edaab74ad645d719676ff4c24d2f462c (diff) | |
| parent | 038be18fd95aa6283eafb85ceabc0b880976424b (diff) | |
Merge git://git.denx.de/u-boot
Diffstat (limited to 'drivers/ddr')
| -rw-r--r-- | drivers/ddr/fsl/Makefile | 4 | ||||
| -rw-r--r-- | drivers/ddr/fsl/ctrl_regs.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/ddr/fsl/Makefile b/drivers/ddr/fsl/Makefile index df66c07230f..01ea86217c0 100644 --- a/drivers/ddr/fsl/Makefile +++ b/drivers/ddr/fsl/Makefile @@ -1,9 +1,7 @@ # # Copyright 2008-2014 Freescale Semiconductor, Inc. # -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# Version 2 as published by the Free Software Foundation. +# SPDX-License-Identifier: GPL-2.0 # obj-$(CONFIG_SYS_FSL_DDR1) += main.o util.o ctrl_regs.o options.o \ diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c index 8367c95cf82..85436791087 100644 --- a/drivers/ddr/fsl/ctrl_regs.c +++ b/drivers/ddr/fsl/ctrl_regs.c @@ -858,7 +858,7 @@ static void set_ddr_sdram_cfg_2(const unsigned int ctrl_num, break; } } - + sr_ie = popts->self_refresh_interrupt_en; num_pr = 1; /* Make this configurable */ /* |