Unverified Commit 682c307d authored by Antonio Niño Díaz's avatar Antonio Niño Díaz Committed by GitHub
Browse files

Merge pull request #1917 from marex/arm/master/v3meagle-v2.0.1

rcar_gen3: plat: Add R-Car V3M support
parents fc3e1591 b709fe9c
...@@ -151,6 +151,7 @@ ...@@ -151,6 +151,7 @@
#define RCAR_CUT_MASK U(0x000000FF) #define RCAR_CUT_MASK U(0x000000FF)
#define RCAR_PRODUCT_H3 U(0x00004F00) #define RCAR_PRODUCT_H3 U(0x00004F00)
#define RCAR_PRODUCT_M3 U(0x00005200) #define RCAR_PRODUCT_M3 U(0x00005200)
#define RCAR_PRODUCT_V3M U(0x00005400)
#define RCAR_PRODUCT_M3N U(0x00005500) #define RCAR_PRODUCT_M3N U(0x00005500)
#define RCAR_PRODUCT_E3 U(0x00005700) #define RCAR_PRODUCT_E3 U(0x00005700)
#define RCAR_PRODUCT_D3 U(0x00005800) #define RCAR_PRODUCT_D3 U(0x00005800)
......
...@@ -30,6 +30,7 @@ RCAR_M3N:=2 ...@@ -30,6 +30,7 @@ RCAR_M3N:=2
RCAR_E3:=3 RCAR_E3:=3
RCAR_H3N:=4 RCAR_H3N:=4
RCAR_D3:=5 RCAR_D3:=5
RCAR_V3M:=6
RCAR_AUTO:=99 RCAR_AUTO:=99
$(eval $(call add_define,RCAR_H3)) $(eval $(call add_define,RCAR_H3))
$(eval $(call add_define,RCAR_M3)) $(eval $(call add_define,RCAR_M3))
...@@ -37,6 +38,7 @@ $(eval $(call add_define,RCAR_M3N)) ...@@ -37,6 +38,7 @@ $(eval $(call add_define,RCAR_M3N))
$(eval $(call add_define,RCAR_E3)) $(eval $(call add_define,RCAR_E3))
$(eval $(call add_define,RCAR_H3N)) $(eval $(call add_define,RCAR_H3N))
$(eval $(call add_define,RCAR_D3)) $(eval $(call add_define,RCAR_D3))
$(eval $(call add_define,RCAR_V3M))
$(eval $(call add_define,RCAR_AUTO)) $(eval $(call add_define,RCAR_AUTO))
RCAR_CUT_10:=0 RCAR_CUT_10:=0
RCAR_CUT_11:=1 RCAR_CUT_11:=1
...@@ -160,6 +162,22 @@ else ...@@ -160,6 +162,22 @@ else
endif endif
$(eval $(call add_define,RCAR_LSI_CUT)) $(eval $(call add_define,RCAR_LSI_CUT))
endif endif
else ifeq (${LSI},V3M)
RCAR_LSI:=${RCAR_V3M}
ifndef LSI_CUT
# enable compatible function.
RCAR_LSI_CUT_COMPAT := 1
$(eval $(call add_define,RCAR_LSI_CUT_COMPAT))
else
# disable compatible function.
ifeq (${LSI_CUT},10)
RCAR_LSI_CUT:=0
endif
ifeq (${LSI_CUT},20)
RCAR_LSI_CUT:=10
endif
$(eval $(call add_define,RCAR_LSI_CUT))
endif
else else
$(error "Error: ${LSI} is not supported.") $(error "Error: ${LSI} is not supported.")
endif endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment