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

update uf2 index url, add UF2_ prefix for volume lable and index url

Browse Source
This commit is contained in:
hathach
2019-04-24 16:31:08 +07:00
parent 4ec938230d
commit 137785f2f0
13 changed files with 47 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -6,8 +6,8 @@ This is a CDC/DFU/UF2 bootloader for nRF52 boards.
- [Adafruit Feather nRF52840 Express](https://www.adafruit.com/product/4062) - [Adafruit Feather nRF52840 Express](https://www.adafruit.com/product/4062)
- [Electronut Labs Papyr](https://docs.electronut.in/papyr/) - [Electronut Labs Papyr](https://docs.electronut.in/papyr/)
- MakerDiary MDK nRF52840 USB Dongle - MakerDiary MDK nRF52840 USB Dongle
- Nordic nRF52840DK PCA10056 - [Nordic nRF52840DK PCA10056](https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52840-DK)
- Nordic nRF52840DK PCA10059 ("Dongle") - [Nordic nRF52840DK PCA10059 ("Dongle")](https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52840-Dongle)
- Particle Argon - Particle Argon
- Particle Boron - Particle Boron
- Particle Xenon - Particle Xenon

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

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

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

@@ -55,5 +55,6 @@
#define DIS_MODEL "Bluefruit Feather nRF52832" #define DIS_MODEL "Bluefruit Feather nRF52832"
#define PRODUCT_NAME "Adafruit Bluefruit Feather nRF52832" #define PRODUCT_NAME "Adafruit Bluefruit Feather nRF52832"
#define UF2_INDEX_URL "https://www.adafruit.com/product/3406"
#endif // _FEATHER_NRF52832_H #endif // _FEATHER_NRF52832_H

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

@@ -55,11 +55,12 @@
#define HWFC false #define HWFC false
// Used as model string in OTA mode // Used as model string in OTA mode
#define DIS_MANUFACTURER "Adafruit Industries" #define DIS_MANUFACTURER "Adafruit Industries"
#define DIS_MODEL "Bluefruit Feather nRF52840 Express" #define DIS_MODEL "Bluefruit Feather nRF52840 Express"
#define PRODUCT_NAME "Adafruit Feather nRF52840 Express" #define PRODUCT_NAME "Adafruit Feather nRF52840 Express"
#define VOLUME_LABEL "FTHR840BOOT" #define UF2_VOLUME_LABEL "FTHR840BOOT"
#define UF2_BOARD_ID "nRF52840-Feather-revD" #define UF2_BOARD_ID "nRF52840-Feather-revD"
#define UF2_INDEX_URL "https://www.adafruit.com/product/4062"
#endif // _FEATHER_NRF52840_H #endif // _FEATHER_NRF52840_H

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

@@ -49,14 +49,12 @@
#define BUTTON_PULL NRF_GPIO_PIN_PULLUP #define BUTTON_PULL NRF_GPIO_PIN_PULLUP
// Used as model string in OTA mode // Used as model string in OTA mode
#define DIS_MANUFACTURER "MakerDiary" #define DIS_MANUFACTURER "MakerDiary"
#define DIS_MODEL "nRF52840 Micro Dev Kit USB Dongle" #define DIS_MODEL "nRF52840 Micro Dev Kit USB Dongle"
#define PRODUCT_NAME "MDK nRF52840 USB Dongle" #define PRODUCT_NAME "MDK nRF52840 USB Dongle"
#define VOLUME_LABEL "MDK840DONGL" #define UF2_VOLUME_LABEL "MDK840DONGL"
#define UF2_BOARD_ID "MakerDiary-nRF52840-USB-Dongle"
#define UF2_BOARD_ID "MakerDiary-nRF52840-USB-Dongle" #define UF2_INDEX_URL "https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle/"
#define INDEX_URL "https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle/"
#endif /* _MDK_NRF52840_DONGLE_H_ */ #endif /* _MDK_NRF52840_DONGLE_H_ */

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

@@ -55,12 +55,14 @@
#define HWFC false #define HWFC false
// Used as model string in OTA mode // Used as model string in OTA mode
#define DIS_MANUFACTURER "Adafruit Industries" #define DIS_MANUFACTURER "Adafruit Industries"
#define DIS_MODEL "Bluefruit Metro nRF52840 Express" #define DIS_MODEL "Bluefruit Metro nRF52840 Express"
#define PRODUCT_NAME "Adafruit Metro nRF52840 Express" #define PRODUCT_NAME "Adafruit Metro nRF52840 Express"
#define VOLUME_LABEL "METR840BOOT" #define UF2_VOLUME_LABEL "METR840BOOT"
#define UF2_BOARD_ID "nRF52840-Metro-revA" #define UF2_BOARD_ID "nRF52840-Metro-revA"
#define UF2_INDEX_URL "https://www.adafruit.com/"
#endif /* _METRO_NRF52840_H_ */ #endif /* _METRO_NRF52840_H_ */

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

@@ -57,13 +57,11 @@
#define HWFC false #define HWFC false
// Used as model string in OTA mode // Used as model string in OTA mode
#define DIS_MANUFACTURER "Particle Industries" #define DIS_MANUFACTURER "Particle Industries"
#define DIS_MODEL "Argon" #define DIS_MODEL "Argon"
#define VOLUME_LABEL "ARGONBOOT " #define UF2_VOLUME_LABEL "ARGONBOOT "
#define UF2_BOARD_ID "nRF52840-Argon-v1"
#define UF2_BOARD_ID "nRF52840-Argon-v1" #define UF2_INDEX_URL "https://www.particle.io/mesh/"
#define INDEX_URL "https://www.particle.io/mesh/"
#endif // _PARTICLE_ARGON_H #endif // _PARTICLE_ARGON_H

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

@@ -57,13 +57,11 @@
#define HWFC false #define HWFC false
// Used as model string in OTA mode // Used as model string in OTA mode
#define DIS_MANUFACTURER "Particle Industries" #define DIS_MANUFACTURER "Particle Industries"
#define DIS_MODEL "Boron" #define DIS_MODEL "Boron"
#define VOLUME_LABEL "BORONBOOT " #define UF2_VOLUME_LABEL "BORONBOOT "
#define UF2_BOARD_ID "nRF52840-Boron-v1"
#define UF2_BOARD_ID "nRF52840-Boron-v1" #define UF2_INDEX_URL "https://www.particle.io/mesh/"
#define INDEX_URL "https://www.particle.io/mesh/"
#endif // _PARTICLE_BORON_H #endif // _PARTICLE_BORON_H

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

@@ -57,13 +57,11 @@
#define HWFC false #define HWFC false
// Used as model string in OTA mode // Used as model string in OTA mode
#define DIS_MANUFACTURER "Particle Industries" #define DIS_MANUFACTURER "Particle Industries"
#define DIS_MODEL "Xenon" #define DIS_MODEL "Xenon"
#define VOLUME_LABEL "XENONBOOT " #define UF2_VOLUME_LABEL "XENONBOOT "
#define UF2_BOARD_ID "nRF52840-Xenon-v1"
#define UF2_BOARD_ID "nRF52840-Xenon-v1" #define UF2_INDEX_URL "https://www.particle.io/mesh/"
#define INDEX_URL "https://www.particle.io/mesh/"
#endif // _PARTICLE_XENON_H #endif // _PARTICLE_XENON_H

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

@@ -54,6 +54,7 @@
#define DIS_MANUFACTURER "Nordic" #define DIS_MANUFACTURER "Nordic"
#define DIS_MODEL "PCA10056" #define DIS_MODEL "PCA10056"
#define UF2_BOARD_ID "nRF52840-pca10056-v1" #define UF2_BOARD_ID "nRF52840-pca10056-v1"
#define UF2_INDEX_URL "https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52840-DK"
#endif // PCA10056_H #endif // PCA10056_H

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

@@ -57,6 +57,7 @@
#define DIS_MANUFACTURER "Nordic" #define DIS_MANUFACTURER "Nordic"
#define DIS_MODEL "PCA10059" #define DIS_MODEL "PCA10059"
#define UF2_BOARD_ID "nRF52840-pca10059-v1" #define UF2_BOARD_ID "nRF52840-pca10059-v1"
#define UF2_INDEX_URL "https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52840-Dongle"
#endif // PCA10059_H #endif // PCA10059_H

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

@@ -71,7 +71,7 @@ const char indexFile[] = //
"<html>" "<html>"
"<body>" "<body>"
"<script>\n" "<script>\n"
"location.replace(\"" INDEX_URL "\");\n" "location.replace(\"" UF2_INDEX_URL "\");\n"
"</script>" "</script>"
"</body>" "</body>"
"</html>\n"; "</html>\n";
@@ -131,7 +131,7 @@ static FAT_BootBlock const BootBlock = {
.PhysicalDriveNum = 0x80, // to match MediaDescriptor of 0xF8 .PhysicalDriveNum = 0x80, // to match MediaDescriptor of 0xF8
.ExtendedBootSig = 0x29, .ExtendedBootSig = 0x29,
.VolumeSerialNumber = 0x00420042, .VolumeSerialNumber = 0x00420042,
.VolumeLabel = VOLUME_LABEL, .VolumeLabel = UF2_VOLUME_LABEL,
.FilesystemIdentifier = "FAT16 ", .FilesystemIdentifier = "FAT16 ",
}; };

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

@@ -4,16 +4,12 @@
#define PRODUCT_NAME DIS_MODEL #define PRODUCT_NAME DIS_MODEL
#endif #endif
#ifndef INDEX_URL
#define INDEX_URL "https://www.adafruit.com/"
#endif
#define BOOTLOADER_ID MK_DIS_FIRMWARE #define BOOTLOADER_ID MK_DIS_FIRMWARE
#define UF2_NUM_BLOCKS 8000 // at least 4,1 MB for FAT16 #define UF2_NUM_BLOCKS 8000 // at least 4,1 MB for FAT16
#ifndef VOLUME_LABEL #ifndef UF2_VOLUME_LABEL
#define VOLUME_LABEL "NRF52BOOT " #define UF2_VOLUME_LABEL "NRF52BOOT "
#endif #endif
#define FLASH_SIZE (USER_FLASH_END-USER_FLASH_START) // Max flash size #define FLASH_SIZE (USER_FLASH_END-USER_FLASH_START) // Max flash size