diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2011-11-08 23:01:12 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2011-11-08 23:01:12 +0000 |
| commit | b84584bddd37a76214b9123d37167b611b04d8b6 (patch) | |
| tree | de54afc7722f3550b370d811ff7a33130e2e4b72 /sys | |
| parent | 8a5e3cea844cf0cd6700273b24ee367bcbefa51e (diff) | |
Cookies? Beagle don't need no stinkin' cookies. To get boot params
anyways.
ok (sight unseen) deraadt@ drahn@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/beagle/beagle/beagle_machdep.c | 10 | ||||
| -rw-r--r-- | sys/arch/beagle/stand/boot.scr/boot.cmd | 2 |
2 files changed, 3 insertions, 9 deletions
diff --git a/sys/arch/beagle/beagle/beagle_machdep.c b/sys/arch/beagle/beagle/beagle_machdep.c index 253c796a24d..40f12e1628d 100644 --- a/sys/arch/beagle/beagle/beagle_machdep.c +++ b/sys/arch/beagle/beagle/beagle_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: beagle_machdep.c,v 1.11 2011/11/08 22:41:41 krw Exp $ */ +/* $OpenBSD: beagle_machdep.c,v 1.12 2011/11/08 23:01:11 krw Exp $ */ /* $NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */ /* @@ -241,8 +241,6 @@ int safepri = 0; void omdog_reset(void); void beagle_powerdown(void); -#define BOOT_STRING_MAGIC 0x4f425344 - char bootargs[MAX_BOOT_STRING]; void process_kernel_args(char *); @@ -906,15 +904,11 @@ process_kernel_args(char *args) { char *cp = args; - if (cp == NULL || *(int *)cp != BOOT_STRING_MAGIC) { + if (cp == NULL) { boothowto = RB_AUTOBOOT; return; } - /* Eat the cookie */ - *(int *)cp = 0; - cp += sizeof(int); - boothowto = 0; /* Make a local copy of the bootargs */ diff --git a/sys/arch/beagle/stand/boot.scr/boot.cmd b/sys/arch/beagle/stand/boot.scr/boot.cmd index 13eaeb9b0c1..35b59a45e51 100644 --- a/sys/arch/beagle/stand/boot.scr/boot.cmd +++ b/sys/arch/beagle/stand/boot.scr/boot.cmd @@ -1,4 +1,4 @@ setenv loadaddr 0x82800000 ; -setenv bootargs DSBOsd0i:/bsd.umg ; +setenv bootargs sd0i:/bsd.umg ; fatload mmc 0 ${loadaddr} bsd.umg ; bootm ${loadaddr} |