29 files changed, 18 insertions, 18 deletions

diff --git a/firmware/FILES b/firmware/FILES
index 7f34d71eaf..f44d5f28b7 100644
--- a/firmware/FILES
+++ b/firmware/FILES
@@ -16,7 +16,7 @@ include/*.h
 include/sys/*.h
 target/arm/*.[chS]
 target/arm/archos/av300/*.[chS]
-target/arm/gigabeat/meg-fx/*.[chS]
+target/arm/s3c2440/gigabeat-fx/*.[chS]
 target/arm/iriver/*.[chS]
 target/arm/iriver/h10/*.[chS]
 target/arm/iriver/ifp7xx/*.[chS]
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 86438d43be..d8d495c89c 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -495,22 +495,22 @@ target/arm/usb-pp.c
 #ifdef GIGABEAT_F
 #ifndef SIMULATOR
 drivers/generic_i2c.c
-target/arm/gigabeat/meg-fx/adc-meg-fx.c
-target/arm/gigabeat/meg-fx/ata-meg-fx.c
-target/arm/gigabeat/meg-fx/backlight-meg-fx.c
-target/arm/gigabeat/meg-fx/button-meg-fx.c
-target/arm/gigabeat/meg-fx/i2c-meg-fx.c
-target/arm/gigabeat/meg-fx/lcd-as-meg-fx.S
-target/arm/gigabeat/meg-fx/lcd-meg-fx.c
-target/arm/gigabeat/meg-fx/power-meg-fx.c
-target/arm/gigabeat/meg-fx/sc606-meg-fx.c
-target/arm/gigabeat/meg-fx/usb-meg-fx.c
-target/arm/gigabeat/meg-fx/wmcodec-meg-fx.c
-target/arm/gigabeat/meg-fx/dma_start.c
-target/arm/gigabeat/meg-fx/system-meg-fx.c
-target/arm/gigabeat/meg-fx/mmu-meg-fx.c
+target/arm/s3c2440/gigabeat-fx/adc-meg-fx.c
+target/arm/s3c2440/gigabeat-fx/ata-meg-fx.c
+target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c
+target/arm/s3c2440/gigabeat-fx/button-meg-fx.c
+target/arm/s3c2440/gigabeat-fx/i2c-meg-fx.c
+target/arm/s3c2440/gigabeat-fx/lcd-as-meg-fx.S
+target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c
+target/arm/s3c2440/gigabeat-fx/power-meg-fx.c
+target/arm/s3c2440/gigabeat-fx/sc606-meg-fx.c
+target/arm/s3c2440/gigabeat-fx/usb-meg-fx.c
+target/arm/s3c2440/gigabeat-fx/wmcodec-meg-fx.c
+target/arm/s3c2440/gigabeat-fx/dma_start.c
+target/arm/s3c2440/gigabeat-fx/system-meg-fx.c
+target/arm/s3c2440/gigabeat-fx/mmu-meg-fx.c
 #ifndef BOOTLOADER
-target/arm/gigabeat/meg-fx/pcm-meg-fx.c
+target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c
 #endif
 #endif /* SIMULATOR */
 #endif /* GIGABEAT_F */
diff --git a/firmware/target/arm/gigabeat/meg-fx/adc-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/adc-meg-fx.c
index 4c448c2e41..4c448c2e41 100644
--- a/firmware/target/arm/gigabeat/meg-fx/adc-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/adc-meg-fx.c
diff --git a/firmware/target/arm/gigabeat/meg-fx/adc-target.h b/firmware/target/arm/s3c2440/gigabeat-fx/adc-target.h
index 8d2beaf320..8d2beaf320 100644
--- a/firmware/target/arm/gigabeat/meg-fx/adc-target.h
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/adc-target.h
diff --git a/firmware/target/arm/gigabeat/meg-fx/ata-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/ata-meg-fx.c
index bc2b53d776..bc2b53d776 100644
--- a/firmware/target/arm/gigabeat/meg-fx/ata-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/ata-meg-fx.c
diff --git a/firmware/target/arm/gigabeat/meg-fx/ata-target.h b/firmware/target/arm/s3c2440/gigabeat-fx/ata-target.h
index 95e3e110f2..95e3e110f2 100644
--- a/firmware/target/arm/gigabeat/meg-fx/ata-target.h
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/ata-target.h
diff --git a/firmware/target/arm/gigabeat/meg-fx/backlight-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c
index a1b6a8a583..a1b6a8a583 100644
--- a/firmware/target/arm/gigabeat/meg-fx/backlight-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c
diff --git a/firmware/target/arm/gigabeat/meg-fx/backlight-target.h b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-target.h
index 5f92cee935..5f92cee935 100644
--- a/firmware/target/arm/gigabeat/meg-fx/backlight-target.h
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-target.h
diff --git a/firmware/target/arm/gigabeat/meg-fx/button-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c
index 71d45c385c..71d45c385c 100644
--- a/firmware/target/arm/gigabeat/meg-fx/button-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c
diff --git a/firmware/target/arm/gigabeat/meg-fx/button-target.h b/firmware/target/arm/s3c2440/gigabeat-fx/button-target.h
index ab68e8050f..ab68e8050f 100644
--- a/firmware/target/arm/gigabeat/meg-fx/button-target.h
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/button-target.h
diff --git a/firmware/target/arm/gigabeat/meg-fx/dma_start.c b/firmware/target/arm/s3c2440/gigabeat-fx/dma_start.c
index c1ab6c15cb..c1ab6c15cb 100644
--- a/firmware/target/arm/gigabeat/meg-fx/dma_start.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/dma_start.c
diff --git a/firmware/target/arm/gigabeat/meg-fx/i2c-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/i2c-meg-fx.c
index 670d6cd04c..670d6cd04c 100644
--- a/firmware/target/arm/gigabeat/meg-fx/i2c-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/i2c-meg-fx.c
diff --git a/firmware/target/arm/gigabeat/meg-fx/i2c-meg-fx.h b/firmware/target/arm/s3c2440/gigabeat-fx/i2c-meg-fx.h
index cf69230487..cf69230487 100644
--- a/firmware/target/arm/gigabeat/meg-fx/i2c-meg-fx.h
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/i2c-meg-fx.h
diff --git a/firmware/target/arm/gigabeat/meg-fx/kernel-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/kernel-meg-fx.c
index 9df90a2344..9df90a2344 100644
--- a/firmware/target/arm/gigabeat/meg-fx/kernel-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/kernel-meg-fx.c
diff --git a/firmware/target/arm/gigabeat/meg-fx/lcd-as-meg-fx.S b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-as-meg-fx.S
index d431c95f29..d431c95f29 100644
--- a/firmware/target/arm/gigabeat/meg-fx/lcd-as-meg-fx.S
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-as-meg-fx.S
diff --git a/firmware/target/arm/gigabeat/meg-fx/lcd-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c
index 1bb68f9686..1bb68f9686 100644
--- a/firmware/target/arm/gigabeat/meg-fx/lcd-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c
diff --git a/firmware/target/arm/gigabeat/meg-fx/lcd-target.h b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-target.h
index cb2a89f349..cb2a89f349 100644
--- a/firmware/target/arm/gigabeat/meg-fx/lcd-target.h
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-target.h
diff --git a/firmware/target/arm/gigabeat/meg-fx/mmu-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/mmu-meg-fx.c
index 6142213f0c..6142213f0c 100644
--- a/firmware/target/arm/gigabeat/meg-fx/mmu-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/mmu-meg-fx.c
diff --git a/firmware/target/arm/gigabeat/meg-fx/mmu-meg-fx.h b/firmware/target/arm/s3c2440/gigabeat-fx/mmu-meg-fx.h
index 71b1b83801..71b1b83801 100644
--- a/firmware/target/arm/gigabeat/meg-fx/mmu-meg-fx.h
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/mmu-meg-fx.h
diff --git a/firmware/target/arm/gigabeat/meg-fx/pcm-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c
index 0f22aa5c5c..0f22aa5c5c 100644
--- a/firmware/target/arm/gigabeat/meg-fx/pcm-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c
diff --git a/firmware/target/arm/gigabeat/meg-fx/power-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c
index eb2ffb5238..eb2ffb5238 100644
--- a/firmware/target/arm/gigabeat/meg-fx/power-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c
diff --git a/firmware/target/arm/gigabeat/meg-fx/sc606-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/sc606-meg-fx.c
index e69eab432a..e69eab432a 100644
--- a/firmware/target/arm/gigabeat/meg-fx/sc606-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/sc606-meg-fx.c
diff --git a/firmware/target/arm/gigabeat/meg-fx/sc606-meg-fx.h b/firmware/target/arm/s3c2440/gigabeat-fx/sc606-meg-fx.h
index 3ea0917e86..3ea0917e86 100644
--- a/firmware/target/arm/gigabeat/meg-fx/sc606-meg-fx.h
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/sc606-meg-fx.h
diff --git a/firmware/target/arm/gigabeat/meg-fx/system-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/system-meg-fx.c
index b7e59e66ea..b7e59e66ea 100644
--- a/firmware/target/arm/gigabeat/meg-fx/system-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/system-meg-fx.c
diff --git a/firmware/target/arm/gigabeat/meg-fx/system-target.h b/firmware/target/arm/s3c2440/gigabeat-fx/system-target.h
index 215b5a4daa..215b5a4daa 100644
--- a/firmware/target/arm/gigabeat/meg-fx/system-target.h
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/system-target.h
diff --git a/firmware/target/arm/gigabeat/meg-fx/usb-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/usb-meg-fx.c
index 3aed8c3256..3aed8c3256 100644
--- a/firmware/target/arm/gigabeat/meg-fx/usb-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/usb-meg-fx.c
diff --git a/firmware/target/arm/gigabeat/meg-fx/usb-target.h b/firmware/target/arm/s3c2440/gigabeat-fx/usb-target.h
index baeb539b38..baeb539b38 100644
--- a/firmware/target/arm/gigabeat/meg-fx/usb-target.h
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/usb-target.h
diff --git a/firmware/target/arm/gigabeat/meg-fx/wmcodec-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/wmcodec-meg-fx.c
index fe42b7527a..fe42b7527a 100644
--- a/firmware/target/arm/gigabeat/meg-fx/wmcodec-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/wmcodec-meg-fx.c
diff --git a/tools/configure b/tools/configure
index 28fdebfdd0..ab7b6e8968 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1129,8 +1129,8 @@ EOF
     bootoutput="FWIMG01.DAT"
     # architecture, manufacturer and model for the target-tree build
     t_cpu="arm"
-    t_manufacturer="gigabeat"
-    t_model="meg-fx"
+    t_manufacturer="s3c2440"
+    t_model="gigabeat-fx"
     ;;
 
    26|ipodmini2g)