summaryrefslogtreecommitdiff
path: root/board/ml2
diff options
context:
space:
mode:
Diffstat (limited to 'board/ml2')
-rw-r--r--board/ml2/flash.c2
-rw-r--r--board/ml2/ml2.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/board/ml2/flash.c b/board/ml2/flash.c
index 4f805a663b1..87cb1ff18e1 100644
--- a/board/ml2/flash.c
+++ b/board/ml2/flash.c
@@ -216,7 +216,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last) {
return rc;
}
-volatile static int write_word (flash_info_t *info, ulong dest, unsigned long long data) {
+static int write_word (flash_info_t *info, ulong dest, unsigned long long data) {
volatile unsigned long long *addr=(unsigned long long *)dest;
unsigned long long result;
diff --git a/board/ml2/ml2.c b/board/ml2/ml2.c
index ff5f8167962..f32e512d4f3 100644
--- a/board/ml2/ml2.c
+++ b/board/ml2/ml2.c
@@ -30,8 +30,8 @@ int board_early_init_f (void)
int checkboard (void)
{
- unsigned char *s = getenv ("serial#");
- unsigned char *e;
+ char *s = getenv ("serial#");
+ char *e;
if (!s || strncmp (s, "ML2", 9)) {
printf ("### No HW ID - assuming ML2");