d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweaks to the beri boot loader so that it builds w/o warnings.

Browse Source 
Sponsored by: Netflix
This commit is contained in:
imp 2017-12-02 00:07:31 +00:00
parent 07c8409a7a
commit b7ed534767
7 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stand/mips/beri/boot2/Makefile
View File

@ -47,9 +47,7 @@ MAN=
AFLAGS= -G0 AFLAGS= -G0
CFLAGS+= -I${.CURDIR} \ CFLAGS+= -I${LDRSRC} \
-I${LDRSRC} \
-D_KERNEL \
-Wall \ -Wall \
-G0 \ -G0 \
-fno-pic -mno-abicalls \ -fno-pic -mno-abicalls \

2
stand/mips/beri/boot2/boot2.c
View File

@ -500,7 +500,7 @@ parse()
*/ */
unit = q[len-1]; unit = q[len-1];
if (unit < '0' || unit > '9') { if (unit < '0' || unit > '9') {
printf("Invalid device: invalid unit\n", q, printf("Invalid device: invalid unit %c\n",
unit); unit);
return (-1); return (-1);
} }

7
stand/mips/beri/common/altera_jtag_uart.c
View File

@ -130,13 +130,6 @@ uart_control_write(uint32_t v)
ALTERA_JTAG_UART_DATA_OFF), v); ALTERA_JTAG_UART_DATA_OFF), v);
} }
static int
uart_writable(void)
{
return ((uart_control_read() & ALTERA_JTAG_UART_CONTROL_WSPACE) != 0);
}
static int static int
uart_readable(void) uart_readable(void)
{ {

2
stand/mips/beri/loader/Makefile
View File

@ -67,7 +67,7 @@ SRCS+= altera_jtag_uart.c \
# Since we don't have a backward compatibility issue, default to this on BERI. # Since we don't have a backward compatibility issue, default to this on BERI.
CFLAGS+= -DBOOT_PROMPT_123 CFLAGS+= -DBOOT_PROMPT_123
HELP_FILES+= help.mips HELP_FILES+= ${.CURDIR}/help.mips
# Always add MI sources # Always add MI sources
.include "${BOOTSRC}/loader.mk" .include "${BOOTSRC}/loader.mk"

6
stand/mips/beri/loader/devicename.c
View File

@ -88,7 +88,7 @@ beri_arch_parsedev(struct disk_devdesc **dev, const char *devspec,
struct disk_devdesc *idev; struct disk_devdesc *idev;
struct devsw *dv; struct devsw *dv;
int i, unit, err; int i, unit, err;
const char *cp; char *cp;
const char *np; const char *np;
/* minimum length check */ /* minimum length check */
@ -130,8 +130,10 @@ beri_arch_parsedev(struct disk_devdesc **dev, const char *devspec,
goto fail; goto fail;
} }
} else { } else {
cp = np; err = EUNIT;
goto fail;
} }
if (*cp && (*cp != ':')) { if (*cp && (*cp != ':')) {
err = EINVAL; err = EINVAL;
goto fail; goto fail;

2
stand/mips/beri/loader/exec.c
View File

@ -119,7 +119,7 @@ beri_elf64_exec(struct preloaded_file *fp)
* least bootinfop. * least bootinfop.
*/ */
(*entry)(boot2_argc, (register_t)boot2_argv, (register_t)boot2_envv, (*entry)(boot2_argc, (register_t)boot2_argv, (register_t)boot2_envv,
&bootinfo); (register_t)&bootinfo);
panic("exec returned"); panic("exec returned");
} }

1
stand/mips/beri/loader/loader.h
View File

@ -41,6 +41,7 @@ extern struct devsw beri_cfi_disk;
extern struct devsw beri_sdcard_disk; extern struct devsw beri_sdcard_disk;
/* devicename.c */ /* devicename.c */
struct env_var;
int beri_arch_setcurrdev(struct env_var *, int, const void *); int beri_arch_setcurrdev(struct env_var *, int, const void *);
char *beri_arch_fmtdev(void *); char *beri_arch_fmtdev(void *);
int beri_arch_getdev(void **, const char *, const char **); int beri_arch_getdev(void **, const char *, const char **);