d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move device statements out of std.imx* and into kernel config files.

Browse Source 
In the armv4/5 world device statements in these files were common, but in
the v6/7 world, other socs don't put device statements into those files, so
this just brings imx5 and imx6 into line with the current conventions.
This commit is contained in:
ian 2018-07-08 21:09:52 +00:00
parent ffe1cb6e2b
commit d3561f8c4c
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/arm/conf/EFIKA_MX
View File

@ -121,6 +121,7 @@ device wlan_amrr # AMRR transmit rate control algorithm
options FDT # Configure using FDT/DTB data options FDT # Configure using FDT/DTB data
options FDT_DTB_STATIC options FDT_DTB_STATIC
makeoptions FDT_DTS_FILE=efikamx.dts makeoptions FDT_DTS_FILE=efikamx.dts
device fdt_pinctrl # FDT pinmux driver
# NOTE: serial console will be disabled if syscons enabled # NOTE: serial console will be disabled if syscons enabled
# Uncomment following lines for framebuffer/syscons support # Uncomment following lines for framebuffer/syscons support

3
sys/arm/conf/GENERIC
View File

@ -261,6 +261,9 @@ device cesa
device crypto device crypto
device cryptodev device cryptodev
# imx6 on-chip RTC
device imx_snvs # On-chip RTC
# Flattened Device Tree # Flattened Device Tree
options FDT # Configure using FDT/DTB data options FDT # Configure using FDT/DTB data
makeoptions MODULES_EXTRA="dtb/allwinner dtb/am335x dtb/imx6 dtb/nvidia dtb/rpi dtb/zynq dtb/omap4" makeoptions MODULES_EXTRA="dtb/allwinner dtb/am335x dtb/imx6 dtb/nvidia dtb/rpi dtb/zynq dtb/omap4"

1
sys/arm/conf/IMX53
View File

@ -118,5 +118,6 @@ device wlan_amrr # AMRR transmit rate control algorithm
# Flattened Device Tree # Flattened Device Tree
options FDT # Configure using FDT/DTB data options FDT # Configure using FDT/DTB data
makeoptions MODULES_EXTRA="dtb/imx5 imx" makeoptions MODULES_EXTRA="dtb/imx5 imx"
device fdt_pinctrl # FDT pinmux driver
options INTRNG options INTRNG

2
sys/arm/conf/IMX6
View File

@ -118,11 +118,13 @@ device hdmi
# Flattened Device Tree # Flattened Device Tree
options FDT # Configure using FDT/DTB data options FDT # Configure using FDT/DTB data
makeoptions MODULES_EXTRA="dtb/imx6 imx" makeoptions MODULES_EXTRA="dtb/imx6 imx"
device fdt_pinctrl # FDT pinmux driver
# SoC-specific devices # SoC-specific devices
device ffec # Freescale Fast Ethernet Controller device ffec # Freescale Fast Ethernet Controller
device fsliic # Freescale i2c/iic device fsliic # Freescale i2c/iic
device iic # iic protocol device iic # iic protocol
device iicbus # iic bus device iicbus # iic bus
device imx_snvs # On-chip RTC
device imxwdt # Watchdog. WARNING: can't be disabled!!! device imxwdt # Watchdog. WARNING: can't be disabled!!!

2
sys/arm/freescale/imx/std.imx51
View File

@ -3,6 +3,4 @@ machine arm armv7
cpu CPU_CORTEXA cpu CPU_CORTEXA
makeoptions CONF_CFLAGS="-march=armv7a" makeoptions CONF_CFLAGS="-march=armv7a"
device fdt_pinctrl
files "../freescale/imx/files.imx5" files "../freescale/imx/files.imx5"

2
sys/arm/freescale/imx/std.imx53
View File

@ -3,6 +3,4 @@ machine arm armv7
cpu CPU_CORTEXA cpu CPU_CORTEXA
makeoptions CONF_CFLAGS="-march=armv7a" makeoptions CONF_CFLAGS="-march=armv7a"
device fdt_pinctrl
files "../freescale/imx/files.imx5" files "../freescale/imx/files.imx5"

3
sys/arm/freescale/imx/std.imx6
View File

@ -6,8 +6,5 @@ makeoptions CONF_CFLAGS="-march=armv7a"
options IPI_IRQ_START=0 options IPI_IRQ_START=0
options IPI_IRQ_END=15 options IPI_IRQ_END=15
device fdt_pinctrl
device imx6_snvs
files "../freescale/imx/files.imx6" files "../freescale/imx/files.imx6"