aboutsummaryrefslogtreecommitdiff
path: root/hw/nseries.c
diff options
context:
space:
mode:
authorpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>2009-04-10 14:29:45 +0000
committerpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>2009-04-10 14:29:45 +0000
commit5c130f659b20d53667e07957ebaa3e656f72b276 (patch)
tree1fce52bae1cfdb3f46599277634769cd50782cb0 /hw/nseries.c
parentd397abbdbe68715ec86b4392e4e6384db64d029d (diff)
downloadqemu-5c130f659b20d53667e07957ebaa3e656f72b276.zip
qemu-5c130f659b20d53667e07957ebaa3e656f72b276.tar.gz
qemu-5c130f659b20d53667e07957ebaa3e656f72b276.tar.bz2
Yet more phys_ram_base elimination.
Signed-off-by: Paul Brook <paul@cofdesourcery.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7067 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/nseries.c')
-rw-r--r--hw/nseries.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/hw/nseries.c b/hw/nseries.c
index f69872e..b40004f 100644
--- a/hw/nseries.c
+++ b/hw/nseries.c
@@ -1342,6 +1342,7 @@ static void n8x0_init(ram_addr_t ram_size, const char *boot_device,
if (option_rom[0] && (boot_device[0] == 'n' || !kernel_filename)) {
int rom_size;
+ uint8_t nolo_tags[0x10000];
/* No, wait, better start at the ROM. */
s->cpu->env->regs[15] = OMAP2_Q2_BASE + 0x400000;
@@ -1359,7 +1360,8 @@ static void n8x0_init(ram_addr_t ram_size, const char *boot_device,
sdram_size - 0x400000);
printf("%i bytes of image loaded\n", rom_size);
- n800_setup_nolo_tags(phys_ram_base + sdram_size);
+ n800_setup_nolo_tags(nolo_tags);
+ cpu_physical_memory_write(OMAP2_SRAM_BASE, nolo_tags, 0x10000);
}
/* FIXME: We shouldn't really be doing this here. The LCD controller
will set the size once configured, so this just sets an initial
@@ -1412,7 +1414,7 @@ QEMUMachine n800_machine = {
.name = "n800",
.desc = "Nokia N800 tablet aka. RX-34 (OMAP2420)",
.init = n800_init,
- .ram_require = (0x08000000 + 0x00010000 + OMAP242X_SRAM_SIZE) |
+ .ram_require = (0x08000000 + 0x00018000 + OMAP242X_SRAM_SIZE) |
RAMSIZE_FIXED,
};
@@ -1420,6 +1422,6 @@ QEMUMachine n810_machine = {
.name = "n810",
.desc = "Nokia N810 tablet aka. RX-44 (OMAP2420)",
.init = n810_init,
- .ram_require = (0x08000000 + 0x00010000 + OMAP242X_SRAM_SIZE) |
+ .ram_require = (0x08000000 + 0x00018000 + OMAP242X_SRAM_SIZE) |
RAMSIZE_FIXED,
};