Mercurial > lcfOS

changeset 379:78c27013f02e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed old recipes
author Windel Bouwman
date Fri, 18 Apr 2014 11:20:11 +0200
parents 83b462f14e67
children 67a584582aee
files kernel/arch/qemu_vexpress/vexpressA9.mmap kernel/arch/vexpressA9.mmap kernel/arm.yaml kernel/build.xml kernel/thumb.yaml test/m3_bare/recipe.yaml user/recipe.yaml
diffstat 7 files changed, 8 insertions(+), 72 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kernel/arch/qemu_vexpress/vexpressA9.mmap	Fri Apr 18 11:20:11 2014 +0200
@@ -0,0 +1,6 @@
+
+{
+    "code": "0x10000",
+    "data": "0x20000"
+}
+
--- a/kernel/arch/vexpressA9.mmap	Fri Apr 11 15:50:20 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-
-{
-    "code": "0x10000",
-    "data": "0x20000"
-}
-
--- a/kernel/arm.yaml	Fri Apr 11 15:50:20 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-
-link:
-  inputs:
-    - assemble:
-       source: startup_a9.asm
-       machine: arm
-    - compile:
-       sources: ['src/kernel.c3', 'src/syscall.c3', 'src/schedule.c3',
-            'arch/vexpressA9.c3', 'src/io.c3', 'src/memory.c3',
-            'src/process.c3',
-            'arch/qemu_vexpress/archmem.c3']
-       machine: arm
-  layout:
-     code: 0x010000
-     data: 0x020000
-  output: kernel_arm.bin
-
--- a/kernel/build.xml	Fri Apr 11 15:50:20 2014 +0200
+++ b/kernel/build.xml	Fri Apr 18 11:20:11 2014 +0200
@@ -2,13 +2,13 @@
 <project name="lcfos-kernel" default="vexpress">
 
     <property name="src" value="src" />
-    <property name="arch" value="arm"/>
+    <property name="arch" value="arm" />
 
     <target name="vexpress">
         <assemble source="startup_a9.asm" target="arm" output="start.o" />
         <compile target="arm" sources='arch/vexpressA9.c3' includes="${src}/*.c3" output="vexp.o" />
         <compile target="arm" sources='${src}/*.c3' output="henkie.o" />
-        <link output="kernel_arm.bin" layout="arch/vexpressA9.mmap" objects="start.o;henkie.o;vexp.o" />
+        <link output="kernel_arm.bin" layout="arch/qemu_vexpress/vexpressA9.mmap" objects="start.o;henkie.o;vexp.o" />
     </target>
 
 </project>
--- a/kernel/thumb.yaml	Fri Apr 11 15:50:20 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-
-link:
-  inputs:
-    - assemble:
-       source: startup_m3.asm
-       machine: thumb
-    - compile:
-       sources: ['src/kernel.c3', 'src/syscall.c3', 'src/schedule.c3', 
-            'arch/cortexm3.c3', 'src/io.c3', 'src/memory.c3',
-            'src/process.c3',
-            'arch/qemu_m3/archmem.c3'
-            ]
-       machine: thumb
-  layout:
-     code: 0x10000
-     data: 0x20000000
-  output: kernel_thumb.bin
-
--- a/test/m3_bare/recipe.yaml	Fri Apr 11 15:50:20 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-
-link:
-  inputs:
-    - assemble:
-       source: startup_m3.asm
-       machine: thumb
-    - compile:
-       sources: [hello.c3]
-       includes: []
-       machine: thumb
-  layout:
-      code: 0x0
-      data: 0x20000000
-  output: bare.bin
-
--- a/user/recipe.yaml	Fri Apr 11 15:50:20 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-
-apps:
- - link:
-    inputs:
-     - compile:
-        sources: [lib.c3, ipc.c3, hello.c3]
-        includes: []
-        machine: thumb
-        output: kernel.elf2
-    layout:
-         code: 0x0
-         data: 0x20000000
-    output: 'hello.bin'
-