[U-Boot] ARM CONFIG_OF_CONTROL status

[Michal Simek]

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<monstr at monstr.eu>   wrote:
>>>>
>>>>> 2012/6/29 Stephan Linz<linz at li-pro.net>:
>>>>>> 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.

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 <fdtdec.h>
  #include <key_matrix.h>
-#include <malloc.h>
+//#include <malloc.h>
  #include <linux/input.h>


Thanks,
Michal

-- 
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian