-
Notifications
You must be signed in to change notification settings - Fork 13.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2 from esp8266/esp8266
merged
- Loading branch information
Showing
42 changed files
with
1,113 additions
and
195 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| Copyright (c) 2015 Ivan Grokhotkov | ||
| All rights reserved. | ||
|
|
||
| Redistribution and use in source and binary forms, with or without modification, | ||
| are permitted provided that the following conditions are met: | ||
|
|
||
| 1. Redistributions of source code must retain the above copyright notice, | ||
| this list of conditions and the following disclaimer. | ||
| 2. Redistributions in binary form must reproduce the above copyright notice, | ||
| this list of conditions and the following disclaimer in the documentation | ||
| and/or other materials provided with the distribution. | ||
| 3. The name of the authors may not be used to endorse or promote products | ||
| derived from this software without specific prior written permission. | ||
|
|
||
| THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED | ||
| WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
| MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT | ||
| SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | ||
| EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT | ||
| OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING | ||
| IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY | ||
| OF SUCH DAMAGE. | ||
|
|
||
| Authors: Ivan Grokhotkov |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| XTENSA_TOOCHAIN ?= | ||
|
|
||
| BIN_DIR := ./ | ||
| TARGET_DIR := ./ | ||
|
|
||
| TARGET_OBJ_FILES := \ | ||
| eboot.o \ | ||
|
|
||
| TARGET_OBJ_PATHS := $(addprefix $(TARGET_DIR)/,$(TARGET_OBJ_FILES)) | ||
|
|
||
| CC := $(XTENSA_TOOCHAIN)xtensa-lx106-elf-gcc | ||
| CXX := $(XTENSA_TOOCHAIN)xtensa-lx106-elf-g++ | ||
| AR := $(XTENSA_TOOCHAIN)xtensa-lx106-elf-ar | ||
| LD := $(XTENSA_TOOCHAIN)xtensa-lx106-elf-gcc | ||
| OBJDUMP := $(XTENSA_TOOCHAIN)xtensa-lx106-elf-objdump | ||
|
|
||
|
|
||
| CFLAGS += -std=gnu99 | ||
|
|
||
| CFLAGS += -O0 -g -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mno-text-section-literals | ||
|
|
||
| LDFLAGS += -nostdlib -Wl,--no-check-sections -umain | ||
|
|
||
| LD_SCRIPT := -Teboot.ld | ||
|
|
||
| APP_OUT:= eboot.elf | ||
| APP_AR := eboot.a | ||
| APP_FW := eboot.bin | ||
|
|
||
| all: $(APP_FW) | ||
|
|
||
| $(APP_AR): $(TARGET_OBJ_PATHS) | ||
| $(AR) cru $@ $^ | ||
|
|
||
|
|
||
| $(APP_OUT): $(APP_AR) | ||
| $(LD) $(LD_SCRIPT) $(LDFLAGS) -Wl,--start-group -Wl,--whole-archive $(APP_AR) -Wl,--end-group -o $@ | ||
|
|
||
| $(APP_FW): $(APP_OUT) | ||
| $(ESPTOOL) -vvv -eo $(APP_OUT) -bo $@ -bs .text -bs .data -bs .rodata -bc -ec || true | ||
|
|
||
|
|
||
| clean: | ||
| rm -f *.o | ||
| rm -f $(APP_AR) | ||
| rm -f $(APP_OUT) | ||
|
|
||
|
|
||
| .PHONY: all clean default | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| /* Copyright (c) 2015 Ivan Grokhotkov. All rights reserved. | ||
| * This file is part of eboot bootloader. | ||
| * | ||
| * Redistribution and use is permitted according to the conditions of the | ||
| * 3-clause BSD license to be found in the LICENSE file. | ||
| */ | ||
|
|
||
|
|
||
| #include <stddef.h> | ||
| #include <stdint.h> | ||
| #include <stdbool.h> | ||
| #include "eboot.h" | ||
| extern void* flashchip; | ||
|
|
||
| #define SWRST do { (*((volatile uint32_t*) 0x60000700)) |= 0x80000000; } while(0); | ||
|
|
||
|
|
||
| int load_app_from_flash_raw(const uint32_t flash_addr) | ||
| { | ||
| image_header_t image_header; | ||
| uint32_t pos = flash_addr + APP_START_OFFSET; | ||
|
|
||
| if (SPIRead(pos, &image_header, sizeof(image_header))) { | ||
| return 1; | ||
| } | ||
| pos += sizeof(image_header); | ||
|
|
||
|
|
||
| for (uint32_t section_index = 0; | ||
| section_index < image_header.num_segments; | ||
| ++section_index) | ||
| { | ||
| section_header_t section_header = {0}; | ||
| if (SPIRead(pos, §ion_header, sizeof(section_header))) { | ||
| return 2; | ||
| } | ||
| pos += sizeof(section_header); | ||
|
|
||
| const uint32_t address = section_header.address; | ||
|
|
||
| bool load = false; | ||
|
|
||
| if (address < 0x40000000) { | ||
| load = true; | ||
| } | ||
|
|
||
| if (address >= 0x40100000 && address < 0x40108000) { | ||
| load = true; | ||
| } | ||
|
|
||
| if (address >= 0x60000000) { | ||
| load = true; | ||
| } | ||
|
|
||
| if (!load) { | ||
| pos += section_header.size; | ||
| continue; | ||
| } | ||
|
|
||
| if (SPIRead(pos, (void*)address, section_header.size)) | ||
| return 3; | ||
|
|
||
| pos += section_header.size; | ||
| } | ||
|
|
||
| register uint32_t sp asm("a1") = 0x3ffffff0; | ||
| register uint32_t pc asm("a3") = image_header.entry; | ||
| __asm__ __volatile__ ("jx a3"); | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
|
|
||
| void main() | ||
| { | ||
| int res = load_app_from_flash_raw(0); | ||
| if (res) { | ||
| ets_putc('\n'); | ||
| ets_putc('#'); | ||
| ets_putc('0' + res); | ||
| ets_putc('\n'); | ||
| SWRST; | ||
| } | ||
|
|
||
| while(true){} | ||
| } |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /* Copyright (c) 2015 Ivan Grokhotkov. All rights reserved. | ||
| * This file is part of eboot bootloader. | ||
| * | ||
| * Redistribution and use is permitted according to the conditions of the | ||
| * 3-clause BSD license to be found in the LICENSE file. | ||
| */ | ||
|
|
||
| #ifndef EBOOT_H | ||
| #define EBOOT_H | ||
|
|
||
|
|
||
| int SPIEraseBlock(uint32_t block); | ||
| int SPIEraseSector(uint32_t sector); | ||
| int SPIRead(uint32_t addr, void *dest, size_t size); | ||
| int SPIWrite(uint32_t addr, void *src, size_t size); | ||
|
|
||
| #define APP_START_OFFSET 0x1000 | ||
|
|
||
| typedef struct { | ||
| unsigned char magic; | ||
| unsigned char num_segments; | ||
|
|
||
| /* SPI Flash Interface (0 = QIO, 1 = QOUT, 2 = DIO, 0x3 = DOUT) */ | ||
| unsigned char flash_mode; | ||
|
|
||
| /* High four bits: 0 = 512K, 1 = 256K, 2 = 1M, 3 = 2M, 4 = 4M, | ||
| Low four bits: 0 = 40MHz, 1= 26MHz, 2 = 20MHz, 0xf = 80MHz */ | ||
| unsigned char flash_size_freq; | ||
|
|
||
| uint32_t entry; | ||
| } image_header_t; | ||
|
|
||
|
|
||
| typedef struct { | ||
| uint32_t address; | ||
| uint32_t size; | ||
| } section_header_t; | ||
|
|
||
|
|
||
|
|
||
| #endif //EBOOT_H |
Oops, something went wrong.