linux-davinci_git: use SOC_FAMILY for omapl devices

* Use the SOC_FAMILY override for omapl137 and omapl138 based
  devices.
* Make associated files directory use SOC_FAMILY name.
* Bump MACHINE_KERNEL_PR

Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
Signed-off-by: Koen Kooi <k-kooi@ti.com>

diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index 28ded38..d3c4957 100644 (file)
--- 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 = "r48"
+MACHINE_KERNEL_PR = "r49"
 
 TARGET_ARCH = "arm"
 

diff --git a/recipes/linux/linux-davinci/da830-omapl137-evm/configs/da830_omapl137_defconfig b/recipes/linux/linux-davinci/omapl137/configs/da830_omapl137_defconfig
similarity index 100%
rename from recipes/linux/linux-davinci/da830-omapl137-evm/configs/da830_omapl137_defconfig
rename to recipes/linux/linux-davinci/omapl137/configs/da830_omapl137_defconfig

diff --git a/recipes/linux/linux-davinci/da830-omapl137-evm/defconfig b/recipes/linux/linux-davinci/omapl137/defconfig
similarity index 100%
rename from recipes/linux/linux-davinci/da830-omapl137-evm/defconfig
rename to recipes/linux/linux-davinci/omapl137/defconfig

diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/0001-board-da850-evm-Disable-NAND-SUBPAGE.patch b/recipes/linux/linux-davinci/omapl138/0001-board-da850-evm-Disable-NAND-SUBPAGE.patch
similarity index 100%
rename from recipes/linux/linux-davinci/da850-omapl138-evm/0001-board-da850-evm-Disable-NAND-SUBPAGE.patch
rename to recipes/linux/linux-davinci/omapl138/0001-board-da850-evm-Disable-NAND-SUBPAGE.patch

diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig b/recipes/linux/linux-davinci/omapl138/configs/da850_omapl138_defconfig
similarity index 100%
rename from recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig
rename to recipes/linux/linux-davinci/omapl138/configs/da850_omapl138_defconfig

diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_mmcpm_stats b/recipes/linux/linux-davinci/omapl138/configs/da850_omapl138_defconfig_mmcpm_stats
similarity index 100%
rename from recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_mmcpm_stats
rename to recipes/linux/linux-davinci/omapl138/configs/da850_omapl138_defconfig_mmcpm_stats

diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_nandnommc b/recipes/linux/linux-davinci/omapl138/configs/da850_omapl138_defconfig_nandnommc
similarity index 100%
rename from recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_nandnommc
rename to recipes/linux/linux-davinci/omapl138/configs/da850_omapl138_defconfig_nandnommc

diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_uivideocap b/recipes/linux/linux-davinci/omapl138/configs/da850_omapl138_defconfig_uivideocap
similarity index 100%
rename from recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_uivideocap
rename to recipes/linux/linux-davinci/omapl138/configs/da850_omapl138_defconfig_uivideocap

diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_uivideocapdis b/recipes/linux/linux-davinci/omapl138/configs/da850_omapl138_defconfig_uivideocapdis
similarity index 100%
rename from recipes/linux/linux-davinci/da850-omapl138-evm/configs/da850_omapl138_defconfig_uivideocapdis
rename to recipes/linux/linux-davinci/omapl138/configs/da850_omapl138_defconfig_uivideocapdis

diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/defconfig b/recipes/linux/linux-davinci/omapl138/defconfig
similarity index 100%
rename from recipes/linux/linux-davinci/da850-omapl138-evm/defconfig
rename to recipes/linux/linux-davinci/omapl138/defconfig

diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/logo_linux_clut224.ppm b/recipes/linux/linux-davinci/omapl138/logo_linux_clut224.ppm
similarity index 100%
rename from recipes/linux/linux-davinci/da850-omapl138-evm/logo_linux_clut224.ppm
rename to recipes/linux/linux-davinci/omapl138/logo_linux_clut224.ppm

diff --git a/recipes/linux/linux-davinci_git.bb b/recipes/linux/linux-davinci_git.bb
index 06b4dc8..99babb2 100644 (file)
--- a/recipes/linux/linux-davinci_git.bb
+++ b/recipes/linux/linux-davinci_git.bb
@@ -3,7 +3,7 @@ require multi-kernel.inc
 DESCRIPTION = "Linux kernel for DaVinci processors"
 KERNEL_IMAGETYPE = "uImage"
 
-COMPATIBLE_MACHINE = "(dm355-evm|dm365-evm|dm6446-evm|dm6467-evm|dm6467t-evm|da830-omapl137-evm|da850-omapl138-evm|dm355-leopard|davinci-sffsdr|hawkboard)"
+COMPATIBLE_MACHINE = "(dm355-evm|dm365-evm|dm6446-evm|dm6467-evm|dm6467t-evm|omapl137|omapl138|dm355-leopard|davinci-sffsdr|hawkboard)"
 
 DEFAULT_PREFERENCE = "1"
 DEFAULT_PREFERENCE_dm365 = "-1"
@@ -52,23 +52,23 @@ 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} "
 
-SRCREV_da830-omapl137-evm         = ${ARAGO_L1_REV}
-SRCREV_da850-omapl138-evm         = ${ARAGO_L1_REV}
+SRCREV_omapl137         = ${ARAGO_L1_REV}
+SRCREV_omapl138         = ${ARAGO_L1_REV}
 SRCREV_hawkboard                  = ${ARAGO_L1_REV}
 
-PV_da830-omapl137-evm             = ${ARAGO_L1_PV}
-PV_da850-omapl138-evm             = ${ARAGO_L1_PV}
+PV_omapl137             = ${ARAGO_L1_PV}
+PV_omapl138             = ${ARAGO_L1_PV}
 PV_hawkboard                      = ${ARAGO_L1_PV}
 
-BRANCH_da830-omapl137-evm         = ${ARAGO_L1_BR}
-BRANCH_da850-omapl138-evm         = ${ARAGO_L1_BR}
+BRANCH_omapl137         = ${ARAGO_L1_BR}
+BRANCH_omapl138         = ${ARAGO_L1_BR}
 BRANCH_hawkboard                  = ${ARAGO_L1_BR}
 
-SRC_URI_append_da830-omapl137-evm = ${ARAGO_L1_URI}
-SRC_URI_append_da850-omapl138-evm = ${ARAGO_L1_URI}
+SRC_URI_append_omapl137 = ${ARAGO_L1_URI}
+SRC_URI_append_omapl138 = ${ARAGO_L1_URI}
 SRC_URI_append_hawkboard          = ${ARAGO_L1_URI}
 
-SRC_URI_append_da850-omapl138-evm = "file://logo_linux_clut224.ppm \
+SRC_URI_append_omapl138 = "file://logo_linux_clut224.ppm \
                                      file://0001-ahci-ti-Fix-currently-harmless-typo-in-SATA-PHY.patch \
                                      file://0002-ahci-ti-Update-SATA-PHY-configuration-RXCDR.patch \
                                      file://0001-board-da850-evm-Disable-NAND-SUBPAGE.patch \