diff -Nur linux-2.6.19-g500-001/arch/arm/mach-s3c2410/Kconfig linux-2.6.19-g500-002/arch/arm/mach-s3c2410/Kconfig
--- linux-2.6.19-g500-001/arch/arm/mach-s3c2410/Kconfig	2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19-g500-002/arch/arm/mach-s3c2410/Kconfig	2006-12-17 13:04:17.000000000 +0100
@@ -139,6 +139,16 @@
 	help
 	  Say Y here if you are using an VSTMS board
 
+config MACH_G500
+	bool "Eten G500"
+	select CPU_S3C2440
+	help
+	  Say Y here if you are using the Eten G500.
+
+	  See <http://www.pierrox.net/G500> or 
+	  <http://www.handhelds.org/moin/moin.cgi/EtenG500Home> for more
+	  information on this project
+
 endmenu
 
 config S3C2410_CLOCK
diff -Nur linux-2.6.19-g500-001/arch/arm/mach-s3c2410/Makefile linux-2.6.19-g500-002/arch/arm/mach-s3c2410/Makefile
--- linux-2.6.19-g500-001/arch/arm/mach-s3c2410/Makefile	2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19-g500-002/arch/arm/mach-s3c2410/Makefile	2006-12-17 13:04:17.000000000 +0100
@@ -87,5 +87,6 @@
 obj-$(CONFIG_MACH_OTOM)		+= mach-otom.o
 obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
 obj-$(CONFIG_MACH_VSTMS)	+= mach-vstms.o
+obj-$(CONFIG_MACH_G500)	+= mach-g500.o
 
-obj-$(CONFIG_MACH_SMDK)		+= common-smdk.o
\ No newline at end of file
+obj-$(CONFIG_MACH_SMDK)		+= common-smdk.o
diff -Nur linux-2.6.19-g500-001/arch/arm/mach-s3c2410/mach-g500.c linux-2.6.19-g500-002/arch/arm/mach-s3c2410/mach-g500.c
--- linux-2.6.19-g500-001/arch/arm/mach-s3c2410/mach-g500.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.19-g500-002/arch/arm/mach-s3c2410/mach-g500.c	2006-12-17 13:09:40.000000000 +0100
@@ -0,0 +1,222 @@
+/* linux/arch/arm/mach-s3c2410/mach-g500.c
+ *
+ * http://www.pierrox.net/G500 or
+ * http://www.handhelds.org/moin/moin.cgi/EtenG500Home
+ * pierrox@pierrox.net
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Origin:
+ * Copied and adapted from mach-rx3715.c, mach-h1940.c and mach-smdk2440.c.
+*/
+
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/interrupt.h>
+#include <linux/list.h>
+#include <linux/timer.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/irq.h>
+
+#include <asm/hardware.h>
+#include <asm/hardware/iomd.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/mach-types.h>
+
+#include <asm/arch/regs-serial.h>
+#include <asm/arch/regs-timer.h>
+#include <asm/arch/regs-gpio.h>
+#include <asm/arch/regs-lcd.h>
+#include <asm/arch/regs-irq.h>
+
+#include <asm/arch/idle.h>
+#include <asm/arch/nand.h>
+#include <asm/arch/fb.h>
+
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+
+#include "s3c2410.h"
+#include "s3c2440.h"
+#include "clock.h"
+#include "devs.h"
+#include "cpu.h"
+#include "irq.h"
+#include "pm.h"
+
+
+static struct map_desc g500_iodesc[] __initdata = {
+	/* nothing */
+};
+
+#define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK
+#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
+#define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE
+
+static struct s3c2410_uartcfg g500_uartcfgs[] = {
+	[0] = {
+		.hwport	     = 0,
+		.flags	     = 0,
+		.ucon	     = 0x9fc5,
+		.ulcon	     = 0x2b,
+		.ufcon	     = 0x11,
+	},
+	[1] = {
+		.hwport	     = 1,
+		.flags	     = 0,
+		.ucon	     = 0x1c5,
+		.ulcon	     = 0x03,
+		.ufcon	     = 0x31,
+	},
+	[2] = {
+		.hwport	     = 2,
+		.flags	     = 0,
+		.ucon	     = 0x8245,
+		.ulcon	     = 0x43,
+		.ufcon	     = 0x00,
+	}
+};
+
+/* LCD driver info */
+
+static struct s3c2410fb_mach_info g500_lcd_cfg __initdata = {
+	.regs	= {
+
+		.lcdcon1	= S3C2410_LCDCON1_CLKVAL(0x04) | 
+				  S3C2410_LCDCON1_TFT | 
+				  S3C2410_LCDCON1_TFT16BPP,
+                                
+		.lcdcon2	= S3C2410_LCDCON2_VBPD(5) | 
+				  S3C2410_LCDCON2_LINEVAL(319) | 
+				  S3C2410_LCDCON2_VFPD(6) | 
+				  S3C2410_LCDCON2_VSPW(1),
+			
+		.lcdcon3	= S3C2410_LCDCON3_HBPD(4) | 
+				  S3C2410_LCDCON3_HOZVAL(239) | 
+				  S3C2410_LCDCON3_HFPD(7),
+
+		.lcdcon4	= S3C2410_LCDCON4_MVAL(0) |
+				  S3C2410_LCDCON4_HSPW(2),
+
+		.lcdcon5	= S3C2410_LCDCON5_FRM565 |
+				  S3C2410_LCDCON5_INVVCLK |
+				  S3C2410_LCDCON5_INVVLINE |
+				  S3C2410_LCDCON5_INVVFRAME |
+				  S3C2410_LCDCON5_INVVDEN |
+				  S3C2410_LCDCON5_PWREN |
+				  S3C2410_LCDCON5_HWSWP
+	},
+
+#if 0
+	/* currently setup by wince, TODO find exact values */
+	.gpccon		= 0xaa940659,
+	.gpccon_mask	= 0xffffffff,
+	.gpcup		= 0x0000ffff,
+	.gpcup_mask	= 0xffffffff,
+	.gpdcon		= 0xaa84aaa0,
+	.gpdcon_mask	= 0xffffffff,
+	.gpdup		= 0x0000faff,
+	.gpdup_mask	= 0xffffffff,
+#endif
+
+	.lpcsel		= 0xCE6,
+
+	.width		= 240,
+	.height		= 320,
+
+	.xres		= {
+		.min	= 240,
+		.max	= 240,
+		.defval	= 240,
+	},
+
+	.yres		= {
+		.min	= 320,
+		.max	= 320,
+		.defval = 320,
+	},
+
+	.bpp		= {
+		.min	= 16,
+		.max	= 16,
+		.defval = 16,
+	},
+};
+
+static struct mtd_partition g500_nand_part[] = {
+	[0] = {
+		.name		= "Whole Flash",
+		.offset		= 0,
+		.size		= MTDPART_SIZ_FULL,
+		.mask_flags	= MTD_WRITEABLE,
+	}
+};
+
+static struct s3c2410_nand_set g500_nand_sets[] = {
+	[0] = {
+		.name		= "Internal",
+		.nr_chips	= 1,
+		.nr_partitions	= ARRAY_SIZE(g500_nand_part),
+		.partitions	= g500_nand_part,
+	},
+};
+
+static struct s3c2410_platform_nand g500_nand_info = {
+	.tacls		= 15, /*31*/ // 1
+	.twrph0		= 30, /*63*/ // 6
+	.twrph1		= 30, /*63*/ // 2
+	.nr_sets	= ARRAY_SIZE(g500_nand_sets),
+	.sets		= g500_nand_sets,
+};
+
+static struct platform_device *g500_devices[] __initdata = {
+	&s3c_device_usb,
+	&s3c_device_lcd,
+	&s3c_device_wdt,
+	&s3c_device_i2c,
+	&s3c_device_iis,
+	&s3c_device_nand,
+};
+
+static struct s3c24xx_board g500_board __initdata = {
+	.devices       = g500_devices,
+	.devices_count = ARRAY_SIZE(g500_devices)
+};
+
+static void __init g500_map_io(void)
+{
+	s3c_device_nand.dev.platform_data = &g500_nand_info;
+	s3c24xx_init_io(g500_iodesc, ARRAY_SIZE(g500_iodesc));
+	s3c24xx_init_clocks(0);
+	s3c24xx_init_uarts(g500_uartcfgs, ARRAY_SIZE(g500_uartcfgs));
+	s3c24xx_set_board(&g500_board);
+}
+
+static void __init g500_machine_init(void)
+{
+	s3c24xx_fb_set_platdata(&g500_lcd_cfg);
+
+	s3c2410_pm_init();
+
+  /* wake up source */
+  s3c_irq_wake(IRQ_EINT1, 1);
+}
+
+MACHINE_START(G500, "G500")
+	/* Maintainer: Pierre Hebert <pierrox@pierrox.net> */
+	.phys_io	= S3C2410_PA_UART,
+	.io_pg_offst	= (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
+	.boot_params	= S3C2410_SDRAM_PA + 0x100,
+
+	.init_irq	= s3c24xx_init_irq,
+	.map_io		= g500_map_io,
+	.init_machine	= g500_machine_init,
+	.timer		= &s3c24xx_timer,
+MACHINE_END
diff -Nur linux-2.6.19-g500-001/arch/arm/tools/mach-types linux-2.6.19-g500-002/arch/arm/tools/mach-types
--- linux-2.6.19-g500-001/arch/arm/tools/mach-types	2006-11-29 22:57:37.000000000 +0100
+++ linux-2.6.19-g500-002/arch/arm/tools/mach-types	2006-12-17 13:04:17.000000000 +0100
@@ -1171,3 +1171,4 @@
 cdcs_quoll		MACH_CDCS_QUOLL		CDCS_QUOLL		1158
 quicksilver		MACH_QUICKSILVER	QUICKSILVER		1159
 uplat926		MACH_UPLAT926		UPLAT926		1160
+g500			MACH_G500		G500			1178

