sync with milkymist-ng

m-labs · Jul 17, 2013 · a26b627 · a26b627
1 parent 2b91d99
commit a26b627
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 230 deletions.
diff --git a/Makefile b/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
diff --git a/agg_test.cpp b/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);
 }

diff --git a/crt0.S b/crt0.S
diff --git a/libglue/yaffs.c b/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);

diff --git a/linker.ld b/linker.ld