diff options
-rw-r--r-- | drivers/renesas/rcar/ddr/boot_init_dram.h (renamed from drivers/staging/renesas/rcar/ddr/boot_init_dram.h) | 0 | ||||
-rw-r--r-- | drivers/renesas/rcar/ddr/ddr.mk | 17 | ||||
-rw-r--r-- | drivers/renesas/rcar/ddr/ddr_a/boot_init_dram_regdef.h (renamed from drivers/staging/renesas/rcar/ddr/ddr_a/boot_init_dram_regdef.h) | 0 | ||||
-rw-r--r-- | drivers/renesas/rcar/ddr/ddr_a/ddr_a.mk | 13 | ||||
-rw-r--r-- | drivers/renesas/rcar/ddr/ddr_a/ddr_init_d3.c (renamed from drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_d3.c) | 0 | ||||
-rw-r--r-- | drivers/renesas/rcar/ddr/ddr_a/ddr_init_e3.c (renamed from drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c) | 0 | ||||
-rw-r--r-- | drivers/renesas/rcar/ddr/ddr_a/ddr_init_v3m.c (renamed from drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_v3m.c) | 0 | ||||
-rw-r--r-- | drivers/renesas/rcar/ddr/ddr_b/boot_init_dram.c (renamed from drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c) | 0 | ||||
-rw-r--r-- | drivers/renesas/rcar/ddr/ddr_b/boot_init_dram_config.c (renamed from drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram_config.c) | 0 | ||||
-rw-r--r-- | drivers/renesas/rcar/ddr/ddr_b/boot_init_dram_regdef.h (renamed from drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram_regdef.h) | 0 | ||||
-rw-r--r-- | drivers/renesas/rcar/ddr/ddr_b/ddr_b.mk (renamed from drivers/staging/renesas/rcar/ddr/ddr_b/ddr_b.mk) | 2 | ||||
-rw-r--r-- | drivers/renesas/rcar/ddr/ddr_b/ddr_regdef.h (renamed from drivers/staging/renesas/rcar/ddr/ddr_b/ddr_regdef.h) | 0 | ||||
-rw-r--r-- | drivers/renesas/rcar/ddr/ddr_b/init_dram_tbl_h3.h (renamed from drivers/staging/renesas/rcar/ddr/ddr_b/init_dram_tbl_h3.h) | 0 | ||||
-rw-r--r-- | drivers/renesas/rcar/ddr/ddr_b/init_dram_tbl_h3ver2.h (renamed from drivers/staging/renesas/rcar/ddr/ddr_b/init_dram_tbl_h3ver2.h) | 0 | ||||
-rw-r--r-- | drivers/renesas/rcar/ddr/ddr_b/init_dram_tbl_m3.h (renamed from drivers/staging/renesas/rcar/ddr/ddr_b/init_dram_tbl_m3.h) | 0 | ||||
-rw-r--r-- | drivers/renesas/rcar/ddr/ddr_b/init_dram_tbl_m3n.h (renamed from drivers/staging/renesas/rcar/ddr/ddr_b/init_dram_tbl_m3n.h) | 0 | ||||
-rw-r--r-- | drivers/renesas/rcar/ddr/ddr_regs.h (renamed from drivers/staging/renesas/rcar/ddr/ddr_regs.h) | 0 | ||||
-rw-r--r-- | drivers/renesas/rcar/ddr/dram_sub_func.c (renamed from drivers/staging/renesas/rcar/ddr/dram_sub_func.c) | 0 | ||||
-rw-r--r-- | drivers/renesas/rcar/ddr/dram_sub_func.h (renamed from drivers/staging/renesas/rcar/ddr/dram_sub_func.h) | 0 | ||||
-rw-r--r-- | drivers/staging/renesas/rcar/ddr/ddr.mk | 17 | ||||
-rw-r--r-- | drivers/staging/renesas/rcar/ddr/ddr_a/ddr_a.mk | 13 | ||||
-rw-r--r-- | plat/renesas/rcar/platform.mk | 4 |
22 files changed, 33 insertions, 33 deletions
diff --git a/drivers/staging/renesas/rcar/ddr/boot_init_dram.h b/drivers/renesas/rcar/ddr/boot_init_dram.h index ac237b2ef..ac237b2ef 100644 --- a/drivers/staging/renesas/rcar/ddr/boot_init_dram.h +++ b/drivers/renesas/rcar/ddr/boot_init_dram.h diff --git a/drivers/renesas/rcar/ddr/ddr.mk b/drivers/renesas/rcar/ddr/ddr.mk new file mode 100644 index 000000000..c26993d00 --- /dev/null +++ b/drivers/renesas/rcar/ddr/ddr.mk @@ -0,0 +1,17 @@ +# +# Copyright (c) 2015-2018, Renesas Electronics Corporation. All rights reserved. +# +# SPDX-License-Identifier: BSD-3-Clause +# + +ifeq (${RCAR_LSI},${RCAR_E3}) + include drivers/renesas/rcar/ddr/ddr_a/ddr_a.mk + BL2_SOURCES += drivers/renesas/rcar/ddr/dram_sub_func.c +else ifeq (${RCAR_LSI},${RCAR_D3}) + include drivers/renesas/rcar/ddr/ddr_a/ddr_a.mk +else ifeq (${RCAR_LSI},${RCAR_V3M}) + include drivers/renesas/rcar/ddr/ddr_a/ddr_a.mk +else + include drivers/renesas/rcar/ddr/ddr_b/ddr_b.mk + BL2_SOURCES += drivers/renesas/rcar/ddr/dram_sub_func.c +endif diff --git a/drivers/staging/renesas/rcar/ddr/ddr_a/boot_init_dram_regdef.h b/drivers/renesas/rcar/ddr/ddr_a/boot_init_dram_regdef.h index 0f89b4350..0f89b4350 100644 --- a/drivers/staging/renesas/rcar/ddr/ddr_a/boot_init_dram_regdef.h +++ b/drivers/renesas/rcar/ddr/ddr_a/boot_init_dram_regdef.h diff --git a/drivers/renesas/rcar/ddr/ddr_a/ddr_a.mk b/drivers/renesas/rcar/ddr/ddr_a/ddr_a.mk new file mode 100644 index 000000000..7882558d0 --- /dev/null +++ b/drivers/renesas/rcar/ddr/ddr_a/ddr_a.mk @@ -0,0 +1,13 @@ +# +# Copyright (c) 2015-2018, Renesas Electronics Corporation. All rights reserved. +# +# SPDX-License-Identifier: BSD-3-Clause +# + +ifeq (${RCAR_LSI},${RCAR_E3}) +BL2_SOURCES += drivers/renesas/rcar/ddr/ddr_a/ddr_init_e3.c +else ifeq (${RCAR_LSI},${RCAR_D3}) +BL2_SOURCES += drivers/renesas/rcar/ddr/ddr_a/ddr_init_d3.c +else +BL2_SOURCES += drivers/renesas/rcar/ddr/ddr_a/ddr_init_v3m.c +endif diff --git a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_d3.c b/drivers/renesas/rcar/ddr/ddr_a/ddr_init_d3.c index a49510ed5..a49510ed5 100644 --- a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_d3.c +++ b/drivers/renesas/rcar/ddr/ddr_a/ddr_init_d3.c diff --git a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c b/drivers/renesas/rcar/ddr/ddr_a/ddr_init_e3.c index fc278ef57..fc278ef57 100644 --- a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c +++ b/drivers/renesas/rcar/ddr/ddr_a/ddr_init_e3.c diff --git a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_v3m.c b/drivers/renesas/rcar/ddr/ddr_a/ddr_init_v3m.c index 5410771c9..5410771c9 100644 --- a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_v3m.c +++ b/drivers/renesas/rcar/ddr/ddr_a/ddr_init_v3m.c diff --git a/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c b/drivers/renesas/rcar/ddr/ddr_b/boot_init_dram.c index 1d6e83a2c..1d6e83a2c 100644 --- a/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c +++ b/drivers/renesas/rcar/ddr/ddr_b/boot_init_dram.c diff --git a/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram_config.c b/drivers/renesas/rcar/ddr/ddr_b/boot_init_dram_config.c index f8caade27..f8caade27 100644 --- a/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram_config.c +++ b/drivers/renesas/rcar/ddr/ddr_b/boot_init_dram_config.c diff --git a/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram_regdef.h b/drivers/renesas/rcar/ddr/ddr_b/boot_init_dram_regdef.h index 5047e5cc2..5047e5cc2 100644 --- a/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram_regdef.h +++ b/drivers/renesas/rcar/ddr/ddr_b/boot_init_dram_regdef.h diff --git a/drivers/staging/renesas/rcar/ddr/ddr_b/ddr_b.mk b/drivers/renesas/rcar/ddr/ddr_b/ddr_b.mk index 875f95339..2bcc2922d 100644 --- a/drivers/staging/renesas/rcar/ddr/ddr_b/ddr_b.mk +++ b/drivers/renesas/rcar/ddr/ddr_b/ddr_b.mk @@ -4,4 +4,4 @@ # SPDX-License-Identifier: BSD-3-Clause # -BL2_SOURCES += drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c +BL2_SOURCES += drivers/renesas/rcar/ddr/ddr_b/boot_init_dram.c diff --git a/drivers/staging/renesas/rcar/ddr/ddr_b/ddr_regdef.h b/drivers/renesas/rcar/ddr/ddr_b/ddr_regdef.h index adf8dab18..adf8dab18 100644 --- a/drivers/staging/renesas/rcar/ddr/ddr_b/ddr_regdef.h +++ b/drivers/renesas/rcar/ddr/ddr_b/ddr_regdef.h diff --git a/drivers/staging/renesas/rcar/ddr/ddr_b/init_dram_tbl_h3.h b/drivers/renesas/rcar/ddr/ddr_b/init_dram_tbl_h3.h index 357f8bad0..357f8bad0 100644 --- a/drivers/staging/renesas/rcar/ddr/ddr_b/init_dram_tbl_h3.h +++ b/drivers/renesas/rcar/ddr/ddr_b/init_dram_tbl_h3.h diff --git a/drivers/staging/renesas/rcar/ddr/ddr_b/init_dram_tbl_h3ver2.h b/drivers/renesas/rcar/ddr/ddr_b/init_dram_tbl_h3ver2.h index e5258af6c..e5258af6c 100644 --- a/drivers/staging/renesas/rcar/ddr/ddr_b/init_dram_tbl_h3ver2.h +++ b/drivers/renesas/rcar/ddr/ddr_b/init_dram_tbl_h3ver2.h diff --git a/drivers/staging/renesas/rcar/ddr/ddr_b/init_dram_tbl_m3.h b/drivers/renesas/rcar/ddr/ddr_b/init_dram_tbl_m3.h index b491f0e91..b491f0e91 100644 --- a/drivers/staging/renesas/rcar/ddr/ddr_b/init_dram_tbl_m3.h +++ b/drivers/renesas/rcar/ddr/ddr_b/init_dram_tbl_m3.h diff --git a/drivers/staging/renesas/rcar/ddr/ddr_b/init_dram_tbl_m3n.h b/drivers/renesas/rcar/ddr/ddr_b/init_dram_tbl_m3n.h index 8d80842fd..8d80842fd 100644 --- a/drivers/staging/renesas/rcar/ddr/ddr_b/init_dram_tbl_m3n.h +++ b/drivers/renesas/rcar/ddr/ddr_b/init_dram_tbl_m3n.h diff --git a/drivers/staging/renesas/rcar/ddr/ddr_regs.h b/drivers/renesas/rcar/ddr/ddr_regs.h index ba26c69c8..ba26c69c8 100644 --- a/drivers/staging/renesas/rcar/ddr/ddr_regs.h +++ b/drivers/renesas/rcar/ddr/ddr_regs.h diff --git a/drivers/staging/renesas/rcar/ddr/dram_sub_func.c b/drivers/renesas/rcar/ddr/dram_sub_func.c index ab8eabbc6..ab8eabbc6 100644 --- a/drivers/staging/renesas/rcar/ddr/dram_sub_func.c +++ b/drivers/renesas/rcar/ddr/dram_sub_func.c diff --git a/drivers/staging/renesas/rcar/ddr/dram_sub_func.h b/drivers/renesas/rcar/ddr/dram_sub_func.h index 69c4d8605..69c4d8605 100644 --- a/drivers/staging/renesas/rcar/ddr/dram_sub_func.h +++ b/drivers/renesas/rcar/ddr/dram_sub_func.h diff --git a/drivers/staging/renesas/rcar/ddr/ddr.mk b/drivers/staging/renesas/rcar/ddr/ddr.mk deleted file mode 100644 index ed7adc339..000000000 --- a/drivers/staging/renesas/rcar/ddr/ddr.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (c) 2015-2018, Renesas Electronics Corporation. All rights reserved. -# -# SPDX-License-Identifier: BSD-3-Clause -# - -ifeq (${RCAR_LSI},${RCAR_E3}) - include drivers/staging/renesas/rcar/ddr/ddr_a/ddr_a.mk - BL2_SOURCES += drivers/staging/renesas/rcar/ddr/dram_sub_func.c -else ifeq (${RCAR_LSI},${RCAR_D3}) - include drivers/staging/renesas/rcar/ddr/ddr_a/ddr_a.mk -else ifeq (${RCAR_LSI},${RCAR_V3M}) - include drivers/staging/renesas/rcar/ddr/ddr_a/ddr_a.mk -else - include drivers/staging/renesas/rcar/ddr/ddr_b/ddr_b.mk - BL2_SOURCES += drivers/staging/renesas/rcar/ddr/dram_sub_func.c -endif diff --git a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_a.mk b/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_a.mk deleted file mode 100644 index aee27a59a..000000000 --- a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_a.mk +++ /dev/null @@ -1,13 +0,0 @@ -# -# Copyright (c) 2015-2018, Renesas Electronics Corporation. All rights reserved. -# -# SPDX-License-Identifier: BSD-3-Clause -# - -ifeq (${RCAR_LSI},${RCAR_E3}) -BL2_SOURCES += drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c -else ifeq (${RCAR_LSI},${RCAR_D3}) -BL2_SOURCES += drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_d3.c -else -BL2_SOURCES += drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_v3m.c -endif diff --git a/plat/renesas/rcar/platform.mk b/plat/renesas/rcar/platform.mk index dc58e191d..4c41dd341 100644 --- a/plat/renesas/rcar/platform.mk +++ b/plat/renesas/rcar/platform.mk @@ -348,12 +348,12 @@ ERRATA_A53_855873 := 1 ERRATA_A57_859972 := 1 ERRATA_A57_813419 := 1 -include drivers/staging/renesas/rcar/ddr/ddr.mk +include drivers/renesas/rcar/ddr/ddr.mk include drivers/renesas/rcar/qos/qos.mk include drivers/renesas/rcar/pfc/pfc.mk include lib/libfdt/libfdt.mk -PLAT_INCLUDES := -Idrivers/staging/renesas/rcar/ddr \ +PLAT_INCLUDES := -Idrivers/renesas/rcar/ddr \ -Idrivers/renesas/rcar/qos \ -Idrivers/renesas/rcar/iic_dvfs \ -Idrivers/renesas/rcar/board \ |