Skip to content

Commit 1cf7797

Browse files
authored
Build date removal, non-prod build memory protect command disable (#158)
* remove build date from binary and file name Signed-off-by: Adam BZH <adam@onekey.so> * bump firmware version to 3.12.1 Signed-off-by: Adam BZH <adam@onekey.so> * bump bootloader version to 2.0.9 Signed-off-by: Adam BZH <adam@onekey.so> * block memory protect on no-production build Signed-off-by: Adam BZH <adam@onekey.so> --------- Signed-off-by: Adam BZH <adam@onekey.so>
1 parent d28b820 commit 1cf7797

File tree

5 files changed

+12
-10
lines changed

5 files changed

+12
-10
lines changed

legacy/bootloader/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
BOOT_BUILD_VERSION=$(shell ../../tools/version.sh version.h)
2-
BOOT_BUILD_DATE=$(shell date "+%m%d")
2+
# BOOT_BUILD_DATE=$(shell date "+%m%d")
33
BUILD_COMMIT=$(shell git rev-parse HEAD | cut -c1-7)
4-
NAME = classic1s_bootloader.$(BOOT_BUILD_VERSION)-Stable-$(BOOT_BUILD_DATE)-$(BUILD_COMMIT)
4+
NAME = classic1s_bootloader.$(BOOT_BUILD_VERSION)-Stable-$(BUILD_COMMIT)
55

66
OBJS += startup.o
77
OBJS += bootloader.o

legacy/bootloader/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#define VERSION_MAJOR 2
22
#define VERSION_MINOR 0
3-
#define VERSION_PATCH 8
3+
#define VERSION_PATCH 9

legacy/firmware/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
APPVER = 1.8.0
22

33
FIRMWARE_BUILD_VERSION=$(shell cat version.h | grep "ONEKEY_VERSION " | awk -F "[\"\"]" '{print $$2}')
4-
FIRMWARE_BUILD_DATE=$(shell date "+%m%d")
4+
# FIRMWARE_BUILD_DATE=$(shell date "+%m%d")
55
ifeq ($(EMULATOR),1)
66
NAME = onekey_emu
77
else
88
ifndef BUILD_ID
99
BUILD_COMMIT=$(shell git rev-parse HEAD | cut -c1-7)
1010
ifneq ($(BITCOIN_ONLY),1)
11-
NAME=classic1s.$(FIRMWARE_BUILD_VERSION)-Stable-$(FIRMWARE_BUILD_DATE)-$(BUILD_COMMIT)
11+
NAME=classic1s.$(FIRMWARE_BUILD_VERSION)-Stable-$(BUILD_COMMIT)
1212
else
13-
NAME=classic1s.$(FIRMWARE_BUILD_VERSION)-Stable-bc-only-$(FIRMWARE_BUILD_DATE)-$(BUILD_COMMIT)
13+
NAME=classic1s.$(FIRMWARE_BUILD_VERSION)-Stable-bc-only-$(BUILD_COMMIT)
1414
endif
1515
else
16-
NAME=classic1s.$(FIRMWARE_BUILD_VERSION)-Alpha-$(FIRMWARE_BUILD_DATE)-$(BUILD_ID)
16+
NAME=classic1s.$(FIRMWARE_BUILD_VERSION)-Alpha-$(BUILD_ID)
1717
endif
1818
endif
1919

legacy/firmware/version.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#define ONEKEY_VER_MAJOR 3
1010
#define ONEKEY_VER_MINOR 12
11-
#define ONEKEY_VER_PATCH 0
11+
#define ONEKEY_VER_PATCH 1
1212

13-
#define ONEKEY_VERSION "3.12.0"
14-
#define ONEKEY_VERSION_HEX 0x3C00
13+
#define ONEKEY_VERSION "3.12.1"
14+
#define ONEKEY_VERSION_HEX 0x3C01

legacy/gd32_hard/memory_gd32.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,14 @@
2626

2727
void memory_protect(void) {
2828
/* enable security protection */
29+
#if PRODUCTION
2930
fmc_unlock();
3031
ob_unlock();
3132
ob_security_protection_config(FMC_HSPC);
3233
ob_start();
3334
ob_lock();
3435
fmc_lock();
36+
#endif
3537
}
3638

3739
uint8_t memory_protect_state(void) { return (FMC_OBCTL0 >> 8) & 0xff; }

0 commit comments

Comments
 (0)