mirror of
https://github.com/logicog/RTLPlayground.git
synced 2026-10-29 17:54:14 +08:00
Merge pull request #706 from DrDoof/feat/banner-compiler
build: show the compiler and the toolchain in the version banner
This commit is contained in:
3 files changed
+16
-1
No files matched your search
@@ -4,11 +4,21 @@ DEFAULT_CONFIG_LOCATION = 454656
|
|||||||
CONFIG_LOCATION = 458752
|
CONFIG_LOCATION = 458752
|
||||||
HTML_LOCATION = 262144
|
HTML_LOCATION = 262144
|
||||||
|
|
||||||
SDCC_PREFIX = toolchain/sdcc-$(shell cat sdcc/* | cksum | cut -d' ' -f1)
|
SDCC_TOOLCHAIN = sdcc-$(shell cat sdcc/* | cksum | cut -d' ' -f1)
|
||||||
|
SDCC_PREFIX = toolchain/$(SDCC_TOOLCHAIN)
|
||||||
ifeq ($(origin CC),default)
|
ifeq ($(origin CC),default)
|
||||||
SDCC = $(SDCC_PREFIX)/bin/sdcc
|
SDCC = $(SDCC_PREFIX)/bin/sdcc
|
||||||
CC = $(SDCC)
|
CC = $(SDCC)
|
||||||
ASM = $(SDCC_PREFIX)/bin/sdas8051
|
ASM = $(SDCC_PREFIX)/bin/sdas8051
|
||||||
|
SDCC_REV := $(shell git log -1 --format=%h -- sdcc 2>/dev/null)
|
||||||
|
ifneq ($(SDCC_REV),)
|
||||||
|
ifneq ($(shell git status --porcelain --untracked-files=no -- sdcc 2>/dev/null),)
|
||||||
|
SDCC_REV := $(SDCC_REV)-dirty
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
SDCC_BANNER = $(if $(SDCC_REV),sdcc/ at $(SDCC_REV),$(SDCC_TOOLCHAIN)) ($(words $(wildcard sdcc/*.patch)) patches)
|
||||||
|
else
|
||||||
|
SDCC_BANNER = system
|
||||||
endif
|
endif
|
||||||
CC_FLAGS = -mmcs51 -I. -Imachine -Ihttpd -Iuip
|
CC_FLAGS = -mmcs51 -I. -Imachine -Ihttpd -Iuip
|
||||||
ASM ?= sdas8051
|
ASM ?= sdas8051
|
||||||
@@ -172,6 +182,7 @@ $(VERSION_HEADER): FORCE
|
|||||||
@printf '%s\n' "#ifndef VERSION_H" "#define VERSION_H" \
|
@printf '%s\n' "#ifndef VERSION_H" "#define VERSION_H" \
|
||||||
"#define VERSION_SW \"$(VERSION_EXTENSION)\"" \
|
"#define VERSION_SW \"$(VERSION_EXTENSION)\"" \
|
||||||
"#define BUILD_DATE \"$(BUILD_DATE)\"" \
|
"#define BUILD_DATE \"$(BUILD_DATE)\"" \
|
||||||
|
"#define SDCC_TOOLCHAIN \"$(SDCC_BANNER)\"" \
|
||||||
"#endif" > $(VERSION_HEADER).tmp
|
"#endif" > $(VERSION_HEADER).tmp
|
||||||
@cmp -s $(VERSION_HEADER).tmp $(VERSION_HEADER) \
|
@cmp -s $(VERSION_HEADER).tmp $(VERSION_HEADER) \
|
||||||
&& rm -f $(VERSION_HEADER).tmp \
|
&& rm -f $(VERSION_HEADER).tmp \
|
||||||
|
|||||||
@@ -1840,6 +1840,8 @@ void print_gpio_status(void) {
|
|||||||
void print_sw_version(void) __banked {
|
void print_sw_version(void) __banked {
|
||||||
print_string("Software version: " VERSION_SW);
|
print_string("Software version: " VERSION_SW);
|
||||||
print_string("\nBuild date: " BUILD_DATE);
|
print_string("\nBuild date: " BUILD_DATE);
|
||||||
|
print_string("\nCompiler: SDCC " STR(__SDCC_VERSION_MAJOR) "." STR(__SDCC_VERSION_MINOR) "." STR(__SDCC_VERSION_PATCH) " #" STR(__SDCC_REVISION));
|
||||||
|
print_string("\nToolchain: " SDCC_TOOLCHAIN);
|
||||||
print_string("\nHardware: ");
|
print_string("\nHardware: ");
|
||||||
print_string(machine.machine_name);
|
print_string(machine.machine_name);
|
||||||
write_char('\n');
|
write_char('\n');
|
||||||
|
|||||||
@@ -19,6 +19,8 @@
|
|||||||
#define MAC_ADDR_LEN 6
|
#define MAC_ADDR_LEN 6
|
||||||
#define PORT_BIT(p) ((uint16_t)1 << (p))
|
#define PORT_BIT(p) ((uint16_t)1 << (p))
|
||||||
#define NUL '\0'
|
#define NUL '\0'
|
||||||
|
#define STR_(x) #x
|
||||||
|
#define STR(x) STR_(x)
|
||||||
|
|
||||||
// Define Port-masks for 9-port devices and 6-port devices
|
// Define Port-masks for 9-port devices and 6-port devices
|
||||||
#define PMASK_9 0x1ff
|
#define PMASK_9 0x1ff
|
||||||
|
|||||||
Reference in new issue
Block a user