From 38079cf5724208a0fd682e1c0c1598e8e5974fef Mon Sep 17 00:00:00 2001 From: Ruslan Bukin Date: Mon, 21 Nov 2016 15:35:56 +0000 Subject: [PATCH] Move FDT option to the main SoC file and mark boards config as NO_UNIVERSE. Pointed out by: andrew Sponsored by: DARPA, AFRL --- sys/mips/conf/CANNA | 3 ++- sys/mips/conf/CI20 | 4 ++-- sys/mips/conf/JZ4780 | 5 +++++ sys/mips/conf/X1000 | 3 +++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/sys/mips/conf/CANNA b/sys/mips/conf/CANNA index 0d6f81b52c30..b5117f8beda9 100644 --- a/sys/mips/conf/CANNA +++ b/sys/mips/conf/CANNA @@ -2,10 +2,11 @@ # # $FreeBSD$ +#NO_UNIVERSE + include "X1000" ident CANNA -options FDT options FDT_DTB_STATIC makeoptions FDT_DTS_FILE=ingenic/canna.dts diff --git a/sys/mips/conf/CI20 b/sys/mips/conf/CI20 index 9d1940d85e85..fef340c15d7a 100644 --- a/sys/mips/conf/CI20 +++ b/sys/mips/conf/CI20 @@ -2,10 +2,11 @@ # # $FreeBSD$ +#NO_UNIVERSE + include "JZ4780" ident CI20 -options FDT options FDT_DTB_STATIC makeoptions FDT_DTS_FILE=ingenic/ci20.dts @@ -27,5 +28,4 @@ options ROOTDEVNAME=\"ufs:mmcsd0\" makeoptions TRAMPLOADADDR=0x88000000 #options VERBOSE_SYSINIT -device dme options PRINTF_BUFR_SIZE=256 diff --git a/sys/mips/conf/JZ4780 b/sys/mips/conf/JZ4780 index 2b7335af2269..53986b2b9bab 100644 --- a/sys/mips/conf/JZ4780 +++ b/sys/mips/conf/JZ4780 @@ -78,6 +78,8 @@ device da device mmc device mmcsd +device dme + # USB support options USB_DEBUG # enable debug msgs options USB_HOST_ALIGN=128 # L2 cache line size @@ -90,3 +92,6 @@ device uhid # "Human Interface Devices" #device ulpt # Printer device umass # Disks/Mass storage - Requires scbus and da device ums # Mouse + +# FDT support +options FDT diff --git a/sys/mips/conf/X1000 b/sys/mips/conf/X1000 index 8659f1112e4b..035a540f73cc 100644 --- a/sys/mips/conf/X1000 +++ b/sys/mips/conf/X1000 @@ -87,3 +87,6 @@ device mmcsd #device ulpt # Printer #device umass # Disks/Mass storage - Requires scbus and da #device ums # Mouse + +# FDT support +options FDT