summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2007-09-30 08:57:49 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2007-09-30 08:57:49 +0000
commit80f1688423eaad7a2ad9e4809331e192bcd0047d (patch)
tree716c8e3160daaa7f462cfe6cf6f848c41b61b2e6
parenta5e788fe8533f6172b3d6b52d2430fe163f7a6fd (diff)
downloadrockbox-80f1688423eaad7a2ad9e4809331e192bcd0047d.zip
rockbox-80f1688423eaad7a2ad9e4809331e192bcd0047d.tar.gz
rockbox-80f1688423eaad7a2ad9e4809331e192bcd0047d.tar.bz2
rockbox-80f1688423eaad7a2ad9e4809331e192bcd0047d.tar.xz
I got bullied in IRC by linuxstb and markun...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14909 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/SOURCES26
-rw-r--r--firmware/boot.lds2
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/adc-mr500.c (renamed from firmware/target/arm/olympus/mrobe-500/adc-mr500.c)0
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/adc-target.h (renamed from firmware/target/arm/olympus/mrobe-500/adc-target.h)0
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/ata-mr500.c (renamed from firmware/target/arm/olympus/mrobe-500/ata-mr500.c)0
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/ata-target.h (renamed from firmware/target/arm/olympus/mrobe-500/ata-target.h)0
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/backlight-mr500.c (renamed from firmware/target/arm/olympus/mrobe-500/backlight-mr500.c)0
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/backlight-target.h (renamed from firmware/target/arm/olympus/mrobe-500/backlight-target.h)0
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c (renamed from firmware/target/arm/olympus/mrobe-500/button-mr500.c)0
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/button-target.h (renamed from firmware/target/arm/olympus/mrobe-500/button-target.h)0
-rwxr-xr-xfirmware/target/arm/tms320dm320/mrobe-500/crt0.S (renamed from firmware/target/arm/olympus/mrobe-500/crt0.S)0
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/kernel-mr500.c (renamed from firmware/target/arm/olympus/mrobe-500/kernel-mr500.c)0
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c (renamed from firmware/target/arm/olympus/mrobe-500/lcd-mr500.c)0
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/lcd-target.h (renamed from firmware/target/arm/olympus/mrobe-500/lcd-target.h)0
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/power-mr500.c (renamed from firmware/target/arm/olympus/mrobe-500/power-mr500.c)0
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/spi-mr500.c (renamed from firmware/target/arm/olympus/mrobe-500/spi-mr500.c)0
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/spi-target.h (renamed from firmware/target/arm/olympus/mrobe-500/spi-target.h)0
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/system-mr500.c (renamed from firmware/target/arm/olympus/mrobe-500/system-mr500.c)0
-rwxr-xr-xfirmware/target/arm/tms320dm320/mrobe-500/system-target.h (renamed from firmware/target/arm/olympus/mrobe-500/system-target.h)0
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/timer-mr500.c (renamed from firmware/target/arm/olympus/mrobe-500/timer-mr500.c)0
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/timer-target.h (renamed from firmware/target/arm/olympus/mrobe-500/timer-target.h)0
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/uart-mr500.c (renamed from firmware/target/arm/olympus/mrobe-500/uart-mr500.c)0
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/uart-target.h (renamed from firmware/target/arm/olympus/mrobe-500/uart-target.h)0
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/usb-mr500.c (renamed from firmware/target/arm/olympus/mrobe-500/usb-mr500.c)0
-rwxr-xr-xtools/configure2
25 files changed, 15 insertions, 15 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 45bedd9..7e2d328 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -333,7 +333,7 @@ target/arm/crt0-pp.S
#elif CONFIG_CPU == PNX0101
target/arm/pnx0101/crt0-pnx0101.S
#elif defined(OLYMPUS_MROBE_500)
-target/arm/olympus/mrobe-500/crt0.S
+target/arm/tms320dm320/mrobe-500/crt0.S
#elif defined(CPU_ARM)
target/arm/crt0.S
#endif /* defined(CPU_*) */
@@ -622,18 +622,18 @@ target/arm/imx31/gigabeat-s/pcm-imx31.c
#ifdef MROBE_500
#ifndef SIMULATOR
-target/arm/olympus/mrobe-500/adc-mr500.c
-target/arm/olympus/mrobe-500/ata-mr500.c
-target/arm/olympus/mrobe-500/backlight-mr500.c
-target/arm/olympus/mrobe-500/button-mr500.c
-target/arm/olympus/mrobe-500/kernel-mr500.c
-target/arm/olympus/mrobe-500/lcd-mr500.c
-target/arm/olympus/mrobe-500/power-mr500.c
-target/arm/olympus/mrobe-500/system-mr500.c
-target/arm/olympus/mrobe-500/timer-mr500.c
-target/arm/olympus/mrobe-500/usb-mr500.c
-target/arm/olympus/mrobe-500/uart-mr500.c
-target/arm/olympus/mrobe-500/spi-mr500.c
+target/arm/tms320dm320/mrobe-500/adc-mr500.c
+target/arm/tms320dm320/mrobe-500/ata-mr500.c
+target/arm/tms320dm320/mrobe-500/backlight-mr500.c
+target/arm/tms320dm320/mrobe-500/button-mr500.c
+target/arm/tms320dm320/mrobe-500/kernel-mr500.c
+target/arm/tms320dm320/mrobe-500/lcd-mr500.c
+target/arm/tms320dm320/mrobe-500/power-mr500.c
+target/arm/tms320dm320/mrobe-500/system-mr500.c
+target/arm/tms320dm320/mrobe-500/timer-mr500.c
+target/arm/tms320dm320/mrobe-500/usb-mr500.c
+target/arm/tms320dm320/mrobe-500/uart-mr500.c
+target/arm/tms320dm320/mrobe-500/spi-mr500.c
#ifndef BOOTLOADER
#endif
diff --git a/firmware/boot.lds b/firmware/boot.lds
index e3dbb49..062370b 100644
--- a/firmware/boot.lds
+++ b/firmware/boot.lds
@@ -10,7 +10,7 @@ OUTPUT_ARCH(arm)
#ifdef CPU_PP
INPUT(target/arm/crt0-pp-bl.o)
#elif defined(OLYMPUS_MROBE_500)
-INPUT(target/arm/olympus/mrobe-500/crt0.o)
+INPUT(target/arm/tms320dm320/mrobe-500/crt0.o)
#else
INPUT(target/arm/crt0.o)
#endif
diff --git a/firmware/target/arm/olympus/mrobe-500/adc-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/adc-mr500.c
index 39d92d6..39d92d6 100644
--- a/firmware/target/arm/olympus/mrobe-500/adc-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/adc-mr500.c
diff --git a/firmware/target/arm/olympus/mrobe-500/adc-target.h b/firmware/target/arm/tms320dm320/mrobe-500/adc-target.h
index 7d4713a..7d4713a 100644
--- a/firmware/target/arm/olympus/mrobe-500/adc-target.h
+++ b/firmware/target/arm/tms320dm320/mrobe-500/adc-target.h
diff --git a/firmware/target/arm/olympus/mrobe-500/ata-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/ata-mr500.c
index 47a8c61..47a8c61 100644
--- a/firmware/target/arm/olympus/mrobe-500/ata-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/ata-mr500.c
diff --git a/firmware/target/arm/olympus/mrobe-500/ata-target.h b/firmware/target/arm/tms320dm320/mrobe-500/ata-target.h
index 97b6f62..97b6f62 100644
--- a/firmware/target/arm/olympus/mrobe-500/ata-target.h
+++ b/firmware/target/arm/tms320dm320/mrobe-500/ata-target.h
diff --git a/firmware/target/arm/olympus/mrobe-500/backlight-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/backlight-mr500.c
index 3c80ede..3c80ede 100644
--- a/firmware/target/arm/olympus/mrobe-500/backlight-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/backlight-mr500.c
diff --git a/firmware/target/arm/olympus/mrobe-500/backlight-target.h b/firmware/target/arm/tms320dm320/mrobe-500/backlight-target.h
index 783b9e1..783b9e1 100644
--- a/firmware/target/arm/olympus/mrobe-500/backlight-target.h
+++ b/firmware/target/arm/tms320dm320/mrobe-500/backlight-target.h
diff --git a/firmware/target/arm/olympus/mrobe-500/button-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c
index 1d0d271..1d0d271 100644
--- a/firmware/target/arm/olympus/mrobe-500/button-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c
diff --git a/firmware/target/arm/olympus/mrobe-500/button-target.h b/firmware/target/arm/tms320dm320/mrobe-500/button-target.h
index f574321..f574321 100644
--- a/firmware/target/arm/olympus/mrobe-500/button-target.h
+++ b/firmware/target/arm/tms320dm320/mrobe-500/button-target.h
diff --git a/firmware/target/arm/olympus/mrobe-500/crt0.S b/firmware/target/arm/tms320dm320/mrobe-500/crt0.S
index 193470f..193470f 100755
--- a/firmware/target/arm/olympus/mrobe-500/crt0.S
+++ b/firmware/target/arm/tms320dm320/mrobe-500/crt0.S
diff --git a/firmware/target/arm/olympus/mrobe-500/kernel-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/kernel-mr500.c
index be2b14b..be2b14b 100644
--- a/firmware/target/arm/olympus/mrobe-500/kernel-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/kernel-mr500.c
diff --git a/firmware/target/arm/olympus/mrobe-500/lcd-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c
index 6c06e07..6c06e07 100644
--- a/firmware/target/arm/olympus/mrobe-500/lcd-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c
diff --git a/firmware/target/arm/olympus/mrobe-500/lcd-target.h b/firmware/target/arm/tms320dm320/mrobe-500/lcd-target.h
index c64cc56..c64cc56 100644
--- a/firmware/target/arm/olympus/mrobe-500/lcd-target.h
+++ b/firmware/target/arm/tms320dm320/mrobe-500/lcd-target.h
diff --git a/firmware/target/arm/olympus/mrobe-500/power-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/power-mr500.c
index 3a6dad7..3a6dad7 100644
--- a/firmware/target/arm/olympus/mrobe-500/power-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/power-mr500.c
diff --git a/firmware/target/arm/olympus/mrobe-500/spi-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/spi-mr500.c
index c47ab8f..c47ab8f 100644
--- a/firmware/target/arm/olympus/mrobe-500/spi-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/spi-mr500.c
diff --git a/firmware/target/arm/olympus/mrobe-500/spi-target.h b/firmware/target/arm/tms320dm320/mrobe-500/spi-target.h
index 866919d..866919d 100644
--- a/firmware/target/arm/olympus/mrobe-500/spi-target.h
+++ b/firmware/target/arm/tms320dm320/mrobe-500/spi-target.h
diff --git a/firmware/target/arm/olympus/mrobe-500/system-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/system-mr500.c
index fad2d43..fad2d43 100644
--- a/firmware/target/arm/olympus/mrobe-500/system-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/system-mr500.c
diff --git a/firmware/target/arm/olympus/mrobe-500/system-target.h b/firmware/target/arm/tms320dm320/mrobe-500/system-target.h
index 7adfda6..7adfda6 100755
--- a/firmware/target/arm/olympus/mrobe-500/system-target.h
+++ b/firmware/target/arm/tms320dm320/mrobe-500/system-target.h
diff --git a/firmware/target/arm/olympus/mrobe-500/timer-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/timer-mr500.c
index 21449ed..21449ed 100644
--- a/firmware/target/arm/olympus/mrobe-500/timer-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/timer-mr500.c
diff --git a/firmware/target/arm/olympus/mrobe-500/timer-target.h b/firmware/target/arm/tms320dm320/mrobe-500/timer-target.h
index 4abe75a..4abe75a 100644
--- a/firmware/target/arm/olympus/mrobe-500/timer-target.h
+++ b/firmware/target/arm/tms320dm320/mrobe-500/timer-target.h
diff --git a/firmware/target/arm/olympus/mrobe-500/uart-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/uart-mr500.c
index 66e59ea..66e59ea 100644
--- a/firmware/target/arm/olympus/mrobe-500/uart-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/uart-mr500.c
diff --git a/firmware/target/arm/olympus/mrobe-500/uart-target.h b/firmware/target/arm/tms320dm320/mrobe-500/uart-target.h
index f077dc1..f077dc1 100644
--- a/firmware/target/arm/olympus/mrobe-500/uart-target.h
+++ b/firmware/target/arm/tms320dm320/mrobe-500/uart-target.h
diff --git a/firmware/target/arm/olympus/mrobe-500/usb-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/usb-mr500.c
index 6063ed3..6063ed3 100644
--- a/firmware/target/arm/olympus/mrobe-500/usb-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/usb-mr500.c
diff --git a/tools/configure b/tools/configure
index f5219f7..085c110 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1301,7 +1301,7 @@ EOF
bootoutput="rockbox.mrboot"
# architecture, manufacturer and model for the target-tree build
t_cpu="arm"
- t_manufacturer="olympus"
+ t_manufacturer="tms320dm320"
t_model="mrobe-500"
;;