diff options
| author | andrew <andrew@FreeBSD.org> | 2016-04-15 16:05:41 +0000 |
|---|---|---|
| committer | andrew <andrew@FreeBSD.org> | 2016-04-15 16:05:41 +0000 |
| commit | b72ace02b465aa1a930c057d7d152afb30b4bf95 (patch) | |
| tree | c056fc0e7b6a92e3f45576eece676b6b5e376499 /sys/conf | |
| parent | 3115fdeded44fbb337c8cb3062b7f5bb11781357 (diff) | |
| download | FreeBSD-src-b72ace02b465aa1a930c057d7d152afb30b4bf95.zip FreeBSD-src-b72ace02b465aa1a930c057d7d152afb30b4bf95.tar.gz | |
Rename ARM_INTRNG and MIPS_INTRNG to INTRNG. This will help with machine
independent code that needs to know about INTRNG such as PCI drivers.
Obtained from: ABT Systems Ltd
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/files.arm | 6 | ||||
| -rw-r--r-- | sys/conf/options.arm | 2 | ||||
| -rw-r--r-- | sys/conf/options.mips | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sys/conf/files.arm b/sys/conf/files.arm index ec1283a..b77d1fc 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -45,8 +45,8 @@ arm/arm/hdmi_if.m optional hdmi arm/arm/identcpu.c standard arm/arm/in_cksum.c optional inet | inet6 arm/arm/in_cksum_arm.S optional inet | inet6 -arm/arm/intr.c optional !arm_intrng -kern/subr_intr.c optional arm_intrng +arm/arm/intr.c optional !intrng +kern/subr_intr.c optional intrng arm/arm/locore.S standard no-obj arm/arm/machdep.c standard arm/arm/machdep_intr.c standard @@ -115,7 +115,7 @@ font.h optional sc \ compile-with "uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \ no-obj no-implicit-rule before-depend \ clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8" -kern/pic_if.m optional arm_intrng +kern/pic_if.m optional intrng kern/subr_busdma_bufalloc.c standard kern/subr_sfbuf.c standard libkern/arm/aeabi_unwind.c standard diff --git a/sys/conf/options.arm b/sys/conf/options.arm index d6d7a37..4737b80 100644 --- a/sys/conf/options.arm +++ b/sys/conf/options.arm @@ -1,7 +1,6 @@ #$FreeBSD$ ARMV6 opt_global.h ARM_CACHE_LOCK_ENABLE opt_global.h -ARM_INTRNG opt_global.h ARM_KERN_DIRECTMAP opt_vm.h ARM_L2_PIPT opt_global.h ARM_MANY_BOARD opt_global.h @@ -24,6 +23,7 @@ DEV_PMU opt_global.h EFI opt_platform.h FLASHADDR opt_global.h GIC_DEFAULT_ICFGR_INIT opt_global.h +INTRNG opt_global.h IPI_IRQ_START opt_smp.h IPI_IRQ_END opt_smp.h FREEBSD_BOOT_LOADER opt_global.h diff --git a/sys/conf/options.mips b/sys/conf/options.mips index 10e2c1b..daae01f 100644 --- a/sys/conf/options.mips +++ b/sys/conf/options.mips @@ -144,5 +144,5 @@ PV_STATS opt_pmap.h # # Options to use INTRNG code # -MIPS_INTRNG opt_global.h +INTRNG opt_global.h MIPS_NIRQ opt_global.h |
