Author: andrew
Date: Fri Jul 7 13:55:11 2017
New Revision: 320777
URL: https://svnweb.freebsd.org/changeset/base/320777
Log:
Remove the MULTIDELAY option from arm. It's now enabled when PLATFORM is
enabled.
Modified:
head/sys/arm/arm/generic_timer.c
head/sys/arm/arm/machdep.c
head/sys/arm/arm/mpcore_timer.c
head/sys/arm/arm/platform.c
head/sys/arm/conf/ALLWINNER_UP
head/sys/arm/conf/ALPINE
head/sys/arm/conf/BEAGLEBONE
head/sys/arm/conf/EFIKA_MX
head/sys/arm/conf/EXYNOS5.common
head/sys/arm/conf/GENERIC
head/sys/arm/conf/IMX53
head/sys/arm/conf/IMX6
head/sys/arm/conf/PANDABOARD
head/sys/arm/conf/RK3188
head/sys/arm/conf/RPI-B
head/sys/arm/conf/RPI2
head/sys/arm/conf/SOCFPGA
head/sys/arm/conf/TEGRA124
head/sys/arm/conf/VERSATILEPB
head/sys/arm/conf/VIRT
head/sys/arm/conf/VYBRID
head/sys/arm/conf/ZEDBOARD
head/sys/arm/include/machdep.h
head/sys/arm/include/platformvar.h
head/sys/conf/options.arm
Modified: head/sys/arm/arm/generic_timer.c
==============================================================================
--- head/sys/arm/arm/generic_timer.c Fri Jul 7 13:44:18 2017
(r320776)
+++ head/sys/arm/arm/generic_timer.c Fri Jul 7 13:55:11 2017
(r320777)
@@ -72,10 +72,6 @@ __FBSDID("$FreeBSD$");
#include <dev/acpica/acpivar.h>
#endif
-#if defined(__arm__) && !defined(MULTIDELAY)
-#error The generic timer requires MULTIDELAY on 32bit arm
-#endif
-
#define GT_CTRL_ENABLE (1 << 0)
#define GT_CTRL_INT_MASK (1 << 1)
#define GT_CTRL_INT_STAT (1 << 2)
Modified: head/sys/arm/arm/machdep.c
==============================================================================
--- head/sys/arm/arm/machdep.c Fri Jul 7 13:44:18 2017 (r320776)
+++ head/sys/arm/arm/machdep.c Fri Jul 7 13:55:11 2017 (r320777)
@@ -146,7 +146,7 @@ static struct pv_addr kernelstack;
#endif /* __ARM_ARCH >= 6 */
#endif /* FDT */
-#ifdef MULTIDELAY
+#ifdef PLATFORM
static delay_func *delay_impl;
static void *delay_arg;
#endif
@@ -331,7 +331,7 @@ cpu_initclocks(void)
}
#endif
-#ifdef MULTIDELAY
+#ifdef PLATFORM
void
arm_set_delay(delay_func *impl, void *arg)
{
Modified: head/sys/arm/arm/mpcore_timer.c
==============================================================================
--- head/sys/arm/arm/mpcore_timer.c Fri Jul 7 13:44:18 2017
(r320776)
+++ head/sys/arm/arm/mpcore_timer.c Fri Jul 7 13:55:11 2017
(r320777)
@@ -59,9 +59,7 @@ __FBSDID("$FreeBSD$");
#include <machine/cpu.h>
#include <machine/intr.h>
-#ifdef MULTIDELAY
#include <machine/machdep.h> /* For arm_set_delay */
-#endif
#include <dev/ofw/openfirm.h>
#include <dev/ofw/ofw_bus.h>
@@ -71,10 +69,6 @@ __FBSDID("$FreeBSD$");
#include <arm/arm/mpcore_timervar.h>
-#if defined(PLATFORM) && !defined(MULTIDELAY)
-#error The MPCore Timer driver requires MULTIDELAY when building with PLATFORM
-#endif
-
/* Private (per-CPU) timer register map */
#define PRV_TIMER_LOAD 0x0000
#define PRV_TIMER_COUNT 0x0004
@@ -442,7 +436,7 @@ arm_tmr_attach(device_t dev)
return (ENXIO);
}
-#ifdef MULTIDELAY
+#ifdef PLATFORM
/*
* We can register as the DELAY() implementation only if we successfully
* set up the global timer.
@@ -533,7 +527,7 @@ arm_tmr_delay(int usec, void *arg)
}
}
-#ifndef MULTIDELAY
+#ifndef PLATFORM
/**
* DELAY - Delay for at least usec microseconds.
* @usec: number of microseconds to delay by
Modified: head/sys/arm/arm/platform.c
==============================================================================
--- head/sys/arm/arm/platform.c Fri Jul 7 13:44:18 2017 (r320776)
+++ head/sys/arm/arm/platform.c Fri Jul 7 13:55:11 2017 (r320777)
@@ -75,9 +75,7 @@ SYSCTL_STRING(_hw, OID_AUTO, platform, CTLFLAG_RDTUN |
*/
SET_DECLARE(platform_set, platform_def_t);
-#ifdef MULTIDELAY
static delay_func platform_delay;
-#endif
void
platform_probe_and_attach(void)
@@ -152,10 +150,8 @@ platform_probe_and_attach(void)
strlcpy(plat_name, plat_def_impl->name, sizeof(plat_name));
-#ifdef MULTIDELAY
/* Set a default delay function */
arm_set_delay(platform_delay, NULL);
-#endif
PLATFORM_ATTACH(plat_obj);
}
@@ -202,7 +198,6 @@ cpu_reset(void)
}
}
-#ifdef MULTIDELAY
static void
platform_delay(int usec, void *arg __unused)
{
@@ -216,7 +211,6 @@ platform_delay(int usec, void *arg __unused)
*/
cpufunc_nullop();
}
-#endif
#if defined(SMP)
void
Modified: head/sys/arm/conf/ALLWINNER_UP
==============================================================================
--- head/sys/arm/conf/ALLWINNER_UP Fri Jul 7 13:44:18 2017
(r320776)
+++ head/sys/arm/conf/ALLWINNER_UP Fri Jul 7 13:55:11 2017
(r320777)
@@ -30,7 +30,6 @@ options SOC_ALLWINNER_A13
options SCHED_4BSD # 4BSD scheduler
options PLATFORM
-options MULTIDELAY
# NFS root from boopt/dhcp
#options BOOTP
Modified: head/sys/arm/conf/ALPINE
==============================================================================
--- head/sys/arm/conf/ALPINE Fri Jul 7 13:44:18 2017 (r320776)
+++ head/sys/arm/conf/ALPINE Fri Jul 7 13:55:11 2017 (r320777)
@@ -28,7 +28,6 @@ makeoptions WERROR="-Werror"
options SCHED_4BSD # 4BSD scheduler
options SMP # Enable multiple cores
options PLATFORM
-options MULTIDELAY
# Interrupt controller
device gic
Modified: head/sys/arm/conf/BEAGLEBONE
==============================================================================
--- head/sys/arm/conf/BEAGLEBONE Fri Jul 7 13:44:18 2017
(r320776)
+++ head/sys/arm/conf/BEAGLEBONE Fri Jul 7 13:55:11 2017
(r320777)
@@ -29,7 +29,6 @@ include "../ti/am335x/std.am335x"
makeoptions MODULES_EXTRA="dtb/am335x am335x_dmtpps"
options INTRNG
-options MULTIDELAY
options SCHED_4BSD # 4BSD scheduler
options PLATFORM
Modified: head/sys/arm/conf/EFIKA_MX
==============================================================================
--- head/sys/arm/conf/EFIKA_MX Fri Jul 7 13:44:18 2017 (r320776)
+++ head/sys/arm/conf/EFIKA_MX Fri Jul 7 13:55:11 2017 (r320777)
@@ -31,7 +31,6 @@ options SCHED_4BSD # 4BSD scheduler
#options MD_ROOT # MD is a potential root device
#options NFSD # Network Filesystem Server
options PLATFORM
-options MULTIDELAY
options INCLUDE_CONFIG_FILE # Include this file in kernel
# NFS root from boopt/dhcp
Modified: head/sys/arm/conf/EXYNOS5.common
==============================================================================
--- head/sys/arm/conf/EXYNOS5.common Fri Jul 7 13:44:18 2017
(r320776)
+++ head/sys/arm/conf/EXYNOS5.common Fri Jul 7 13:55:11 2017
(r320777)
@@ -23,7 +23,6 @@ makeoptions WERROR="-Werror"
include "std.armv6"
options SCHED_ULE # ULE scheduler
options PLATFORM # Platform based SoC
-options MULTIDELAY
options PREEMPTION # Enable kernel thread preemption
options INET # InterNETworking
options INET6 # IPv6 communications protocols
Modified: head/sys/arm/conf/GENERIC
==============================================================================
--- head/sys/arm/conf/GENERIC Fri Jul 7 13:44:18 2017 (r320776)
+++ head/sys/arm/conf/GENERIC Fri Jul 7 13:55:11 2017 (r320777)
@@ -62,7 +62,6 @@ options SOC_OMAP4
options SCHED_ULE # ULE scheduler
options SMP # Enable multiple cores
options PLATFORM
-options MULTIDELAY
options LINUX_BOOT_ABI
# EXT_RESOURCES pseudo devices
Modified: head/sys/arm/conf/IMX53
==============================================================================
--- head/sys/arm/conf/IMX53 Fri Jul 7 13:44:18 2017 (r320776)
+++ head/sys/arm/conf/IMX53 Fri Jul 7 13:55:11 2017 (r320777)
@@ -28,7 +28,6 @@ options SOC_IMX53
options SCHED_4BSD # 4BSD scheduler
#options NFSD # Network Filesystem Server
options PLATFORM
-options MULTIDELAY
options INCLUDE_CONFIG_FILE # Include this file in kernel
# kernel/memory size reduction
Modified: head/sys/arm/conf/IMX6
==============================================================================
--- head/sys/arm/conf/IMX6 Fri Jul 7 13:44:18 2017 (r320776)
+++ head/sys/arm/conf/IMX6 Fri Jul 7 13:55:11 2017 (r320777)
@@ -31,7 +31,6 @@ options SCHED_ULE # ULE scheduler
options INCLUDE_CONFIG_FILE # Include this file in kernel
options PLATFORM
options SMP # Enable multiple cores
-options MULTIDELAY
# NFS root from boopt/dhcp
#options BOOTP
Modified: head/sys/arm/conf/PANDABOARD
==============================================================================
--- head/sys/arm/conf/PANDABOARD Fri Jul 7 13:44:18 2017
(r320776)
+++ head/sys/arm/conf/PANDABOARD Fri Jul 7 13:55:11 2017
(r320777)
@@ -34,7 +34,6 @@ makeoptions MODULES_EXTRA=dtb/omap4
options SCHED_ULE # ULE scheduler
options PLATFORM
-options MULTIDELAY
options SMP # Enable multiple cores
# NFS root from boopt/dhcp
Modified: head/sys/arm/conf/RK3188
==============================================================================
--- head/sys/arm/conf/RK3188 Fri Jul 7 13:44:18 2017 (r320776)
+++ head/sys/arm/conf/RK3188 Fri Jul 7 13:55:11 2017 (r320777)
@@ -28,7 +28,6 @@ options SOC_ROCKCHIP_RK3188
options SCHED_ULE # ULE scheduler
options SMP # Enable multiple cores
options PLATFORM
-options MULTIDELAY
# Root mount from MMC/SD card
options ROOTDEVNAME=\"ufs:/dev/mmcsd0\"
Modified: head/sys/arm/conf/RPI-B
==============================================================================
--- head/sys/arm/conf/RPI-B Fri Jul 7 13:44:18 2017 (r320776)
+++ head/sys/arm/conf/RPI-B Fri Jul 7 13:55:11 2017 (r320777)
@@ -28,7 +28,6 @@ options INTRNG
options SCHED_4BSD # 4BSD scheduler
options PLATFORM
-options MULTIDELAY
# NFS root from boopt/dhcp
#options BOOTP
Modified: head/sys/arm/conf/RPI2
==============================================================================
--- head/sys/arm/conf/RPI2 Fri Jul 7 13:44:18 2017 (r320776)
+++ head/sys/arm/conf/RPI2 Fri Jul 7 13:55:11 2017 (r320777)
@@ -31,7 +31,6 @@ options INTRNG
options SCHED_ULE # ULE scheduler
options SMP # Enable multiple cores
options PLATFORM
-options MULTIDELAY
# NFS root from boopt/dhcp
#options BOOTP
Modified: head/sys/arm/conf/SOCFPGA
==============================================================================
--- head/sys/arm/conf/SOCFPGA Fri Jul 7 13:44:18 2017 (r320776)
+++ head/sys/arm/conf/SOCFPGA Fri Jul 7 13:55:11 2017 (r320777)
@@ -29,7 +29,6 @@ makeoptions WERROR="-Werror"
options SCHED_ULE # ULE scheduler
options PLATFORM # Platform based SoC
options SMP # Enable multiple cores
-options MULTIDELAY
options SOC_ALTERA_ARRIA10
options SOC_ALTERA_CYCLONE5
Modified: head/sys/arm/conf/TEGRA124
==============================================================================
--- head/sys/arm/conf/TEGRA124 Fri Jul 7 13:44:18 2017 (r320776)
+++ head/sys/arm/conf/TEGRA124 Fri Jul 7 13:55:11 2017 (r320777)
@@ -25,7 +25,6 @@ ident TEGRA124
options SCHED_ULE # ULE scheduler
options PLATFORM # Platform based SoC
-options MULTIDELAY
options SMP # Enable multiple cores
options LINUX_BOOT_ABI
Modified: head/sys/arm/conf/VERSATILEPB
==============================================================================
--- head/sys/arm/conf/VERSATILEPB Fri Jul 7 13:44:18 2017
(r320776)
+++ head/sys/arm/conf/VERSATILEPB Fri Jul 7 13:55:11 2017
(r320777)
@@ -70,7 +70,6 @@ device random # Entropy device
options INTRNG
options PLATFORM
-options MULTIDELAY
# Flattened Device Tree
options FDT # Configure using FDT/DTB data
Modified: head/sys/arm/conf/VIRT
==============================================================================
--- head/sys/arm/conf/VIRT Fri Jul 7 13:44:18 2017 (r320776)
+++ head/sys/arm/conf/VIRT Fri Jul 7 13:55:11 2017 (r320777)
@@ -26,7 +26,6 @@ include "../qemu/std.virt"
options SCHED_ULE # ULE scheduler
options PLATFORM
options SMP # Enable multiple cores
-options MULTIDELAY
# Interrupt controller
device gic
Modified: head/sys/arm/conf/VYBRID
==============================================================================
--- head/sys/arm/conf/VYBRID Fri Jul 7 13:44:18 2017 (r320776)
+++ head/sys/arm/conf/VYBRID Fri Jul 7 13:55:11 2017 (r320777)
@@ -26,7 +26,6 @@ makeoptions WERROR="-Werror"
options SCHED_4BSD # 4BSD scheduler
options PLATFORM # Platform based SoC
-options MULTIDELAY
#options NANDFS # NAND Filesystem
#options SMP # Enable multiple cores
Modified: head/sys/arm/conf/ZEDBOARD
==============================================================================
--- head/sys/arm/conf/ZEDBOARD Fri Jul 7 13:44:18 2017 (r320776)
+++ head/sys/arm/conf/ZEDBOARD Fri Jul 7 13:55:11 2017 (r320777)
@@ -28,7 +28,6 @@ makeoptions MODULES_EXTRA="dtb/zynq"
options SCHED_ULE # ULE scheduler
options PLATFORM # Platform based SoC
-options MULTIDELAY
#options NFSSD # Network Filesystem Server
options SMP # Enable multiple cores
Modified: head/sys/arm/include/machdep.h
==============================================================================
--- head/sys/arm/include/machdep.h Fri Jul 7 13:44:18 2017
(r320776)
+++ head/sys/arm/include/machdep.h Fri Jul 7 13:55:11 2017
(r320777)
@@ -48,7 +48,7 @@ void board_set_revision(uint32_t);
int arm_predict_branch(void *, u_int, register_t, register_t *,
u_int (*)(void*, int), u_int (*)(void*, vm_offset_t, u_int*));
-#ifdef MULTIDELAY
+#ifdef PLATFORM
typedef void delay_func(int, void *);
void arm_set_delay(delay_func *, void *);
#endif
Modified: head/sys/arm/include/platformvar.h
==============================================================================
--- head/sys/arm/include/platformvar.h Fri Jul 7 13:44:18 2017
(r320776)
+++ head/sys/arm/include/platformvar.h Fri Jul 7 13:55:11 2017
(r320777)
@@ -90,15 +90,9 @@ typedef struct fdt_platform_class fdt_platform_def_t;
extern platform_method_t fdt_platform_methods[];
-#ifdef MULTIDELAY
-#define FDT_PLATFORM_CTASSERT(delay) CTASSERT(delay > 0)
-#else
-#define FDT_PLATFORM_CTASSERT(delay)
-#endif
-
#define FDT_PLATFORM_DEF2(NAME, VAR_NAME, NAME_STR, size, compatible, \
delay) \
-FDT_PLATFORM_CTASSERT(delay); \
+CTASSERT(delay > 0); \
static fdt_platform_def_t VAR_NAME ## _fdt_platform = {
\
.name = NAME_STR, \
.methods = fdt_platform_methods, \
Modified: head/sys/conf/options.arm
==============================================================================
--- head/sys/conf/options.arm Fri Jul 7 13:44:18 2017 (r320776)
+++ head/sys/conf/options.arm Fri Jul 7 13:55:11 2017 (r320777)
@@ -34,7 +34,6 @@ KERNBASE opt_global.h
KERNVIRTADDR opt_global.h
LINUX_BOOT_ABI opt_global.h
LOADERRAMADDR opt_global.h
-MULTIDELAY opt_global.h
NKPT2PG opt_pmap.h
PHYSADDR opt_global.h
PLATFORM opt_global.h
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
