Skip to content

Commit

Permalink
Updated PROS Kernel, okapi, fixed #53, general cleaning
Browse files Browse the repository at this point in the history
  • Loading branch information
ssejrog committed Aug 22, 2022
1 parent 3c775f3 commit 1c2b988
Show file tree
Hide file tree
Showing 83 changed files with 2,918 additions and 819 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*.elf

# PROS
.cache/
bin/
.vscode/
.cache/
compile_commands.json
temp.log
temp.errors
Expand Down
Binary file modified firmware/libpros.a
Binary file not shown.
Binary file modified firmware/okapilib.a
Binary file not shown.
1 change: 1 addition & 0 deletions firmware/squiggles.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
INCLUDE+=-iquote"$(ROOT)/include/okapi/squiggles"
56 changes: 28 additions & 28 deletions firmware/v5-common.ld
Original file line number Diff line number Diff line change
Expand Up @@ -21,52 +21,52 @@ SECTIONS
*(.gnu.linkonce.t.*)
*(.plt)
*(.gnu_warning)
*(.gcc_execpt_table)
*(.gcc_except_table)
*(.glue_7)
*(.glue_7t)
*(.vfp11_veneer)
*(.ARM.extab)
*(.gnu.linkonce.armextab.*)
} > MEMORY
} > RAM

.init : {
KEEP (*(.init))
} > MEMORY
} > RAM

.fini : {
KEEP (*(.fini))
} > MEMORY
} > RAM

.rodata : {
__rodata_start = .;
*(.rodata)
*(.rodata.*)
*(.gnu.linkonce.r.*)
__rodata_end = .;
} > MEMORY
} > RAM

.rodata1 : {
__rodata1_start = .;
*(.rodata1)
*(.rodata1.*)
__rodata1_end = .;
} > MEMORY
} > RAM

.sdata2 : {
__sdata2_start = .;
*(.sdata2)
*(.sdata2.*)
*(.gnu.linkonce.s2.*)
__sdata2_end = .;
} > MEMORY
} > RAM

.sbss2 : {
__sbss2_start = .;
*(.sbss2)
*(.sbss2.*)
*(.gnu.linkonce.sb2.*)
__sbss2_end = .;
} > MEMORY
} > RAM

.data : {
__data_start = .;
Expand All @@ -77,18 +77,18 @@ SECTIONS
*(.got)
*(.got.plt)
__data_end = .;
} > MEMORY
} > RAM

.data1 : {
__data1_start = .;
*(.data1)
*(.data1.*)
__data1_end = .;
} > MEMORY
} > RAM

.got : {
*(.got)
} > MEMORY
} > RAM

.ctors : {
__CTOR_LIST__ = .;
Expand All @@ -99,7 +99,7 @@ SECTIONS
KEEP (*(.ctors))
__CTOR_END__ = .;
___CTORS_END___ = .;
} > MEMORY
} > RAM

.dtors : {
__DTOR_LIST__ = .;
Expand All @@ -110,99 +110,99 @@ SECTIONS
KEEP (*(.dtors))
__DTOR_END__ = .;
___DTORS_END___ = .;
} > MEMORY
} > RAM

.fixup : {
__fixup_start = .;
*(.fixup)
__fixup_end = .;
} > MEMORY
} > RAM

.eh_frame : {
*(.eh_frame)
} > MEMORY
} > RAM

.eh_framehdr : {
__eh_framehdr_start = .;
*(.eh_framehdr)
__eh_framehdr_end = .;
} > MEMORY
} > RAM

.gcc_except_table : {
*(.gcc_except_table)
} > MEMORY
} > RAM

.mmu_tbl (ALIGN(16384)) : {
__mmu_tbl_start = .;
*(.mmu_tbl)
__mmu_tbl_end = .;
} > MEMORY
} > RAM

.ARM.exidx : {
__exidx_start = .;
*(.ARM.exidx*)
*(.gnu.linkonce.armexidix.*.*)
__exidx_end = .;
} > MEMORY
} > RAM

.preinit_array : {
__preinit_array_start = .;
KEEP (*(SORT(.preinit_array.*)))
KEEP (*(.preinit_array))
__preinit_array_end = .;
} > MEMORY
} > RAM

.init_array : {
__init_array_start = .;
KEEP (*(SORT(.init_array.*)))
KEEP (*(.init_array))
__init_array_end = .;
} > MEMORY
} > RAM

.fini_array : {
__fini_array_start = .;
KEEP (*(SORT(.fini_array.*)))
KEEP (*(.fini_array))
__fini_array_end = .;
} > MEMORY
} > RAM

.ARM.attributes : {
__ARM.attributes_start = .;
*(.ARM.attributes)
__ARM.attributes_end = .;
} > MEMORY
} > RAM

.sdata : {
__sdata_start = .;
*(.sdata)
*(.sdata.*)
*(.gnu.linkonce.s.*)
__sdata_end = .;
} > MEMORY
} > RAM

.sbss (NOLOAD) : {
__sbss_start = .;
*(.sbss)
*(.sbss.*)
*(.gnu.linkonce.sb.*)
__sbss_end = .;
} > MEMORY
} > RAM

.tdata : {
__tdata_start = .;
*(.tdata)
*(.tdata.*)
*(.gnu.linkonce.td.*)
__tdata_end = .;
} > MEMORY
} > RAM

.tbss : {
__tbss_start = .;
*(.tbss)
*(.tbss.*)
*(.gnu.linkonce.tb.*)
__tbss_end = .;
} > MEMORY
} > RAM

.bss (NOLOAD) : {
__bss_start = .;
Expand All @@ -211,7 +211,7 @@ SECTIONS
*(.gnu.linkonce.b.*)
*(COMMON)
__bss_end = .;
} > MEMORY
} > RAM

_SDA_BASE_ = __sdata_start + ((__sbss_end - __sdata_start) / 2 );

Expand Down
2 changes: 1 addition & 1 deletion firmware/v5-hot.ld
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ MEMORY
HOT_MEMORY : ORIGIN = start_of_hot_mem, LENGTH = _HOT_MEM_SIZE /* Just over 8 MB */
}

REGION_ALIAS("MEMORY", HOT_MEMORY);
REGION_ALIAS("RAM", HOT_MEMORY);

ENTRY(install_hot_table)
2 changes: 1 addition & 1 deletion firmware/v5.ld
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ MEMORY
HOT_MEMORY : ORIGIN = start_of_hot_mem, LENGTH = _HOT_MEM_SIZE /* Just over 8 MB */
}

REGION_ALIAS("MEMORY", COLD_MEMORY);
REGION_ALIAS("RAM", COLD_MEMORY);

ENTRY(vexStartup)
Loading

0 comments on commit 1c2b988

Please sign in to comment.