Skip to content

Commit 3fe9532

Browse files
author
Xiaobo Gu
committed
Add p230 and p231 config
a). P230 = S905D version Q200 board b). P231 = S905D version Q201 board c). P230 use Q200 bsp files, compatible with each other. d). P231 use Q201 bsp files, compatible with each other. e). Update SYS_PROMPT. Change-Id: I9dbe1b5984f0f93e25dab436a606243fc177c59e
1 parent c96b144 commit 3fe9532

File tree

8 files changed

+79
-5
lines changed

8 files changed

+79
-5
lines changed

board/amlogic/Kconfig

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,14 @@ config GXL_P212_V1
4747
bool "Support amlogic gxl p212 board"
4848
default n
4949

50+
config GXL_P230_V1
51+
bool "Support amlogic gxm/gxl p230 board"
52+
default n
53+
54+
config GXL_P231_V1
55+
bool "Support amlogic gxm/gxl p231 board"
56+
default n
57+
5058
config GXM_SKT_V1
5159
bool "Support amlogic gxm/gxl skt board"
5260
default n
@@ -118,6 +126,14 @@ if GXL_P212_V1
118126
source "board/amlogic/gxl_p212_v1/Kconfig"
119127
endif
120128

129+
if GXL_P230_V1
130+
source "board/amlogic/gxl_p230_v1/Kconfig"
131+
endif
132+
133+
if GXL_P231_V1
134+
source "board/amlogic/gxl_p231_v1/Kconfig"
135+
endif
136+
121137
if GXM_SKT_V1
122138
source "board/amlogic/gxm_skt_v1/Kconfig"
123139
endif
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
CONFIG_ARM=y
2+
CONFIG_TARGET_MESON_GX=y
3+
CONFIG_GXL_P230_V1=y
4+
CONFIG_DM=y
5+
CONFIG_DM_GPIO=y
6+
CONFIG_AML_GPIO=y
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
CONFIG_ARM=y
2+
CONFIG_TARGET_MESON_GX=y
3+
CONFIG_GXL_P231_V1=y
4+
CONFIG_DM=y
5+
CONFIG_DM_GPIO=y
6+
CONFIG_AML_GPIO=y

board/amlogic/gxl_p230_v1/Kconfig

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
if TARGET_MESON_GX
2+
3+
config SYS_CPU
4+
string
5+
default "armv8"
6+
7+
config SYS_BOARD
8+
string
9+
default "gxm_q200_v1"
10+
11+
config SYS_VENDOR
12+
string
13+
default "amlogic"
14+
15+
config SYS_SOC
16+
string
17+
default "gxl"
18+
19+
config SYS_CONFIG_NAME
20+
default "gxl_p230_v1"
21+
22+
endif

board/amlogic/gxl_p230_v1/README

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
p230 config use q200 files.

board/amlogic/gxl_p231_v1/Kconfig

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
if TARGET_MESON_GX
2+
3+
config SYS_CPU
4+
string
5+
default "armv8"
6+
7+
config SYS_BOARD
8+
string
9+
default "gxm_q201_v1"
10+
11+
config SYS_VENDOR
12+
string
13+
default "amlogic"
14+
15+
config SYS_SOC
16+
string
17+
default "gxl"
18+
19+
config SYS_CONFIG_NAME
20+
default "gxl_p231_v1"
21+
22+
endif

board/amlogic/gxl_p231_v1/README

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
p231 config use q201 files.

scripts/Makefile.autoconf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,17 @@ include/autoconf.mk include/autoconf.mk.dep: include/config.h
6868
# support amlogic config folder and customer folder
6969

7070
# 1st. this is old u-boot config file folder
71-
config_file=$(shell echo "$(srctree)/include/configs/$(CONFIG_SYS_CONFIG_NAME).h")
71+
config_file=$(shell echo "$(srctree)/include/configs/$(CONFIG_SYS_BOARD).h")
7272
ifneq ($(config_file), $(wildcard $(config_file)))
7373

7474
# 2nd. this is amlogic config file folder
75-
config_file=$(shell echo "$(srctree)/board/amlogic/configs/$(CONFIG_SYS_CONFIG_NAME).h")
75+
config_file=$(shell echo "$(srctree)/board/amlogic/configs/$(CONFIG_SYS_BOARD).h")
7676
ifneq ($(config_file), $(wildcard $(config_file)))
7777

7878
# 3rd. this is amlogic customer config folder
79-
config_file=$(shell echo "$(srctree)/customer/board/configs/$(CONFIG_SYS_CONFIG_NAME).h")
79+
config_file=$(shell echo "$(srctree)/customer/board/configs/$(CONFIG_SYS_BOARD).h")
8080
ifneq ($(config_file), $(wildcard $(config_file)))
81-
$(error $(shell echo "Error: Can not find $(CONFIG_SYS_CONFIG_NAME).h"))
81+
$(error $(shell echo "Error: Can not find $(CONFIG_SYS_BOARD).h"))
8282
endif
8383
endif
8484
endif
@@ -99,7 +99,7 @@ define filechk_config_h
9999
echo \#include \<asm/config.h\>; \
100100
echo \#include \<config_fallbacks.h\>; \
101101
echo \#include \<config_uncmd_spl.h\>; \
102-
echo \#define SYS_PROMPT \"$(BOARD)\#\"; )
102+
echo \#define SYS_PROMPT \"$(CONFIG_SYS_CONFIG_NAME)\#\"; )
103103
endef
104104

105105
include/config.h: scripts/Makefile.autoconf create_symlink FORCE

0 commit comments

Comments
 (0)