diff options
author | grehan <grehan@FreeBSD.org> | 2011-07-18 22:00:21 +0000 |
---|---|---|
committer | grehan <grehan@FreeBSD.org> | 2011-07-18 22:00:21 +0000 |
commit | 1823067d93fba5ecf7990fee39428954fa5cbf1b (patch) | |
tree | 02a0ea02eab1c6db10baf7c805a29a81132bbe98 /sys/conf | |
parent | cba736c8eee565e8ba803c9ef7c7f06aefb162ed (diff) | |
parent | 9a6ff5ad378cfaaa99c5162e2b0f6e4cb6a3c796 (diff) | |
download | FreeBSD-src-1823067d93fba5ecf7990fee39428954fa5cbf1b.zip FreeBSD-src-1823067d93fba5ecf7990fee39428954fa5cbf1b.tar.gz |
IFC @ r224187
Diffstat (limited to 'sys/conf')
-rw-r--r-- | sys/conf/Makefile.mips | 21 | ||||
-rw-r--r-- | sys/conf/NOTES | 12 | ||||
-rw-r--r-- | sys/conf/files | 5 | ||||
-rw-r--r-- | sys/conf/files.i386 | 2 | ||||
-rw-r--r-- | sys/conf/files.mips | 1 | ||||
-rw-r--r-- | sys/conf/options | 3 | ||||
-rw-r--r-- | sys/conf/options.mips | 9 |
7 files changed, 34 insertions, 19 deletions
diff --git a/sys/conf/Makefile.mips b/sys/conf/Makefile.mips index 55d57e6..ab2b40a 100644 --- a/sys/conf/Makefile.mips +++ b/sys/conf/Makefile.mips @@ -50,7 +50,13 @@ HACK_EXTRA_FLAGS=-shared # is extremely poor, as well as -mno-abicalls to force no ABI usage. CFLAGS+=${EXTRA_FLAGS} $(ARCH_FLAGS) HACK_EXTRA_FLAGS+=${EXTRA_FLAGS} $(ARCH_FLAGS) -TRAMP_EXTRA_FLAGS=${EXTRA_FLAGS} $(ARCH_FLAGS) +TRAMP_ARCH_FLAGS?=$(ARCH_FLAGS) +TRAMP_EXTRA_FLAGS=${EXTRA_FLAGS} ${TRAMP_ARCH_FLAGS} +.if ${MACHINE_ARCH:Mmips64*} != "" +TRAMP_ELFSIZE=64 +.else +TRAMP_ELFSIZE=32 +.endif # XXX hardcoded kernel entry point ASM_CFLAGS+=${CFLAGS} -D_LOCORE -DLOCORE @@ -64,11 +70,12 @@ ${KERNEL_KO}.tramp.bin: ${KERNEL_KO} $S/$M/$M/elf_trampoline.c \ sed -e s/${KERNLOADADDR}/${TRAMPLOADADDR}/ -e s/" + SIZEOF_HEADERS"// \ ${LDSCRIPT_NAME} > ${LDSCRIPT_NAME}.tramp.noheader ${CC} -O -nostdlib -I. -I$S ${TRAMP_EXTRA_FLAGS} ${TRAMP_LDFLAGS} -Xlinker \ - -T -Xlinker ${LDSCRIPT_NAME}.tramp.noheader \ - -DKERNNAME="\"${KERNEL_KO}.tmp\"" $S/$M/$M/elf_trampoline.c \ - $S/$M/$M/inckern.S -o ${KERNEL_KO}.tramp.noheader - ${OBJCOPY} -S -O binary ${KERNEL_KO}.tramp.noheader \ - ${KERNEL_KO}.tramp.bin \ + -T -Xlinker ${LDSCRIPT_NAME}.tramp.noheader \ + -DKERNNAME="\"${KERNEL_KO}.tmp\"" -DELFSIZE=${TRAMP_ELFSIZE} \ + $S/$M/$M/elf_trampoline.c $S/$M/$M/inckern.S \ + -o ${KERNEL_KO}.tramp.elf + ${OBJCOPY} -S -O binary ${KERNEL_KO}.tramp.elf \ + ${KERNEL_KO}.tramp.bin %BEFORE_DEPEND @@ -83,7 +90,7 @@ ${KERNEL_KO}.tramp.bin: ${KERNEL_KO} $S/$M/$M/elf_trampoline.c \ %CLEAN CLEAN+= ${LDSCRIPT_NAME} ${LDSCRIPT_NAME}.tramp.noheader \ - ${KERNEL_KO}.tramp.noheader ${KERNEL_KO}.tramp.bin + ${KERNEL_KO}.tramp.elf ${KERNEL_KO}.tramp.bin ${LDSCRIPT_NAME}: $S/conf/${LDSCRIPT_NAME} sed s/KERNLOADADDR/${KERNLOADADDR}/g $S/conf/${LDSCRIPT_NAME} \ diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 835c30b..d3951e3 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1162,7 +1162,8 @@ options MAC_STUB options MAC_TEST # Support for Capsicum -options CAPABILITY_MODE +options CAPABILITIES # fine-grained rights on file descriptors +options CAPABILITY_MODE # sandboxes with no global namespace access ##################################################################### @@ -2252,14 +2253,14 @@ device sound # conjunction with snd_sbc. # snd_sbc: Creative SoundBlaster ISA PnP/non-PnP. # Supports ESS and Avance ISA chips as well. -# snd_spicds: SPI codec driver, needed by Envy24/Envy24HT drivers. # snd_solo: ESS Solo-1x PCI. +# snd_spicds: SPI codec driver, needed by Envy24/Envy24HT drivers. # snd_t4dwave: Trident 4DWave DX/NX PCI, Sis 7018 PCI and Acer Labs # M5451 PCI. +# snd_uaudio: USB audio. # snd_via8233: VIA VT8233x PCI. # snd_via82c686: VIA VT82C686A PCI. # snd_vibes: S3 Sonicvibes PCI. -# snd_uaudio: USB audio. device snd_ad1816 device snd_als4000 @@ -2289,10 +2290,10 @@ device snd_sbc device snd_solo device snd_spicds device snd_t4dwave +device snd_uaudio device snd_via8233 device snd_via82c686 device snd_vibes -device snd_uaudio # For non-PnP sound cards: hint.pcm.0.at="isa" @@ -2832,9 +2833,6 @@ options VERBOSE_SYSINIT ##################################################################### # SYSV IPC KERNEL PARAMETERS # -# Maximum number of entries in a semaphore map. -options SEMMAP=31 - # Maximum number of System V semaphores that can be used on the system at # one time. options SEMMNI=11 diff --git a/sys/conf/files b/sys/conf/files index 853c0c8..0dc814e 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1918,6 +1918,7 @@ dev/usb/net/if_kue.c optional kue dev/usb/net/if_mos.c optional mos dev/usb/net/if_rue.c optional rue dev/usb/net/if_udav.c optional udav +dev/usb/net/if_usie.c optional usie dev/usb/net/usb_ethernet.c optional aue | axe | cdce | cue | kue | mos | \ rue | udav dev/usb/net/uhso.c optional uhso @@ -1970,8 +1971,8 @@ dev/usb/serial/uvscom.c optional uvscom dev/usb/serial/usb_serial.c optional ucom | u3g | uark | ubsa | ubser | \ uchcom | ucycom | ufoma | uftdi | \ ugensa | uipaq | umcs | umct | \ - umodem | umoscom | uplcom | uslcom | \ - uvisor | uvscom + umodem | umoscom | uplcom | usie | \ + uslcom | uvisor | uvscom # # USB misc drivers # diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 41a1772..a19b93c 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -412,7 +412,7 @@ x86/x86/io_apic.c optional apic x86/x86/local_apic.c optional apic x86/x86/mca.c standard x86/x86/mptable.c optional apic native -x86/x86/mptable_pci.c optional apic pci +x86/x86/mptable_pci.c optional apic native pci x86/x86/msi.c optional apic pci x86/x86/nexus.c standard x86/x86/tsc.c standard diff --git a/sys/conf/files.mips b/sys/conf/files.mips index 7ad93a5..6438c49 100644 --- a/sys/conf/files.mips +++ b/sys/conf/files.mips @@ -106,4 +106,5 @@ dev/siba/siba_pcib.c optional siba pci dev/hwpmc/hwpmc_mips.c optional hwpmc dev/hwpmc/hwpmc_mips24k.c optional hwpmc +dev/rt/if_rt.c optional rt dev/nvram2env/nvram2env.c optional nvram2env diff --git a/sys/conf/options b/sys/conf/options index 35c0dfc..9f1ac80 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -63,6 +63,7 @@ SYSCTL_DEBUG opt_sysctl.h ADAPTIVE_LOCKMGRS ALQ AUDIT opt_global.h +CAPABILITIES opt_capsicum.h CAPABILITY_MODE opt_capsicum.h CODA_COMPAT_5 opt_coda.h COMPAT_43 opt_compat.h @@ -163,7 +164,6 @@ MSGMNI opt_sysvipc.h MSGSEG opt_sysvipc.h MSGSSZ opt_sysvipc.h MSGTQL opt_sysvipc.h -SEMMAP opt_sysvipc.h SEMMNI opt_sysvipc.h SEMMNS opt_sysvipc.h SEMMNU opt_sysvipc.h @@ -426,7 +426,6 @@ SLIP_IFF_OPTS opt_slip.h TCPDEBUG TCP_OFFLOAD_DISABLE opt_inet.h #Disable code to dispatch tcp offloading TCP_SIGNATURE opt_inet.h -TCP_SORECEIVE_STREAM opt_inet.h VLAN_ARRAY opt_vlan.h XBONEHACK FLOWTABLE opt_route.h diff --git a/sys/conf/options.mips b/sys/conf/options.mips index c3ba6b9..0384283 100644 --- a/sys/conf/options.mips +++ b/sys/conf/options.mips @@ -36,6 +36,7 @@ CPU_HAVEFPU opt_global.h CPU_SB1 opt_global.h CPU_CNMIPS opt_global.h CPU_RMI opt_global.h +CPU_NLM opt_global.h ISA_MIPS1 opt_cputype.h ISA_MIPS3 opt_cputype.h @@ -70,3 +71,11 @@ OCTEON_BOARD_CAPK_0100ND opt_cvmx.h # Options that control the Atheros SoC peripherals # ARGE_DEBUG opt_global.h + +# +# Options that control the Ralink RT305xF Etherenet MAC. +# +IF_RT_DEBUG opt_if_rt.h +IF_RT_PHY_SUPPORT opt_if_rt.h +IF_RT_RING_DATA_COUNT opt_if_rt.h + |