From 6cf0211e8a72e076d1409ae52e43e6be497db475 Mon Sep 17 00:00:00 2001 From: Jacob Stiffler Date: Wed, 16 Nov 2016 09:01:22 -0500 Subject: linux: k2g: use k2g-evm files for all k2g SOCs Signed-off-by: Jacob Stiffler Signed-off-by: Denys Dmytriyenko --- recipes-kernel/linux/files/k2g-evm/cmem.dtsi | 54 ---------------------- recipes-kernel/linux/files/k2g/cmem.dtsi | 54 ++++++++++++++++++++++ .../linux/linux-ti-staging-4.4/k2g-evm/defconfig | 1 - .../linux/linux-ti-staging-4.4/k2g/defconfig | 1 + .../linux-ti-staging-rt-4.4/k2g-evm/defconfig | 1 - .../linux/linux-ti-staging-rt-4.4/k2g/defconfig | 1 + .../linux-ti-staging-systest-4.4/k2g-evm/defconfig | 1 - .../linux-ti-staging-systest-4.4/k2g/defconfig | 1 + 8 files changed, 57 insertions(+), 57 deletions(-) delete mode 100644 recipes-kernel/linux/files/k2g-evm/cmem.dtsi create mode 100644 recipes-kernel/linux/files/k2g/cmem.dtsi delete mode 100644 recipes-kernel/linux/linux-ti-staging-4.4/k2g-evm/defconfig create mode 100644 recipes-kernel/linux/linux-ti-staging-4.4/k2g/defconfig delete mode 100644 recipes-kernel/linux/linux-ti-staging-rt-4.4/k2g-evm/defconfig create mode 100644 recipes-kernel/linux/linux-ti-staging-rt-4.4/k2g/defconfig delete mode 100644 recipes-kernel/linux/linux-ti-staging-systest-4.4/k2g-evm/defconfig create mode 100644 recipes-kernel/linux/linux-ti-staging-systest-4.4/k2g/defconfig diff --git a/recipes-kernel/linux/files/k2g-evm/cmem.dtsi b/recipes-kernel/linux/files/k2g-evm/cmem.dtsi deleted file mode 100644 index f30bf5ba..00000000 --- a/recipes-kernel/linux/files/k2g-evm/cmem.dtsi +++ /dev/null @@ -1,54 +0,0 @@ -/ { - reserved-memory { - mpm_block_mem_0: mpm_block_mem@820000000 { - reg = <0x00000008 0x20000000 0x00000000 0x02000000>; - no-map; - status = "okay"; - }; - - cmem_block_mem_0: cmem_block_mem@829000000 { - reg = <0x00000008 0x29000000 0x00000000 0x17000000>; - no-map; - status = "okay"; - }; - - cmem_block_mem_1: cmem_block_mem@00c000000 { - reg = <0x00000000 0x0c000000 0x00000000 0x00100000>; - no-map; - status = "okay"; - }; - - cmem_block_mem_2: cmem_block_mem@822000000 { - reg = <0x00000008 0x22000000 0x00000000 0x07000000>; - no-map; - status = "okay"; - }; - }; - - cmem { - compatible = "ti,cmem"; - #address-cells = <1>; - #size-cells = <0>; - - #pool-size-cells = <2>; - - status = "okay"; - - cmem_block_0: cmem_block@0 { - reg = <0>; - memory-region = <&cmem_block_mem_0>; - cmem-buf-pools = <1 0x00000000 0x17000000>; - }; - - cmem_block_1: cmem_block@1 { - reg = <1>; - memory-region = <&cmem_block_mem_1>; - }; - - cmem_block_2: cmem_block@2 { - reg = <2>; - memory-region = <&cmem_block_mem_2>; - }; - }; - -}; diff --git a/recipes-kernel/linux/files/k2g/cmem.dtsi b/recipes-kernel/linux/files/k2g/cmem.dtsi new file mode 100644 index 00000000..f30bf5ba --- /dev/null +++ b/recipes-kernel/linux/files/k2g/cmem.dtsi @@ -0,0 +1,54 @@ +/ { + reserved-memory { + mpm_block_mem_0: mpm_block_mem@820000000 { + reg = <0x00000008 0x20000000 0x00000000 0x02000000>; + no-map; + status = "okay"; + }; + + cmem_block_mem_0: cmem_block_mem@829000000 { + reg = <0x00000008 0x29000000 0x00000000 0x17000000>; + no-map; + status = "okay"; + }; + + cmem_block_mem_1: cmem_block_mem@00c000000 { + reg = <0x00000000 0x0c000000 0x00000000 0x00100000>; + no-map; + status = "okay"; + }; + + cmem_block_mem_2: cmem_block_mem@822000000 { + reg = <0x00000008 0x22000000 0x00000000 0x07000000>; + no-map; + status = "okay"; + }; + }; + + cmem { + compatible = "ti,cmem"; + #address-cells = <1>; + #size-cells = <0>; + + #pool-size-cells = <2>; + + status = "okay"; + + cmem_block_0: cmem_block@0 { + reg = <0>; + memory-region = <&cmem_block_mem_0>; + cmem-buf-pools = <1 0x00000000 0x17000000>; + }; + + cmem_block_1: cmem_block@1 { + reg = <1>; + memory-region = <&cmem_block_mem_1>; + }; + + cmem_block_2: cmem_block@2 { + reg = <2>; + memory-region = <&cmem_block_mem_2>; + }; + }; + +}; diff --git a/recipes-kernel/linux/linux-ti-staging-4.4/k2g-evm/defconfig b/recipes-kernel/linux/linux-ti-staging-4.4/k2g-evm/defconfig deleted file mode 100644 index 316b04bb..00000000 --- a/recipes-kernel/linux/linux-ti-staging-4.4/k2g-evm/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_k2g_release diff --git a/recipes-kernel/linux/linux-ti-staging-4.4/k2g/defconfig b/recipes-kernel/linux/linux-ti-staging-4.4/k2g/defconfig new file mode 100644 index 00000000..316b04bb --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-4.4/k2g/defconfig @@ -0,0 +1 @@ +use-tisdk-config=ti_sdk_k2g_release diff --git a/recipes-kernel/linux/linux-ti-staging-rt-4.4/k2g-evm/defconfig b/recipes-kernel/linux/linux-ti-staging-rt-4.4/k2g-evm/defconfig deleted file mode 100644 index a9c24f2e..00000000 --- a/recipes-kernel/linux/linux-ti-staging-rt-4.4/k2g-evm/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.4/k2g/defconfig b/recipes-kernel/linux/linux-ti-staging-rt-4.4/k2g/defconfig new file mode 100644 index 00000000..a9c24f2e --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-rt-4.4/k2g/defconfig @@ -0,0 +1 @@ +use-tisdk-config=ti_sdk_k2g_rt_release diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.4/k2g-evm/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.4/k2g-evm/defconfig deleted file mode 100644 index abfb3309..00000000 --- a/recipes-kernel/linux/linux-ti-staging-systest-4.4/k2g-evm/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_k2g_debug diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.4/k2g/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.4/k2g/defconfig new file mode 100644 index 00000000..abfb3309 --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-systest-4.4/k2g/defconfig @@ -0,0 +1 @@ +use-tisdk-config=ti_sdk_k2g_debug -- cgit v1.2.3-54-g00ecf