From 577108554fecc06920f7c7477713967de6551661 Mon Sep 17 00:00:00 2001
From: whitequark <whitequark@whitequark.org>
Date: Thu, 7 Jan 2016 18:26:11 +0000
Subject: [PATCH] Move kernel CPU address space up to 0x40800000.

---
 artiq/gateware/amp/kernel_cpu.py | 2 +-
 artiq/runtime/kloader.h          | 4 ++--
 artiq/runtime/ksupport.ld        | 4 ++--
 artiq/runtime/runtime.ld         | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/artiq/gateware/amp/kernel_cpu.py b/artiq/gateware/amp/kernel_cpu.py
index 2736027e3..6aca00d32 100644
--- a/artiq/gateware/amp/kernel_cpu.py
+++ b/artiq/gateware/amp/kernel_cpu.py
@@ -7,7 +7,7 @@ from misoc.integration.soc_core import mem_decoder
 
 class KernelCPU(Module):
     def __init__(self, platform,
-                 exec_address=0x40400000,
+                 exec_address=0x40800000,
                  main_mem_origin=0x40000000,
                  l2_size=8192):
         self._reset = CSRStorage(reset=1)
diff --git a/artiq/runtime/kloader.h b/artiq/runtime/kloader.h
index d2527eb71..92f353df0 100644
--- a/artiq/runtime/kloader.h
+++ b/artiq/runtime/kloader.h
@@ -3,8 +3,8 @@
 
 #include "artiq_personality.h"
 
-#define KERNELCPU_EXEC_ADDRESS    0x40400000
-#define KERNELCPU_PAYLOAD_ADDRESS 0x40420000
+#define KERNELCPU_EXEC_ADDRESS    0x40800000
+#define KERNELCPU_PAYLOAD_ADDRESS 0x40820000
 #define KERNELCPU_LAST_ADDRESS    (0x4fffffff - 1024*1024)
 #define KSUPPORT_HEADER_SIZE      0x80
 
diff --git a/artiq/runtime/ksupport.ld b/artiq/runtime/ksupport.ld
index 9f9ca4bb9..016b9d008 100644
--- a/artiq/runtime/ksupport.ld
+++ b/artiq/runtime/ksupport.ld
@@ -3,11 +3,11 @@ ENTRY(_start)
 
 INCLUDE generated/regions.ld
 
-/* First 4M of main memory are reserved for runtime code/data
+/* First 8M of main memory are reserved for runtime code/data
  * then comes kernel memory. First 128K of kernel memory are for support code.
  */
 MEMORY {
-    ksupport (RWX) : ORIGIN = 0x40400000, LENGTH = 0x20000
+    ksupport (RWX) : ORIGIN = 0x40800000, LENGTH = 0x20000
 }
 
 /* On AMP systems, kernel stack is at the end of main RAM,
diff --git a/artiq/runtime/runtime.ld b/artiq/runtime/runtime.ld
index dacfe535d..0d5f590d7 100644
--- a/artiq/runtime/runtime.ld
+++ b/artiq/runtime/runtime.ld
@@ -7,14 +7,14 @@ INCLUDE generated/regions.ld
  * ld does not allow this expression here.
  */
 MEMORY {
-	runtime : ORIGIN = 0x40000000, LENGTH = 0x400000 /* 4M */
+	runtime : ORIGIN = 0x40000000, LENGTH = 0x800000 /* 8M */
 }
 
 /* First 4M of main memory are reserved for runtime code/data
  * then comes kernel memory. First 32K of kernel memory are for support code.
  */
 MEMORY {
-  kernel : ORIGIN = 0x40400000, LENGTH = 0x8000
+  kernel : ORIGIN = 0x40800000, LENGTH = 0x8000
 }
 
 /* Kernel memory space start right after the runtime,