diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2020-04-07 10:11:02 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2020-04-07 10:11:02 +0000 |
| commit | b3679f4e3174a00fb54acb6c3ba8bf00aa56bdfb (patch) | |
| tree | 19208c39fcf9739966b1c63bf9c4575e5c878d53 | |
| parent | 2d5ab8aa1825356e00fa4b93bf6653a08b771751 (diff) | |
Kill board_id variable; its last consumer is gone now.
ok jsg@
| -rw-r--r-- | sys/arch/armv7/armv7/armv7_machdep.c | 13 | ||||
| -rw-r--r-- | sys/arch/armv7/armv7/armv7var.h | 20 |
2 files changed, 3 insertions, 30 deletions
diff --git a/sys/arch/armv7/armv7/armv7_machdep.c b/sys/arch/armv7/armv7/armv7_machdep.c index d792b5e95f8..ad53bf5b6df 100644 --- a/sys/arch/armv7/armv7/armv7_machdep.c +++ b/sys/arch/armv7/armv7/armv7_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: armv7_machdep.c,v 1.58 2019/05/06 03:32:48 mlarkin Exp $ */ +/* $OpenBSD: armv7_machdep.c,v 1.59 2020/04/07 10:11:01 kettenis Exp $ */ /* $NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */ /* @@ -174,8 +174,6 @@ extern u_int data_abort_handler_address; extern u_int prefetch_abort_handler_address; extern u_int undefined_handler_address; -uint32_t board_id; - #define KERNEL_PT_SYS 0 /* Page table for mapping proc0 zero page */ #define KERNEL_PT_KERNEL 1 /* Page table for mapping kernel */ #define KERNEL_PT_KERNEL_NUM 32 @@ -390,14 +388,6 @@ initarm(void *arg0, void *arg1, void *arg2, paddr_t loadaddr) if (arg0) esym = (uint32_t)arg0; - board_id = (uint32_t)arg1; - /* - * u-boot has decided the top four bits are - * 'compatibility revision' for sunxi - */ - if (board_id != 0xffffffff) - board_id &= 0x0fffffff; - /* * Heads up ... Setup the CPU / MMU / TLB functions */ @@ -853,7 +843,6 @@ initarm(void *arg0, void *arg1, void *arg2, paddr_t loadaddr) if (boothowto & RB_KDB) db_enter(); #endif - printf("board type: %u\n", board_id); cpu_setup(); diff --git a/sys/arch/armv7/armv7/armv7var.h b/sys/arch/armv7/armv7/armv7var.h index 9ab3a858392..bb55332ecbc 100644 --- a/sys/arch/armv7/armv7/armv7var.h +++ b/sys/arch/armv7/armv7/armv7var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: armv7var.h,v 1.16 2019/10/25 10:17:06 kettenis Exp $ */ +/* $OpenBSD: armv7var.h,v 1.17 2020/04/07 10:11:01 kettenis Exp $ */ /* * Copyright (c) 2005,2008 Dale Rahn <drahn@openbsd.com> * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se> @@ -27,13 +27,7 @@ struct board_dev { int unit; }; -struct armv7_board { - uint32_t board_id; - struct board_dev *devs; - void (*init)(void); -}; - -/* Needed by omap, sunxi */ +/* Needed by omap */ struct armv7_softc { struct device sc_dv; @@ -74,15 +68,5 @@ struct armv7_dev *armv7_find_dev(const char *, int); void armv7_attach(struct device *, struct device *, void *); int armv7_submatch(struct device *, void *, void *); -/* board identification - from uboot */ -#define BOARD_ID_OMAP3_BEAGLE 1546 -#define BOARD_ID_OMAP3_OVERO 1798 -#define BOARD_ID_OMAP4_PANDA 2791 -#define BOARD_ID_EXYNOS4_SMDKC210 2838 -#define BOARD_ID_EXYNOS4_NURI 3379 -#define BOARD_ID_AM335X_BEAGLEBONE 3589 -#define BOARD_ID_EXYNOS5_CHROMEBOOK 3774 -extern uint32_t board_id; - #endif /* __ARMV7VAR_H__ */ |