diff options
-rw-r--r-- | meta-fishriver/README | 13 | ||||
-rw-r--r-- | meta-fishriver/conf/machine/fishriver.conf | 4 | ||||
-rw-r--r-- | meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend | 4 | ||||
-rw-r--r-- | meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend | 3 |
4 files changed, 5 insertions, 19 deletions
diff --git a/meta-fishriver/README b/meta-fishriver/README index 1ffbbf1a..013f76e6 100644 --- a/meta-fishriver/README +++ b/meta-fishriver/README | |||
@@ -11,19 +11,6 @@ Table of Contents | |||
11 | III. Booting the images in /binary | 11 | III. Booting the images in /binary |
12 | 12 | ||
13 | 13 | ||
14 | I. Special notes on the meta-fishriver BSP layer | ||
15 | ================================================ | ||
16 | |||
17 | The meta-fishriver layer currently and temporarily uses the crownbay | ||
18 | kernel branch. This will change once we have new patches and/or | ||
19 | config changes for: | ||
20 | |||
21 | - Zigbee | ||
22 | - wifi | ||
23 | - upstream gma500 | ||
24 | - EMGD? | ||
25 | |||
26 | |||
27 | II. Building the meta-fishriver BSP layer | 14 | II. Building the meta-fishriver BSP layer |
28 | ========================================= | 15 | ========================================= |
29 | 16 | ||
diff --git a/meta-fishriver/conf/machine/fishriver.conf b/meta-fishriver/conf/machine/fishriver.conf index e562752f..861ca8b0 100644 --- a/meta-fishriver/conf/machine/fishriver.conf +++ b/meta-fishriver/conf/machine/fishriver.conf | |||
@@ -38,5 +38,5 @@ GLIBC_EXTRA_OECONF = "--with-tls" | |||
38 | SRCREV_machine_pn-linux-yocto_fishriver ?= "301ab1710d29a9bb931cb64c747d03da09dfea3f" | 38 | SRCREV_machine_pn-linux-yocto_fishriver ?= "301ab1710d29a9bb931cb64c747d03da09dfea3f" |
39 | SRCREV_meta_pn-linux-yocto_fishriver ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26" | 39 | SRCREV_meta_pn-linux-yocto_fishriver ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26" |
40 | 40 | ||
41 | SRCREV_machine_pn-linux-yocto-stable_crownbay ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695" | 41 | SRCREV_machine_pn-linux-yocto-stable_fishriver ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695" |
42 | SRCREV_meta_pn-linux-yocto-stable_crownbay ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a" | 42 | SRCREV_meta_pn-linux-yocto-stable_fishriver ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a" |
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend index dcc4534b..29399ba2 100644 --- a/meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend +++ b/meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend | |||
@@ -1,5 +1,5 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | COMPATIBLE_MACHINE_fishriver = "crownbay" | 3 | COMPATIBLE_MACHINE_fishriver = "fishriver" |
4 | KMACHINE_fishriver = "crownbay" | 4 | KMACHINE_fishriver = "fishriver" |
5 | 5 | ||
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend index ba38dbee..eec65d8b 100644 --- a/meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend +++ b/meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend | |||
@@ -1,4 +1,3 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | COMPATIBLE_MACHINE_fishriver = "fishriver" | 2 | COMPATIBLE_MACHINE_fishriver = "fishriver" |
3 | # zzzz /yocto/standard/crownbay->fishriver | 3 | KMACHINE_fishriver = "yocto/standard/fishriver" |
4 | KMACHINE_fishriver = "yocto/standard/crownbay" | ||