Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

sync with milkymist-ng

  • Loading branch information...
commit a26b62784117a864369f3b07ef6b7fc6ba1c3d08 1 parent 2b91d99
@sbourdeauducq sbourdeauducq authored
Showing with 13 additions and 230 deletions.
  1. +8 −4 Makefile
  2. +3 −3 agg_test.cpp
  3. +0 −167 crt0.S
  4. +2 −0  libglue/yaffs.c
  5. +0 −56 linker.ld
View
12 Makefile
@@ -1,7 +1,7 @@
MISPDIR=.
include $(MISPDIR)/common.mak
-OBJECTS=crt0.o isr.o luainit.o agg_test.o main.o
+OBJECTS=isr.o luainit.o agg_test.o main.o
OURLIBS=m mm yaffs2 glue lua lfs agl
INCFLAGS=-I$(MISPDIR)/libm/include -I$(MISPDIR)/libmm/include -I$(MISPDIR)/libglue/include -I$(LUADIR)/src -I$(MISPDIR)/liblfs/include -I$(MISPDIR)/libagl/include
@@ -17,10 +17,14 @@ all: misp.bin
$(OBJCOPY) -O binary $< $@
chmod -x $@
-misp.elf: linker.ld $(OBJECTS) libs
+misp.elf: $(OBJECTS) libs
%.elf:
- $(LD) $(LDFLAGS) -T $< -N -o $@ $(OBJECTS) \
+ $(LD) $(LDFLAGS) \
+ -T $(M2DIR)/software/libbase/linker-sdram.ld \
+ -N -o $@ \
+ $(M2DIR)/software/libbase/crt0.o \
+ $(OBJECTS) \
-L$(M2DIR)/software/libbase \
-L$(M2DIR)/software/libcompiler-rt \
$(addprefix -L$(MISPDIR)/lib,$(OURLIBS)) \
@@ -47,6 +51,6 @@ clean:
done
netboot: misp.bin
- cp misp.bin /var/lib/tftpboot/boot.bin
+ cp misp.bin /srv/tftp/boot.bin
.PHONY: clean libs netboot
View
6 agg_test.cpp
@@ -7,8 +7,8 @@
enum
{
- width = 1024,
- height = 768
+ width = 1920,
+ height = 1080
};
@@ -154,7 +154,7 @@ static void vga_set_mode(int mode)
static void start_fb(unsigned char *addr)
{
- vga_set_mode(VGA_MODE_1024_768);
+ vga_set_mode(VGA_MODE_1920_1080);
fb_base_write((unsigned int)addr);
fb_enable_write(1);
}
View
167 crt0.S
@@ -1,167 +0,0 @@
-/*
- * LatticeMico32 C startup code.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
- */
-
-/* Exception handlers - Must be 32 bytes long. */
-.section .text, "ax", @progbits
-.global _start
-_start:
-_reset_handler:
- xor r0, r0, r0
- wcsr IE, r0
- mvhi r1, hi(_reset_handler)
- ori r1, r1, lo(_reset_handler)
- wcsr EBA, r1
- bi _crt0
- nop
- nop
-
-_breakpoint_handler:
- bi _breakpoint_handler
- nop
- nop
- nop
- nop
- nop
- nop
- nop
-
-_instruction_bus_error_handler:
- bi _instruction_bus_error_handler
- nop
- nop
- nop
- nop
- nop
- nop
- nop
-
-_watchpoint_hander:
- bi _watchpoint_hander
- nop
- nop
- nop
- nop
- nop
- nop
- nop
-
-_data_bus_error_handler:
- bi _data_bus_error_handler
- nop
- nop
- nop
- nop
- nop
- nop
- nop
-
-_divide_by_zero_handler:
- bi _divide_by_zero_handler
- nop
- nop
- nop
- nop
- nop
- nop
- nop
-
-_interrupt_handler:
- sw (sp+0), ra
- calli .save_all
- calli isr
- bi .restore_all_and_eret
- nop
- nop
- nop
- nop
-
-macaddress:
- .byte 0x10
- .byte 0xe2
- .byte 0xd5
- .byte 0x00
- .byte 0x00
- .byte 0x00
-
- /* padding to align to a 32-bit boundary */
- .byte 0x00
- .byte 0x00
-
-_crt0:
- /* Setup stack and global pointer */
- mvhi sp, hi(_fstack)
- ori sp, sp, lo(_fstack)
- mvhi gp, hi(_gp)
- ori gp, gp, lo(_gp)
-
- /* Clear BSS */
- mvhi r1, hi(_fbss)
- ori r1, r1, lo(_fbss)
- mvhi r3, hi(_ebss)
- ori r3, r3, lo(_ebss)
-.clearBSS:
- be r1, r3, .callMain
- sw (r1+0), r0
- addi r1, r1, 4
- bi .clearBSS
-
-.callMain:
- bi main
-
-.save_all:
- addi sp, sp, -56
- sw (sp+4), r1
- sw (sp+8), r2
- sw (sp+12), r3
- sw (sp+16), r4
- sw (sp+20), r5
- sw (sp+24), r6
- sw (sp+28), r7
- sw (sp+32), r8
- sw (sp+36), r9
- sw (sp+40), r10
- sw (sp+48), ea
- sw (sp+52), ba
- /* ra needs to be moved from initial stack location */
- lw r1, (sp+56)
- sw (sp+44), r1
- ret
-
-.restore_all_and_eret:
- lw r1, (sp+4)
- lw r2, (sp+8)
- lw r3, (sp+12)
- lw r4, (sp+16)
- lw r5, (sp+20)
- lw r6, (sp+24)
- lw r7, (sp+28)
- lw r8, (sp+32)
- lw r9, (sp+36)
- lw r10, (sp+40)
- lw ra, (sp+44)
- lw ea, (sp+48)
- lw ba, (sp+52)
- addi sp, sp, 56
- eret
View
2  libglue/yaffs.c
@@ -69,6 +69,8 @@ void yaffs_bug_fn(const char *file_name, int line_no)
#define NOR_CHUNK_TAGS_SIZE 16
#define NOR_CHUNK_WHOLE_SIZE (NOR_CHUNK_DATA_SIZE+NOR_CHUNK_TAGS_SIZE)
+#define FLASH_OFFSET_FILESYSTEM (FLASH_OFFSET_APP + 1024*1024*2)
+
static void read_flash(void *data, int len, int offset)
{
memcpy(data, (char *)(0x80000000 | FLASH_OFFSET_FILESYSTEM) + offset, len);
View
56 linker.ld
@@ -1,56 +0,0 @@
-OUTPUT_FORMAT("elf32-lm32")
-ENTRY(_start)
-
-__DYNAMIC = 0;
-
-MEMORY {
- sdram : ORIGIN = 0x40000000, LENGTH = 0x08000000 /* 128M */
-}
-
-SECTIONS
-{
- .text :
- {
- _ftext = .;
- *(.text .stub .text.* .gnu.linkonce.t.*)
- _etext = .;
- } > sdram
-
- .rodata :
- {
- . = ALIGN(4);
- _frodata = .;
- *(.rodata .rodata.* .gnu.linkonce.r.*)
- *(.rodata1)
- _erodata = .;
- } > sdram
-
- .data :
- {
- . = ALIGN(4);
- _fdata = .;
- *(.data .data.* .gnu.linkonce.d.*)
- *(.data1)
- _gp = ALIGN(16);
- *(.sdata .sdata.* .gnu.linkonce.s.*)
- _edata = .;
- } > sdram
-
- .bss :
- {
- . = ALIGN(4);
- _fbss = .;
- *(.dynsbss)
- *(.sbss .sbss.* .gnu.linkonce.sb.*)
- *(.scommon)
- *(.dynbss)
- *(.bss .bss.* .gnu.linkonce.b.*)
- *(COMMON)
- . = ALIGN(4);
- _ebss = .;
- . = ALIGN(8);
- _heapstart = .;
- } > sdram
-}
-
-PROVIDE(_fstack = ORIGIN(sdram) + LENGTH(sdram) - 4);
Please sign in to comment.
Something went wrong with that request. Please try again.