diff options
7 files changed, 8 insertions, 18 deletions
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc index 59d763df69..6e959675f7 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 = "r44" +MACHINE_KERNEL_PR = "r45" TARGET_ARCH = "arm" diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig b/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig index 553c18e106..b3120502fa 100644 --- a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig +++ b/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig @@ -258,9 +258,7 @@ CONFIG_DAVINCI_MUX=y # CONFIG_DAVINCI_MUX_DEBUG is not set # CONFIG_DAVINCI_MUX_WARNINGS is not set CONFIG_DAVINCI_RESET_CLOCKS=y -CONFIG_DAVINCI_MCBSP=y -# CONFIG_DAVINCI_MCBSP0 is not set -CONFIG_DAVINCI_MCBSP1=y +# CONFIG_DAVINCI_MCBSP is not set # # Processor Type diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_mmcpm_stats b/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_mmcpm_stats index c3fb62a389..4836640025 100644 --- a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_mmcpm_stats +++ b/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_mmcpm_stats @@ -259,9 +259,7 @@ CONFIG_DAVINCI_MUX=y # CONFIG_DAVINCI_MUX_DEBUG is not set # CONFIG_DAVINCI_MUX_WARNINGS is not set CONFIG_DAVINCI_RESET_CLOCKS=y -CONFIG_DAVINCI_MCBSP=y -# CONFIG_DAVINCI_MCBSP0 is not set -CONFIG_DAVINCI_MCBSP1=y +# CONFIG_DAVINCI_MCBSP is not set # # Processor Type diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_uivideocap b/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_uivideocap index ef2e835eba..0597147d84 100644 --- a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_uivideocap +++ b/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_uivideocap @@ -258,9 +258,7 @@ CONFIG_DAVINCI_MUX=y # CONFIG_DAVINCI_MUX_DEBUG is not set # CONFIG_DAVINCI_MUX_WARNINGS is not set CONFIG_DAVINCI_RESET_CLOCKS=y -CONFIG_DAVINCI_MCBSP=y -# CONFIG_DAVINCI_MCBSP0 is not set -CONFIG_DAVINCI_MCBSP1=y +# CONFIG_DAVINCI_MCBSP is not set # # Processor Type diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_uivideocapdis b/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_uivideocapdis index fcb520aefc..5f40d99c37 100644 --- a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_uivideocapdis +++ b/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_uivideocapdis @@ -258,9 +258,7 @@ CONFIG_DAVINCI_MUX=y # CONFIG_DAVINCI_MUX_DEBUG is not set # CONFIG_DAVINCI_MUX_WARNINGS is not set CONFIG_DAVINCI_RESET_CLOCKS=y -CONFIG_DAVINCI_MCBSP=y -# CONFIG_DAVINCI_MCBSP0 is not set -CONFIG_DAVINCI_MCBSP1=y +# CONFIG_DAVINCI_MCBSP is not set # # Processor Type diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/defconfig b/recipes/linux/linux-davinci/da850-omapl138-evm/defconfig index f409ece946..8462139df5 100644 --- a/recipes/linux/linux-davinci/da850-omapl138-evm/defconfig +++ b/recipes/linux/linux-davinci/da850-omapl138-evm/defconfig @@ -259,9 +259,7 @@ CONFIG_DAVINCI_MUX=y # CONFIG_DAVINCI_MUX_DEBUG is not set # CONFIG_DAVINCI_MUX_WARNINGS is not set CONFIG_DAVINCI_RESET_CLOCKS=y -CONFIG_DAVINCI_MCBSP=y -# CONFIG_DAVINCI_MCBSP0 is not set -CONFIG_DAVINCI_MCBSP1=y +# CONFIG_DAVINCI_MCBSP is not set # # Processor Type diff --git a/recipes/linux/linux-davinci_git.bb b/recipes/linux/linux-davinci_git.bb index 31b875d0ad..99f149b031 100644 --- a/recipes/linux/linux-davinci_git.bb +++ b/recipes/linux/linux-davinci_git.bb @@ -44,9 +44,9 @@ SRC_URI_append_dm6467 = ${ARAGO_DM_URI} # The main PR is now using MACHINE_KERNEL_PR, for davinci see conf/machine/include/davinci.inc -# OMAPL tracking master branch +# OMAPL tracking master branch - PSP 3.20.00.12 -ARAGO_L1_REV = "76fcecb83d562608bcebba44774f92b6c62d3593" +ARAGO_L1_REV = "2acf935c01b9adb50164d421c40cdc5862b9e143" ARAGO_L1_BR = "master" ARAGO_L1_PV = "2.6.32+2.6.33-rc4-${PR}+gitr${SRCREV}" ARAGO_L1_URI = "git://arago-project.org/git/projects/linux-omapl1.git;protocol=git;branch=${BRANCH} " |