diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2016-10-06 18:15:45 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2016-10-06 18:15:45 +0000 |
| commit | 0daee0d42432ef125cbb739468ebe7604f0eeb12 (patch) | |
| tree | 24c4dfd901150ae033e97648b0222222bc5bece6 /sys/arch | |
| parent | 6d045edac914cf1dce0b95f3dca7457446980468 (diff) | |
Remove board IDs for the i.MX platform. The kernel doesn't need them anymore.
Make sure we pass 0 as the board ID instead of random garbage if we don't
find a matching compatible string.
ok jsg@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/armv7/stand/efiboot/conf.c | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/stand/efiboot/efiboot.c | 14 | ||||
| -rw-r--r-- | sys/arch/armv7/stand/efiboot/exec.c | 4 |
3 files changed, 5 insertions, 17 deletions
diff --git a/sys/arch/armv7/stand/efiboot/conf.c b/sys/arch/armv7/stand/efiboot/conf.c index 447dffcbf9b..edf38569630 100644 --- a/sys/arch/armv7/stand/efiboot/conf.c +++ b/sys/arch/armv7/stand/efiboot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.4 2016/09/24 13:40:12 kettenis Exp $ */ +/* $OpenBSD: conf.c,v 1.5 2016/10/06 18:15:44 kettenis Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -35,7 +35,7 @@ #include "efiboot.h" #include "efidev.h" -const char version[] = "0.3"; +const char version[] = "0.4"; int debug = 0; struct fs_ops file_system[] = { diff --git a/sys/arch/armv7/stand/efiboot/efiboot.c b/sys/arch/armv7/stand/efiboot/efiboot.c index e95ab25e1ee..67d1e6af516 100644 --- a/sys/arch/armv7/stand/efiboot/efiboot.c +++ b/sys/arch/armv7/stand/efiboot/efiboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: efiboot.c,v 1.11 2016/07/01 09:34:39 patrick Exp $ */ +/* $OpenBSD: efiboot.c,v 1.12 2016/10/06 18:15:44 kettenis Exp $ */ /* * Copyright (c) 2015 YASUOKA Masahiko <yasuoka@yasuoka.net> @@ -229,25 +229,13 @@ struct board_id board_id_table[] = { { "allwinner,sun4i-a10", 4104 }, { "allwinner,sun7i-a20", 4283 }, { "arm,vexpress", 2272 }, - { "boundary,imx6q-nitrogen6_max", 3769 }, - { "boundary,imx6q-nitrogen6x", 3769 }, - { "compulab,cm-fx6", 4273 }, - { "fsl,imx6q-sabrelite", 3769 }, - { "fsl,imx6q-sabresd", 3980 }, { "google,snow", 3774 }, { "google,spring", 3774 }, - { "kosagi,imx6q-novena", 4269 }, { "samsung,universal_c210", 2838 }, - { "solidrun,cubox-i/dl", 4821 }, - { "solidrun,cubox-i/q", 4821 }, - { "solidrun,hummingboard/dl", 4773 }, - { "solidrun,hummingboard/q", 4773 }, { "ti,am335x-bone", 3589 }, { "ti,omap3-beagle", 1546 }, { "ti,omap3-beagle-xm", 1546 }, { "ti,omap4-panda", 2791 }, - { "udoo,imx6q-udoo", 4800 }, - { "wand,imx6q-wandboard", 4412 }, }; static EFI_GUID fdt_guid = FDT_TABLE_GUID; diff --git a/sys/arch/armv7/stand/efiboot/exec.c b/sys/arch/armv7/stand/efiboot/exec.c index e9c55aa4b85..282b38b8aaa 100644 --- a/sys/arch/armv7/stand/efiboot/exec.c +++ b/sys/arch/armv7/stand/efiboot/exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.c,v 1.9 2016/09/24 13:40:12 kettenis Exp $ */ +/* $OpenBSD: exec.c,v 1.10 2016/10/06 18:15:44 kettenis Exp $ */ /* * Copyright (c) 2006, 2016 Mark Kettenis @@ -42,7 +42,7 @@ run_loadfile(u_long *marks, int howto) char args[256]; char *cp; void *fdt; - uint32_t board_id; + uint32_t board_id = 0; int i; /* |