Pull request 20130405
cover Pull request 20130405
Hello,
Following the patches I sent to the meta-handheld layer a few days ago to add machine support for the Ben Nanonote, I found out that the corresponding kernel recipe fails to build on oe-core (builds fine on oe-classic).
A few settings were missing and, more importantly, the version of gcc in oe-core seems to enable the -Wunused-but-set-variable switch, which makes it error on many variables that were indeed 'unused but set'. After trying to solve this issue the easy way, by setting 'CFLAGS=-Wno-error=unused-but-set-variable -Wno-error=unused-but-set-parameter' to no avail, I chose to annotate the aforementioned variables in the kernel code with __attribute__((__unused__)).
The patches that come as a follow-up of this message are what it's all about; sorry for the inconvenience in the first place. Please pull into meta-handheld.
The following changes since commit a9b2b63d1f40a75638ee6ddb3599501c6974deb9:
ben-nanonote: import ben-nanonote machine support (2013-04-03 18:13:48 +0100)
are available in the git repository at:
git://seketeli.fr/~apelete/meta-handheld.git fix-nanonote-kernel-build
Apelete Seketeli (2):
linux-jlime-ben-nanonote: fix build errors
ben-nanonote: add DEFAULTTUNE to machine configuration
conf/machine/ben-nanonote.conf | 1 + .../gcc-attribute-unused.patch | 87 ++++++++++++++++++++ .../linux/linux-jlime-ben-nanonote_2.6.36.bb | 4 +- 3 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 recipes-kernel/linux/linux-jlime-ben-nanonote-2.6.36/gcc-attribute-unused.patch
Signature · 1 line
1.7.10.4
PATCH 1/2 linux-jlime-ben-nanonote: fix build errors
The following changes fix build errors occuring on linux kernel 2.6.36 for the ben-nanonote machine:
- add LIC_FILES_CHKSUM,
- add "gcc-attribute-unused.patch" patch file to fix an issue where gcc errors on 'unused but set variables' in kernel code. The patch annonate such variables with __attribute__((__unused__)).
--- .../gcc-attribute-unused.patch | 87 ++++++++++++++++++++ .../linux/linux-jlime-ben-nanonote_2.6.36.bb | 4 +- 2 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 recipes-kernel/linux/linux-jlime-ben-nanonote-2.6.36/gcc-attribute-unused.patch
recipes-kernel/linux/linux-jlime-ben-nanonote-2.6.36/gcc-attribute-unused.patch new file +87 -0
@@ -0,0 +1,87 @@ +diff --git a/arch/mips/jz4740/dma.c b/arch/mips/jz4740/dma.c +index 5ebe75a..20511d6 100644 +--- a/arch/mips/jz4740/dma.c ++++ b/arch/mips/jz4740/dma.c +@@ -242,7 +242,7 @@ EXPORT_SYMBOL_GPL(jz4740_dma_get_residue); + + static void jz4740_dma_chan_irq(struct jz4740_dma_chan *dma) + { +- uint32_t status; ++ uint32_t status __attribute__((__unused__)); + + status = jz4740_dma_read(JZ_REG_DMA_STATUS_CTRL(dma->id)); + +diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c +index 5922342..69466ec 100644 +--- a/arch/mips/kernel/signal.c ++++ b/arch/mips/kernel/signal.c +@@ -84,7 +84,7 @@ static int protected_save_fp_context(struct sigcontext __user *sc) + + static int protected_restore_fp_context(struct sigcontext __user *sc) + { +- int err, tmp; ++ int err, tmp __attribute__((__unused__)); + while (1) { + lock_fpu_owner(); + own_fpu_inatomic(0); +diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c +index 1dc6edf..51b1860 100644 +--- a/arch/mips/kernel/syscall.c ++++ b/arch/mips/kernel/syscall.c +@@ -383,7 +383,7 @@ save_static_function(sys_sysmips); + static int __used noinline + _sys_sysmips(nabi_no_regargs struct pt_regs regs) + { +- long cmd, arg1, arg2, arg3; ++ long cmd, arg1, arg2, arg3 __attribute__((__unused__)); + + cmd = regs.regs[4]; + arg1 = regs.regs[5]; +diff --git a/arch/mips/math-emu/ieee754int.h b/arch/mips/math-emu/ieee754int.h +index 1a846c5..76836c8 100644 +--- a/arch/mips/math-emu/ieee754int.h ++++ b/arch/mips/math-emu/ieee754int.h +@@ -71,7 +71,7 @@ + + + #define COMPXSP \ +- unsigned xm; int xe; int xs; int xc ++ unsigned xm; int xe; int xs __attribute__((__unused__)); int xc + + #define COMPYSP \ + unsigned ym; int ye; int ys; int yc +@@ -105,7 +105,7 @@ + + + #define COMPXDP \ +-u64 xm; int xe; int xs; int xc ++u64 xm; int xe; int xs __attribute__((__unused__)); int xc + + #define COMPYDP \ + u64 ym; int ye; int ys; int yc +diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c +index 6721ee2..a107db5 100644 +--- a/arch/mips/mm/c-r4k.c ++++ b/arch/mips/mm/c-r4k.c +@@ -1076,7 +1076,7 @@ static int __cpuinit probe_scache(void) + unsigned long flags, addr, begin, end, pow2; + unsigned int config = read_c0_config(); + struct cpuinfo_mips *c = ¤t_cpu_data; +- int tmp; ++ int tmp __attribute__((__unused__)); + + if (config & CONF_SC) + return 0; +diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c +index 2efcbd2..1850105 100644 +--- a/arch/mips/mm/init.c ++++ b/arch/mips/mm/init.c +@@ -324,7 +324,7 @@ int page_is_ram(unsigned long pagenr) + void __init paging_init(void) + { + unsigned long max_zone_pfns[MAX_NR_ZONES]; +- unsigned long lastpfn; ++ unsigned long lastpfn __attribute__((__unused__)); + + pagetable_init(); +
recipes-kernel/linux/linux-jlime-ben-nanonote_2.6.36.bb +3 -1
@@ -1,6 +1,7 @@ DESCRIPTION = "Linux 2.6.36 kernel for the Ben Nanonote" SECTION = "kernel" LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" DEPENDS += "u-boot-mkimage-native"
@@ -15,7 +16,8 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kristoffer/linux-hpc.gi file://logo_linux_clut224.tar.gz \ file://modifier-keys.patch \ file://config-ben-nanonote \ - file://jz4740-udc.patch" + file://jz4740-udc.patch \ + file://gcc-attribute-unused.patch" S = "${WORKDIR}/git"
Signature · 1 line
1.7.10.4
PATCH 2/2 ben-nanonote: add DEFAULTTUNE to machine configuration
In reply to Apelete SeketeliAdd DEFAULTTUNE to machine configuration to ensure that the correct tune features are selected by default.
--- conf/machine/ben-nanonote.conf | 1 + 1 file changed, 1 insertion(+)
conf/machine/ben-nanonote.conf +1 -0
@@ -3,6 +3,7 @@ #@DESCRIPTION: Machine configuration for the Qi-Hardware's Ben Nanonote require conf/machine/include/tune-mips32.inc +DEFAULTTUNE = "mips32el-nf" PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-ben-nanonote"
Signature · 1 line
1.7.10.4
Re: [meta-handheld][PATCH 2/2] ben-nanonote: add DEFAULTTUNE to machine configuration
Hi Apelete,
Quoted 13 lines · On Friday 05 April 2013 07:37:55 Apelete Seketeli wrote:
Add DEFAULTTUNE to machine configuration to ensure that the correct tune features are selected by default.
Signed-off-by Apelete Seketeli <[email protected]>--- conf/machine/ben-nanonote.conf | 1 + 1 file changed, 1 insertion(+)conf/machine/ben-nanonote.conf +0
-0
conf/machine/ben-nanonote.conf line 8
Quoted 6 lines
conf/machine/ben-nanonote.conf +1
-0@@ -3,6 +3,7 @@ #@DESCRIPTION: Machine configuration for the Qi-Hardware's Ben Nanonote require conf/machine/include/tune-mips32.inc +DEFAULTTUNE = "mips32el-nf" PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-ben-nanonote"
There was a discussion just the other day on this mailing list; setting DEFAULTTUNE is considered the province of distro configuration and thus shouldn't be in the machine config:
http://lists.linuxtogo.org/pipermail/openembedded-devel/2013-April/044719.html
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre