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.tar.gz
rockbox-80f1688423eaad7a2ad9e4809331e192bcd0047d.zip
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 45bedd9dbe..7e2d328c72 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -333,7 +333,7 @@ target/arm/crt0-pp.S
333#elif CONFIG_CPU == PNX0101 333#elif CONFIG_CPU == PNX0101
334target/arm/pnx0101/crt0-pnx0101.S 334target/arm/pnx0101/crt0-pnx0101.S
335#elif defined(OLYMPUS_MROBE_500) 335#elif defined(OLYMPUS_MROBE_500)
336target/arm/olympus/mrobe-500/crt0.S 336target/arm/tms320dm320/mrobe-500/crt0.S
337#elif defined(CPU_ARM) 337#elif defined(CPU_ARM)
338target/arm/crt0.S 338target/arm/crt0.S
339#endif /* defined(CPU_*) */ 339#endif /* defined(CPU_*) */
@@ -622,18 +622,18 @@ target/arm/imx31/gigabeat-s/pcm-imx31.c
622 622
623#ifdef MROBE_500 623#ifdef MROBE_500
624#ifndef SIMULATOR 624#ifndef SIMULATOR
625target/arm/olympus/mrobe-500/adc-mr500.c 625target/arm/tms320dm320/mrobe-500/adc-mr500.c
626target/arm/olympus/mrobe-500/ata-mr500.c 626target/arm/tms320dm320/mrobe-500/ata-mr500.c
627target/arm/olympus/mrobe-500/backlight-mr500.c 627target/arm/tms320dm320/mrobe-500/backlight-mr500.c
628target/arm/olympus/mrobe-500/button-mr500.c 628target/arm/tms320dm320/mrobe-500/button-mr500.c
629target/arm/olympus/mrobe-500/kernel-mr500.c 629target/arm/tms320dm320/mrobe-500/kernel-mr500.c
630target/arm/olympus/mrobe-500/lcd-mr500.c 630target/arm/tms320dm320/mrobe-500/lcd-mr500.c
631target/arm/olympus/mrobe-500/power-mr500.c 631target/arm/tms320dm320/mrobe-500/power-mr500.c
632target/arm/olympus/mrobe-500/system-mr500.c 632target/arm/tms320dm320/mrobe-500/system-mr500.c
633target/arm/olympus/mrobe-500/timer-mr500.c 633target/arm/tms320dm320/mrobe-500/timer-mr500.c
634target/arm/olympus/mrobe-500/usb-mr500.c 634target/arm/tms320dm320/mrobe-500/usb-mr500.c
635target/arm/olympus/mrobe-500/uart-mr500.c 635target/arm/tms320dm320/mrobe-500/uart-mr500.c
636target/arm/olympus/mrobe-500/spi-mr500.c 636target/arm/tms320dm320/mrobe-500/spi-mr500.c
637#ifndef BOOTLOADER 637#ifndef BOOTLOADER
638 638
639#endif 639#endif
diff --git a/firmware/boot.lds b/firmware/boot.lds
index e3dbb49a8c..062370bf20 100644
--- a/firmware/boot.lds
+++ b/firmware/boot.lds
@@ -10,7 +10,7 @@ OUTPUT_ARCH(arm)
10#ifdef CPU_PP 10#ifdef CPU_PP
11INPUT(target/arm/crt0-pp-bl.o) 11INPUT(target/arm/crt0-pp-bl.o)
12#elif defined(OLYMPUS_MROBE_500) 12#elif defined(OLYMPUS_MROBE_500)
13INPUT(target/arm/olympus/mrobe-500/crt0.o) 13INPUT(target/arm/tms320dm320/mrobe-500/crt0.o)
14#else 14#else
15INPUT(target/arm/crt0.o) 15INPUT(target/arm/crt0.o)
16#endif 16#endif
diff --git a/firmware/target/arm/olympus/mrobe-500/adc-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/adc-mr500.c
index 39d92d67b0..39d92d67b0 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 7d4713a186..7d4713a186 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 47a8c61a45..47a8c61a45 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 97b6f62c86..97b6f62c86 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 3c80ede00d..3c80ede00d 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 783b9e1320..783b9e1320 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 1d0d2714a8..1d0d2714a8 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 f574321717..f574321717 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 193470fd4a..193470fd4a 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 be2b14b3cb..be2b14b3cb 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 6c06e070f9..6c06e070f9 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 c64cc56276..c64cc56276 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 3a6dad77f4..3a6dad77f4 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 c47ab8f6ed..c47ab8f6ed 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 866919dc27..866919dc27 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 fad2d4331e..fad2d4331e 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 7adfda6f7d..7adfda6f7d 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 21449ed19f..21449ed19f 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 4abe75ad82..4abe75ad82 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 66e59eaaac..66e59eaaac 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 f077dc1025..f077dc1025 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 6063ed3727..6063ed3727 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 f5219f7a44..085c11092b 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1301,7 +1301,7 @@ EOF
1301 bootoutput="rockbox.mrboot" 1301 bootoutput="rockbox.mrboot"
1302 # architecture, manufacturer and model for the target-tree build 1302 # architecture, manufacturer and model for the target-tree build
1303 t_cpu="arm" 1303 t_cpu="arm"
1304 t_manufacturer="olympus" 1304 t_manufacturer="tms320dm320"
1305 t_model="mrobe-500" 1305 t_model="mrobe-500"
1306 ;; 1306 ;;
1307 1307