From bdaabfffc9f93009233f10979a66d8a77f040a33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Fr=C3=B6schle?= <mfro@mubf.de>
Date: Fri, 19 Oct 2012 09:59:44 +0000
Subject: [PATCH] new Makefile target "ram" moved flash.lk to flash.lk.S.
 Flash.lk is now an intermediate file

---
 BaS_GNU/.cproject | 10 +++++-
 BaS_GNU/flash.lk  | 86 -----------------------------------------------
 2 files changed, 9 insertions(+), 87 deletions(-)
 delete mode 100644 BaS_GNU/flash.lk

diff --git a/BaS_GNU/.cproject b/BaS_GNU/.cproject
index 9245952..293c3ff 100644
--- a/BaS_GNU/.cproject
+++ b/BaS_GNU/.cproject
@@ -109,6 +109,7 @@
 		<buildTargets>
 			<target name="all" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>make</buildCommand>
+				<buildArguments/>
 				<buildTarget>all</buildTarget>
 				<stopOnError>true</stopOnError>
 				<useDefaultCommand>true</useDefaultCommand>
@@ -116,12 +117,19 @@
 			</target>
 			<target name="clean" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>make</buildCommand>
-				<buildArguments/>
 				<buildTarget>clean</buildTarget>
 				<stopOnError>true</stopOnError>
 				<useDefaultCommand>true</useDefaultCommand>
 				<runAllBuilders>true</runAllBuilders>
 			</target>
+			<target name="ram" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments/>
+				<buildTarget>ram</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
 		</buildTargets>
 	</storageModule>
 </cproject>
diff --git a/BaS_GNU/flash.lk b/BaS_GNU/flash.lk
deleted file mode 100644
index 708008d..0000000
--- a/BaS_GNU/flash.lk
+++ /dev/null
@@ -1,86 +0,0 @@
-MEMORY {
-   flash (RX)  : ORIGIN = 0xE0000000, LENGTH = 0x00200000
-   ram (WX) : ORIGIN = 0x1FE00000, LENGTH = 0x00100000		/* target to copy BaS to */
-}
-
-SECTIONS {
-	_Bas_base = ABSOLUTE(0x1FE00000);
-	_tos_base = ABSOLUTE(0xe00000);
-	 
-	/* Init CS0 (BootFLASH @ E000_0000 - E07F_FFFF 8Mbytes) */
-	___BOOT_FLASH           = ABSOLUTE(0xE0000000);
- 	___BOOT_FLASH_SIZE      = ABSOLUTE(0x00800000);
-	/* SDRAM Initialization @ 0000_0000 - 1FFF_FFFF 512Mbytes */
- 	___SDRAM                = ABSOLUTE(0x00000000);
- 	___SDRAM_SIZE           = ABSOLUTE(0x20000000);
-
-	/* VIDEO RAM BASIS */
-	__VRAM                = ABSOLUTE(0x60000000);
-
-	/* Memory mapped registers */
- 	__MBAR                 = ABSOLUTE(0xFF000000);
- 	__MMUBAR               = ABSOLUTE(0xFF040000);
-
-	/*
-	 * 4KB on-chip Core SRAM0: -> exception table and exception stack
-	 */
- 	__RAMBAR0              = ABSOLUTE(0xFF100000);
- 	__RAMBAR0_SIZE         = ABSOLUTE(0x00001000);
-
- 	__SUP_SP = ABSOLUTE(__RAMBAR0 + __RAMBAR0_SIZE - 4);
-
-	/* 4KB on-chip Core SRAM1: -> modified code */
- 	__RAMBAR1              = ABSOLUTE(0xFF101000);
- 	__RAMBAR1_SIZE         = ABSOLUTE(0x00001000);
-
-	/* system variables */
-	
-	/* RAMBAR0 0 to 0x7FF -> exception vectors */
-	_rt_mod    = __RAMBAR0 + 0x800;
-	_rt_ssp    = __RAMBAR0 + 0x804;
-	_rt_usp    = __RAMBAR0 + 0x808;
-	_rt_vbr    = __RAMBAR0 + 0x80C;  	/* (8)01 */
-	_rt_cacr   = __RAMBAR0 + 0x810;   	/* 002 */
-	_rt_asid   = __RAMBAR0 + 0x814;   	/* 003 */
-	_rt_acr0   = __RAMBAR0 + 0x818;   	/* 004 */
-	_rt_acr1   = __RAMBAR0 + 0x81c;   	/* 005 */
-	_rt_acr2   = __RAMBAR0 + 0x820;   	/* 006 */
-	_rt_acr3   = __RAMBAR0 + 0x824;   	/* 007 */
-	_rt_mmubar = __RAMBAR0 + 0x828;		/* 008 */
-	_rt_sr     = __RAMBAR0 + 0x82c;
-	_d0_save   = __RAMBAR0 + 0x830;
-	_a7_save   = __RAMBAR0 + 0x834;
-	_video_tlb = __RAMBAR0 + 0x838;
-	_video_sbt = __RAMBAR0 + 0x83C;
-	_rt_mbar   = __RAMBAR0 + 0x844;   	/* (c)0f */
-
-	/* 32KB on-chip System SRAM */
- 	__SYS_SRAM             = ABSOLUTE(0xFF010000);
-	__SYS_SRAM_SIZE        = ABSOLUTE(0x00008000);
-
-	.code ___BOOT_FLASH : 
-	{
-		objs/startcf.o
-	} > flash
-	
-	.text :
-	{
-		objs/sysinit.o(.text)
-		objs/init_fpga.o(.text)
-		objs/sd_card.o(.text)
-		objs/cache.o(.text)
-		objs/mmu.o(.text)
-		objs/exceptions.o(.text)
-		objs/supervisor.o(.text)
-		objs/ewf.o(.text)
-		objs/illegal_instruction.o(.text)
-		_bas = .;
-	} > flash
-
-	.bas _Bas_base : AT (ADDR(.text) + SIZEOF(.text))
-	{
-		objs/BaS.o(.text)
-		_bas_end = ABSOLUTE(.);
-	} > ram
-	
-}
\ No newline at end of file