diff --git a/sys/arm/conf/A20 b/sys/arm/conf/A20 index 00cdb8f41cd..3bac4551858 100644 --- a/sys/arm/conf/A20 +++ b/sys/arm/conf/A20 @@ -47,7 +47,7 @@ options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed #options BOOTP_NFSROOT #options BOOTP_COMPAT #options BOOTP_NFSV3 -#options BOOTP_WIRED_TO=cpsw0 +#options BOOTP_WIRED_TO=dwc0 # Boot device is 2nd slice on MMC/SD card options ROOTDEVNAME=\"ufs:/dev/da0s2\" @@ -102,7 +102,8 @@ device ether device mii device bpf -device emac +#device emac # 10/100 integrated EMAC controller +device dwc # 10/100/1000 integrated GMAC controller # USB ethernet support, requires miibus device miibus diff --git a/sys/boot/fdt/dts/arm/cubieboard2.dts b/sys/boot/fdt/dts/arm/cubieboard2.dts index 700952a81ea..480df660e73 100644 --- a/sys/boot/fdt/dts/arm/cubieboard2.dts +++ b/sys/boot/fdt/dts/arm/cubieboard2.dts @@ -67,6 +67,10 @@ status = "okay"; }; + gmac@01c50000 { + status = "okay"; + }; + ahci: sata@01c18000 { status = "okay"; };