From f7e85105e77f72a1d779d9dd64231970bb91d3e0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 19 Feb 2017 19:06:01 +0100 Subject: rework mini.config for rpi3 --- target/arm/kernel/raspberry-pi3 | 18 ++++++++---------- target/linux/config/Config.in.dma | 12 ------------ target/linux/config/Config.in.misc | 3 +++ target/linux/config/Config.in.usb | 1 + 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/target/arm/kernel/raspberry-pi3 b/target/arm/kernel/raspberry-pi3 index 27610cc02..01b711e44 100644 --- a/target/arm/kernel/raspberry-pi3 +++ b/target/arm/kernel/raspberry-pi3 @@ -1,17 +1,15 @@ CONFIG_ARM=y -CONFIG_ARCH_BCM2709=y -CONFIG_BCM2709_DT=y -CONFIG_PHYS_OFFSET=0 -CONFIG_HAVE_ARM_ARCH_TIMER=y -CONFIG_FIQ=y -CONFIG_ATAGS=y -CONFIG_KUSER_HELPERS=y -CONFIG_ARM_ERRATA_643719=y -CONFIG_BCM2708_NOL2CACHE=y +CONFIG_ARCH_MULTIPLATFORM=y +CONFIG_ARCH_MULTI_V6_V7=y +CONFIG_ARCH_MULTI_V7=y +CONFIG_ARCH_BCM=y +CONFIG_ARCH_BCM2835=y CONFIG_RASPBERRYPI_FIRMWARE=y CONFIG_BRCM_CHAR_DRIVERS=y CONFIG_BCM2708_VCHIQ=y CONFIG_BCM2708_VCMEM=y +CONFIG_BCM_VC_SM=y +CONFIG_BCM_VC_CMA=y +CONFIG_BCM_VCIO=y CONFIG_MAILBOX=y CONFIG_BCM2835_MBOX=y -CONFIG_CMDLINE_FROM_BOOTLOADER=y diff --git a/target/linux/config/Config.in.dma b/target/linux/config/Config.in.dma index 18dc2bd20..d92326c36 100644 --- a/target/linux/config/Config.in.dma +++ b/target/linux/config/Config.in.dma @@ -42,15 +42,6 @@ config ADK_KERNEL_DMA_CMA config ADK_KERNEL_MXS_DMA bool -config ADK_KERNEL_BCM_VC_SM - bool - -config ADK_KERNEL_BCM_VC_CMA - bool - -config ADK_KERNEL_BCM_VCIO - bool - config ADK_KERNEL_DMA_BCM2835 bool @@ -63,9 +54,6 @@ config ADK_KERNEL_DMA_BCM2708 select ADK_KERNEL_CMA_SIZE_SEL_MBYTES select ADK_KERNEL_CMA_SIZE_16 select ADK_KERNEL_DMA_CMA - select ADK_KERNEL_BCM_VC_SM - select ADK_KERNEL_BCM_VC_CMA - select ADK_KERNEL_BCM_VCIO depends on ADK_TARGET_BOARD_BCM28XX default y if ADK_TARGET_BOARD_BCM28XX default n diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc index 185f435c2..f26dbea6e 100644 --- a/target/linux/config/Config.in.misc +++ b/target/linux/config/Config.in.misc @@ -29,6 +29,9 @@ config ADK_KERNEL_KEYS config ADK_KERNEL_SBUS bool +config ADK_KERNEL_FIQ + bool + config ADK_KERNEL_FSL_OTP bool depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index 1605e2c7f..648a03b9b 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -181,6 +181,7 @@ config ADK_KERNEL_USB_OHCI_HCD config ADK_KERNEL_USB_DWCOTG bool "Support for DWCOTG controller" select ADK_KERNEL_USB + select ADK_KERNEL_FIQ depends on ADK_TARGET_BOARD_BCM28XX default y if ADK_TARGET_BOARD_BCM28XX default n -- cgit v1.2.3