diff --git a/board/arm/linux_defconfig b/board/arm/linux_defconfig index 5ace00c2..3c0639ad 100644 --- a/board/arm/linux_defconfig +++ b/board/arm/linux_defconfig @@ -30,8 +30,6 @@ CONFIG_SCHED_AUTOGROUP=y CONFIG_BLK_DEV_INITRD=y CONFIG_KALLSYMS_ALL=y CONFIG_PROFILING=y -CONFIG_ARCH_BCM=y -CONFIG_ARCH_BCM2835=y # CONFIG_ARM_ERRATA_643719 is not set CONFIG_SMP=y CONFIG_CPU_FREQ=y @@ -41,7 +39,6 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y CONFIG_CPUFREQ_DT=y -CONFIG_ARM_RASPBERRYPI_CPUFREQ=y CONFIG_VFP=y CONFIG_NEON=y CONFIG_KERNEL_MODE_NEON=y @@ -261,7 +258,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y # CONFIG_STANDALONE is not set -CONFIG_RASPBERRYPI_FIRMWARE=y CONFIG_FW_CFG_SYSFS=y CONFIG_FW_CFG_SYSFS_CMDLINE=y CONFIG_OF_OVERLAY=y @@ -303,63 +299,29 @@ CONFIG_VETH=m CONFIG_VIRTIO_NET=y CONFIG_NLMON=y CONFIG_NET_VRF=y -CONFIG_BCMGENET=y -CONFIG_SMSC911X=y -CONFIG_USB_LAN78XX=y CONFIG_USB_USBNET=y -CONFIG_USB_NET_SMSC95XX=y -CONFIG_INPUT_MOUSEDEV=m CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_EDT_FT5X06=m # CONFIG_LEGACY_PTYS is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_SHARE_IRQ=y -CONFIG_SERIAL_8250_BCM2835AUX=y -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_SERIAL_DEV_BUS=y CONFIG_VIRTIO_CONSOLE=y CONFIG_I2C_CHARDEV=y -CONFIG_I2C_BCM2835=m CONFIG_SPI=y -CONFIG_SPI_BCM2835=y -CONFIG_SPI_BCM2835AUX=y -CONFIG_SENSORS_RASPBERRYPI_HWMON=m CONFIG_THERMAL=y -CONFIG_BCM2711_THERMAL=y -CONFIG_BCM2835_THERMAL=m CONFIG_WATCHDOG=y CONFIG_I6300ESB_WDT=y -CONFIG_BCM2835_WDT=y CONFIG_MFD_SYSCON=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_REGULATOR_GPIO=y CONFIG_MEDIA_SUPPORT=y -CONFIG_DRM=y -CONFIG_DRM_LOAD_EDID_FIRMWARE=y -CONFIG_DRM_SIMPLEDRM=y -CONFIG_DRM_PANEL_SIMPLE=m -CONFIG_DRM_TOSHIBA_TC358762=m -CONFIG_DRM_V3D=m -CONFIG_DRM_VC4=m -CONFIG_DRM_VC4_HDMI_CEC=y -CONFIG_FB=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_SOC=y -CONFIG_SND_BCM2835_SOC_I2S=y -CONFIG_HID_GENERIC=m CONFIG_USB=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_OTG=y +CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_EHCI_HCD_PLATFORM=m +CONFIG_USB_OHCI_HCD=m +CONFIG_USB_OHCI_HCD_PLATFORM=m CONFIG_USB_STORAGE=y -CONFIG_USB_DWC2=y -CONFIG_NOP_USB_XCEIV=y CONFIG_USB_GADGET=y CONFIG_USB_ETH=m CONFIG_USB_ETH_EEM=y @@ -367,8 +329,6 @@ CONFIG_USB_G_SERIAL=m CONFIG_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_MMC_SDHCI_IPROC=y -CONFIG_MMC_BCM2835=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=y @@ -382,20 +342,13 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y CONFIG_LEDS_TRIGGER_TRANSIENT=y CONFIG_LEDS_TRIGGER_CAMERA=y CONFIG_DMADEVICES=y -CONFIG_DMA_BCM2835=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_BALLOON=y CONFIG_VIRTIO_INPUT=y CONFIG_VIRTIO_MMIO=y -CONFIG_STAGING=y -CONFIG_SND_BCM2835=m -CONFIG_CLK_RASPBERRYPI=y CONFIG_MAILBOX=y -CONFIG_BCM2835_MBOX=y # CONFIG_IOMMU_SUPPORT is not set -CONFIG_RASPBERRYPI_POWER=y CONFIG_PWM=y -CONFIG_PWM_BCM2835=y CONFIG_EXT2_FS=y CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT4_FS=y diff --git a/board/arm/raspberrypi-rpi2/raspberrypi-rpi2.mk b/board/arm/raspberrypi-rpi2/raspberrypi-rpi2.mk index 73d4a0b6..a904a138 100644 --- a/board/arm/raspberrypi-rpi2/raspberrypi-rpi2.mk +++ b/board/arm/raspberrypi-rpi2/raspberrypi-rpi2.mk @@ -1,13 +1,19 @@ # Raspberry Pi 2 Model B specific kernel configuration define RASPBERRYPI_RPI2_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_ARCH_BCM) + $(call KCONFIG_ENABLE_OPT,CONFIG_ARCH_BCM2835) + $(call KCONFIG_ENABLE_OPT,CONFIG_SOUND) $(call KCONFIG_ENABLE_OPT,CONFIG_SND) $(call KCONFIG_ENABLE_OPT,CONFIG_SND_SOC) + $(call KCONFIG_SET_OPT,CONFIG_SND_BCM2835_SOC_I2S,y) + $(call KCONFIG_SET_OPT,CONFIG_SND_BCM2835,m) $(call KCONFIG_ENABLE_OPT,CONFIG_INPUT_MOUSE) $(call KCONFIG_ENABLE_OPT,CONFIG_INPUT_KEYBOARD) $(call KCONFIG_ENABLE_OPT,CONFIG_INPUT_TOUCHSCREEN) $(call KCONFIG_SET_OPT,CONFIG_INPUT_MOUSEDEV,m) $(call KCONFIG_SET_OPT,CONFIG_HID_GENERIC,m) + $(call KCONFIG_SET_OPT,CONFIG_TOUCHSCREEN_EDT_FT5X06,m) $(call KCONFIG_ENABLE_OPT,CONFIG_ARCH_BCM) $(call KCONFIG_ENABLE_OPT,CONFIG_ARCH_BCM2835) @@ -15,46 +21,58 @@ define RASPBERRYPI_RPI2_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_BCM2835_WDT) $(call KCONFIG_ENABLE_OPT,CONFIG_DMA_BCM2835) $(call KCONFIG_ENABLE_OPT,CONFIG_RASPBERRYPI_FIRMWARE) + $(call KCONFIG_ENABLE_OPT,CONFIG_RASPBERRYPI_POWER) + $(call KCONFIG_ENABLE_OPT,CONFIG_ARM_RASPBERRYPI_CPUFREQ) + $(call KCONFIG_ENABLE_OPT,CONFIG_CLK_RASPBERRYPI) $(call KCONFIG_ENABLE_OPT,CONFIG_PINCTRL_BCM2835) $(call KCONFIG_ENABLE_OPT,CONFIG_GPIO_BCM2835) + $(call KCONFIG_ENABLE_OPT,CONFIG_PWM_BCM2835) $(call KCONFIG_SET_OPT,CONFIG_BRCMFMAC,m) $(call KCONFIG_ENABLE_OPT,CONFIG_BRCMFMAC_SDIO) $(call KCONFIG_SET_OPT,CONFIG_I2C_BCM2835,m) + $(call KCONFIG_SET_OPT,CONFIG_SPI_BCM2835,y) + $(call KCONFIG_SET_OPT,CONFIG_SPI_BCM2835AUX,y) + $(call KCONFIG_SET_OPT,CONFIG_SENSORS_RASPBERRYPI_HWMON,m) + $(call KCONFIG_SET_OPT,CONFIG_BCM2711_THERMAL,y) $(call KCONFIG_SET_OPT,CONFIG_BCM2835_THERMAL,m) $(call KCONFIG_ENABLE_OPT,CONFIG_MMC_BCM2835) - $(call KCONFIG_ENABLE_OPT,CONFIG_RASPBERRYPI_POWER) + $(call KCONFIG_SET_OPT,CONFIG_MMC_SDHCI_IPROC,y) $(call KCONFIG_ENABLE_OPT,CONFIG_SERIAL_8250) $(call KCONFIG_ENABLE_OPT,CONFIG_SERIAL_8250_CONSOLE) $(call KCONFIG_ENABLE_OPT,CONFIG_SERIAL_8250_BCM2835AUX) $(call KCONFIG_ENABLE_OPT,CONFIG_SERIAL_8250_EXTENDED) $(call KCONFIG_ENABLE_OPT,CONFIG_SERIAL_8250_SHARE_IRQ) + $(call KCONFIG_ENABLE_OPT,CONFIG_SERIAL_AMBA_PL011) + $(call KCONFIG_ENABLE_OPT,CONFIG_SERIAL_AMBA_PL011_CONSOLE) $(call KCONFIG_ENABLE_OPT,CONFIG_NET_VENDOR_BROADCOM) + $(call KCONFIG_SET_OPT,CONFIG_BCMGENET,y) $(call KCONFIG_SET_OPT,CONFIG_SMSC911X,y) + $(call KCONFIG_ENABLE_OPT,CONFIG_USB_USBNET) + $(call KCONFIG_SET_OPT,CONFIG_USB_LAN78XX,y) + $(call KCONFIG_SET_OPT,CONFIG_USB_NET_SMSC95XX,y) $(call KCONFIG_SET_OPT,CONFIG_REGULATOR_GPIO,y) $(call KCONFIG_ENABLE_OPT,CONFIG_COMMON_CLK_BCM2835) - $(call KCONFIG_ENABLE_OPT,CONFIG_CLK_RASPBERRYPI) $(call KCONFIG_ENABLE_OPT,CONFIG_DRM) $(call KCONFIG_ENABLE_OPT,CONFIG_DRM_KMS_HELPER) + $(call KCONFIG_SET_OPT,CONFIG_DRM_SIMPLEDRM,y) $(call KCONFIG_SET_OPT,CONFIG_DRM_V3D,m) $(call KCONFIG_SET_OPT,CONFIG_DRM_VC4,m) - $(call KCONFIG_SET_OPT,CONFIG_STAGING,y) - $(call KCONFIG_SET_OPT,CONFIG_SND_BCM2835,m) - $(call KCONFIG_ENABLE_OPT,CONFIG_DRM_VC4_HDMI_CEC) $(call KCONFIG_ENABLE_OPT,CONFIG_DRM_LOAD_EDID_FIRMWARE) $(call KCONFIG_ENABLE_OPT,CONFIG_DRM_PANEL_BRIDGE) $(call KCONFIG_ENABLE_OPT,CONFIG_DRM_BRIDGE) $(call KCONFIG_SET_OPT,CONFIG_DRM_TOSHIBA_TC358762,m) $(call KCONFIG_SET_OPT,CONFIG_DRM_PANEL_SIMPLE,m) + $(call KCONFIG_SET_OPT,CONFIG_STAGING,y) $(call KCONFIG_ENABLE_OPT,CONFIG_FB) $(call KCONFIG_ENABLE_OPT,CONFIG_FRAMEBUFFER_CONSOLE) $(call KCONFIG_ENABLE_OPT,CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY) $(call KCONFIG_ENABLE_OPT,CONFIG_DRM_FBDEV_EMULATION) - - $(call KCONFIG_SET_OPT,CONFIG_TOUCHSCREEN_EDT_FT5X06,m) - $(call KCONFIG_ENABLE_OPT,CONFIG_BACKLIGHT_CLASS_DEVICE) + + $(call KCONFIG_ENABLE_OPT,CONFIG_USB_DWC2) + $(call KCONFIG_ENABLE_OPT,CONFIG_NOP_USB_XCEIV) endef $(eval $(ix-board))