From f44f961812c059b69df19ac5bd828986ba10513f Mon Sep 17 00:00:00 2001 From: Marcoen Hirschberg Date: Wed, 18 Apr 2007 12:22:27 +0000 Subject: [PATCH] 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 --- firmware/FILES | 2 +- firmware/SOURCES | 30 +++++++++---------- .../gigabeat-fx}/adc-meg-fx.c | 0 .../gigabeat-fx}/adc-target.h | 0 .../gigabeat-fx}/ata-meg-fx.c | 0 .../gigabeat-fx}/ata-target.h | 0 .../gigabeat-fx}/backlight-meg-fx.c | 0 .../gigabeat-fx}/backlight-target.h | 0 .../gigabeat-fx}/button-meg-fx.c | 0 .../gigabeat-fx}/button-target.h | 0 .../gigabeat-fx}/dma_start.c | 0 .../gigabeat-fx}/i2c-meg-fx.c | 0 .../gigabeat-fx}/i2c-meg-fx.h | 0 .../gigabeat-fx}/kernel-meg-fx.c | 0 .../gigabeat-fx}/lcd-as-meg-fx.S | 0 .../gigabeat-fx}/lcd-meg-fx.c | 0 .../gigabeat-fx}/lcd-target.h | 0 .../gigabeat-fx}/mmu-meg-fx.c | 0 .../gigabeat-fx}/mmu-meg-fx.h | 0 .../gigabeat-fx}/pcm-meg-fx.c | 0 .../gigabeat-fx}/power-meg-fx.c | 0 .../gigabeat-fx}/sc606-meg-fx.c | 0 .../gigabeat-fx}/sc606-meg-fx.h | 0 .../gigabeat-fx}/system-meg-fx.c | 0 .../gigabeat-fx}/system-target.h | 0 .../gigabeat-fx}/usb-meg-fx.c | 0 .../gigabeat-fx}/usb-target.h | 0 .../gigabeat-fx}/wmcodec-meg-fx.c | 0 tools/configure | 4 +-- 29 files changed, 18 insertions(+), 18 deletions(-) rename firmware/target/arm/{gigabeat/meg-fx => s3c2440/gigabeat-fx}/adc-meg-fx.c (100%) rename firmware/target/arm/{gigabeat/meg-fx => s3c2440/gigabeat-fx}/adc-target.h (100%) rename firmware/target/arm/{gigabeat/meg-fx => s3c2440/gigabeat-fx}/ata-meg-fx.c (100%) rename firmware/target/arm/{gigabeat/meg-fx => s3c2440/gigabeat-fx}/ata-target.h (100%) rename firmware/target/arm/{gigabeat/meg-fx => s3c2440/gigabeat-fx}/backlight-meg-fx.c (100%) rename firmware/target/arm/{gigabeat/meg-fx => s3c2440/gigabeat-fx}/backlight-target.h (100%) rename firmware/target/arm/{gigabeat/meg-fx => s3c2440/gigabeat-fx}/button-meg-fx.c (100%) rename firmware/target/arm/{gigabeat/meg-fx => s3c2440/gigabeat-fx}/button-target.h (100%) rename firmware/target/arm/{gigabeat/meg-fx => s3c2440/gigabeat-fx}/dma_start.c (100%) rename firmware/target/arm/{gigabeat/meg-fx => s3c2440/gigabeat-fx}/i2c-meg-fx.c (100%) rename firmware/target/arm/{gigabeat/meg-fx => s3c2440/gigabeat-fx}/i2c-meg-fx.h (100%) rename firmware/target/arm/{gigabeat/meg-fx => s3c2440/gigabeat-fx}/kernel-meg-fx.c (100%) rename firmware/target/arm/{gigabeat/meg-fx => s3c2440/gigabeat-fx}/lcd-as-meg-fx.S (100%) rename firmware/target/arm/{gigabeat/meg-fx => s3c2440/gigabeat-fx}/lcd-meg-fx.c (100%) rename firmware/target/arm/{gigabeat/meg-fx => s3c2440/gigabeat-fx}/lcd-target.h (100%) rename firmware/target/arm/{gigabeat/meg-fx => s3c2440/gigabeat-fx}/mmu-meg-fx.c (100%) rename firmware/target/arm/{gigabeat/meg-fx => s3c2440/gigabeat-fx}/mmu-meg-fx.h (100%) rename firmware/target/arm/{gigabeat/meg-fx => s3c2440/gigabeat-fx}/pcm-meg-fx.c (100%) rename firmware/target/arm/{gigabeat/meg-fx => s3c2440/gigabeat-fx}/power-meg-fx.c (100%) rename firmware/target/arm/{gigabeat/meg-fx => s3c2440/gigabeat-fx}/sc606-meg-fx.c (100%) rename firmware/target/arm/{gigabeat/meg-fx => s3c2440/gigabeat-fx}/sc606-meg-fx.h (100%) rename firmware/target/arm/{gigabeat/meg-fx => s3c2440/gigabeat-fx}/system-meg-fx.c (100%) rename firmware/target/arm/{gigabeat/meg-fx => s3c2440/gigabeat-fx}/system-target.h (100%) rename firmware/target/arm/{gigabeat/meg-fx => s3c2440/gigabeat-fx}/usb-meg-fx.c (100%) rename firmware/target/arm/{gigabeat/meg-fx => s3c2440/gigabeat-fx}/usb-target.h (100%) rename firmware/target/arm/{gigabeat/meg-fx => s3c2440/gigabeat-fx}/wmcodec-meg-fx.c (100%) 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 similarity index 100% rename from firmware/target/arm/gigabeat/meg-fx/adc-meg-fx.c rename to 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 similarity index 100% rename from firmware/target/arm/gigabeat/meg-fx/adc-target.h rename to 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 similarity index 100% rename from firmware/target/arm/gigabeat/meg-fx/ata-meg-fx.c rename to 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 similarity index 100% rename from firmware/target/arm/gigabeat/meg-fx/ata-target.h rename to 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 similarity index 100% rename from firmware/target/arm/gigabeat/meg-fx/backlight-meg-fx.c rename to 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 similarity index 100% rename from firmware/target/arm/gigabeat/meg-fx/backlight-target.h rename to 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 similarity index 100% rename from firmware/target/arm/gigabeat/meg-fx/button-meg-fx.c rename to 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 similarity index 100% rename from firmware/target/arm/gigabeat/meg-fx/button-target.h rename to 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 similarity index 100% rename from firmware/target/arm/gigabeat/meg-fx/dma_start.c rename to 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 similarity index 100% rename from firmware/target/arm/gigabeat/meg-fx/i2c-meg-fx.c rename to 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 similarity index 100% rename from firmware/target/arm/gigabeat/meg-fx/i2c-meg-fx.h rename to 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 similarity index 100% rename from firmware/target/arm/gigabeat/meg-fx/kernel-meg-fx.c rename to 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 similarity index 100% rename from firmware/target/arm/gigabeat/meg-fx/lcd-as-meg-fx.S rename to 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 similarity index 100% rename from firmware/target/arm/gigabeat/meg-fx/lcd-meg-fx.c rename to 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 similarity index 100% rename from firmware/target/arm/gigabeat/meg-fx/lcd-target.h rename to 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 similarity index 100% rename from firmware/target/arm/gigabeat/meg-fx/mmu-meg-fx.c rename to 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 similarity index 100% rename from firmware/target/arm/gigabeat/meg-fx/mmu-meg-fx.h rename to 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 similarity index 100% rename from firmware/target/arm/gigabeat/meg-fx/pcm-meg-fx.c rename to 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 similarity index 100% rename from firmware/target/arm/gigabeat/meg-fx/power-meg-fx.c rename to 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 similarity index 100% rename from firmware/target/arm/gigabeat/meg-fx/sc606-meg-fx.c rename to 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 similarity index 100% rename from firmware/target/arm/gigabeat/meg-fx/sc606-meg-fx.h rename to 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 similarity index 100% rename from firmware/target/arm/gigabeat/meg-fx/system-meg-fx.c rename to 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 similarity index 100% rename from firmware/target/arm/gigabeat/meg-fx/system-target.h rename to 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 similarity index 100% rename from firmware/target/arm/gigabeat/meg-fx/usb-meg-fx.c rename to 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 similarity index 100% rename from firmware/target/arm/gigabeat/meg-fx/usb-target.h rename to 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 similarity index 100% rename from firmware/target/arm/gigabeat/meg-fx/wmcodec-meg-fx.c rename to 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)