Skip to content

Commit 3fa0285

Browse files
YuguoWHYuguoWH
committed
Makefile: Revert back CORE to CUR_CORE
Notice, Please use CUR_CORE instead of CORE in make command! Signed-off-by: Yuguo Zou <yuguo.zou@synopsys.com>
1 parent 2c31b24 commit 3fa0285

File tree

21 files changed

+90
-98
lines changed

21 files changed

+90
-98
lines changed

‎board/axs/axs.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ TCFFILE_NAME = $(firstword $(basename $(notdir $(TCF))))
3838
endif
3939
endif
4040

41-
## If CORE is not in SUPPORTED_BD_VERS list, then force BD_VER and VALID_BD_VER to be 103
41+
## If CUR_CORE is not in SUPPORTED_BD_VERS list, then force BD_VER and VALID_BD_VER to be 103
4242
ifeq ($(TCFFILE_IS_VALID),1)
4343
ifeq ($(VALID_BD_VER),)
4444
override BD_VER := 103

‎board/axs/configs/103/core_config.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@
1010
# CURRENT CORE CONFIGURATION
1111
# Select the core configuration loaded into FPGA chip
1212
##
13-
CORE ?= archs36
13+
CUR_CORE ?= archs36
1414
ONCHIP_IP_LIST ?= designware/uart designware/gpio

‎board/axs/configs/103/core_debug.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
ifeq ($(VALID_CORE),archs36)
1+
ifeq ($(VALID_CUR_CORE),archs36)
22
OPENOCD_CFG_FILE ?= $(OPENOCD_SCRIPT_ROOT)/board/snps_axs103_hs36.cfg
33
else
4-
ifeq ($(VALID_CORE),archs38)
4+
ifeq ($(VALID_CUR_CORE),archs38)
55
OPENOCD_CFG_FILE ?= $(OPENOCD_SCRIPT_ROOT)/board/snps_axs103_hs38.cfg
66
else
77
OPENOCD_CFG_FILE ?= $(OPENOCD_SCRIPT_ROOT)/board/snps_axs103_hs36.cfg

‎board/axs/configs/core_configs.mk‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,32 +16,32 @@ ifneq ($(wildcard $(CORE_CONFIG_MK)),)
1616
COMMON_COMPILE_PREREQUISITES += $(CORE_CONFIG_MK)
1717
include $(CORE_CONFIG_MK)
1818
else
19-
CORE ?= $(firstword $(SUPPORTED_CORES))
19+
CUR_CORE ?= $(firstword $(SUPPORTED_CORES))
2020
endif
2121

22-
override CORE := $(strip $(CORE))
22+
override CUR_CORE := $(strip $(CUR_CORE))
2323

2424
## Set Valid Core Configuration For Board
25-
VALID_CORE = $(call check_item_exist, $(CORE), $(SUPPORTED_CORES))
25+
VALID_CUR_CORE = $(call check_item_exist, $(CUR_CORE), $(SUPPORTED_CORES))
2626

2727
## Check TCF file existence
2828
ifneq ($(TCFFILE_IS_VALID),1)
29-
TCF ?= $(CORE_TCF_DIR)/$(VALID_CORE).tcf
29+
TCF ?= $(CORE_TCF_DIR)/$(VALID_CUR_CORE).tcf
3030
endif
3131

32-
## If CORE is not in SUPPORT_CORES list, then force CORE and VALID_CORE to be TCF filename
32+
## If CUR_CORE is not in SUPPORT_CORES list, then force CUR_CORE and VALID_CUR_CORE to be TCF filename
3333
ifeq ($(TCFFILE_IS_VALID),1)
34-
ifeq ($(VALID_CORE),)
35-
override CORE := $(TCFFILE_NAME)
36-
override VALID_CORE := $(TCFFILE_NAME)
34+
ifeq ($(VALID_CUR_CORE),)
35+
override CUR_CORE := $(TCFFILE_NAME)
36+
override VALID_CUR_CORE := $(TCFFILE_NAME)
3737
endif
3838
endif
3939

4040
## Check Core Configuration Supported
4141
ifneq ($(TCFFILE_IS_VALID),1)
42-
ifeq ($(VALID_CORE),)
42+
ifeq ($(VALID_CUR_CORE),)
4343
$(info BOARD $(BOARD)-$(BD_VER) Core Configurations - $(SUPPORTED_CORES) are supported)
44-
$(error $(CORE) is not supported in $(BOARD)-$(BD_VER), please check it!)
44+
$(error $(CUR_CORE) is not supported in $(BOARD)-$(BD_VER), please check it!)
4545
endif
4646
endif
4747

@@ -54,4 +54,4 @@ endif
5454

5555
OPENOCD_OPTIONS = -s $(OPENOCD_SCRIPT_ROOT) -f $(OPENOCD_CFG_FILE)
5656

57-
CORE_DEFINES += -DCURRENT_CORE=$(VALID_CORE)
57+
CORE_DEFINES += -DCURRENT_CORE=$(VALID_CUR_CORE)

‎board/emsdp/emsdp.mk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ TCFFILE_NAME = $(firstword $(basename $(notdir $(TCF))))
3535
endif
3636
endif
3737

38-
## If CORE is not in SUPPORTED_BD_VERS list, then force BD_VER and VALID_BD_VER to be rev1
38+
## If CUR_CORE is not in SUPPORTED_BD_VERS list, then force BD_VER and VALID_BD_VER to be rev2
3939
ifeq ($(TCFFILE_IS_VALID),1)
4040
ifeq ($(VALID_BD_VER),)
41-
override BD_VER := rev1
42-
override VALID_BD_VER := rev1
41+
override BD_VER := rev2
42+
override VALID_BD_VER := rev2
4343
endif
4444
endif
4545

‎board/emsdp/rev1/configs/core_configs.mk‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
CORE_DIRS = $(sort $(dir $(wildcard $(BOARD_EMSDP_DIR)/$(VALID_BD_VER)/configs/*/*.h)))
33
SUPPORTED_CORES := $(patsubst $(BOARD_EMSDP_DIR)/$(VALID_BD_VER)/configs/%/, %,$(CORE_DIRS))
44

5-
CORE ?= $(firstword $(SUPPORTED_CORES))
5+
CUR_CORE ?= $(firstword $(SUPPORTED_CORES))
66

7-
override CORE := $(strip $(CORE))
7+
override CUR_CORE := $(strip $(CUR_CORE))
88

99
## Set Valid Core Configuration For Board
10-
VALID_CORE = $(call check_item_exist, $(CORE), $(SUPPORTED_CORES))
10+
VALID_CUR_CORE = $(call check_item_exist, $(CUR_CORE), $(SUPPORTED_CORES))
1111

12-
BOARD_CORE_DIR = $(BOARD_EMSDP_DIR)/$(VALID_BD_VER)/configs/$(VALID_CORE)
12+
BOARD_CORE_DIR = $(BOARD_EMSDP_DIR)/$(VALID_BD_VER)/configs/$(VALID_CUR_CORE)
1313

1414
ONCHIP_IP_LIST ?= . designware/spi designware/uart designware/gpio designware/sdio designware/trng designware/pwm_timer subsystem/spi subsystem/gpio subsystem/uart subsystem/iic subsystem/i2s
1515

@@ -18,21 +18,20 @@ ifneq ($(TCFFILE_IS_VALID),1)
1818
TCF ?= $(wildcard $(BOARD_CORE_DIR)/*/*.tcf)
1919
endif
2020

21-
22-
## If CORE is not in SUPPORT_CORES list, then force CORE and VALID_CORE to be TCF filename
21+
## If CUR_CORE is not in SUPPORT_CORES list, then force CUR_CORE and VALID_CUR_CORE to be TCF filename
2322
ifeq ($(TCFFILE_IS_VALID),1)
24-
ifeq ($(VALID_CORE),)
25-
override CORE := $(TCFFILE_NAME)
26-
override VALID_CORE := $(TCFFILE_NAME)
23+
ifeq ($(VALID_CUR_CORE),)
24+
override CUR_CORE := $(TCFFILE_NAME)
25+
override VALID_CUR_CORE := $(TCFFILE_NAME)
2726
endif
2827
endif
2928

3029
## Check Core Configuration Supported
31-
ifneq ($(TCFFILE_IS_VALID),1)
32-
ifeq ($(VALID_CORE),)
30+
ifeq ($(TCFFILE_IS_VALID),1)
31+
ifeq ($(VALID_CUR_CORE),)
3332
$(info BOARD $(BOARD)-$(BD_VER) Core Configurations - $(SUPPORTED_CORES) are supported)
34-
$(error $(CORE) is not supported in $(BOARD)-$(BD_VER), please check it!)
33+
$(error $(CUR_CORE) is not supported in $(BOARD)-$(BD_VER), please check it!)
3534
endif
3635
endif
3736

38-
CORE_DEFINES += -DCURRENT_CORE=$(VALID_CORE)
37+
CORE_DEFINES += -DCURRENT_CORE=$(VALID_CUR_CORE)

‎board/emsdp/rev2/configs/core_configs.mk‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
CORE_DIRS = $(sort $(dir $(wildcard $(BOARD_EMSDP_DIR)/$(VALID_BD_VER)/configs/*/*.h)))
33
SUPPORTED_CORES := $(patsubst $(BOARD_EMSDP_DIR)/$(VALID_BD_VER)/configs/%/, %,$(CORE_DIRS))
44

5-
CORE ?= $(firstword $(SUPPORTED_CORES))
5+
CUR_CORE ?= $(firstword $(SUPPORTED_CORES))
66

7-
override CORE := $(strip $(CORE))
7+
override CUR_CORE := $(strip $(CUR_CORE))
88

99
## Set Valid Core Configuration For Board
10-
VALID_CORE = $(call check_item_exist, $(CORE), $(SUPPORTED_CORES))
10+
VALID_CUR_CORE = $(call check_item_exist, $(CUR_CORE), $(SUPPORTED_CORES))
1111

12-
BOARD_CORE_DIR = $(BOARD_EMSDP_DIR)/$(VALID_BD_VER)/configs/$(VALID_CORE)
12+
BOARD_CORE_DIR = $(BOARD_EMSDP_DIR)/$(VALID_BD_VER)/configs/$(VALID_CUR_CORE)
1313

1414
ONCHIP_IP_LIST ?= . designware/spi designware/uart designware/gpio designware/sdio designware/trng designware/pwm_timer subsystem/spi subsystem/gpio subsystem/uart subsystem/iic subsystem/i2s
1515

@@ -18,20 +18,20 @@ ifneq ($(TCFFILE_IS_VALID),1)
1818
TCF ?= $(wildcard $(BOARD_CORE_DIR)/*/*.tcf)
1919
endif
2020

21-
## If CORE is not in SUPPORT_CORES list, then force CORE and VALID_CORE to be TCF filename
21+
## If CUR_CORE is not in SUPPORT_CORES list, then force CUR_CORE and VALID_CUR_CORE to be TCF filename
2222
ifeq ($(TCFFILE_IS_VALID),1)
23-
ifeq ($(VALID_CORE),)
24-
override CORE := $(TCFFILE_NAME)
25-
override VALID_CORE := $(TCFFILE_NAME)
23+
ifeq ($(VALID_CUR_CORE),)
24+
override CUR_CORE := $(TCFFILE_NAME)
25+
override VALID_CUR_CORE := $(TCFFILE_NAME)
2626
endif
2727
endif
2828

2929
## Check Core Configuration Supported
3030
ifeq ($(TCFFILE_IS_VALID),1)
31-
ifeq ($(VALID_CORE),)
31+
ifeq ($(VALID_CUR_CORE),)
3232
$(info BOARD $(BOARD)-$(BD_VER) Core Configurations - $(SUPPORTED_CORES) are supported)
33-
$(error $(CORE) is not supported in $(BOARD)-$(BD_VER), please check it!)
33+
$(error $(CUR_CORE) is not supported in $(BOARD)-$(BD_VER), please check it!)
3434
endif
3535
endif
3636

37-
CORE_DEFINES += -DCURRENT_CORE=$(VALID_CORE)
37+
CORE_DEFINES += -DCURRENT_CORE=$(VALID_CUR_CORE)

‎board/emsdp/rev2/configs/em7d_esp_dfss/core_config.mk‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎board/emsk/configs/11/core_config.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
# CURRENT CORE CONFIGURATION
1212
# Select the core configuration loaded into FPGA chip
1313
##
14-
CORE ?= arcem6
14+
CUR_CORE ?= arcem6
1515
ONCHIP_IP_LIST ?= designware/iic designware/spi designware/uart designware/gpio

‎board/emsk/configs/22/core_config.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@
1010
# CURRENT CORE CONFIGURATION
1111
# Select the core configuration loaded into FPGA chip
1212
##
13-
CORE ?= arcem7d
13+
CUR_CORE ?= arcem7d
1414
ONCHIP_IP_LIST ?= designware/iic designware/spi designware/uart designware/gpio

0 commit comments

Comments
 (0)