summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2010-01-05 14:40:07 +0100
committerKoen Kooi <koen@openembedded.org>2010-01-05 14:41:32 +0100
commitfdaf5c66adbe3cd39a5a54c8163b70a8af8e8e1e (patch)
tree862dcdd0fdb9d444e38cc1bffa9f371cc3357792
parent59e22a032e4e2df0f471611a6de4d7f56b79216d (diff)
hawkboard, da850-omapl138-evm: fix SATA
-rw-r--r--conf/machine/include/davinci.inc2
-rw-r--r--recipes/linux/linux-davinci/da850-omapl138-evm/defconfig2
-rw-r--r--recipes/linux/linux-davinci/hawkboard/defconfig4
3 files changed, 4 insertions, 4 deletions
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index d4cacb9c44..bd8401a020 100644
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -1,7 +1,7 @@
require conf/machine/include/tune-arm926ejs.inc
# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r30"
+MACHINE_KERNEL_PR = "r31"
TARGET_ARCH = "arm"
diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/defconfig b/recipes/linux/linux-davinci/da850-omapl138-evm/defconfig
index 05bc1e74e6..c57ad71bee 100644
--- a/recipes/linux/linux-davinci/da850-omapl138-evm/defconfig
+++ b/recipes/linux/linux-davinci/da850-omapl138-evm/defconfig
@@ -657,7 +657,7 @@ CONFIG_SCSI_LOWLEVEL=y
CONFIG_ATA=y
# CONFIG_ATA_NONSTANDARD is not set
CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_SATA_PMP=y
+# CONFIG_SATA_PMP is not set
CONFIG_SATA_AHCI=y
# CONFIG_ATA_SFF is not set
# CONFIG_MD is not set
diff --git a/recipes/linux/linux-davinci/hawkboard/defconfig b/recipes/linux/linux-davinci/hawkboard/defconfig
index 07bf56369f..1952db3929 100644
--- a/recipes/linux/linux-davinci/hawkboard/defconfig
+++ b/recipes/linux/linux-davinci/hawkboard/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.32-rc6
-# Thu Dec 17 14:57:56 2009
+# Tue Jan 5 14:21:28 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -672,7 +672,7 @@ CONFIG_SCSI_LOWLEVEL=y
CONFIG_ATA=y
# CONFIG_ATA_NONSTANDARD is not set
CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_SATA_PMP=y
+# CONFIG_SATA_PMP is not set
CONFIG_SATA_AHCI=y
# CONFIG_ATA_SFF is not set
# CONFIG_MD is not set