From a01194eba676792f1b515c2e14479c1bc77d1095 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Thu, 15 Feb 2018 09:20:02 +0000 Subject: linux-ti-staging: upgrade to 4.14 Some DTBs have changed, am57xx-evm moved to DT overlays. Signed-off-by: Denys Dmytriyenko --- conf/machine/am57xx-evm.conf | 3 +- conf/machine/dra7xx-evm.conf | 7 ++- .../linux/linux-ti-staging-4.14/defconfig | 1 + .../linux/linux-ti-staging-4.14/dra7xx/defconfig | 1 + .../linux/linux-ti-staging-4.14/k2g/defconfig | 1 + .../linux/linux-ti-staging-4.14/keystone/defconfig | 1 + .../linux/linux-ti-staging-4.14/omapl138/defconfig | 1 + .../linux/linux-ti-staging-4.14/ti33x/defconfig | 1 + .../linux/linux-ti-staging-4.14/ti43x/defconfig | 1 + .../linux/linux-ti-staging-4.9/defconfig | 1 - .../linux/linux-ti-staging-4.9/dra7xx/defconfig | 1 - .../linux/linux-ti-staging-4.9/k2g/defconfig | 1 - .../linux/linux-ti-staging-4.9/keystone/defconfig | 1 - .../linux/linux-ti-staging-4.9/omapl138/defconfig | 1 - .../linux/linux-ti-staging-4.9/ti33x/defconfig | 1 - .../linux/linux-ti-staging-4.9/ti43x/defconfig | 1 - .../linux/linux-ti-staging-rt-4.14/defconfig | 1 + .../linux-ti-staging-rt-4.14/dra7xx/defconfig | 1 + .../linux/linux-ti-staging-rt-4.14/k2g/defconfig | 1 + .../linux-ti-staging-rt-4.14/keystone/defconfig | 1 + .../linux/linux-ti-staging-rt-4.14/ti33x/defconfig | 1 + .../linux/linux-ti-staging-rt-4.14/ti43x/defconfig | 1 + .../linux/linux-ti-staging-rt-4.9/defconfig | 1 - .../linux/linux-ti-staging-rt-4.9/dra7xx/defconfig | 1 - .../linux/linux-ti-staging-rt-4.9/k2g/defconfig | 1 - .../linux-ti-staging-rt-4.9/keystone/defconfig | 1 - .../linux/linux-ti-staging-rt-4.9/ti33x/defconfig | 1 - .../linux/linux-ti-staging-rt-4.9/ti43x/defconfig | 1 - recipes-kernel/linux/linux-ti-staging-rt_4.14.bb | 9 +++ recipes-kernel/linux/linux-ti-staging-rt_4.9.bb | 9 --- .../linux/linux-ti-staging-systest-4.14/defconfig | 1 + .../linux-ti-staging-systest-4.14/dra7xx/defconfig | 1 + .../linux-ti-staging-systest-4.14/k2g/defconfig | 1 + .../keystone/defconfig | 1 + .../omapl138/defconfig | 1 + .../linux-ti-staging-systest-4.14/ti33x/defconfig | 1 + .../linux-ti-staging-systest-4.14/ti43x/defconfig | 1 + .../linux/linux-ti-staging-systest-4.9/defconfig | 1 - .../linux-ti-staging-systest-4.9/dra7xx/defconfig | 1 - .../linux-ti-staging-systest-4.9/k2g/defconfig | 1 - .../keystone/defconfig | 1 - .../omapl138/defconfig | 1 - .../linux-ti-staging-systest-4.9/ti33x/defconfig | 1 - .../linux-ti-staging-systest-4.9/ti43x/defconfig | 1 - .../linux/linux-ti-staging-systest_4.14.bb | 5 ++ .../linux/linux-ti-staging-systest_4.9.bb | 5 -- recipes-kernel/linux/linux-ti-staging_4.14.bb | 67 ++++++++++++++++++++++ recipes-kernel/linux/linux-ti-staging_4.9.bb | 67 ---------------------- 48 files changed, 106 insertions(+), 106 deletions(-) create mode 100644 recipes-kernel/linux/linux-ti-staging-4.14/defconfig create mode 100644 recipes-kernel/linux/linux-ti-staging-4.14/dra7xx/defconfig create mode 100644 recipes-kernel/linux/linux-ti-staging-4.14/k2g/defconfig create mode 100644 recipes-kernel/linux/linux-ti-staging-4.14/keystone/defconfig create mode 100644 recipes-kernel/linux/linux-ti-staging-4.14/omapl138/defconfig create mode 100644 recipes-kernel/linux/linux-ti-staging-4.14/ti33x/defconfig create mode 100644 recipes-kernel/linux/linux-ti-staging-4.14/ti43x/defconfig delete mode 100644 recipes-kernel/linux/linux-ti-staging-4.9/defconfig delete mode 100644 recipes-kernel/linux/linux-ti-staging-4.9/dra7xx/defconfig delete mode 100644 recipes-kernel/linux/linux-ti-staging-4.9/k2g/defconfig delete mode 100644 recipes-kernel/linux/linux-ti-staging-4.9/keystone/defconfig delete mode 100644 recipes-kernel/linux/linux-ti-staging-4.9/omapl138/defconfig delete mode 100644 recipes-kernel/linux/linux-ti-staging-4.9/ti33x/defconfig delete mode 100644 recipes-kernel/linux/linux-ti-staging-4.9/ti43x/defconfig create mode 100644 recipes-kernel/linux/linux-ti-staging-rt-4.14/defconfig create mode 100644 recipes-kernel/linux/linux-ti-staging-rt-4.14/dra7xx/defconfig create mode 100644 recipes-kernel/linux/linux-ti-staging-rt-4.14/k2g/defconfig create mode 100644 recipes-kernel/linux/linux-ti-staging-rt-4.14/keystone/defconfig create mode 100644 recipes-kernel/linux/linux-ti-staging-rt-4.14/ti33x/defconfig create mode 100644 recipes-kernel/linux/linux-ti-staging-rt-4.14/ti43x/defconfig delete mode 100644 recipes-kernel/linux/linux-ti-staging-rt-4.9/defconfig delete mode 100644 recipes-kernel/linux/linux-ti-staging-rt-4.9/dra7xx/defconfig delete mode 100644 recipes-kernel/linux/linux-ti-staging-rt-4.9/k2g/defconfig delete mode 100644 recipes-kernel/linux/linux-ti-staging-rt-4.9/keystone/defconfig delete mode 100644 recipes-kernel/linux/linux-ti-staging-rt-4.9/ti33x/defconfig delete mode 100644 recipes-kernel/linux/linux-ti-staging-rt-4.9/ti43x/defconfig create mode 100644 recipes-kernel/linux/linux-ti-staging-rt_4.14.bb delete mode 100644 recipes-kernel/linux/linux-ti-staging-rt_4.9.bb create mode 100644 recipes-kernel/linux/linux-ti-staging-systest-4.14/defconfig create mode 100644 recipes-kernel/linux/linux-ti-staging-systest-4.14/dra7xx/defconfig create mode 100644 recipes-kernel/linux/linux-ti-staging-systest-4.14/k2g/defconfig create mode 100644 recipes-kernel/linux/linux-ti-staging-systest-4.14/keystone/defconfig create mode 100644 recipes-kernel/linux/linux-ti-staging-systest-4.14/omapl138/defconfig create mode 100644 recipes-kernel/linux/linux-ti-staging-systest-4.14/ti33x/defconfig create mode 100644 recipes-kernel/linux/linux-ti-staging-systest-4.14/ti43x/defconfig delete mode 100644 recipes-kernel/linux/linux-ti-staging-systest-4.9/defconfig delete mode 100644 recipes-kernel/linux/linux-ti-staging-systest-4.9/dra7xx/defconfig delete mode 100644 recipes-kernel/linux/linux-ti-staging-systest-4.9/k2g/defconfig delete mode 100644 recipes-kernel/linux/linux-ti-staging-systest-4.9/keystone/defconfig delete mode 100644 recipes-kernel/linux/linux-ti-staging-systest-4.9/omapl138/defconfig delete mode 100644 recipes-kernel/linux/linux-ti-staging-systest-4.9/ti33x/defconfig delete mode 100644 recipes-kernel/linux/linux-ti-staging-systest-4.9/ti43x/defconfig create mode 100644 recipes-kernel/linux/linux-ti-staging-systest_4.14.bb delete mode 100644 recipes-kernel/linux/linux-ti-staging-systest_4.9.bb create mode 100644 recipes-kernel/linux/linux-ti-staging_4.14.bb delete mode 100644 recipes-kernel/linux/linux-ti-staging_4.9.bb diff --git a/conf/machine/am57xx-evm.conf b/conf/machine/am57xx-evm.conf index 8e389829..f3637b70 100644 --- a/conf/machine/am57xx-evm.conf +++ b/conf/machine/am57xx-evm.conf @@ -11,8 +11,7 @@ IMAGE_FSTYPES += "tar.xz" SERIAL_CONSOLE = "115200 ttyS2" KERNEL_DEVICETREE = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb am57xx-beagle-x15-revc.dtb \ - am57xx-evm.dtb am57xx-evm-cam-mt9t111.dtb am57xx-evm-cam-ov10635.dtb \ - am57xx-evm-reva3.dtb am57xx-evm-reva3-cam-mt9t111.dtb am57xx-evm-reva3-cam-ov10635.dtb \ + ti/am57xx-evm.dtbo ti/mt9t111.dtbo ti/ov10635.dtbo \ am571x-idk.dtb am571x-idk-lcd-osd101t2045.dtb am571x-idk-lcd-osd101t2587.dtb \ am572x-idk.dtb am572x-idk-lcd-osd101t2045.dtb am572x-idk-lcd-osd101t2587.dtb \ am574x-idk.dtb am574x-idk-lcd-osd101t2587.dtb \ diff --git a/conf/machine/dra7xx-evm.conf b/conf/machine/dra7xx-evm.conf index 7db9ff69..e0717c5f 100644 --- a/conf/machine/dra7xx-evm.conf +++ b/conf/machine/dra7xx-evm.conf @@ -10,10 +10,11 @@ IMAGE_FSTYPES += "tar.xz" SERIAL_CONSOLE = "115200 ttyS0" -KERNEL_DEVICETREE = "dra7-evm.dtb dra7-evm-lcd-lg.dtb dra7-evm-lcd-osd101t2045.dtb dra7-evm-lcd-osd101t2587.dtb \ - dra72-evm.dtb dra72-evm-lcd-lg.dtb dra72-evm-lcd-osd101t2045.dtb dra72-evm-lcd-osd101t2587.dtb \ +KERNEL_DEVICETREE = "dra7-evm.dtb dra7-evm-lcd-osd101t2045.dtb dra7-evm-lcd-osd101t2587.dtb \ + dra72-evm.dtb dra72-evm-lcd-osd101t2045.dtb dra72-evm-lcd-osd101t2587.dtb \ dra72-evm-revc.dtb dra72-evm-revc-lcd-osd101t2045.dtb dra72-evm-revc-lcd-osd101t2587.dtb \ - dra71-evm.dtb dra71-evm-lcd-auo-g101evn01.0.dtb dra76-evm.dtb dra76-evm-tfp410.dtb" + dra71-evm.dtb dra71-evm-lcd-auo-g101evn01.0.dtb \ + dra76-evm.dtb dra76-evm-tfp410.dtb" UBOOT_MACHINE = "dra7xx_evm_config" diff --git a/recipes-kernel/linux/linux-ti-staging-4.14/defconfig b/recipes-kernel/linux/linux-ti-staging-4.14/defconfig new file mode 100644 index 00000000..d083d182 --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-4.14/defconfig @@ -0,0 +1 @@ +use-tisdk-config=ti_sdk_omap2_release diff --git a/recipes-kernel/linux/linux-ti-staging-4.14/dra7xx/defconfig b/recipes-kernel/linux/linux-ti-staging-4.14/dra7xx/defconfig new file mode 100644 index 00000000..dcb53bab --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-4.14/dra7xx/defconfig @@ -0,0 +1 @@ +use-tisdk-config=ti_sdk_dra7x_release diff --git a/recipes-kernel/linux/linux-ti-staging-4.14/k2g/defconfig b/recipes-kernel/linux/linux-ti-staging-4.14/k2g/defconfig new file mode 100644 index 00000000..316b04bb --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-4.14/k2g/defconfig @@ -0,0 +1 @@ +use-tisdk-config=ti_sdk_k2g_release diff --git a/recipes-kernel/linux/linux-ti-staging-4.14/keystone/defconfig b/recipes-kernel/linux/linux-ti-staging-4.14/keystone/defconfig new file mode 100644 index 00000000..5a40b93d --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-4.14/keystone/defconfig @@ -0,0 +1 @@ +use-tisdk-config=ti_sdk_keystone_release diff --git a/recipes-kernel/linux/linux-ti-staging-4.14/omapl138/defconfig b/recipes-kernel/linux/linux-ti-staging-4.14/omapl138/defconfig new file mode 100644 index 00000000..b3467853 --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-4.14/omapl138/defconfig @@ -0,0 +1 @@ +use-tisdk-config=ti_sdk_omapl138_release diff --git a/recipes-kernel/linux/linux-ti-staging-4.14/ti33x/defconfig b/recipes-kernel/linux/linux-ti-staging-4.14/ti33x/defconfig new file mode 100644 index 00000000..88f80fa9 --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-4.14/ti33x/defconfig @@ -0,0 +1 @@ +use-tisdk-config=ti_sdk_am3x_release diff --git a/recipes-kernel/linux/linux-ti-staging-4.14/ti43x/defconfig b/recipes-kernel/linux/linux-ti-staging-4.14/ti43x/defconfig new file mode 100644 index 00000000..4b9daaf9 --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-4.14/ti43x/defconfig @@ -0,0 +1 @@ +use-tisdk-config=ti_sdk_am4x_release diff --git a/recipes-kernel/linux/linux-ti-staging-4.9/defconfig b/recipes-kernel/linux/linux-ti-staging-4.9/defconfig deleted file mode 100644 index d083d182..00000000 --- a/recipes-kernel/linux/linux-ti-staging-4.9/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_omap2_release diff --git a/recipes-kernel/linux/linux-ti-staging-4.9/dra7xx/defconfig b/recipes-kernel/linux/linux-ti-staging-4.9/dra7xx/defconfig deleted file mode 100644 index dcb53bab..00000000 --- a/recipes-kernel/linux/linux-ti-staging-4.9/dra7xx/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_dra7x_release diff --git a/recipes-kernel/linux/linux-ti-staging-4.9/k2g/defconfig b/recipes-kernel/linux/linux-ti-staging-4.9/k2g/defconfig deleted file mode 100644 index 316b04bb..00000000 --- a/recipes-kernel/linux/linux-ti-staging-4.9/k2g/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_k2g_release diff --git a/recipes-kernel/linux/linux-ti-staging-4.9/keystone/defconfig b/recipes-kernel/linux/linux-ti-staging-4.9/keystone/defconfig deleted file mode 100644 index 5a40b93d..00000000 --- a/recipes-kernel/linux/linux-ti-staging-4.9/keystone/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_keystone_release diff --git a/recipes-kernel/linux/linux-ti-staging-4.9/omapl138/defconfig b/recipes-kernel/linux/linux-ti-staging-4.9/omapl138/defconfig deleted file mode 100644 index b3467853..00000000 --- a/recipes-kernel/linux/linux-ti-staging-4.9/omapl138/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_omapl138_release diff --git a/recipes-kernel/linux/linux-ti-staging-4.9/ti33x/defconfig b/recipes-kernel/linux/linux-ti-staging-4.9/ti33x/defconfig deleted file mode 100644 index 88f80fa9..00000000 --- a/recipes-kernel/linux/linux-ti-staging-4.9/ti33x/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_am3x_release diff --git a/recipes-kernel/linux/linux-ti-staging-4.9/ti43x/defconfig b/recipes-kernel/linux/linux-ti-staging-4.9/ti43x/defconfig deleted file mode 100644 index 4b9daaf9..00000000 --- a/recipes-kernel/linux/linux-ti-staging-4.9/ti43x/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_am4x_release diff --git a/recipes-kernel/linux/linux-ti-staging-rt-4.14/defconfig b/recipes-kernel/linux/linux-ti-staging-rt-4.14/defconfig new file mode 100644 index 00000000..f0b8bab0 --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-rt-4.14/defconfig @@ -0,0 +1 @@ +use-tisdk-config=ti_sdk_omap2_rt_release diff --git a/recipes-kernel/linux/linux-ti-staging-rt-4.14/dra7xx/defconfig b/recipes-kernel/linux/linux-ti-staging-rt-4.14/dra7xx/defconfig new file mode 100644 index 00000000..47e3d04a --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-rt-4.14/dra7xx/defconfig @@ -0,0 +1 @@ +use-tisdk-config=ti_sdk_dra7x_rt_release diff --git a/recipes-kernel/linux/linux-ti-staging-rt-4.14/k2g/defconfig b/recipes-kernel/linux/linux-ti-staging-rt-4.14/k2g/defconfig new file mode 100644 index 00000000..a9c24f2e --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-rt-4.14/k2g/defconfig @@ -0,0 +1 @@ +use-tisdk-config=ti_sdk_k2g_rt_release diff --git a/recipes-kernel/linux/linux-ti-staging-rt-4.14/keystone/defconfig b/recipes-kernel/linux/linux-ti-staging-rt-4.14/keystone/defconfig new file mode 100644 index 00000000..fc68085f --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-rt-4.14/keystone/defconfig @@ -0,0 +1 @@ +use-tisdk-config=ti_sdk_keystone_rt_release diff --git a/recipes-kernel/linux/linux-ti-staging-rt-4.14/ti33x/defconfig b/recipes-kernel/linux/linux-ti-staging-rt-4.14/ti33x/defconfig new file mode 100644 index 00000000..0a4fbac2 --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-rt-4.14/ti33x/defconfig @@ -0,0 +1 @@ +use-tisdk-config=ti_sdk_am3x_rt_release diff --git a/recipes-kernel/linux/linux-ti-staging-rt-4.14/ti43x/defconfig b/recipes-kernel/linux/linux-ti-staging-rt-4.14/ti43x/defconfig new file mode 100644 index 00000000..99594c81 --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-rt-4.14/ti43x/defconfig @@ -0,0 +1 @@ +use-tisdk-config=ti_sdk_am4x_rt_release diff --git a/recipes-kernel/linux/linux-ti-staging-rt-4.9/defconfig b/recipes-kernel/linux/linux-ti-staging-rt-4.9/defconfig deleted file mode 100644 index f0b8bab0..00000000 --- a/recipes-kernel/linux/linux-ti-staging-rt-4.9/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_omap2_rt_release diff --git a/recipes-kernel/linux/linux-ti-staging-rt-4.9/dra7xx/defconfig b/recipes-kernel/linux/linux-ti-staging-rt-4.9/dra7xx/defconfig deleted file mode 100644 index 47e3d04a..00000000 --- a/recipes-kernel/linux/linux-ti-staging-rt-4.9/dra7xx/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_dra7x_rt_release diff --git a/recipes-kernel/linux/linux-ti-staging-rt-4.9/k2g/defconfig b/recipes-kernel/linux/linux-ti-staging-rt-4.9/k2g/defconfig deleted file mode 100644 index a9c24f2e..00000000 --- a/recipes-kernel/linux/linux-ti-staging-rt-4.9/k2g/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_k2g_rt_release diff --git a/recipes-kernel/linux/linux-ti-staging-rt-4.9/keystone/defconfig b/recipes-kernel/linux/linux-ti-staging-rt-4.9/keystone/defconfig deleted file mode 100644 index fc68085f..00000000 --- a/recipes-kernel/linux/linux-ti-staging-rt-4.9/keystone/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_keystone_rt_release diff --git a/recipes-kernel/linux/linux-ti-staging-rt-4.9/ti33x/defconfig b/recipes-kernel/linux/linux-ti-staging-rt-4.9/ti33x/defconfig deleted file mode 100644 index 0a4fbac2..00000000 --- a/recipes-kernel/linux/linux-ti-staging-rt-4.9/ti33x/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_am3x_rt_release diff --git a/recipes-kernel/linux/linux-ti-staging-rt-4.9/ti43x/defconfig b/recipes-kernel/linux/linux-ti-staging-rt-4.9/ti43x/defconfig deleted file mode 100644 index 99594c81..00000000 --- a/recipes-kernel/linux/linux-ti-staging-rt-4.9/ti43x/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_am4x_rt_release diff --git a/recipes-kernel/linux/linux-ti-staging-rt_4.14.bb b/recipes-kernel/linux/linux-ti-staging-rt_4.14.bb new file mode 100644 index 00000000..802a8b10 --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-rt_4.14.bb @@ -0,0 +1,9 @@ +require linux-ti-staging_4.14.bb + +# Look in the generic major.minor directory for files +# This will have priority over generic non-rt path +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.14:" + +BRANCH = "ti-rt-linux-4.14.y" + +SRCREV = "92c3e398509d57ea7ad40ac87aa5b7ed5e5014e2" diff --git a/recipes-kernel/linux/linux-ti-staging-rt_4.9.bb b/recipes-kernel/linux/linux-ti-staging-rt_4.9.bb deleted file mode 100644 index f8b35849..00000000 --- a/recipes-kernel/linux/linux-ti-staging-rt_4.9.bb +++ /dev/null @@ -1,9 +0,0 @@ -require linux-ti-staging_4.9.bb - -# Look in the generic major.minor directory for files -# This will have priority over generic non-rt path -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.9:" - -BRANCH = "ti-rt-linux-4.9.y" - -SRCREV = "764089ed2a847e9d4c06c0e0baaaeaf42aa2d99f" diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.14/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.14/defconfig new file mode 100644 index 00000000..5d051bd1 --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-systest-4.14/defconfig @@ -0,0 +1 @@ +use-tisdk-config=ti_sdk_omap2_debug diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.14/dra7xx/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.14/dra7xx/defconfig new file mode 100644 index 00000000..2b3635c3 --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-systest-4.14/dra7xx/defconfig @@ -0,0 +1 @@ +use-tisdk-config=ti_sdk_dra7x_debug diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.14/k2g/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.14/k2g/defconfig new file mode 100644 index 00000000..abfb3309 --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-systest-4.14/k2g/defconfig @@ -0,0 +1 @@ +use-tisdk-config=ti_sdk_k2g_debug diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.14/keystone/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.14/keystone/defconfig new file mode 100644 index 00000000..e95bcf95 --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-systest-4.14/keystone/defconfig @@ -0,0 +1 @@ +use-tisdk-config=ti_sdk_keystone_debug diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.14/omapl138/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.14/omapl138/defconfig new file mode 100644 index 00000000..95b61168 --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-systest-4.14/omapl138/defconfig @@ -0,0 +1 @@ +use-tisdk-config=ti_sdk_omapl138_debug diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.14/ti33x/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.14/ti33x/defconfig new file mode 100644 index 00000000..9ab6733c --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-systest-4.14/ti33x/defconfig @@ -0,0 +1 @@ +use-tisdk-config=ti_sdk_am3x_debug diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.14/ti43x/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.14/ti43x/defconfig new file mode 100644 index 00000000..825c31cd --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-systest-4.14/ti43x/defconfig @@ -0,0 +1 @@ +use-tisdk-config=ti_sdk_am4x_debug diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.9/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.9/defconfig deleted file mode 100644 index 5d051bd1..00000000 --- a/recipes-kernel/linux/linux-ti-staging-systest-4.9/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_omap2_debug diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.9/dra7xx/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.9/dra7xx/defconfig deleted file mode 100644 index 2b3635c3..00000000 --- a/recipes-kernel/linux/linux-ti-staging-systest-4.9/dra7xx/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_dra7x_debug diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.9/k2g/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.9/k2g/defconfig deleted file mode 100644 index abfb3309..00000000 --- a/recipes-kernel/linux/linux-ti-staging-systest-4.9/k2g/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_k2g_debug diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.9/keystone/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.9/keystone/defconfig deleted file mode 100644 index e95bcf95..00000000 --- a/recipes-kernel/linux/linux-ti-staging-systest-4.9/keystone/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_keystone_debug diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.9/omapl138/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.9/omapl138/defconfig deleted file mode 100644 index 95b61168..00000000 --- a/recipes-kernel/linux/linux-ti-staging-systest-4.9/omapl138/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_omapl138_debug diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.9/ti33x/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.9/ti33x/defconfig deleted file mode 100644 index 9ab6733c..00000000 --- a/recipes-kernel/linux/linux-ti-staging-systest-4.9/ti33x/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_am3x_debug diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.9/ti43x/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.9/ti43x/defconfig deleted file mode 100644 index 825c31cd..00000000 --- a/recipes-kernel/linux/linux-ti-staging-systest-4.9/ti43x/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_am4x_debug diff --git a/recipes-kernel/linux/linux-ti-staging-systest_4.14.bb b/recipes-kernel/linux/linux-ti-staging-systest_4.14.bb new file mode 100644 index 00000000..5fa8fe27 --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-systest_4.14.bb @@ -0,0 +1,5 @@ +require linux-ti-staging_4.14.bb + +# Look in the generic major.minor directory for files +# This will have priority over generic non-rt path +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.14:" diff --git a/recipes-kernel/linux/linux-ti-staging-systest_4.9.bb b/recipes-kernel/linux/linux-ti-staging-systest_4.9.bb deleted file mode 100644 index c53f94c5..00000000 --- a/recipes-kernel/linux/linux-ti-staging-systest_4.9.bb +++ /dev/null @@ -1,5 +0,0 @@ -require linux-ti-staging_4.9.bb - -# Look in the generic major.minor directory for files -# This will have priority over generic non-rt path -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.9:" diff --git a/recipes-kernel/linux/linux-ti-staging_4.14.bb b/recipes-kernel/linux/linux-ti-staging_4.14.bb new file mode 100644 index 00000000..f8d0d444 --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging_4.14.bb @@ -0,0 +1,67 @@ +SECTION = "kernel" +DESCRIPTION = "Linux kernel for TI devices" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" + +inherit kernel + +require recipes-kernel/linux/setup-defconfig.inc +require recipes-kernel/linux/cmem.inc +require recipes-kernel/linux/ti-uio.inc + +# Look in the generic major.minor directory for files +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.14:" + +# Pull in the devicetree files into the rootfs +RDEPENDS_${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree" + +# Add run-time dependency for PM firmware to the rootfs +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_ti33x = " amx3-cm3" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_ti43x = " amx3-cm3" + +# Add run-time dependency for VPE VPDMA firmware to the rootfs +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_dra7xx = " vpdma-fw" + +# Add run-time dependency for Goodix firmware to the rootfs +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_dra7xx = " goodix-fw" + +# Install boot-monitor skern file into /boot dir of rootfs +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_keystone = " boot-monitor" + +# Install ti-sci-fw into /boot dir of rootfs +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_k2g = " ti-sci-fw" + +# Add run-time dependency for SerDes firmware to the rootfs +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_keystone = " serdes-fw" + +# Add run-time dependency for QMSS PDSP firmware to the rootfs +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_keystone = " qmss-pdsp-fw" + +# Add run-time dependency for NETCP PA firmware to the rootfs +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_k2hk = " netcp-pa-fw" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_k2e = " netcp-pa-fw" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_k2l-evm = " netcp-pa-fw" + +# Add run-time dependency for PRU Ethernet firmware to the rootfs +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am57xx-evm = " prueth-fw" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am437x-evm = " prueth-fw" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am335x-evm = " prueth-fw" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_k2g = " prueth-fw" + +KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" + +S = "${WORKDIR}/git" + +BRANCH = "ti-lsk-linux-4.14.y" + +SRCREV = "36a950c35adcec9c55c20ef1deb5e33c87ae0a3f" +PV = "4.14.19+git${SRCPV}" + +# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild +MACHINE_KERNEL_PR_append = "a" +PR = "${MACHINE_KERNEL_PR}" + +KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git" +KERNEL_GIT_PROTOCOL = "git" +SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ + file://defconfig" diff --git a/recipes-kernel/linux/linux-ti-staging_4.9.bb b/recipes-kernel/linux/linux-ti-staging_4.9.bb deleted file mode 100644 index 4cde7d34..00000000 --- a/recipes-kernel/linux/linux-ti-staging_4.9.bb +++ /dev/null @@ -1,67 +0,0 @@ -SECTION = "kernel" -DESCRIPTION = "Linux kernel for TI devices" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" - -inherit kernel - -require recipes-kernel/linux/setup-defconfig.inc -require recipes-kernel/linux/cmem.inc -require recipes-kernel/linux/ti-uio.inc - -# Look in the generic major.minor directory for files -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.9:" - -# Pull in the devicetree files into the rootfs -RDEPENDS_${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree" - -# Add run-time dependency for PM firmware to the rootfs -RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_ti33x = " amx3-cm3" -RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_ti43x = " amx3-cm3" - -# Add run-time dependency for VPE VPDMA firmware to the rootfs -RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_dra7xx = " vpdma-fw" - -# Add run-time dependency for Goodix firmware to the rootfs -RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_dra7xx = " goodix-fw" - -# Install boot-monitor skern file into /boot dir of rootfs -RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_keystone = " boot-monitor" - -# Install ti-sci-fw into /boot dir of rootfs -RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_k2g = " ti-sci-fw" - -# Add run-time dependency for SerDes firmware to the rootfs -RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_keystone = " serdes-fw" - -# Add run-time dependency for QMSS PDSP firmware to the rootfs -RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_keystone = " qmss-pdsp-fw" - -# Add run-time dependency for NETCP PA firmware to the rootfs -RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_k2hk = " netcp-pa-fw" -RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_k2e = " netcp-pa-fw" -RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_k2l-evm = " netcp-pa-fw" - -# Add run-time dependency for PRU Ethernet firmware to the rootfs -RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am57xx-evm = " prueth-fw" -RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am437x-evm = " prueth-fw" -RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am335x-evm = " prueth-fw" -RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_k2g = " prueth-fw" - -KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" - -S = "${WORKDIR}/git" - -BRANCH = "ti-lsk-linux-4.9.y" - -SRCREV = "89d085d1a407961d43d2492803facb6a8e678fda" -PV = "4.9.69+git${SRCPV}" - -# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild -MACHINE_KERNEL_PR_append = "a" -PR = "${MACHINE_KERNEL_PR}" - -KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git" -KERNEL_GIT_PROTOCOL = "git" -SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ - file://defconfig" -- cgit v1.2.3-54-g00ecf