saymrwulf/xous-core
1
0
Fork 0
mirror of https://github.com/saymrwulf/xous-core.git synced 2026-11-08 04:56:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of github.com:betrusted-io/xous-core into main

Browse source
This commit is contained in:
bunnie 2022-11-04 17:06:40 +08:00
commit 4264231033
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
loader/link.x
View file

@ -1,9 +1,9 @@
MEMORY
{
RAM : ORIGIN = 0x40000000, LENGTH = 16M
FLASH : ORIGIN = 0x20501000, LENGTH = 188k
FONTS : ORIGIN = 0x20530000, LENGTH = 4352k
MEMLCD: ORIGIN = 0xB0000000, LENGTH = 32k
RAM : ORIGIN = 0x40000000, LENGTH = 16M
MEMLCD : ORIGIN = 0xB0000000, LENGTH = 32k
}
/*
Fonts go from 0x2053_0000 to 0x2097_0000
@ -51,7 +51,7 @@ SECTIONS
.text.dummy (NOLOAD) :
{
/* This section is intended to make _stext address work */
. = _stext;
. = ABSOLUTE(_stext);
} > REGION_TEXT
.text _stext :
@ -91,7 +91,7 @@ SECTIONS
_edata = .;
} > REGION_DATA AT > REGION_RODATA
.fonts ALIGN(65536) : SUBALIGN(65536)
.fonts : ALIGN(65536)
{
KEEP(*(.fontdata));
} > FONTS

2
tools/src/elf.rs
View file

@ -209,7 +209,7 @@ pub fn process_program(b: &[u8]) -> Result<ProgramDescription, ElfReadError> {
s.address()
);
continue;
} else if text_offset == 0 && s.size() != 0 {
} else if text_offset == 0 && (s.address() != 0 || s.size() != 0) {
text_offset = s.address() as u32;
text_size += s.size() as u32;
} else {