diff options
| author | Renato Botelho <renato@netgate.com> | 2016-11-10 07:35:47 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-11-10 07:35:47 -0200 |
| commit | e06dd1d464d989e4c819e9fc383761d74be6f119 (patch) | |
| tree | e574c8d6488a2657dccd8e8fd18ef708f393c545 /sys/arm/conf | |
| parent | ad34a03fa7496e0be9fcc7c56c8e49fa763d34a0 (diff) | |
| parent | ae76dae508b95eb0ab4a3b9bd65333a903686046 (diff) | |
| download | FreeBSD-src-e06dd1d464d989e4c819e9fc383761d74be6f119.zip FreeBSD-src-e06dd1d464d989e4c819e9fc383761d74be6f119.tar.gz | |
Merge remote-tracking branch 'origin/stable/11' into devel-11
Diffstat (limited to 'sys/arm/conf')
| -rw-r--r-- | sys/arm/conf/ALLWINNER_UP (renamed from sys/arm/conf/A10) | 7 | ||||
| -rw-r--r-- | sys/arm/conf/CUBIEBOARD | 33 |
2 files changed, 3 insertions, 37 deletions
diff --git a/sys/arm/conf/A10 b/sys/arm/conf/ALLWINNER_UP index 1f8b470..68c20a6 100644 --- a/sys/arm/conf/A10 +++ b/sys/arm/conf/ALLWINNER_UP @@ -1,5 +1,5 @@ # -# A10 -- Custom configuration for the AllWinner A10 SoC +# ALLWINNER_UP -- Custom configuration for the AllWinner Uniprocessor SoC # # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: @@ -18,17 +18,16 @@ # # $FreeBSD$ -ident A10 +ident ALLWINNER_UP include "std.armv6" -include "../allwinner/std.a10" +include "../allwinner/std.allwinner_up" options INTRNG options SOC_ALLWINNER_A10 options SOC_ALLWINNER_A13 -options HZ=100 options SCHED_4BSD # 4BSD scheduler options PLATFORM options MULTIDELAY diff --git a/sys/arm/conf/CUBIEBOARD b/sys/arm/conf/CUBIEBOARD deleted file mode 100644 index 5ee432e..0000000 --- a/sys/arm/conf/CUBIEBOARD +++ /dev/null @@ -1,33 +0,0 @@ -# -# CUBIEBOARD -- Custom configuration for the CUBIEBOARD ARM development -# platform, check out http://www.cubieboard.org -# -# For more information on this file, please read the config(5) manual page, -# and/or the handbook section on Kernel Configuration Files: -# -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html -# -# The handbook is also available locally in /usr/share/doc/handbook -# if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the -# latest information. -# -# An exhaustive list of options and more detailed explanations of the -# device lines is also present in the ../../conf/NOTES and NOTES files. -# If you are in doubt as to the purpose or necessity of a line, check first -# in NOTES. -# -# $FreeBSD$ - -#NO_UNIVERSE - -include "A10" -ident CUBIEBOARD - -# Boot device is 2nd slice on MMC/SD card -options ROOTDEVNAME=\"ufs:/dev/da0s2\" - -# Flattened Device Tree -options FDT -options FDT_DTB_STATIC -makeoptions FDT_DTS_FILE=cubieboard.dts |
