From patchwork Mon Jul 9 07:58:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 169705 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 077652C0207 for ; Mon, 9 Jul 2012 17:58:19 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2D670280E3; Mon, 9 Jul 2012 09:58:17 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vxmR3+7FDmxJ; Mon, 9 Jul 2012 09:58:16 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D4D42280D3; Mon, 9 Jul 2012 09:58:15 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A3CBE280D3 for ; Mon, 9 Jul 2012 09:58:13 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XQzwiltYi5v5 for ; Mon, 9 Jul 2012 09:58:12 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-bk0-f44.google.com (mail-bk0-f44.google.com [209.85.214.44]) by theia.denx.de (Postfix) with ESMTPS id ACBB1280D0 for ; Mon, 9 Jul 2012 09:58:11 +0200 (CEST) Received: by bkty7 with SMTP id y7so2423358bkt.3 for ; Mon, 09 Jul 2012 00:58:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:reply-to:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=SBk8MAQKac9bbvX9UHb6llty0p00ohqejMEia7ngVgU=; b=epbYIsra9zNRtiWyh1MupqdiGVXD/THdt7vJhwF17d8LiGn0A5g+lTYLlRIjTvtGTS eg5ZEoOmoWj198/DNYMBj4o6vF6++4o2XnV9l2YvuTd0mfGsHErP1T9e65DoK4n45xbM LhV1wK2C0G1z17BHuNwMp9hX71Tn29ZW3Dby8GIoU7pysEGrSx6KjgqQy/0oXIi59Ckf I8wsZACUlMr53K3FiLRbIDABysuw0+g8BD0MGEkNKLGhujuYaGaUPpzlHlvGtW/SQaAL RpmGBlMC1kA7yTPkK8n5YLAOh9Xz8q/UlV0AXWFKyPJB5EZ5fmGghSODMVniuHFZjbtA 2vLA== Received: by 10.204.132.80 with SMTP id a16mr18180523bkt.82.1341820690583; Mon, 09 Jul 2012 00:58:10 -0700 (PDT) Received: from [192.168.0.101] (11.161.broadband5.iol.cz. [88.100.161.11]) by mx.google.com with ESMTPS id n17sm11395447bks.6.2012.07.09.00.58.07 (version=SSLv3 cipher=OTHER); Mon, 09 Jul 2012 00:58:09 -0700 (PDT) Message-ID: <4FFA8F0D.9010401@monstr.eu> Date: Mon, 09 Jul 2012 09:58:05 +0200 From: Michal Simek User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:12.0) Gecko/20120430 Thunderbird/12.0.1 MIME-Version: 1.0 To: linz@li-pro.net References: <4FEAD263.2020707@monstr.eu> <4FEB1A3C.7050207@monstr.eu> <4FEBF08D.2060604@monstr.eu> <4FEBFE72.20106@monstr.eu> <4FED64C3.8050302@monstr.eu> <1341001359.3999.106.camel@keto> <1341346946.2746.93.camel@keto> <4FF3E194.4000801@monstr.eu> <1341433625.2722.27.camel@keto> In-Reply-To: <1341433625.2722.27.camel@keto> X-Gm-Message-State: ALoCoQmBpjFF0SPHzzld+bkA493FDDN9p/tIOU21y5vZOjJClLoAmNEwSodmutXYKzs4qBQwphqv Cc: "u-boot@lists.denx.de" Subject: Re: [U-Boot] ARM CONFIG_OF_CONTROL status X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list Reply-To: monstr@monstr.eu List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de On 07/04/2012 10:27 PM, Stephan Linz wrote: > Am Mittwoch, den 04.07.2012, 08:24 +0200 schrieb Michal Simek: >> On 07/03/2012 10:22 PM, Stephan Linz wrote: >>> Am Dienstag, den 03.07.2012, 12:21 -0700 schrieb Simon Glass: >>>> Hi, >>>> >>>> On Sun, Jul 1, 2012 at 10:43 PM, Michal Simek wrote: >>>> >>>>> 2012/6/29 Stephan Linz: >>>>>> Am Freitag, den 29.06.2012, 10:18 +0200 schrieb Michal Simek: >>>>>>> On 06/29/2012 04:32 AM, Simon Glass wrote: >>>>>>>> Hi, >>>>>>>> >>>>>>>> --snip-- >>>>>>> >>>>>>> >>>>> >>>> >>>> Well there is no inherent problem with having multiple include files, >>>> except that it is hard to support with the old dtc when there are in >>>> different subdirs. >>>> >>>> As a workaround, how about putting the include files in the >>>> board/vendor/dts subdir as well for now? >>> >>> Hi, >>> >>> good idea -- but they cannot be used directly. The substitution variable >>> ARCH_CPU_DTS is already reserved for dtsi in arch/cpu. The Microblaze >>> architecture needs a board specific dts onyl. That's why I think the new >>> substitution variable BOARD_DTS can be a option to solve the CPP problem >>> today and handle the dtc -i in the future. >>> >>> BOARD_DTS can point to anything below board/vendor and perhaps with a >>> new configuration option similar to CONFIG_DEFAULT_DEVICE_TREE the >>> substitution could be affected with freely selectable file name instead >>> of DEVICE_TREE only. >> >> >> ok. >> >> Stephan: go ahead and create proper patch with empty dts/dtsi files. > > Hi Michal, > > see my patch set, that I've already submitted. The patches are based on > your patch set from last week. I've create a bundle on patchwork: > > http://patchwork.ozlabs.org/bundle/rexut/microblaze-fdt/ > > Further you will need a QnD hack to avoid a compilation error due to > type conflicts (I've not explored here, not yet): > > In file included from key_matrix.c:28: > include/malloc.h:364: error: conflicting types for 'memset' > include/linux/string.h:71: error: previous declaration of 'memset' was > here > include/malloc.h:365: error: conflicting types for 'memcpy' > include/linux/string.h:74: error: previous declaration of 'memcpy' was > here > > > Here is the QnD hack: > > > diff --git a/drivers/input/Makefile b/drivers/input/Makefile > index 5c831b2..5efeeb3 100644 > --- a/drivers/input/Makefile > +++ b/drivers/input/Makefile > @@ -32,7 +32,7 @@ COBJS-y += keyboard.o pc_keyb.o > COBJS-$(CONFIG_PS2MULT) += ps2mult.o ps2ser.o > endif > COBJS-y += input.o > -COBJS-$(CONFIG_OF_CONTROL) += key_matrix.o > +#COBJS-$(CONFIG_OF_CONTROL) += key_matrix.o > > COBJS := $(COBJS-y) > SRCS := $(COBJS:.o=.c) Yes, I have seen this too. I did this. Thanks, Michal diff --git a/drivers/input/key_matrix.c b/drivers/input/key_matrix.c index 84b898f..804a761 100644 (file) --- a/drivers/input/key_matrix.c +++ b/drivers/input/key_matrix.c @@ -25,7 +25,7 @@ #include #include -#include +//#include #include