xobs/simmel-bootloader
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update uf2 BOARD_ID

Browse Source
This commit is contained in:
hathach
2019-04-24 16:15:59 +07:00
parent 9a0ee51d91
commit 4ec938230d
12 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -259,7 +259,6 @@ CFLAGS += -DMK_DIS_FIRMWARE='$(MK_DIS_FIRMWARE)'
CFLAGS += -DDFU_APP_DATA_RESERVED=7*4096 CFLAGS += -DDFU_APP_DATA_RESERVED=7*4096
CFLAGS += -DUF2_VERSION='"$(GIT_VERSION) $(GIT_SUBMODULE_VERSIONS) $(SD_NAME) $(SD_VERSION)"' CFLAGS += -DUF2_VERSION='"$(GIT_VERSION) $(GIT_SUBMODULE_VERSIONS) $(SD_NAME) $(SD_VERSION)"'
CFLAGS += -DBOARD_$(shell echo $(BOARD) | tr '[:lower:]' '[:upper:]')
ifneq ($(IS_52832),) ifneq ($(IS_52832),)
CFLAGS += -DNRF52 CFLAGS += -DNRF52

2
src/boards/electronut_labs_papyr/board.h
View File

@@ -60,7 +60,7 @@
#define DIS_MANUFACTURER "Electronut Labs" #define DIS_MANUFACTURER "Electronut Labs"
#define DIS_MODEL "Papyr" #define DIS_MODEL "Papyr"
#define BOARD_ID "Electronut Labs Papyr" #define UF2_BOARD_ID "Electronut Labs Papyr"
#define INDEX_URL "https://docs.electronut.in/papyr" #define INDEX_URL "https://docs.electronut.in/papyr"
#define USB_DESC_VID 0x239A #define USB_DESC_VID 0x239A

1
src/boards/feather_nrf52840_express/board.h
View File

@@ -60,5 +60,6 @@
#define PRODUCT_NAME "Adafruit Feather nRF52840 Express" #define PRODUCT_NAME "Adafruit Feather nRF52840 Express"
#define VOLUME_LABEL "FTHR840BOOT" #define VOLUME_LABEL "FTHR840BOOT"
#define UF2_BOARD_ID "nRF52840-Feather-revD"
#endif // _FEATHER_NRF52840_H #endif // _FEATHER_NRF52840_H

2
src/boards/mdk_nrf52840_dongle/board.h
View File

@@ -55,7 +55,7 @@
#define PRODUCT_NAME "MDK nRF52840 USB Dongle" #define PRODUCT_NAME "MDK nRF52840 USB Dongle"
#define VOLUME_LABEL "MDK840DONGL" #define VOLUME_LABEL "MDK840DONGL"
#define BOARD_ID "MakerDiary-nRF52840-USB-Dongle" #define UF2_BOARD_ID "MakerDiary-nRF52840-USB-Dongle"
#define INDEX_URL "https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle/" #define INDEX_URL "https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle/"

1
src/boards/metro_nrf52840_express/board.h
View File

@@ -60,6 +60,7 @@
#define PRODUCT_NAME "Adafruit Metro nRF52840 Express" #define PRODUCT_NAME "Adafruit Metro nRF52840 Express"
#define VOLUME_LABEL "METR840BOOT" #define VOLUME_LABEL "METR840BOOT"
#define UF2_BOARD_ID "nRF52840-Metro-revA"
#endif /* _METRO_NRF52840_H_ */ #endif /* _METRO_NRF52840_H_ */

2
src/boards/particle_argon/board.h
View File

@@ -62,7 +62,7 @@
#define VOLUME_LABEL "ARGONBOOT " #define VOLUME_LABEL "ARGONBOOT "
#define BOARD_ID "Particle-Argon-v1" #define UF2_BOARD_ID "nRF52840-Argon-v1"
#define INDEX_URL "https://www.particle.io/mesh/" #define INDEX_URL "https://www.particle.io/mesh/"

2
src/boards/particle_boron/board.h
View File

@@ -62,7 +62,7 @@
#define VOLUME_LABEL "BORONBOOT " #define VOLUME_LABEL "BORONBOOT "
#define BOARD_ID "Particle-Boron-v1" #define UF2_BOARD_ID "nRF52840-Boron-v1"
#define INDEX_URL "https://www.particle.io/mesh/" #define INDEX_URL "https://www.particle.io/mesh/"

2
src/boards/particle_xenon/board.h
View File

@@ -62,7 +62,7 @@
#define VOLUME_LABEL "XENONBOOT " #define VOLUME_LABEL "XENONBOOT "
#define BOARD_ID "Particle-Xenon-v1" #define UF2_BOARD_ID "nRF52840-Xenon-v1"
#define INDEX_URL "https://www.particle.io/mesh/" #define INDEX_URL "https://www.particle.io/mesh/"

2
src/boards/pca10056/board.h
View File

@@ -54,4 +54,6 @@
#define DIS_MANUFACTURER "Nordic" #define DIS_MANUFACTURER "Nordic"
#define DIS_MODEL "PCA10056" #define DIS_MODEL "PCA10056"
#define UF2_BOARD_ID "nRF52840-pca10056-v1"
#endif // PCA10056_H #endif // PCA10056_H

2
src/boards/pca10059/board.h
View File

@@ -57,4 +57,6 @@
#define DIS_MANUFACTURER "Nordic" #define DIS_MANUFACTURER "Nordic"
#define DIS_MODEL "PCA10059" #define DIS_MODEL "PCA10059"
#define UF2_BOARD_ID "nRF52840-pca10059-v1"
#endif // PCA10059_H #endif // PCA10059_H

3
src/usb/uf2/ghostfat.c
View File

@@ -63,8 +63,7 @@ struct TextFile {
const char infoUf2File[] = // const char infoUf2File[] = //
"UF2 Bootloader " UF2_VERSION "\r\n" "UF2 Bootloader " UF2_VERSION "\r\n"
"Model: " PRODUCT_NAME "\r\n" "Model: " PRODUCT_NAME "\r\n"
"Board-ID: " BOARD_ID "\r\n" "Board-ID: " UF2_BOARD_ID "\r\n"
"Bootloader: " BOOTLOADER_ID "\r\n"
"Date: " __DATE__ "\r\n"; "Date: " __DATE__ "\r\n";
const char indexFile[] = // const char indexFile[] = //

4
src/usb/uf2/uf2cfg.h
View File

@@ -4,10 +4,6 @@
#define PRODUCT_NAME DIS_MODEL #define PRODUCT_NAME DIS_MODEL
#endif #endif
#ifndef BOARD_ID
#define BOARD_ID "NRF52-Bluefruit-v0"
#endif
#ifndef INDEX_URL #ifndef INDEX_URL
#define INDEX_URL "https://www.adafruit.com/" #define INDEX_URL "https://www.adafruit.com/"
#endif #endif