summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-12-22 10:30:26 +0100
committerWolfgang Denk <wd@denx.de>2006-12-22 10:30:26 +0100
commit82e5236a8b719543643fd26d5827938ab2b94818 (patch)
treedb7b09516ac4ef883ec300556b4e5d5a322eaa29
parentc84bad0ef60e7055ab0bd49b93069509cecc382a (diff)
downloadbarebox-82e5236a8b719543643fd26d5827938ab2b94818.tar.gz
barebox-82e5236a8b719543643fd26d5827938ab2b94818.tar.xz
Minor code cleanup; update CHANGELOG.
-rw-r--r--CHANGELOG24
-rwxr-xr-xMAKEALL2
-rw-r--r--board/mcc200/auto_update.c30
3 files changed, 34 insertions, 22 deletions
diff --git a/CHANGELOG b/CHANGELOG
index b74f53698c..e0b9be9d2d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,27 @@
+commit c84bad0ef60e7055ab0bd49b93069509cecc382a
+Author: Bartlomiej Sieka <tur@semihalf.com>
+Date: Wed Dec 20 00:29:43 2006 +0100
+
+ Fix to make the baudrate changes immediate for the MCF52x2 family.
+
+commit daa6e418bcc0c717752e8de939c213c790286096
+Author: Bartlomiej Sieka <tur@semihalf.com>
+Date: Wed Dec 20 00:27:32 2006 +0100
+
+ Preliminary support for the iDMR board (ColdFire).
+
+commit cdb97a6678826f85e7c69eae6a1c113d034c9b10
+Author: Andrei Safronov <safronov@pollux.denx.de>
+Date: Fri Dec 8 16:23:08 2006 +0100
+
+ automatic update mechanism
+
+commit dd520bf314c7add4183c5191692180f576f96b60
+Author: Wolfgang Denk <wd@pollux.denx.de>
+Date: Thu Nov 30 18:02:20 2006 +0100
+
+ Code cleanup.
+
commit 8d9a8610b8256331132227e9e6585c6bd5742787
Author: Wolfgang Denk <wd@pollux.denx.de>
Date: Thu Nov 30 01:54:07 2006 +0100
diff --git a/MAKEALL b/MAKEALL
index a9e245cc67..d2159ef0c9 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -299,7 +299,7 @@ LIST_microblaze=" \
LIST_coldfire=" \
cobra5272 EB+MCF-EV123 EB+MCF-EV123_internal \
- idmr M5271EVB M5272C3 M5282EVB \
+ idmr M5271EVB M5272C3 M5282EVB \
TASREG r5200 M5271EVB \
"
diff --git a/board/mcc200/auto_update.c b/board/mcc200/auto_update.c
index 786543e5db..63e4139fc2 100644
--- a/board/mcc200/auto_update.c
+++ b/board/mcc200/auto_update.c
@@ -79,8 +79,7 @@
#define AU_FIRMWARE "u-boot.img"
#define AU_KERNEL "kernel.img"
-struct flash_layout
-{
+struct flash_layout {
long start;
long end;
};
@@ -139,33 +138,28 @@ extern int flash_write (char *, ulong, ulong);
extern block_dev_desc_t *get_dev (char*, int);
extern int u_boot_hush_start(void);
-int
-au_check_cksum_valid(int idx, long nbytes)
+int au_check_cksum_valid(int idx, long nbytes)
{
image_header_t *hdr;
unsigned long checksum;
hdr = (image_header_t *)LOAD_ADDR;
- if (nbytes != (sizeof(*hdr) + ntohl(hdr->ih_size)))
- {
+ if (nbytes != (sizeof(*hdr) + ntohl(hdr->ih_size))) {
printf ("Image %s bad total SIZE\n", aufile[idx]);
return -1;
}
/* check the data CRC */
checksum = ntohl(hdr->ih_dcrc);
- if (crc32 (0, (uchar *)(LOAD_ADDR + sizeof(*hdr)), ntohl(hdr->ih_size))
- != checksum)
- {
+ if (crc32 (0, (uchar *)(LOAD_ADDR + sizeof(*hdr)), ntohl(hdr->ih_size)) != checksum) {
printf ("Image %s bad data checksum\n", aufile[idx]);
return -1;
}
return 0;
}
-int
-au_check_header_valid(int idx, long nbytes)
+int au_check_header_valid(int idx, long nbytes)
{
image_header_t *hdr;
unsigned long checksum;
@@ -180,13 +174,11 @@ au_check_header_valid(int idx, long nbytes)
printf("size %#x %#lx ", ntohl(hdr->ih_size), nbytes);
printf("type %#x %#x ", hdr->ih_type, IH_TYPE_KERNEL);
#endif
- if (nbytes < sizeof(*hdr))
- {
+ if (nbytes < sizeof(*hdr)) {
printf ("Image %s bad header SIZE\n", aufile[idx]);
return -1;
}
- if (ntohl(hdr->ih_magic) != IH_MAGIC || hdr->ih_arch != IH_CPU_PPC)
- {
+ if (ntohl(hdr->ih_magic) != IH_MAGIC || hdr->ih_arch != IH_CPU_PPC) {
printf ("Image %s bad MAGIC or ARCH\n", aufile[idx]);
return -1;
}
@@ -222,9 +214,7 @@ au_check_header_valid(int idx, long nbytes)
return 0;
}
-
-int
-au_do_update(int idx, long sz)
+int au_do_update(int idx, long sz)
{
image_header_t *hdr;
char *addr;
@@ -303,14 +293,12 @@ au_do_update(int idx, long sz)
return 0;
}
-
/*
* this is called from board_init() after the hardware has been set up
* and is usable. That seems like a good time to do this.
* Right now the return value is ignored.
*/
-int
-do_auto_update(void)
+int do_auto_update(void)
{
block_dev_desc_t *stor_dev;
long sz;