--- a/baseport/syborg/bootstrap/syborg.inc Thu Aug 26 19:04:50 2010 +0100
+++ b/baseport/syborg/bootstrap/syborg.inc Thu Sep 02 16:05:48 2010 +0100
@@ -22,7 +22,7 @@
KHwRamBaseAddr EQU 0x00000000
; More ram required to boot SF image
-KHwRamSizeMb EQU 128 ; 128MB
+KHwRamSizeMb EQU 512 ; 512MB
;KHwRamSizeMb EQU 256 ; 256MB
@@ -52,8 +52,9 @@
KHwBaseNand EQU KHwBaseRegisters + 0x0d000
KHwBaseAudio EQU KHwBaseRegisters + 0x0e000
KHwBaseWebcamera EQU KHwBaseRegisters + 0x0f000
-KHwBasePlatform EQU KHwBaseRegisters + 0x10000
-KHwGraphicsRegBase EQU KHwBaseRegisters + 0x11000
+KHwNVMemoryDevice EQU KHwBaseRegisters + 0x10000
+KHwGraphicsRegBase EQU KHwBaseRegisters + 0x011000
+KHwBasePlatform EQU KHwBaseRegisters + 0x12000
;-----------------------------------------------------------------------------
; Module linear bases
@@ -80,7 +81,8 @@
KHwLinBaseNand EQU KHwLinBaseRegisters + 0x0d*KHwLinSeparation
KHwLinBaseAudio EQU KHwLinBaseRegisters + 0x0e*KHwLinSeparation
KHwLinBaseWebcameraDevice EQU KHwLinBaseRegisters + 0x0f*KHwLinSeparation
-KHwLinBasePlatform EQU KHwLinBaseRegisters + 0x10*KHwLinSeparation;
-KHwLinBaseGraphics EQU KHwLinBaseRegisters + 0x11*KHwLinSeparation;
+KHwLinBaseNVMemory EQU KHwLinBaseRegisters + 0x10*KHwLinSeparation
+KHwLinBaseGraphics EQU KHwLinBaseRegisters + 0x11*KHwLinSeparation
+KHwLinBasePlatform EQU KHwLinBaseRegisters + 0x12*KHwLinSeparation
END
--- a/baseport/syborg/bootstrap/syborg.s Thu Aug 26 19:04:50 2010 +0100
+++ b/baseport/syborg/bootstrap/syborg.s Thu Sep 02 16:05:48 2010 +0100
@@ -183,9 +183,9 @@
HW_MAPPING KHwBaseNand, 1, HW_MULT_4K
HW_MAPPING KHwBaseAudio, 1, HW_MULT_4K
HW_MAPPING KHwBaseWebcamera, 1, HW_MULT_4K
- HW_MAPPING KHwBasePlatform, 8, HW_MULT_4K
+ HW_MAPPING KHwNVMemoryDevice, 1, HW_MULT_4K
HW_MAPPING KHwGraphicsRegBase, 1, HW_MULT_4K
-
+ HW_MAPPING KHwBasePlatform, 8, HW_MULT_4K
DCD 0 ; terminator
--- a/baseport/syborg/specific/syborg.h Thu Aug 26 19:04:50 2010 +0100
+++ b/baseport/syborg/specific/syborg.h Thu Sep 02 16:05:48 2010 +0100
@@ -53,7 +53,9 @@
const TUint KHwSVPNandDevice = KHwBasePeripherals + 0x0d*KHwLinSeparation;
const TUint KHwSVPAudioDevice = KHwBasePeripherals + 0x0e*KHwLinSeparation;
const TUint KHwSVPWebcameraDevice = KHwBasePeripherals + 0x0f*KHwLinSeparation;
-const TUint KHwSVPPlatformDevice = KHwBasePeripherals + 0x10*KHwLinSeparation;
+const TUint KHwNVMemoryDevice = KHwBasePeripherals + 0x10*KHwLinSeparation;
+const TUint KHwGraphicsRegBase = KHwBasePeripherals + 0x11*KHwLinSeparation;
+const TUint KHwSVPPlatformDevice = KHwBasePeripherals + 0x12*KHwLinSeparation;
enum TSyborgInterruptId
{
@@ -68,7 +70,9 @@
EIntSerial2 = 7,
EIntSerial3 = 8,
EIntNet0 = 9,
- EIntAudio0 = 10
+ EIntAudio0 = 10,
+ EIntNVMemoryDevice = 12,
+ EIntGraphics = 13
};
// Timer Mode
Binary file baseport/syborg/syborg.dtb has changed
--- a/baseport/syborg/syborg.dts Thu Aug 26 19:04:50 2010 +0100
+++ b/baseport/syborg/syborg.dts Thu Sep 02 16:05:48 2010 +0100
@@ -12,7 +12,7 @@
};
memory@0 {
device_type = "memory";
- reg = <0 08000000>;
+ reg = <0 20000000>;
};
syborg {
#address-cells = <1>;
@@ -50,7 +50,7 @@
};
framebuffer@0 {
compatible = "syborg,framebuffer";
- width = <168>;
+ width = <300>;
height = <280>;
reg = <c0005000>;
interrupts = <4>;
@@ -92,7 +92,7 @@
compatible = "syborg,hostfs";
reg = <c000a000>;
host-path = "\\svphostfs\\";
- drive-number = <d#19>;
+ drive-number = <d#5>;
};
ss@0 {
compatible = "syborg,snapshot";
@@ -121,9 +121,24 @@
interrupts = <b>;
interrupt-parent = <&intc>;
};
+ nvmemorydevice@0 {
+ compatible = "syborg,nvmemorydevice";
+ drive_size = <4000000>;
+ sector_size = <200>;
+ drive_image_name = "syborg_system.img";
+ reg = <c0010000>;
+ interrupts = <c>;
+ interrupt-parent = <&intc>;
+ };
+ graphicsdevice@0 {
+ compatible = "syborg,graphicsdevice";
+ reg = <c0011000>;
+ interrupts = <d>;
+ interrupt-parent = <&intc>;
+ };
platform@0 {
compatible = "syborg,platform";
- reg = <c0010000>;
+ reg = <c0012000>;
};
};
};