move the Gigabeat from gigabeat/meg-fx to s3c2440/gigabeat-fx to avoid problems with possible ports in the future: Gigabeat S/V (i.mx31 based) and Kenwood HD20GA7/HD20GA9 (s3c2440 based)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13200 a1c6a512-1295-4272-9138-f99709370657

29 files changed, 18 insertions, 18 deletions

diff --git a/firmware/FILES b/firmware/FILES
index 7f34d71..f44d5f2 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 86438d4..d8d495c 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 4c448c2..4c448c2 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 8d2beaf..8d2beaf 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 bc2b53d..bc2b53d 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 95e3e11..95e3e11 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 a1b6a8a..a1b6a8a 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 5f92cee..5f92cee 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 71d45c3..71d45c3 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 ab68e80..ab68e80 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 c1ab6c1..c1ab6c1 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 670d6cd..670d6cd 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 cf69230..cf69230 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 9df90a2..9df90a2 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 d431c95..d431c95 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 1bb68f9..1bb68f9 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 cb2a89f..cb2a89f 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 6142213..6142213 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 71b1b83..71b1b83 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 0f22aa5..0f22aa5 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 eb2ffb5..eb2ffb5 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 e69eab4..e69eab4 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 3ea0917..3ea0917 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 b7e59e6..b7e59e6 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 215b5a4..215b5a4 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 3aed8c3..3aed8c3 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 baeb539..baeb539 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 fe42b75..fe42b75 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 28fdebf..ab7b6e8 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)