summaryrefslogtreecommitdiffstats
path: root/rbutil
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2008-10-11 13:11:47 +0000
committerDave Chapman <dave@dchapman.com>2008-10-11 13:11:47 +0000
commit3c65d2b17f3f76e22629d1e78c2897d2840ad67f (patch)
tree774bf24766e4d60ea7fa60e7ca781d3012f1a783 /rbutil
parentd2e551f6dfe4e42c13eac0c273fb15457d0e0299 (diff)
downloadrockbox-3c65d2b17f3f76e22629d1e78c2897d2840ad67f.tar.gz
rockbox-3c65d2b17f3f76e22629d1e78c2897d2840ad67f.tar.bz2
rockbox-3c65d2b17f3f76e22629d1e78c2897d2840ad67f.zip
Fix another bug in dualboot.S, add Rafael Carre as the (C) holder of dualboot.S (most of the code there is his) and use the standard Rockbox header in mkamsboot.c. This code is still untested on target.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18771 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil')
-rw-r--r--rbutil/mkamsboot/dualboot.S23
-rw-r--r--rbutil/mkamsboot/mkamsboot.c46
2 files changed, 45 insertions, 24 deletions
diff --git a/rbutil/mkamsboot/dualboot.S b/rbutil/mkamsboot/dualboot.S
index c8d2dd7d9f..8a1caa6f63 100644
--- a/rbutil/mkamsboot/dualboot.S
+++ b/rbutil/mkamsboot/dualboot.S
@@ -1,3 +1,24 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id:$
+ *
+ * Copyright (C) 2008 Rafaël Carré
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
.text
/* This is the size of the Clip's RAM, but there is nothing to be gained
@@ -47,7 +68,7 @@ uclcopy:
cmp r2, r0
bne uclcopy
- add r5, r2, #2 /* r5 is entry point of copy of uclunpack */
+ add r5, r3, #2 /* r5 is entry point of copy of uclunpack */
/* function, plus one (for thumb mode */
/* enable gpio clock */
diff --git a/rbutil/mkamsboot/mkamsboot.c b/rbutil/mkamsboot/mkamsboot.c
index 67f9850584..fa975f8fc7 100644
--- a/rbutil/mkamsboot/mkamsboot.c
+++ b/rbutil/mkamsboot/mkamsboot.c
@@ -1,26 +1,26 @@
-/*
-
-mkamsboot.c - a tool for merging bootloader code into an Sansa V2
- (AMS) firmware file
-
-Copyright (C) Dave Chapman 2008
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA
-
-*/
-
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id:$
+ *
+ * mkamsboot.c - a tool for merging bootloader code into an Sansa V2
+ * (AMS) firmware file
+ *
+ * Copyright (C) 2008 Dave Chapman
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
/*