aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-02-14 21:34:05 -0500
committerTom Rini <trini@konsulko.com>2018-02-14 21:34:05 -0500
commitac727577f0f84991e0cae999f175174e606027e2 (patch)
tree1b6403f46fa05ff8bc8ac48d467385009b12da87
parentd693742b254fdbafeb39dea80e7e9640bc0ebae4 (diff)
downloadu-boot-ac727577f0f84991e0cae999f175174e606027e2.zip
u-boot-ac727577f0f84991e0cae999f175174e606027e2.tar.gz
u-boot-ac727577f0f84991e0cae999f175174e606027e2.tar.bz2
Revert "drivers/ddr/fsl: Dual-license DDR driver"
Upon further review, not all code authors are in favour of this change. This reverts commit ee3556bcafbb05e59aabdc31368984e76acaabc4. Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat
-rw-r--r--drivers/ddr/fsl/arm_ddr_gen3.c2
-rw-r--r--drivers/ddr/fsl/ctrl_regs.c2
-rw-r--r--drivers/ddr/fsl/ddr1_dimm_params.c2
-rw-r--r--drivers/ddr/fsl/ddr2_dimm_params.c2
-rw-r--r--drivers/ddr/fsl/ddr3_dimm_params.c2
-rw-r--r--drivers/ddr/fsl/ddr4_dimm_params.c2
-rw-r--r--drivers/ddr/fsl/fsl_ddr_gen4.c2
-rw-r--r--drivers/ddr/fsl/fsl_mmdc.c2
-rw-r--r--drivers/ddr/fsl/interactive.c2
-rw-r--r--drivers/ddr/fsl/lc_common_dimm_params.c2
-rw-r--r--drivers/ddr/fsl/main.c2
-rw-r--r--drivers/ddr/fsl/mpc85xx_ddr_gen1.c2
-rw-r--r--drivers/ddr/fsl/mpc85xx_ddr_gen2.c2
-rw-r--r--drivers/ddr/fsl/mpc85xx_ddr_gen3.c2
-rw-r--r--drivers/ddr/fsl/mpc86xx_ddr.c2
-rw-r--r--drivers/ddr/fsl/options.c2
-rw-r--r--drivers/ddr/fsl/util.c2
-rw-r--r--include/common_timing_params.h2
-rw-r--r--include/fsl_ddr.h2
-rw-r--r--include/fsl_ddr_dimm_params.h2
-rw-r--r--include/fsl_ddrc_version.h2
-rw-r--r--include/fsl_immap.h2
-rw-r--r--include/fsl_mmdc.h2
23 files changed, 23 insertions, 23 deletions
diff --git a/drivers/ddr/fsl/arm_ddr_gen3.c b/drivers/ddr/fsl/arm_ddr_gen3.c
index 4fa0d5d..aaf4dfb 100644
--- a/drivers/ddr/fsl/arm_ddr_gen3.c
+++ b/drivers/ddr/fsl/arm_ddr_gen3.c
@@ -1,7 +1,7 @@
/*
* Copyright 2013 Freescale Semiconductor, Inc.
*
- * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
+ * SPDX-License-Identifier: GPL-2.0+
*
* Derived from mpc85xx_ddr_gen3.c, removed all workarounds
*/
diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c
index 7308309..8b87271 100644
--- a/drivers/ddr/fsl/ctrl_regs.c
+++ b/drivers/ddr/fsl/ctrl_regs.c
@@ -2,7 +2,7 @@
* Copyright 2008-2016 Freescale Semiconductor, Inc.
* Copyright 2017-2018 NXP Semiconductor
*
- * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
+ * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/drivers/ddr/fsl/ddr1_dimm_params.c b/drivers/ddr/fsl/ddr1_dimm_params.c
index 8a8c17c..c02725e 100644
--- a/drivers/ddr/fsl/ddr1_dimm_params.c
+++ b/drivers/ddr/fsl/ddr1_dimm_params.c
@@ -1,7 +1,7 @@
/*
* Copyright 2008 Freescale Semiconductor, Inc.
*
- * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause
+ * SPDX-License-Identifier: GPL-2.0
*/
#include <common.h>
diff --git a/drivers/ddr/fsl/ddr2_dimm_params.c b/drivers/ddr/fsl/ddr2_dimm_params.c
index 3ff35aa..062c849 100644
--- a/drivers/ddr/fsl/ddr2_dimm_params.c
+++ b/drivers/ddr/fsl/ddr2_dimm_params.c
@@ -1,7 +1,7 @@
/*
* Copyright 2008 Freescale Semiconductor, Inc.
*
- * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause
+ * SPDX-License-Identifier: GPL-2.0
*/
#include <common.h>
diff --git a/drivers/ddr/fsl/ddr3_dimm_params.c b/drivers/ddr/fsl/ddr3_dimm_params.c
index d8f170e..8a0587a 100644
--- a/drivers/ddr/fsl/ddr3_dimm_params.c
+++ b/drivers/ddr/fsl/ddr3_dimm_params.c
@@ -6,7 +6,7 @@
* from ddr3 spd, please refer to the spec
* JEDEC standard No.21-C 4_01_02_11R18.pdf
*
- * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause
+ * SPDX-License-Identifier: GPL-2.0
*/
#include <common.h>
diff --git a/drivers/ddr/fsl/ddr4_dimm_params.c b/drivers/ddr/fsl/ddr4_dimm_params.c
index 343b0ff..4867fbc 100644
--- a/drivers/ddr/fsl/ddr4_dimm_params.c
+++ b/drivers/ddr/fsl/ddr4_dimm_params.c
@@ -2,7 +2,7 @@
* Copyright 2014-2016 Freescale Semiconductor, Inc.
* Copyright 2017-2018 NXP Semiconductor
*
- * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
+ * SPDX-License-Identifier: GPL-2.0+
*
* calculate the organization and timing parameter
* from ddr3 spd, please refer to the spec
diff --git a/drivers/ddr/fsl/fsl_ddr_gen4.c b/drivers/ddr/fsl/fsl_ddr_gen4.c
index 1829aa4..c225c8e 100644
--- a/drivers/ddr/fsl/fsl_ddr_gen4.c
+++ b/drivers/ddr/fsl/fsl_ddr_gen4.c
@@ -1,7 +1,7 @@
/*
* Copyright 2014-2015 Freescale Semiconductor, Inc.
*
- * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
+ * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
diff --git a/drivers/ddr/fsl/fsl_mmdc.c b/drivers/ddr/fsl/fsl_mmdc.c
index 1312c08..52eec0f 100644
--- a/drivers/ddr/fsl/fsl_mmdc.c
+++ b/drivers/ddr/fsl/fsl_mmdc.c
@@ -1,7 +1,7 @@
/*
* Copyright 2016 Freescale Semiconductor, Inc.
*
- * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
+ * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/drivers/ddr/fsl/interactive.c b/drivers/ddr/fsl/interactive.c
index f5c21e4..1fa35c3 100644
--- a/drivers/ddr/fsl/interactive.c
+++ b/drivers/ddr/fsl/interactive.c
@@ -2,7 +2,7 @@
* Copyright 2010-2016 Freescale Semiconductor, Inc.
* Copyright 2017-2018 NXP Semiconductor
*
- * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
+ * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/drivers/ddr/fsl/lc_common_dimm_params.c b/drivers/ddr/fsl/lc_common_dimm_params.c
index 3d28abd..6599901 100644
--- a/drivers/ddr/fsl/lc_common_dimm_params.c
+++ b/drivers/ddr/fsl/lc_common_dimm_params.c
@@ -2,7 +2,7 @@
* Copyright 2008-2016 Freescale Semiconductor, Inc.
* Copyright 2017-2018 NXP Semiconductor
*
- * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause
+ * SPDX-License-Identifier: GPL-2.0
*/
#include <common.h>
diff --git a/drivers/ddr/fsl/main.c b/drivers/ddr/fsl/main.c
index 85897b1..d0a7b3f 100644
--- a/drivers/ddr/fsl/main.c
+++ b/drivers/ddr/fsl/main.c
@@ -1,7 +1,7 @@
/*
* Copyright 2008-2014 Freescale Semiconductor, Inc.
*
- * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause
+ * SPDX-License-Identifier: GPL-2.0
*/
/*
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
index f74bf32..c005f52 100644
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
@@ -1,7 +1,7 @@
/*
* Copyright 2008 Freescale Semiconductor, Inc.
*
- * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause
+ * SPDX-License-Identifier: GPL-2.0
*/
#include <common.h>
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen2.c b/drivers/ddr/fsl/mpc85xx_ddr_gen2.c
index 6da4400..898b0cd 100644
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen2.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen2.c
@@ -1,7 +1,7 @@
/*
* Copyright 2008-2011 Freescale Semiconductor, Inc.
*
- * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause
+ * SPDX-License-Identifier: GPL-2.0
*/
#include <common.h>
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c
index e58f76a..afbed59 100644
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c
@@ -1,7 +1,7 @@
/*
* Copyright 2008-2012 Freescale Semiconductor, Inc.
*
- * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause
+ * SPDX-License-Identifier: GPL-2.0
*/
#include <common.h>
diff --git a/drivers/ddr/fsl/mpc86xx_ddr.c b/drivers/ddr/fsl/mpc86xx_ddr.c
index bda5b83..a65eb31 100644
--- a/drivers/ddr/fsl/mpc86xx_ddr.c
+++ b/drivers/ddr/fsl/mpc86xx_ddr.c
@@ -1,7 +1,7 @@
/*
* Copyright 2008 Freescale Semiconductor, Inc.
*
- * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause
+ * SPDX-License-Identifier: GPL-2.0
*/
#include <common.h>
diff --git a/drivers/ddr/fsl/options.c b/drivers/ddr/fsl/options.c
index 1abea1d..85ec48c 100644
--- a/drivers/ddr/fsl/options.c
+++ b/drivers/ddr/fsl/options.c
@@ -2,7 +2,7 @@
* Copyright 2008, 2010-2016 Freescale Semiconductor, Inc.
* Copyright 2017-2018 NXP Semiconductor
*
- * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
+ * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
diff --git a/drivers/ddr/fsl/util.c b/drivers/ddr/fsl/util.c
index 11731cb..d6e6e78 100644
--- a/drivers/ddr/fsl/util.c
+++ b/drivers/ddr/fsl/util.c
@@ -1,7 +1,7 @@
/*
* Copyright 2008-2014 Freescale Semiconductor, Inc.
*
- * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause
+ * SPDX-License-Identifier: GPL-2.0
*/
#include <common.h>
diff --git a/include/common_timing_params.h b/include/common_timing_params.h
index 3881456..0700107 100644
--- a/include/common_timing_params.h
+++ b/include/common_timing_params.h
@@ -1,7 +1,7 @@
/*
* Copyright 2008-2014 Freescale Semiconductor, Inc.
*
- * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause
+ * SPDX-License-Identifier: GPL-2.0
*/
#ifndef COMMON_TIMING_PARAMS_H
diff --git a/include/fsl_ddr.h b/include/fsl_ddr.h
index 996723c..261b94e 100644
--- a/include/fsl_ddr.h
+++ b/include/fsl_ddr.h
@@ -1,7 +1,7 @@
/*
* Copyright 2008-2014 Freescale Semiconductor, Inc.
*
- * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause
+ * SPDX-License-Identifier: GPL-2.0
*/
#ifndef FSL_DDR_MAIN_H
diff --git a/include/fsl_ddr_dimm_params.h b/include/fsl_ddr_dimm_params.h
index af673fd..1632a8f 100644
--- a/include/fsl_ddr_dimm_params.h
+++ b/include/fsl_ddr_dimm_params.h
@@ -2,7 +2,7 @@
* Copyright 2008-2016 Freescale Semiconductor, Inc.
* Copyright 2017-2018 NXP Semiconductor
*
- * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause
+ * SPDX-License-Identifier: GPL-2.0
*/
#ifndef DDR2_DIMM_PARAMS_H
diff --git a/include/fsl_ddrc_version.h b/include/fsl_ddrc_version.h
index 4c5aed4..60ba98b 100644
--- a/include/fsl_ddrc_version.h
+++ b/include/fsl_ddrc_version.h
@@ -1,7 +1,7 @@
/*
* Copyright 2014 Freescale Semiconductor, Inc.
*
- * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
+ * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __FSL_DDRC_VER_H
diff --git a/include/fsl_immap.h b/include/fsl_immap.h
index e210c4c..4f5a19c 100644
--- a/include/fsl_immap.h
+++ b/include/fsl_immap.h
@@ -3,7 +3,7 @@
*
* Copyright 2013-2014 Freescale Semiconductor, Inc.
*
- * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
+ * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __FSL_IMMAP_H
diff --git a/include/fsl_mmdc.h b/include/fsl_mmdc.h
index d364e07..d5c4f8d 100644
--- a/include/fsl_mmdc.h
+++ b/include/fsl_mmdc.h
@@ -1,7 +1,7 @@
/*
* Copyright 2016 Freescale Semiconductor, Inc.
*
- * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
+ * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef FSL_MMDC_H
generated by cgit v1.1 at 2024-07-10 12:22:43 +0000