diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-09-01 22:25:19 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-09-01 22:26:50 +0200 |
| commit | 77dcf4f883cd9ee840e7d431ed982fa982a60405 (patch) | |
| tree | 36a8d3f098d3271d632157e98898d7fd201bca65 /target/linux/config | |
| parent | 6a8a13075e6dd6ff646fca3dd1c5dae0ed88c41f (diff) | |
rpi2: unbreak bootop with 4.1.x kernel
Add missing kernel symbols. NOL2CACHE and *BSG to allow
bootup. Remove support patches for older kernels.
Enable REGMAP by default.
Diffstat (limited to 'target/linux/config')
| -rw-r--r-- | target/linux/config/Config.in.block | 27 | ||||
| -rw-r--r-- | target/linux/config/Config.in.serial | 12 |
2 files changed, 28 insertions, 11 deletions
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index 9c173ccc3..31b6bc299 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -1,11 +1,17 @@ +menu "Block devices support" +depends on ADK_TARGET_WITH_BLOCK + config ADK_KERNEL_BLOCK bool config ADK_KERNEL_LBDAF bool -menu "Block devices support" -depends on ADK_TARGET_WITH_BLOCK +config ADK_KERNEL_BLK_DEV_BSG + bool + +config ADK_KERNEL_BLK_DEV_BSGLIB + bool config ADK_KERNEL_MD bool @@ -13,15 +19,9 @@ config ADK_KERNEL_MD config ADK_KERNEL_RAID6_PQ tristate -config ADK_KERNEL_LBD - bool - config ADK_KERNEL_BLK_DEV_IO_TRACE bool -config ADK_KERNEL_LSF - bool - config ADK_KERNEL_IOSCHED_AS bool @@ -330,14 +330,17 @@ config ADK_KERNEL_MMC_AT91 default n config ADK_KERNEL_MMC_BCM2835 - bool "SD card support for BCM2835 boards" + bool "SD card support for BCM28XX boards" select ADK_KERNEL_BLOCK select ADK_KERNEL_LBDAF select ADK_KERNEL_SCSI select ADK_KERNEL_MMC select ADK_KERNEL_MMC_BLOCK + select ADK_KERNEL_MMC_BLOCK_BOUNCE select ADK_KERNEL_BLK_DEV select ADK_KERNEL_BLK_DEV_SD + select ADK_KERNEL_BLK_DEV_BSG + select ADK_KERNEL_BLK_DEV_BSGLIB select ADK_KERNEL_MMC_SDHCI select ADK_KERNEL_MMC_SDHCI_PLTFM select ADK_KERNEL_MMC_BCM2835_DMA @@ -361,6 +364,8 @@ config ADK_KERNEL_MMC_SDHCI_ESDHC_IMX select ADK_KERNEL_MMC_BLOCK_BOUNCE select ADK_KERNEL_BLK_DEV select ADK_KERNEL_BLK_DEV_SD + select ADK_KERNEL_BLK_DEV_BSG + select ADK_KERNEL_BLK_DEV_BSGLIB select ADK_KERNEL_MMC_SDHCI select ADK_KERNEL_MMC_SDHCI_IO_ACCESSORS select ADK_KERNEL_MMC_SDHCI_PLTFM @@ -384,6 +389,8 @@ config ADK_KERNEL_MMC_SUNXI select ADK_KERNEL_MMC_BLOCK_BOUNCE select ADK_KERNEL_BLK_DEV select ADK_KERNEL_BLK_DEV_SD + select ADK_KERNEL_BLK_DEV_BSG + select ADK_KERNEL_BLK_DEV_BSGLIB select ADK_KERNEL_MMC_SDHCI select ADK_KERNEL_MMC_SDHCI_IO_ACCESSORS select ADK_KERNEL_MMC_SDHCI_PLTFM @@ -398,8 +405,6 @@ menu "Block driver support" config ADK_KERNEL_SCSI tristate "SCSI support" - select ADK_KERNEL_LBD - select ADK_KERNEL_LSF select ADK_KERNEL_IOSCHED_AS help If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial index c5e7dcded..823119155 100644 --- a/target/linux/config/Config.in.serial +++ b/target/linux/config/Config.in.serial @@ -22,6 +22,9 @@ config ADK_KERNEL_SERIAL_PMACZILOG_CONSOLE config ADK_KERNEL_SERIAL_SH_SCI_CONSOLE bool +config ADK_KERNEL_SERIAL_AMBA_PL011_CONSOLE + bool + config ADK_KERNEL_DA_CONSOLE bool @@ -56,6 +59,15 @@ config ADK_KERNEL_SERIAL_8250 help Serial driver for 8250 UART chip. +config ADK_KERNEL_SERIAL_AMBA_PL011 + bool "AMBA PL011 serial driver" + select ADK_KERNEL_SERIAL_AMBA_PL011_CONSOLE + depends on ADK_TARGET_BOARD_BCM28XX + default y if ADK_TARGET_BOARD_BCM28XX + default n + help + Serial driver for AMBA PL011 chip. + config ADK_KERNEL_SERIAL_SH_SCI bool "sci serial driver" select ADK_KERNEL_SERIAL_SH_SCI_CONSOLE |