summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-07 16:10:25 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-07 17:59:52 +0200
commit660828b97932653e8f29779fa9ea23155c442ea2 (patch)
tree0564ffaff2ea099ed693c70022678047cea12213 /target
parentd231c4227ec215853fe51efbe55297c1a0a6062e (diff)
update to 3.14.3, convert some drivers to modules
Diffstat (limited to 'target')
-rw-r--r--target/arm/cubox-i/patches/3.14.3/sdma-firmware-cubox-i.patch (renamed from target/linux/patches/3.14.1/sdma-firmware-cubox-i.patch)0
-rw-r--r--target/arm/sys-available/cubox-i1
-rw-r--r--target/config/Config.in.hardware3
-rw-r--r--target/linux/config/Config.in.audio2
-rw-r--r--target/linux/config/Config.in.dma4
-rw-r--r--target/linux/config/Config.in.i2c17
-rw-r--r--target/linux/config/Config.in.misc8
-rw-r--r--target/linux/config/Config.in.netfilter.ip44
-rw-r--r--target/linux/config/Config.in.regulator39
-rw-r--r--target/linux/config/Config.in.sensors24
-rw-r--r--target/linux/config/Config.in.spi36
-rw-r--r--target/linux/patches/3.14.3/bsd-compatibility.patch (renamed from target/linux/patches/3.14.1/bsd-compatibility.patch)0
-rw-r--r--target/linux/patches/3.14.3/defaults.patch (renamed from target/linux/patches/3.14.1/defaults.patch)0
-rw-r--r--target/linux/patches/3.14.3/disable-netfilter.patch (renamed from target/linux/patches/3.14.1/disable-netfilter.patch)0
-rw-r--r--target/linux/patches/3.14.3/export-symbol-for-exmap.patch (renamed from target/linux/patches/3.14.1/export-symbol-for-exmap.patch)0
-rw-r--r--target/linux/patches/3.14.3/fblogo.patch (renamed from target/linux/patches/3.14.1/fblogo.patch)0
-rw-r--r--target/linux/patches/3.14.3/gemalto.patch (renamed from target/linux/patches/3.14.1/gemalto.patch)0
-rw-r--r--target/linux/patches/3.14.3/initramfs-nosizelimit.patch (renamed from target/linux/patches/3.14.1/initramfs-nosizelimit.patch)0
-rw-r--r--target/linux/patches/3.14.3/lemote-rfkill.patch (renamed from target/linux/patches/3.14.1/lemote-rfkill.patch)0
-rw-r--r--target/linux/patches/3.14.3/microblaze-axi.patch (renamed from target/linux/patches/3.14.1/microblaze-axi.patch)0
-rw-r--r--target/linux/patches/3.14.3/microblaze-ethernet.patch (renamed from target/linux/patches/3.14.1/microblaze-ethernet.patch)0
-rw-r--r--target/linux/patches/3.14.3/mtd-rootfs.patch (renamed from target/linux/patches/3.14.1/mtd-rootfs.patch)0
-rw-r--r--target/linux/patches/3.14.3/non-static.patch (renamed from target/linux/patches/3.14.1/non-static.patch)0
-rw-r--r--target/linux/patches/3.14.3/ppc64-missing-zlib.patch (renamed from target/linux/patches/3.14.1/ppc64-missing-zlib.patch)0
-rw-r--r--target/linux/patches/3.14.3/startup.patch (renamed from target/linux/patches/3.14.1/startup.patch)0
-rw-r--r--target/linux/patches/3.14.3/uuid.patch (renamed from target/linux/patches/3.14.1/uuid.patch)0
-rw-r--r--target/linux/patches/3.14.3/wlan-cf.patch (renamed from target/linux/patches/3.14.1/wlan-cf.patch)0
-rw-r--r--target/linux/patches/3.14.3/xargs.patch (renamed from target/linux/patches/3.14.1/xargs.patch)0
-rw-r--r--target/linux/patches/3.14.3/zlib-inflate.patch (renamed from target/linux/patches/3.14.1/zlib-inflate.patch)0
29 files changed, 67 insertions, 71 deletions
diff --git a/target/linux/patches/3.14.1/sdma-firmware-cubox-i.patch b/target/arm/cubox-i/patches/3.14.3/sdma-firmware-cubox-i.patch
index 13f94a208..13f94a208 100644
--- a/target/linux/patches/3.14.1/sdma-firmware-cubox-i.patch
+++ b/target/arm/cubox-i/patches/3.14.3/sdma-firmware-cubox-i.patch
diff --git a/target/arm/sys-available/cubox-i b/target/arm/sys-available/cubox-i
index 5b58a56c8..46e37e75d 100644
--- a/target/arm/sys-available/cubox-i
+++ b/target/arm/sys-available/cubox-i
@@ -10,6 +10,7 @@ config ADK_TARGET_SYSTEM_CUBOX_I
select ADK_TARGET_WITH_VGA
select ADK_TARGET_WITH_USB
select ADK_TARGET_WITH_I2C
+ select ADK_TARGET_WITH_SPI
select ADK_TARGET_WITH_RTC
select ADK_TARGET_WITH_SDIO
select ADK_TARGET_WITH_SOUND
diff --git a/target/config/Config.in.hardware b/target/config/Config.in.hardware
index 0dd0c5f3d..ced7df690 100644
--- a/target/config/Config.in.hardware
+++ b/target/config/Config.in.hardware
@@ -5,6 +5,9 @@ config ADK_TARGET_WITH_USB
config ADK_TARGET_WITH_I2C
boolean
+config ADK_TARGET_WITH_SPI
+ boolean
+
config ADK_TARGET_WITH_PCI
boolean
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index 81a3d2ae9..3c0d02dbf 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -171,6 +171,8 @@ config ADK_KPACKAGE_KMOD_SND_IMX_SOC
select ADK_KERNEL_SND_SOC_IMX_HDMI_DMA
select ADK_KERNEL_SND_SOC_IMX_HDMI
select ADK_KERNEL_SND_SOC_IMX_SPDIF
+ select ADK_KPACKAGE_KMOD_REGMAP_SPI
+ select ADK_KPACKAGE_KMOD_REGMAP_I2C
default y if ADK_TARGET_SYSTEM_CUBOX_I
default n
diff --git a/target/linux/config/Config.in.dma b/target/linux/config/Config.in.dma
index 0bf761bd4..350299568 100644
--- a/target/linux/config/Config.in.dma
+++ b/target/linux/config/Config.in.dma
@@ -1,6 +1,10 @@
config ADK_KERNEL_DMADEVICES
boolean
+config ADK_KPACKAGE_KMOD_DMA_BCM2708
+ tristate
+ select ADK_KERNEL_DMADEVICES
+
config ADK_KERNEL_IMX_SDMA
boolean
depends on ADK_TARGET_SYSTEM_CUBOX_I
diff --git a/target/linux/config/Config.in.i2c b/target/linux/config/Config.in.i2c
index eee17ee8c..f4e08fd18 100644
--- a/target/linux/config/Config.in.i2c
+++ b/target/linux/config/Config.in.i2c
@@ -1,29 +1,30 @@
config ADK_KERNEL_I2C
boolean
-config ADK_KERNEL_I2C_CHARDEV
- boolean
+config ADK_KPACKAGE_KMOD_I2C_CHARDEV
+ tristate
menu "I2C driver support"
depends on ADK_TARGET_WITH_I2C
-config ADK_KERNEL_I2C_IMX
+config ADK_KPACKAGE_KMOD_I2C_IMX
prompt "I2C driver for Cubox-i"
- boolean
+ tristate
depends on ADK_TARGET_SYSTEM_CUBOX_I
select ADK_KERNEL_I2C
- select ADK_KERNEL_I2C_CHARDEV
+ select ADK_KPACKAGE_KMOD_I2C_CHARDEV
default y if ADK_TARGET_SYSTEM_CUBOX_I
default n
help
- I2C driver for cubox-i.
+ I2C driver for Cubox-i.
-config ADK_KPACKAGE_KMOD_SCx200_ACB
+config ADK_KPACKAGE_KMOD_SCX200_ACB
prompt "I2C driver for Geode"
tristate
depends on ADK_CPU_GEODE
select ADK_KERNEL_I2C
- select ADK_KERNEL_I2C_CHARDEV
+ select ADK_KPACKAGE_KMOD_I2C_CHARDEV
+ default y if ADK_CPU_GEODE
default n
help
I2C driver for Geode boards.
diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc
index 88b1e9692..175993155 100644
--- a/target/linux/config/Config.in.misc
+++ b/target/linux/config/Config.in.misc
@@ -11,14 +11,6 @@ config ADK_KERNEL_FW_LOADER_USER_HELPER
boolean
default n
-config ADK_KPACKAGE_KMOD_DMA_BCM2708
- select ADK_KERNEL_DMADEVICES
- boolean
-
-config ADK_KPACKAGE_KMOD_REGMAP_MMIO
- select ADK_KERNEL_REGMAP
- boolean
-
config ADK_KERNEL_KEYS
boolean
diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4
index 046fe8254..ff374fc46 100644
--- a/target/linux/config/Config.in.netfilter.ip4
+++ b/target/linux/config/Config.in.netfilter.ip4
@@ -41,7 +41,7 @@ config ADK_KPACKAGE_KMOD_FULL_NAT
select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_11_10
select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_18
select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_11
- select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_14_1
+ select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_14_3
config ADK_KPACKAGE_KMOD_NF_NAT
tristate 'Full NAT'
@@ -59,7 +59,7 @@ config ADK_KPACKAGE_KMOD_NF_NAT_IPV4
|| ADK_KERNEL_VERSION_3_11_10 \
|| ADK_KERNEL_VERSION_3_12_18 \
|| ADK_KERNEL_VERSION_3_13_11 \
- || ADK_KERNEL_VERSION_3_14_1
+ || ADK_KERNEL_VERSION_3_14_3
help
The Full NAT option allows masquerading, port forwarding and other
forms of full Network Address Port Translation. It is controlled by
diff --git a/target/linux/config/Config.in.regulator b/target/linux/config/Config.in.regulator
index 80b3c9e69..ede860c7b 100644
--- a/target/linux/config/Config.in.regulator
+++ b/target/linux/config/Config.in.regulator
@@ -2,50 +2,61 @@ config ADK_KERNEL_REGULATOR
boolean
default n
-config ADK_KERNEL_REGULATOR_FIXED_VOLTAGE
+config ADK_KPACKAGE_KMOD_REGULATOR_FIXED_VOLTAGE
boolean
+ select ADK_KERNEL_REGULATOR
default n
-config ADK_KERNEL_REGULATOR_ANATOP
+config ADK_KPACKAGE_KMOD_REGULATOR_ANATOP
boolean
+ select ADK_KERNEL_REGULATOR
default n
-config ADK_KERNEL_REGULATOR_MC13XXX_CORE
+config ADK_KPACKAGE_KMOD_REGULATOR_MC13XXX_CORE
boolean
+ select ADK_KERNEL_REGULATOR
default n
-config ADK_KERNEL_REGULATOR_DA9052
+config ADK_KPACKAGE_KMOD_REGULATOR_DA9052
boolean
+ select ADK_KERNEL_REGULATOR
default n
-config ADK_KERNEL_REGULATOR_MC13783
+config ADK_KPACKAGE_KMOD_REGULATOR_MC13783
boolean
+ select ADK_KERNEL_REGULATOR
default n
-config ADK_KERNEL_REGULATOR_MC13892
+config ADK_KPACKAGE_KMOD_REGULATOR_MC13892
boolean
+ select ADK_KERNEL_REGULATOR
default n
-config ADK_KERNEL_REGULATOR_PFUZE100
+config ADK_KPACKAGE_KMOD_REGULATOR_PFUZE100
boolean
+ select ADK_KERNEL_REGULATOR
default n
config ADK_KERNEL_REGMAP
boolean
default n
-config ADK_KERNEL_REGMAP_I2C
- boolean
+config ADK_KPACKAGE_KMOD_REGMAP_I2C
+ tristate
+ select ADK_KERNEL_REGMAP
default n
-config ADK_KERNEL_REGMAP_SPI
- boolean
+config ADK_KPACKAGE_KMOD_REGMAP_SPI
+ tristate
+ select ADK_KERNEL_REGMAP
default n
config ADK_KERNEL_REGMAP_MMIO
- boolean
+ tristate
+ select ADK_KERNEL_REGMAP
default n
-config ADK_KERNEL_REGMAP_IRQ
- boolean
+config ADK_KPACKAGE_KMOD_REGMAP_IRQ
+ tristate
+ select ADK_KERNEL_REGMAP
default n
diff --git a/target/linux/config/Config.in.sensors b/target/linux/config/Config.in.sensors
deleted file mode 100644
index 9a9b44f5f..000000000
--- a/target/linux/config/Config.in.sensors
+++ /dev/null
@@ -1,24 +0,0 @@
-menu "Sensors"
-
-config ADK_KERNEL_HWMON
- boolean
-
-config ADK_KPACKAGE_KMOD_CORETEMP
- prompt "Coretemp"
- boolean
- select ADK_KERNEL_EXPERIMENTAL
- select ADK_KERNEL_I2C
- select ADK_KERNEL_I2C_CHARDEV
- select ADK_KERNEL_HWMON
- default n
- help
- Coretemp module
-
-config ADK_KPACKAGE_KMOD_IT87
- prompt "IT87"
- boolean
- default n
- help
- Module for IT87 smbus chipsets
-endmenu
-
diff --git a/target/linux/config/Config.in.spi b/target/linux/config/Config.in.spi
index 125a90344..1999241d6 100644
--- a/target/linux/config/Config.in.spi
+++ b/target/linux/config/Config.in.spi
@@ -4,32 +4,38 @@ config ADK_KERNEL_SPI
config ADK_KERNEL_SPI_MASTER
boolean
-config ADK_KERNEL_SPI_BITBANG
- boolean
+menu "SPI driver support"
+depends on ADK_TARGET_WITH_SPI
-config ADK_KERNEL_SPI_XILINX
- boolean
+config ADK_KPACKAGE_KMOD_SPI_BITBANG
+ tristate
+
+config ADK_KPACKAGE_KMOD_SPI_XILINX
+ tristate
-config ADK_KERNEL_SPI_AR71XX
+config ADK_KPACKAGE_KMOD_SPI_AR71XX
+ tristate
select ADK_KERNEL_SPI
- boolean
-config ADK_KERNEL_SPI_RB4XX
+config ADK_KPACKAGE_KMOD_SPI_RB4XX
+ tristate
select ADK_KERNEL_SPI
- boolean
-config ADK_KERNEL_SPI_RB4XX_CPLD
+config ADK_KPACKAGE_KMOD_SPI_RB4XX_CPLD
+ tristate
select ADK_KERNEL_SPI
- boolean
-config ADK_KERNEL_SPI_PXA2XX
+config ADK_KPACKAGE_KMOD_SPI_PXA2XX
+ tristate
select ADK_KERNEL_SPI
- boolean
-config ADK_KERNEL_SPI_IMX
- boolean
+config ADK_KPACKAGE_KMOD_SPI_IMX
+ prompt "SPI driver for Solidrun Cubox-i"
+ tristate
select ADK_KERNEL_SPI
select ADK_KERNEL_SPI_MASTER
- select ADK_KERNEL_SPI_BITBANG
+ select ADK_KPACKAGE_KMOD_SPI_BITBANG
default y if ADK_TARGET_SYSTEM_CUBOX_I
default n
+
+endmenu
diff --git a/target/linux/patches/3.14.1/bsd-compatibility.patch b/target/linux/patches/3.14.3/bsd-compatibility.patch
index b954b658f..b954b658f 100644
--- a/target/linux/patches/3.14.1/bsd-compatibility.patch
+++ b/target/linux/patches/3.14.3/bsd-compatibility.patch
diff --git a/target/linux/patches/3.14.1/defaults.patch b/target/linux/patches/3.14.3/defaults.patch
index 6cdca084e..6cdca084e 100644
--- a/target/linux/patches/3.14.1/defaults.patch
+++ b/target/linux/patches/3.14.3/defaults.patch
diff --git a/target/linux/patches/3.14.1/disable-netfilter.patch b/target/linux/patches/3.14.3/disable-netfilter.patch
index 7b1ca013a..7b1ca013a 100644
--- a/target/linux/patches/3.14.1/disable-netfilter.patch
+++ b/target/linux/patches/3.14.3/disable-netfilter.patch
diff --git a/target/linux/patches/3.14.1/export-symbol-for-exmap.patch b/target/linux/patches/3.14.3/export-symbol-for-exmap.patch
index 4f0fc8449..4f0fc8449 100644
--- a/target/linux/patches/3.14.1/export-symbol-for-exmap.patch
+++ b/target/linux/patches/3.14.3/export-symbol-for-exmap.patch
diff --git a/target/linux/patches/3.14.1/fblogo.patch b/target/linux/patches/3.14.3/fblogo.patch
index cbbb4216f..cbbb4216f 100644
--- a/target/linux/patches/3.14.1/fblogo.patch
+++ b/target/linux/patches/3.14.3/fblogo.patch
diff --git a/target/linux/patches/3.14.1/gemalto.patch b/target/linux/patches/3.14.3/gemalto.patch
index 65f7af1d7..65f7af1d7 100644
--- a/target/linux/patches/3.14.1/gemalto.patch
+++ b/target/linux/patches/3.14.3/gemalto.patch
diff --git a/target/linux/patches/3.14.1/initramfs-nosizelimit.patch b/target/linux/patches/3.14.3/initramfs-nosizelimit.patch
index 40d2f6bd8..40d2f6bd8 100644
--- a/target/linux/patches/3.14.1/initramfs-nosizelimit.patch
+++ b/target/linux/patches/3.14.3/initramfs-nosizelimit.patch
diff --git a/target/linux/patches/3.14.1/lemote-rfkill.patch b/target/linux/patches/3.14.3/lemote-rfkill.patch
index a61488434..a61488434 100644
--- a/target/linux/patches/3.14.1/lemote-rfkill.patch
+++ b/target/linux/patches/3.14.3/lemote-rfkill.patch
diff --git a/target/linux/patches/3.14.1/microblaze-axi.patch b/target/linux/patches/3.14.3/microblaze-axi.patch
index 1a4b17d8c..1a4b17d8c 100644
--- a/target/linux/patches/3.14.1/microblaze-axi.patch
+++ b/target/linux/patches/3.14.3/microblaze-axi.patch
diff --git a/target/linux/patches/3.14.1/microblaze-ethernet.patch b/target/linux/patches/3.14.3/microblaze-ethernet.patch
index 742ab477e..742ab477e 100644
--- a/target/linux/patches/3.14.1/microblaze-ethernet.patch
+++ b/target/linux/patches/3.14.3/microblaze-ethernet.patch
diff --git a/target/linux/patches/3.14.1/mtd-rootfs.patch b/target/linux/patches/3.14.3/mtd-rootfs.patch
index 775d5fc80..775d5fc80 100644
--- a/target/linux/patches/3.14.1/mtd-rootfs.patch
+++ b/target/linux/patches/3.14.3/mtd-rootfs.patch
diff --git a/target/linux/patches/3.14.1/non-static.patch b/target/linux/patches/3.14.3/non-static.patch
index a967703d0..a967703d0 100644
--- a/target/linux/patches/3.14.1/non-static.patch
+++ b/target/linux/patches/3.14.3/non-static.patch
diff --git a/target/linux/patches/3.14.1/ppc64-missing-zlib.patch b/target/linux/patches/3.14.3/ppc64-missing-zlib.patch
index c6e0616be..c6e0616be 100644
--- a/target/linux/patches/3.14.1/ppc64-missing-zlib.patch
+++ b/target/linux/patches/3.14.3/ppc64-missing-zlib.patch
diff --git a/target/linux/patches/3.14.1/startup.patch b/target/linux/patches/3.14.3/startup.patch
index d396b75e4..d396b75e4 100644
--- a/target/linux/patches/3.14.1/startup.patch
+++ b/target/linux/patches/3.14.3/startup.patch
diff --git a/target/linux/patches/3.14.1/uuid.patch b/target/linux/patches/3.14.3/uuid.patch
index e8d523074..e8d523074 100644
--- a/target/linux/patches/3.14.1/uuid.patch
+++ b/target/linux/patches/3.14.3/uuid.patch
diff --git a/target/linux/patches/3.14.1/wlan-cf.patch b/target/linux/patches/3.14.3/wlan-cf.patch
index fc20759e2..fc20759e2 100644
--- a/target/linux/patches/3.14.1/wlan-cf.patch
+++ b/target/linux/patches/3.14.3/wlan-cf.patch
diff --git a/target/linux/patches/3.14.1/xargs.patch b/target/linux/patches/3.14.3/xargs.patch
index 2c7b3df59..2c7b3df59 100644
--- a/target/linux/patches/3.14.1/xargs.patch
+++ b/target/linux/patches/3.14.3/xargs.patch
diff --git a/target/linux/patches/3.14.1/zlib-inflate.patch b/target/linux/patches/3.14.3/zlib-inflate.patch
index 58e1f6d21..58e1f6d21 100644
--- a/target/linux/patches/3.14.1/zlib-inflate.patch
+++ b/target/linux/patches/3.14.3/zlib-inflate.patch