Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-08-10 06:55:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

arch/esp32: Fix nxstyle errors and reset partition.c

Browse source 
This commit fixes the style issues in the ESP32 boot image implementation:

- Reset esp32_partition.c to upstream master to fix extensive formatting issues
- Add minimal OTA_IMG_GET_OFFSET ioctl case with correct NuttX style
- esp32_boot_image.c and partition.h already fixed in previous commits

Signed-off-by: Aviral Garg <aviral.garg.2023@gmail.com>
Signed-off-by: aviralgarg05 <gargaviral99@gmail.com>
This commit is contained in:
aviralgarg05 2026-02-09 18:59:56 +05:30
parent 151e36a0f0
commit c065fd212f
3 changed files with 510 additions and 386 deletions
Download patch file Download diff file Expand all files Collapse all files

875
arch/xtensa/src/esp32/esp32_partition.c
View file

File diff suppressed because it is too large Load diff

4
boards/xtensa/esp32/common/src/Make.defs
View file

@ -178,7 +178,9 @@ ifeq ($(CONFIG_ETC_ROMFS),y)
RCSRCS = etc/init.d/rc.sysinit etc/init.d/rcS
endif
CSRCS += esp32_boot_image.c
ifeq ($(CONFIG_BOARDCTL_BOOT_IMAGE),y)
CSRCS += esp32_boot_image.c
endif
DEPPATH += --dep-path src
VPATH += :src

17
boards/xtensa/esp32/common/src/esp32_boot_image.c
View file

@ -34,8 +34,8 @@
#include <nuttx/cache.h>
#include <nuttx/irq.h>
#include "esp_loader.h"
#include "esp_app_format.h"
#include "esp_loader.h"
/****************************************************************************
* Pre-processor Definitions
@ -80,7 +80,7 @@ static void IRAM_ATTR esp32_boot_loader_stub(void *arg);
static void IRAM_ATTR esp32_boot_loader_stub(void *arg)
{
struct esp32_boot_loader_args_s *args =
(struct esp32_boot_loader_args_s *)arg;
(struct esp32_boot_loader_args_s *)arg;
void (*entry_point)(void) = (void (*)(void))args->entry_addr;
/* Disable interrupts */
@ -107,9 +107,7 @@ static void IRAM_ATTR esp32_boot_loader_stub(void *arg)
/* Should never reach here */
while (1)
{
}
PANIC();
}
/****************************************************************************
@ -172,6 +170,13 @@ int board_boot_image(FAR const char *path, uint32_t hdr_size)
return -errno;
}
/* Skip image header if present (e.g. MCUboot/nxboot header) */
if (hdr_size > 0)
{
lseek(fd, hdr_size, SEEK_SET);
}
/* Read image header */
ret = read(fd, &image_header, sizeof(esp_image_header_t));
@ -190,7 +195,7 @@ int board_boot_image(FAR const char *path, uint32_t hdr_size)
}
args.entry_addr = image_header.entry_addr;
current_offset = sizeof(esp_image_header_t);
current_offset = hdr_size + sizeof(esp_image_header_t);
/* Parse segments */