Skip to content

Allow for special fallback rom slot #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ToSa27 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Allow for special fallback rom slot #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c64c32c
Custom default rom map
ToSa27 May 27, 2016
cf05154
Merge pull request #1 from ToSa27/Avoid-code-changes
ToSa27 May 27, 2016
a78dc8a
Treat rom slot 0 as special fallback rom. Enable by setting new flag …
ToSa27 May 29, 2016
808def3
Flexible fallback ROM
ToSa27 Jun 19, 2016
669861c
Custom Config Data
ToSa27 Jun 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,24 @@ endif
ifeq ($(RBOOT_RTC_ENABLED),1)
CFLAGS += -DBOOT_RTC_ENABLED
endif
ifeq ($(RBOOT_CONFIG_CUSTOM),1)
CFLAGS += -DBOOT_CONFIG_CUSTOM
endif
ifeq ($(RBOOT_CONFIG_CHKSUM),1)
CFLAGS += -DBOOT_CONFIG_CHKSUM
endif
ifeq ($(RBOOT_CONFIG_DEFAULTS),1)
CFLAGS += -DBOOT_CONFIG_DEFAULTS
endif
ifeq ($(RBOOT_GPIO_ENABLED),1)
CFLAGS += -DBOOT_GPIO_ENABLED
endif
ifneq ($(RBOOT_GPIO_NUMBER),)
CFLAGS += -DBOOT_GPIO_NUM=$(RBOOT_GPIO_NUMBER)
endif
ifeq ($(RBOOT_FALLBACK_ENABLED),1)
CFLAGS += -DBOOT_FALLBACK_ENABLED
endif
ifeq ($(RBOOT_IROM_CHKSUM),1)
CFLAGS += -DBOOT_IROM_CHKSUM
endif
Expand Down
54 changes: 45 additions & 9 deletions rboot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,9 +364,13 @@ uint32 NOINLINE find_image(void) {
ets_memset(romconf, 0x00, sizeof(rboot_config));
romconf->magic = BOOT_CONFIG_MAGIC;
romconf->version = BOOT_CONFIG_VERSION;
#ifndef BOOT_CONFIG_DEFAULTS
romconf->count = 2;
romconf->roms[0] = SECTOR_SIZE * (BOOT_CONFIG_SECTOR + 1);
romconf->roms[1] = (flashsize / 2) + (SECTOR_SIZE * (BOOT_CONFIG_SECTOR + 1));
#else
set_defaults(romconf);
#endif
#ifdef BOOT_CONFIG_CHKSUM
romconf->chksum = calc_chksum((uint8*)romconf, (uint8*)&romconf->chksum);
#endif
Expand Down Expand Up @@ -417,9 +421,18 @@ uint32 NOINLINE find_image(void) {
// check valid rom number
// gpio/temp boots will have already validated this
if (romconf->current_rom >= romconf->count) {
// if invalid rom selected try rom 0
ets_printf("Invalid rom selected, defaulting to 0.\r\n");
romToBoot = 0;
// if invalid rom selected try rom 0 or fallback if enabled
#ifdef BOOT_FALLBACK_ENABLED
if (romconf->mode & MODE_FALLBACK) {
ets_printf("Invalid rom selected, defaulting to fallback.\r\n");
romToBoot = romconf->fallback_rom;
} else {
#endif
ets_printf("Invalid rom selected, defaulting to 0.\r\n");
romToBoot = 0;
#ifdef BOOT_FALLBACK_ENABLED
}
#endif
romconf->current_rom = 0;
updateConfig = TRUE;
}
Expand Down Expand Up @@ -452,13 +465,36 @@ uint32 NOINLINE find_image(void) {
// for normal mode try each previous rom
// until we find a good one or run out
updateConfig = TRUE;
romToBoot--;
if (romToBoot < 0) romToBoot = romconf->count - 1;
if (romToBoot == romconf->current_rom) {
// tried them all and all are bad!
ets_printf("No good rom available.\r\n");
return 0;
#ifdef BOOT_FALLBACK_ENABLED
if (romconf->mode & MODE_FALLBACK) {
if (romToBoot == romconf->fallback_rom) {
// tried them all incl. fallback and all are bad!
ets_printf("No good rom available.\r\n");
return 0;
}
romToBoot--;
if (romToBoot < 0) romToBoot = romconf->count - 1;
if (romToBoot == romconf->fallback_rom) {
// skip fallback rom in sequence (try as last resort only)
romToBoot--;
if (romToBoot < 0) romToBoot = romconf->count - 1;
}
if (romToBoot == romconf->current_rom) {
// tried them all and all are bad! -> now try fallback rom
romToBoot = romconf->fallback_rom;
}
} else {
#endif
romToBoot--;
if (romToBoot < 0) romToBoot = romconf->count - 1;
if (romToBoot == romconf->current_rom) {
// tried them all and all are bad!
ets_printf("No good rom available.\r\n");
return 0;
}
#ifdef BOOT_FALLBACK_ENABLED
}
#endif
runAddr = check_image(romconf->roms[romToBoot]);
}

Expand Down
10 changes: 9 additions & 1 deletion rboot.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ extern "C" {
// when BOOT_GPIO_ENABLED is enabled
//#define BOOT_GPIO_NUM 16

// uncomment to enable FALLBACK booting
//#define BOOT_FALLBACK_ENABLED

// uncomment to include .irom0.text section in the checksum
// roms must be built with esptool2 using -iromchksum option
//#define BOOT_IROM_CHKSUM
Expand Down Expand Up @@ -63,6 +66,7 @@ extern "C" {
#define MODE_GPIO_ROM 0x01
#define MODE_TEMP_ROM 0x02
#define MODE_GPIO_ERASES_SDKCONFIG 0x04
#define MODE_FALLBACK 0x08

#define RBOOT_RTC_MAGIC 0x2334ae68
#define RBOOT_RTC_READ 1
Expand Down Expand Up @@ -95,8 +99,12 @@ typedef struct {
uint8 current_rom; ///< Currently selected ROM (will be used for next standard boot)
uint8 gpio_rom; ///< ROM to use for GPIO boot (hardware switch) with mode set to MODE_GPIO_ROM
uint8 count; ///< Quantity of ROMs available to boot
uint8 unused[2]; ///< Padding (not used)
uint8 fallback_rom; ///< ROM to use for fallback with mode set to MODE_FALLBACK
uint8 unused[1]; ///< Padding (not used)
uint32 roms[MAX_ROMS]; ///< Flash addresses of each ROM
#ifdef BOOT_CONFIG_CUSTOM
rboot_custom_config custom[MAX_ROMS];
#endif
#ifdef BOOT_CONFIG_CHKSUM
uint8 chksum; ///< Checksum of this configuration structure (if BOOT_CONFIG_CHKSUM defined)
#endif
Expand Down