From owner-svn-src-all@freebsd.org Fri Apr 27 05:32:10 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7A6CDFC130D; Fri, 27 Apr 2018 05:32:10 +0000 (UTC) (envelope-from mw@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2816E72AD8; Fri, 27 Apr 2018 05:32:10 +0000 (UTC) (envelope-from mw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0A81C225B6; Fri, 27 Apr 2018 05:32:10 +0000 (UTC) (envelope-from mw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3R5W9GJ064208; Fri, 27 Apr 2018 05:32:09 GMT (envelope-from mw@FreeBSD.org) Received: (from mw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3R5W9mM064207; Fri, 27 Apr 2018 05:32:09 GMT (envelope-from mw@FreeBSD.org) Message-Id: <201804270532.w3R5W9mM064207@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mw set sender to mw@FreeBSD.org using -f From: Marcin Wojtas Date: Fri, 27 Apr 2018 05:32:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r333050 - head/sys/arm/conf X-SVN-Group: head X-SVN-Commit-Author: mw X-SVN-Commit-Paths: head/sys/arm/conf X-SVN-Commit-Revision: 333050 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Apr 2018 05:32:10 -0000 Author: mw Date: Fri Apr 27 05:32:09 2018 New Revision: 333050 URL: https://svnweb.freebsd.org/changeset/base/333050 Log: Revert r333035 due broken booting on !Marvell GENERIC platforms Reported by: manu Modified: head/sys/arm/conf/GENERIC Modified: head/sys/arm/conf/GENERIC ============================================================================== --- head/sys/arm/conf/GENERIC Fri Apr 27 02:39:36 2018 (r333049) +++ head/sys/arm/conf/GENERIC Fri Apr 27 05:32:09 2018 (r333050) @@ -21,7 +21,6 @@ ident GENERIC cpu CPU_CORTEXA -cpu CPU_MV_PJ4B options SMP_ON_UP machine arm armv7 makeoptions CONF_CFLAGS="-march=armv7a" @@ -39,7 +38,6 @@ files "../allwinner/h3/files.h3" files "../broadcom/bcm2835/files.bcm2836" files "../broadcom/bcm2835/files.bcm283x" files "../freescale/imx/files.imx6" -files "../mv/files.arm7" files "../nvidia/tegra124/files.tegra124" files "../qemu/files.qemu" files "../ti/files.ti" @@ -59,8 +57,6 @@ options SOC_ALLWINNER_H3 options SOC_BCM2836 options SOC_TI_AM335X options SOC_OMAP4 -options SOC_MV_ARMADA38X -options SOC_MV_ARMADAXP options SCHED_ULE # ULE scheduler options SMP # Enable multiple cores @@ -189,10 +185,9 @@ device pass # Passthrough device (direct ATA/SCSI a # USB support options USB_HOST_ALIGN=64 # Align usb buffers to cache line size. device usb -device uhci +#device uhci device ohci device ehci -device xhci device dwcotg # DWC OTG controller device musb @@ -201,8 +196,6 @@ device umass # Disks/Mass storage - Requires scbus device uhid # "Human Interface Devices" device ukbd # Allow keyboard like HIDs to control console -device firmware - # Device mode support device usb_template # Control of the gadget @@ -211,11 +204,6 @@ device loop device ether device vlan # 802.1Q VLAN support device bpf -device mii -device mdio -device etherswitch -device e6000sw -device neta # Marvell Network controller # Ethernet NICs that use the common MII bus controller code. # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! @@ -255,11 +243,6 @@ device ti_sdma # Extensible Firmware Interface options EFI - -# Marvell Cryptographic Engine and Security Accelerator -device cesa -device crypto -device cryptodev # Flattened Device Tree options FDT # Configure using FDT/DTB data