Re: svn commit: r333035 - head/sys/arm/conf

[Emmanuel Vadot]

 Hi Marcin,

On Thu, 26 Apr 2018 19:23:38 + (UTC)
Marcin Wojtas  wrote:

> Author: mw
> Date: Thu Apr 26 19:23:37 2018
> New Revision: 333035
> URL: https://svnweb.freebsd.org/changeset/base/333035
> 
> Log:
>   Add Marvell ArmadaXP and Armada38X to GENERIC config
>   
>   Include source files and drivers for Marvell ArmadaXP and Armada38X
>   in GENERIC kernel config.
>   
>   Submitted by: Michal Mazur 
> Rafal Kozik 
>   Obtained from: Semihalf
>   Sponsored by: Stormshield
>   Differential Revision: https://reviews.freebsd.org/D14747
> 
> Modified:
>   head/sys/arm/conf/GENERIC

 This break GENERIC when running on !marvell.

 The code in sys/arm/mv/mv_common.c tries to read a register in a
memory region that doesn't exist in !marvell (in soc_id).

 Could you revert this commit please.

 Thanks,

-- 
Emmanuel Vadot  
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r333035 - head/sys/arm/conf

[Marcin Wojtas]

Author: mw
Date: Thu Apr 26 19:23:37 2018
New Revision: 333035
URL: https://svnweb.freebsd.org/changeset/base/333035

Log:
  Add Marvell ArmadaXP and Armada38X to GENERIC config
  
  Include source files and drivers for Marvell ArmadaXP and Armada38X
  in GENERIC kernel config.
  
  Submitted by: Michal Mazur 
  Rafal Kozik 
  Obtained from: Semihalf
  Sponsored by: Stormshield
  Differential Revision: https://reviews.freebsd.org/D14747

Modified:
  head/sys/arm/conf/GENERIC

Modified: head/sys/arm/conf/GENERIC
==
--- head/sys/arm/conf/GENERIC   Thu Apr 26 19:23:19 2018(r333034)
+++ head/sys/arm/conf/GENERIC   Thu Apr 26 19:23:37 2018(r333035)
@@ -21,6 +21,7 @@
 ident  GENERIC
 
 cpuCPU_CORTEXA
+cpuCPU_MV_PJ4B
 optionsSMP_ON_UP
 machinearm armv7
 makeoptionsCONF_CFLAGS="-march=armv7a"
@@ -38,6 +39,7 @@ 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"
@@ -57,6 +59,8 @@ options   SOC_ALLWINNER_H3
 optionsSOC_BCM2836
 optionsSOC_TI_AM335X
 optionsSOC_OMAP4
+options SOC_MV_ARMADA38X
+options SOC_MV_ARMADAXP
 
 optionsSCHED_ULE   # ULE scheduler
 optionsSMP # Enable multiple cores
@@ -185,9 +189,10 @@ device pass# Passthrough 
device (direct ATA/SCSI a
 # USB support
 optionsUSB_HOST_ALIGN=64   # Align usb buffers to cache line size.
 device usb
-#deviceuhci
+device uhci
 device ohci
 device ehci
+device xhci
 device dwcotg  # DWC OTG controller
 device musb
 
@@ -196,6 +201,8 @@ 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
 
@@ -204,6 +211,11 @@ 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!
@@ -243,6 +255,11 @@ device ti_sdma
 
 # Extensible Firmware Interface
 optionsEFI
+
+# Marvell Cryptographic Engine and Security Accelerator
+device cesa
+device crypto
+device cryptodev
 
 # Flattened Device Tree
 optionsFDT # Configure using FDT/DTB data
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"