Commit a9f57e6

committed

eboot rebuild + fix .ld inconsistency

1 parent d2e1f8b commit a9f57e6Copy full SHA for a9f57e6

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ OBJDUMP := $(XTENSA_TOOLCHAIN)xtensa-lx106-elf-objdump`
`21`	`21`
`22`	`22`	`INC += -I../../tools/sdk/include -I../../tools/sdk/uzlib/src`
`23`	`23`
`24`		`-CFLAGS += -std=gnu17`
	`24`	`+CFLAGS += -std=gnu23`
`25`	`25`
`26`	`26`	`CFLAGS += -Os -fcommon -g -Wall -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mno-text-section-literals -ffunction-sections -fdata-sections -free -fipa-pta`
`27`	`27`
`@@ -47,7 +47,7 @@ tinfgzip.o: $(UZLIB_PATH)/tinfgzip.c $(UZLIB_PATH)/uzlib.h $(UZLIB_PATH)/uzlib_c`
`47`	`47`	`$(CC) $(CFLAGS) -c -o tinfgzip.o $(UZLIB_PATH)/tinfgzip.c`
`48`	`48`
`49`	`49`	`$(APP_AR): $(TARGET_OBJ_PATHS) tinflate.o tinfgzip.o Makefile`
`50`		`- $(AR) cru $@ $^`
	`50`	`+ $(AR) Dcr $@ $^`
`51`	`51`
`52`	`52`	`$(APP_OUT): $(APP_AR) eboot.ld \| Makefile`
`53`	`53`	`$(LD) $(LD_SCRIPT) $(LDFLAGS) -Wl,--start-group -Wl,--sort-common $(APP_AR) -Wl,--end-group -o $@`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,9 @@ extern void ets_wdt_enable(uint32_t mode, uint32_t arg1, uint32_t arg2);`
`51`	`51`	`*/`
`52`	`52`	`extern uint32_t ets_wdt_disable(void);`
`53`	`53`
	`54`	`+/* See tools/sdk/ld/eagle.rom.addr.v6.ld */`
	`55`	`+extern int rom_memcmp (const void , const void , size_t);`
	`56`	`+`
`54`	`57`	`int print_version(const uint32_t flash_addr)`
`55`	`58`	`{`
`56`	`59`	`uint32_t ver;`
`@@ -205,7 +208,7 @@ int copy_raw(const uint32_t src_addr,`
`205`	`208`	`if (SPIRead(daddr, buffer2, buffer_size)) {`
`206`	`209`	`return 4;`
`207`	`210`	`}`
`208`		`- if (memcmp(buffer, buffer2, buffer_size)) {`
	`211`	`+ if (rom_memcmp(buffer, buffer2, buffer_size)) {`
`209`	`212`	`return 9;`
`210`	`213`	`}`
`211`	`214`	`} else {`
`@@ -216,7 +219,7 @@ int copy_raw(const uint32_t src_addr,`
`216`	`219`	`if (SPIRead(daddr, buffer2, buffer_size)) {`
`217`	`220`	`return 4;`
`218`	`221`	`}`
`219`		`- if (!memcmp(buffer2, buffer, buffer_size)) {`
	`222`	`+ if (!rom_memcmp(buffer2, buffer, buffer_size)) {`
`220`	`223`	`ets_putc('B'); // Note we skipped the bootloader in output`
`221`	`224`	`skip = true; // And skip erase/write`
`222`	`225`	`}`

-2.05 KB

Binary file not shown.

Lines changed: 1 addition & 1 deletion

Comments

(0)