diff options
Diffstat (limited to 'sys/arm/conf/GENERIC')
| -rw-r--r-- | sys/arm/conf/GENERIC | 42 |
1 files changed, 9 insertions, 33 deletions
diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC index b7b380aa84d6..16830340df4f 100644 --- a/sys/arm/conf/GENERIC +++ b/sys/arm/conf/GENERIC @@ -1,5 +1,5 @@ # -# GENERICV6 -- Generic(ish) kernel config. +# GENERIC -- Generic(ish) kernel config. # # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: @@ -16,7 +16,6 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD$ ident GENERIC @@ -43,9 +42,6 @@ files "../mv/files.arm7" files "../nvidia/tegra124/files.tegra124" files "../qemu/files.qemu" files "../rockchip/files.rk32xx" -files "../ti/files.ti" -files "../ti/am335x/files.am335x" -files "../ti/omap4/files.omap4" files "../xilinx/files.zynq7" options SOC_ALLWINNER_A10 @@ -61,8 +57,8 @@ options SOC_BCM2836 options SOC_BRCM_BCM2837 options SOC_MV_ARMADA38X options SOC_MV_ARMADAXP -options SOC_TI_AM335X -options SOC_OMAP4 +options SOC_TI_AM335X +options SOC_OMAP4 options SCHED_ULE # ULE scheduler options SMP # Enable multiple cores @@ -102,7 +98,6 @@ device ahci # AHCI-compatible SATA controllers #device ata # Legacy ATA/SATA controllers # PCI -options NEW_PCIB device pci device pci_host_generic @@ -140,12 +135,6 @@ device bcm2835_bsc device fsliic # Freescale i2c/iic device icee # AT24Cxxx and compatible EEPROMs device sy8106a # SY8106A Buck Regulator -device ti_i2c -device am335x_pmic # AM335x Power Management IC (TPC65217) -device am335x_rtc # RTC support (power management only) -device twl # TI TWLX0X0/TPS659x0 Power Management -device twl_vreg # twl voltage regulation -device twl_clks # twl external clocks # i2c RTCs device ds1307 # Dallas DS1307 RTC and compatible @@ -164,7 +153,7 @@ device gpioregulator # EVDEV support device evdev # input event device support -options EVDEV_SUPPORT # evdev support in legacy drivers +options EVDEV_SUPPORT # evdev support in legacy drivers device uinput # install /dev/uinput cdev device aw_cir @@ -173,12 +162,8 @@ device spibus device spigen device bcm2835_spi device mv_spi -device ti_spi device zy7_qspi # Xilinx Zynq QSPI controller -# ADC support -device ti_adc - # PWM device pwm @@ -186,7 +171,6 @@ device pwm # If we don't enable the watchdog driver, the BeagleBone could potentially # reboot automatically because the boot loader might have enabled the # watchdog. -device ti_wdt device imxwdt # Watchdog. WARNING: can't be disabled!!! device aw_wdog # Allwinner Watchdog @@ -229,7 +213,6 @@ device miibus device awg # 10/100/1000 integrated EMAC controller device cgem # Cadence GEM Gigabit Ethernet device -device cpsw # TI Common Platform Ethernet Switch (CPSW) device dwc # 10/100/1000 integrated GMAC controller device emac # 10/100 integrated EMAC controller device ffec # Freescale Fast Ethernet Controller @@ -244,21 +227,18 @@ device vt device kbdmux device ums device videomode -device hdmi device vchiq +# IMX6 HDMI Controller +device dwc_hdmi +device imx6_hdmi +device imx6_ipu + # Pinmux device fdt_pinctrl -# TI Programmable Realtime Unit support -device ti_pruss - -# Mailbox support -device ti_mbox - # DMA controller device fslsdma -device ti_sdma device a10_dmac device a31_dmac @@ -286,16 +266,12 @@ device hid # Generic HID support # Flattened Device Tree options FDT # Configure using FDT/DTB data makeoptions MODULES_EXTRA+="dtb/allwinner" -makeoptions MODULES_EXTRA+="dtb/am335x" makeoptions MODULES_EXTRA+="dtb/imx6" makeoptions MODULES_EXTRA+="dtb/nvidia" -makeoptions MODULES_EXTRA+="dtb/omap4" makeoptions MODULES_EXTRA+="dtb/rockchip" makeoptions MODULES_EXTRA+="dtb/rpi" makeoptions MODULES_EXTRA+="dtb/zynq" # SOC-specific modules makeoptions MODULES_EXTRA+="allwinner" -makeoptions MODULES_EXTRA+="arm_ti" makeoptions MODULES_EXTRA+="imx" - |