minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-11 05:02:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

UC101: fix compiler warnings

Browse Source
This commit is contained in:
Wolfgang Denk 2007-03-07 16:33:44 +01:00
parent 8d7e273222
commit 3921843398
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
board/uc101/uc101.c
View File

@ -170,9 +170,9 @@ long int initdram (int board_type)
/* find RAM size using SDRAM CS0 only */ /* find RAM size using SDRAM CS0 only */
sdram_start(0); sdram_start(0);
test1 = get_ram_size((ulong *)CFG_SDRAM_BASE, 0x20000000); test1 = get_ram_size((long *)CFG_SDRAM_BASE, 0x20000000);
sdram_start(1); sdram_start(1);
test2 = get_ram_size((ulong *)CFG_SDRAM_BASE, 0x20000000); test2 = get_ram_size((long *)CFG_SDRAM_BASE, 0x20000000);
if (test1 > test2) { if (test1 > test2) {
sdram_start(0); sdram_start(0);
dramsize = test1; dramsize = test1;
@ -266,7 +266,7 @@ struct kbd_data_t* get_keys (struct kbd_data_t *kbd_data)
return kbd_data; return kbd_data;
} }
static int compare_magic (const struct kbd_data_t *kbd_data, uchar *str) static int compare_magic (const struct kbd_data_t *kbd_data, char *str)
{ {
char s1 = str[0]; char s1 = str[0];
@ -283,11 +283,11 @@ static int compare_magic (const struct kbd_data_t *kbd_data, uchar *str)
return 0; return 0;
} }
static uchar *key_match (const struct kbd_data_t *kbd_data) static char *key_match (const struct kbd_data_t *kbd_data)
{ {
uchar magic[sizeof (kbd_magic_prefix) + 1]; char magic[sizeof (kbd_magic_prefix) + 1];
uchar *suffix; char *suffix;
uchar *kbd_magic_keys; char *kbd_magic_keys;
/* /*
* The following string defines the characters that can be appended * The following string defines the characters that can be appended
@ -308,7 +308,7 @@ static uchar *key_match (const struct kbd_data_t *kbd_data)
sprintf (magic, "%s%c", kbd_magic_prefix, *suffix); sprintf (magic, "%s%c", kbd_magic_prefix, *suffix);
if (compare_magic(kbd_data, getenv(magic)) == 0) { if (compare_magic(kbd_data, getenv(magic)) == 0) {
uchar cmd_name[sizeof (kbd_command_prefix) + 1]; char cmd_name[sizeof (kbd_command_prefix) + 1];
char *cmd; char *cmd;
sprintf (cmd_name, "%s%c", kbd_command_prefix, *suffix); sprintf (cmd_name, "%s%c", kbd_command_prefix, *suffix);
@ -331,7 +331,7 @@ int misc_init_r (void)
#ifdef CONFIG_PREBOOT #ifdef CONFIG_PREBOOT
struct kbd_data_t kbd_data; struct kbd_data_t kbd_data;
/* Decode keys */ /* Decode keys */
uchar *str = strdup (key_match (get_keys (&kbd_data))); char *str = strdup (key_match (get_keys (&kbd_data)));
/* Set or delete definition */ /* Set or delete definition */
setenv ("preboot", str); setenv ("preboot", str);
free (str); free (str);