diff options
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/config/Config.in.block | 27 | ||||
| -rw-r--r-- | target/linux/config/Config.in.serial | 12 | ||||
| -rw-r--r-- | target/linux/patches/3.18.16/regmap-bool.patch | 27 | ||||
| -rw-r--r-- | target/linux/patches/4.1.6/regmap-default-on.patch | 17 |
4 files changed, 45 insertions, 38 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 diff --git a/target/linux/patches/3.18.16/regmap-bool.patch b/target/linux/patches/3.18.16/regmap-bool.patch deleted file mode 100644 index 5c0ff5e2c..000000000 --- a/target/linux/patches/3.18.16/regmap-bool.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Nur linux-3.18.5.orig/drivers/base/regmap/Kconfig linux-3.18.5/drivers/base/regmap/Kconfig ---- linux-3.18.5.orig/drivers/base/regmap/Kconfig 2015-01-30 02:41:03.000000000 +0100 -+++ linux-3.18.5/drivers/base/regmap/Kconfig 2015-02-02 11:53:27.854106073 +0100 -@@ -10,19 +10,19 @@ - bool - - config REGMAP_I2C -- tristate -+ bool - depends on I2C - - config REGMAP_SPI -- tristate -+ bool - depends on SPI - - config REGMAP_SPMI -- tristate -+ bool - depends on SPMI - - config REGMAP_MMIO -- tristate -+ bool - - config REGMAP_IRQ - bool diff --git a/target/linux/patches/4.1.6/regmap-default-on.patch b/target/linux/patches/4.1.6/regmap-default-on.patch new file mode 100644 index 000000000..8d72224bf --- /dev/null +++ b/target/linux/patches/4.1.6/regmap-default-on.patch @@ -0,0 +1,17 @@ +diff -Nur linux-4.1.6.orig/drivers/base/regmap/Kconfig linux-4.1.6/drivers/base/regmap/Kconfig +--- linux-4.1.6.orig/drivers/base/regmap/Kconfig 2015-08-17 05:52:51.000000000 +0200 ++++ linux-4.1.6/drivers/base/regmap/Kconfig 2015-08-29 22:18:50.329683337 +0200 +@@ -3,7 +3,7 @@ + # subsystems should select the appropriate symbols. + + config REGMAP +- default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_AC97 || REGMAP_MMIO || REGMAP_IRQ) ++ default y + select LZO_COMPRESS + select LZO_DECOMPRESS + select IRQ_DOMAIN if REGMAP_IRQ +@@ -29,3 +29,4 @@ + + config REGMAP_IRQ + bool ++ default y |