summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--target/arm/kernel/raspberry-pi11
-rw-r--r--target/config/Config.in.kernelcfg1
-rw-r--r--target/linux/config/Config.in.block7
3 files changed, 10 insertions, 9 deletions
diff --git a/target/arm/kernel/raspberry-pi b/target/arm/kernel/raspberry-pi
index 601991e85..eaad02ab8 100644
--- a/target/arm/kernel/raspberry-pi
+++ b/target/arm/kernel/raspberry-pi
@@ -1,16 +1,15 @@
CONFIG_ARM=y
-CONFIG_FIQ=y
-CONFIG_PHYS_OFFSET=0
-CONFIG_ATAGS=y
-CONFIG_ATAGS_PROC=y
-CONFIG_KUSER_HELPERS=y
CONFIG_ARCH_MULTI_V6=y
CONFIG_ARCH_BCM2708=y
CONFIG_MACH_BCM2708=y
CONFIG_BCM2708_DT=y
+CONFIG_PHYS_OFFSET=0
+CONFIG_FIQ=y
+CONFIG_ATAGS=y
+CONFIG_KUSER_HELPERS=y
CONFIG_RASPBERRYPI_FIRMWARE=y
CONFIG_BRCM_CHAR_DRIVERS=y
-CONFIG_BCM2708_NOL2CACHE=y
+CONFIG_BCM2708_SPIDEV=y
CONFIG_BCM2708_DMAER=y
CONFIG_BCM2708_VCHIQ=y
CONFIG_BCM2708_VCMEM=y
diff --git a/target/config/Config.in.kernelcfg b/target/config/Config.in.kernelcfg
index 2d85cb973..59fc28801 100644
--- a/target/config/Config.in.kernelcfg
+++ b/target/config/Config.in.kernelcfg
@@ -15,6 +15,7 @@ endchoice
config ADK_TARGET_KERNEL_DEFCONFIG
string
depends on ADK_TARGET_KERNEL_USE_DEFCONFIG
+ default "bcmrpi_defconfig" if ADK_TARGET_SYSTEM_RASPBERRY_PI
default "twr-k70f120m_defconfig" if ADK_TARGET_SYSTEM_KINETIS_K70
default "imx_v7_cbi_hb_defconfig" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 5e5bf4d19..248b5e804 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -13,6 +13,9 @@ config ADK_KERNEL_BLK_DEV_BSG
config ADK_KERNEL_BLK_DEV_BSGLIB
bool
+config ADK_KERNEL_BLK_DEV_THROTTLING
+ bool
+
config ADK_KERNEL_MD
bool
@@ -97,9 +100,6 @@ config ADK_KERNEL_MMC_SDHCI_IO_ACCESSORS
config ADK_KERNEL_MMC_SDHCI_PLTFM
bool
-config ADK_KERNEL_MMC_BCM2835
- bool
-
config ADK_KERNEL_MMC_BCM2835_DMA
bool
@@ -343,6 +343,7 @@ config ADK_KERNEL_MMC_BCM2835
select ADK_KERNEL_BLK_DEV_SD
select ADK_KERNEL_BLK_DEV_BSG
select ADK_KERNEL_BLK_DEV_BSGLIB
+ select ADK_KERNEL_BLK_DEV_THROTTLING
select ADK_KERNEL_MMC_SDHCI
select ADK_KERNEL_MMC_SDHCI_PLTFM
select ADK_KERNEL_MMC_BCM2835_DMA