Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit ac727577f0f84991e0cae999f175174e606027e2

Authored by Tom Rini
1 parent d693742b25
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

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>

Showing 23 changed files with 23 additions and 23 deletions Side-by-side Diff

drivers/ddr/fsl/arm_ddr_gen3.c
Diff comments   View file @ ac72757
1 1 /*
2 2 * Copyright 2013 Freescale Semiconductor, Inc.
3 3 *
4   - * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
  4 + * SPDX-License-Identifier: GPL-2.0+
5 5 *
6 6 * Derived from mpc85xx_ddr_gen3.c, removed all workarounds
7 7 */
drivers/ddr/fsl/ctrl_regs.c
Diff comments   View file @ ac72757
... ... @@ -2,7 +2,7 @@
2 2 * Copyright 2008-2016 Freescale Semiconductor, Inc.
3 3 * Copyright 2017-2018 NXP Semiconductor
4 4 *
5   - * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
  5 + * SPDX-License-Identifier: GPL-2.0+
6 6 */
7 7  
8 8 /*
drivers/ddr/fsl/ddr1_dimm_params.c
Diff comments   View file @ ac72757
1 1 /*
2 2 * Copyright 2008 Freescale Semiconductor, Inc.
3 3 *
4   - * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause
  4 + * SPDX-License-Identifier: GPL-2.0
5 5 */
6 6  
7 7 #include <common.h>
drivers/ddr/fsl/ddr2_dimm_params.c
Diff comments   View file @ ac72757
1 1 /*
2 2 * Copyright 2008 Freescale Semiconductor, Inc.
3 3 *
4   - * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause
  4 + * SPDX-License-Identifier: GPL-2.0
5 5 */
6 6  
7 7 #include <common.h>
drivers/ddr/fsl/ddr3_dimm_params.c
Diff comments   View file @ ac72757
... ... @@ -6,7 +6,7 @@
6 6 * from ddr3 spd, please refer to the spec
7 7 * JEDEC standard No.21-C 4_01_02_11R18.pdf
8 8 *
9   - * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause
  9 + * SPDX-License-Identifier: GPL-2.0
10 10 */
11 11  
12 12 #include <common.h>
drivers/ddr/fsl/ddr4_dimm_params.c
Diff comments   View file @ ac72757
... ... @@ -2,7 +2,7 @@
2 2 * Copyright 2014-2016 Freescale Semiconductor, Inc.
3 3 * Copyright 2017-2018 NXP Semiconductor
4 4 *
5   - * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
  5 + * SPDX-License-Identifier: GPL-2.0+
6 6 *
7 7 * calculate the organization and timing parameter
8 8 * from ddr3 spd, please refer to the spec
drivers/ddr/fsl/fsl_ddr_gen4.c
Diff comments   View file @ ac72757
1 1 /*
2 2 * Copyright 2014-2015 Freescale Semiconductor, Inc.
3 3 *
4   - * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
  4 + * SPDX-License-Identifier: GPL-2.0+
5 5 */
6 6  
7 7 #include <common.h>
drivers/ddr/fsl/fsl_mmdc.c
Diff comments   View file @ ac72757
1 1 /*
2 2 * Copyright 2016 Freescale Semiconductor, Inc.
3 3 *
4   - * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
  4 + * SPDX-License-Identifier: GPL-2.0+
5 5 */
6 6  
7 7 /*
drivers/ddr/fsl/interactive.c
Diff comments   View file @ ac72757
... ... @@ -2,7 +2,7 @@
2 2 * Copyright 2010-2016 Freescale Semiconductor, Inc.
3 3 * Copyright 2017-2018 NXP Semiconductor
4 4 *
5   - * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
  5 + * SPDX-License-Identifier: GPL-2.0+
6 6 */
7 7  
8 8 /*
drivers/ddr/fsl/lc_common_dimm_params.c
Diff comments   View file @ ac72757
... ... @@ -2,7 +2,7 @@
2 2 * Copyright 2008-2016 Freescale Semiconductor, Inc.
3 3 * Copyright 2017-2018 NXP Semiconductor
4 4 *
5   - * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause
  5 + * SPDX-License-Identifier: GPL-2.0
6 6 */
7 7  
8 8 #include <common.h>
drivers/ddr/fsl/main.c
Diff comments   View file @ ac72757
1 1 /*
2 2 * Copyright 2008-2014 Freescale Semiconductor, Inc.
3 3 *
4   - * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause
  4 + * SPDX-License-Identifier: GPL-2.0
5 5 */
6 6  
7 7 /*
drivers/ddr/fsl/mpc85xx_ddr_gen1.c
Diff comments   View file @ ac72757
1 1 /*
2 2 * Copyright 2008 Freescale Semiconductor, Inc.
3 3 *
4   - * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause
  4 + * SPDX-License-Identifier: GPL-2.0
5 5 */
6 6  
7 7 #include <common.h>
drivers/ddr/fsl/mpc85xx_ddr_gen2.c
Diff comments   View file @ ac72757
1 1 /*
2 2 * Copyright 2008-2011 Freescale Semiconductor, Inc.
3 3 *
4   - * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause
  4 + * SPDX-License-Identifier: GPL-2.0
5 5 */
6 6  
7 7 #include <common.h>
drivers/ddr/fsl/mpc85xx_ddr_gen3.c
Diff comments   View file @ ac72757
1 1 /*
2 2 * Copyright 2008-2012 Freescale Semiconductor, Inc.
3 3 *
4   - * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause
  4 + * SPDX-License-Identifier: GPL-2.0
5 5 */
6 6  
7 7 #include <common.h>
drivers/ddr/fsl/mpc86xx_ddr.c
Diff comments   View file @ ac72757
1 1 /*
2 2 * Copyright 2008 Freescale Semiconductor, Inc.
3 3 *
4   - * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause
  4 + * SPDX-License-Identifier: GPL-2.0
5 5 */
6 6  
7 7 #include <common.h>
drivers/ddr/fsl/options.c
Diff comments   View file @ ac72757
... ... @@ -2,7 +2,7 @@
2 2 * Copyright 2008, 2010-2016 Freescale Semiconductor, Inc.
3 3 * Copyright 2017-2018 NXP Semiconductor
4 4 *
5   - * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
  5 + * SPDX-License-Identifier: GPL-2.0+
6 6 */
7 7  
8 8 #include <common.h>
drivers/ddr/fsl/util.c
Diff comments   View file @ ac72757
1 1 /*
2 2 * Copyright 2008-2014 Freescale Semiconductor, Inc.
3 3 *
4   - * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause
  4 + * SPDX-License-Identifier: GPL-2.0
5 5 */
6 6  
7 7 #include <common.h>
include/common_timing_params.h
Diff comments   View file @ ac72757
1 1 /*
2 2 * Copyright 2008-2014 Freescale Semiconductor, Inc.
3 3 *
4   - * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause
  4 + * SPDX-License-Identifier: GPL-2.0
5 5 */
6 6  
7 7 #ifndef COMMON_TIMING_PARAMS_H
1 1 /*
2 2 * Copyright 2008-2014 Freescale Semiconductor, Inc.
3 3 *
4   - * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause
  4 + * SPDX-License-Identifier: GPL-2.0
5 5 */
6 6  
7 7 #ifndef FSL_DDR_MAIN_H
include/fsl_ddr_dimm_params.h
Diff comments   View file @ ac72757
... ... @@ -2,7 +2,7 @@
2 2 * Copyright 2008-2016 Freescale Semiconductor, Inc.
3 3 * Copyright 2017-2018 NXP Semiconductor
4 4 *
5   - * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause
  5 + * SPDX-License-Identifier: GPL-2.0
6 6 */
7 7  
8 8 #ifndef DDR2_DIMM_PARAMS_H
include/fsl_ddrc_version.h
Diff comments   View file @ ac72757
1 1 /*
2 2 * Copyright 2014 Freescale Semiconductor, Inc.
3 3 *
4   - * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
  4 + * SPDX-License-Identifier: GPL-2.0+
5 5 */
6 6  
7 7 #ifndef __FSL_DDRC_VER_H
... ... @@ -3,7 +3,7 @@
3 3 *
4 4 * Copyright 2013-2014 Freescale Semiconductor, Inc.
5 5 *
6   - * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
  6 + * SPDX-License-Identifier: GPL-2.0+
7 7 */
8 8  
9 9 #ifndef __FSL_IMMAP_H
1 1 /*
2 2 * Copyright 2016 Freescale Semiconductor, Inc.
3 3 *
4   - * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
  4 + * SPDX-License-Identifier: GPL-2.0+
5 5 */
6 6  
7 7 #ifndef FSL_MMDC_H