Author: andrew
Date: 2008-05-27 15:20:36 +0200 (Tue, 27 May 2008)
New Revision: 4454
Modified:
trunk/src/host/qemu-neo1973/hw/neo1973.c
Log:
Use the NAND chip from GTA02 in GTA02fake (128MiB, 1.8V).
(Gets detected by u-boot and linux but flash.sh isn't supported yet).
Modified: trunk/src/host/qemu-neo1973/hw/neo1973.c
===================================================================
--- trunk/src/host/qemu-neo1973/hw/neo1973.c 2008-05-27 12:49:47 UTC (rev 4453)
+++ trunk/src/host/qemu-neo1973/hw/neo1973.c 2008-05-27 13:20:36 UTC (rev 4454)
@@ -766,8 +766,6 @@
}
s->cpu = s3c2410_init(s->ram, ds, s->mmc);
- s3c_nand_register(s->cpu, nand_init(NAND_MFR_SAMSUNG, 0x76));
-
/* Setup peripherals */
neo_gpio_setup(s);
@@ -830,14 +828,17 @@
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
+ struct neo_board_s *neo;
int sd_idx = drive_get_index(IF_SD, 0, 0);
struct sd_card_s *sd = 0;
if (sd_idx >= 0)
sd = sd_init(drives_table[sd_idx].bdrv, 0);
- neo1973_init_common(ram_size, ds,
+ neo = neo1973_init_common(ram_size, ds,
kernel_filename, cpu_model, sd, NEO1973_GTA01);
+
+ s3c_nand_register(neo->cpu, nand_init(NAND_MFR_SAMSUNG, 0x76));
}
static void gta02f_init(int ram_size, int vga_ram_size,
@@ -851,6 +852,8 @@
neo = neo1973_init_common(ram_size, ds,
kernel_filename, cpu_model, sd, NEO1973_GTA02F);
+ s3c_nand_register(neo->cpu, nand_init(NAND_MFR_SAMSUNG, 0xa1));
+
neo_gps_setup(neo);
neo_machid_init(neo);
}