Build fails on omap3530_beagle_per_uart_defconfig

[Anand Gadiyar]

On Mon, Dec 7, 2009 at 5:01 PM, Sascha Hauer <s.hauer at pengutronix.de> wrote:
> Hi,
>
> On Sat, Dec 05, 2009 at 10:14:17PM +0530, Anand Gadiyar wrote:
>> Hi,
>>
>> This is my first attempt at building barebox. So I'm probably making
>> some silly mistake here.
>
> No, your commands look good, it's just that the omap configs are broken.
> The following patch at least allows to compile the config.
>
> Sascha


Thank you! This patch worked.
A similar patch was needed for the SDP board as well.

Will boot test tomorrow.

- Anand

>
>
> diff --git a/arch/arm/Makefile b/arch/arm/Makefile
> index 51001c4..377210d 100644
> --- a/arch/arm/Makefile
> +++ b/arch/arm/Makefile
> @@ -59,7 +59,7 @@ board-$(CONFIG_MACH_IMX27ADS)                 := imx27ads
>  board-$(CONFIG_MACH_MMCCPU)                    := mmccpu
>  board-$(CONFIG_MACH_MX1ADS)                    := mx1ads
>  board-$(CONFIG_MACH_NXDB500)                   := netx
> -board-$(CONFIG_MACH_OMAP)                      := omap
> +board-$(CONFIG_ARCH_OMAP)                      := omap
>  board-$(CONFIG_MACH_PCA100)                    := phycard-i.MX27
>  board-$(CONFIG_MACH_PCM037)                    := pcm037
>  board-$(CONFIG_MACH_PCM038)                    := pcm038
> diff --git a/arch/arm/mach-omap/syslib.c b/arch/arm/mach-omap/syslib.c
> index 51824da..4f70abc 100644
> --- a/arch/arm/mach-omap/syslib.c
> +++ b/arch/arm/mach-omap/syslib.c
> @@ -31,6 +31,7 @@
>  */
>
>  #include <config.h>
> +#include <common.h>
>  #include <asm/io.h>
>  #include <mach/syslib.h>
>
> diff --git a/board/omap/board-beagle.c b/board/omap/board-beagle.c
> index 282c532..368702d 100644
> --- a/board/omap/board-beagle.c
> +++ b/board/omap/board-beagle.c
> @@ -53,6 +53,7 @@
>  #include <driver.h>
>  #include <asm/io.h>
>  #include <ns16550.h>
> +#include <asm/armlinux.h>
>  #include <mach/silicon.h>
>  #include <mach/sdrc.h>
>  #include <mach/sys_info.h>
> @@ -244,32 +245,15 @@ static struct device_d sdram_dev = {
>        .name = "mem",
>        .map_base = 0x80000000,
>        .size = 128 * 1024 * 1024,
> -       .platform_data = &ram_pdata,
> +       .platform_data = &sram_pdata,
>  };
>
> -#ifndef CONFIG_CMD_MEMORY
> -static struct driver_d ram_drv = {
> -       .name = "ram",
> -       .probe = dummy_probe,
> -       .open = dev_open_default,
> -       .close = dev_close_default,
> -       .read = mem_read,
> -       .write = mem_write,
> -       .lseek = dev_lseek_default,
> -};
> -#endif
> -
>  static int beagle_devices_init(void)
>  {
>        int ret;
>        ret = register_device(&sdram_dev);
>        if (ret)
>                goto failed;
> -#ifndef CONFIG_CMD_MEMORY
> -       ret = register_driver(&ram_drv);
> -       if (ret)
> -               goto failed;
> -#endif
>  #ifdef CONFIG_GPMC
>        /* WP is made high and WAIT1 active Low */
>        gpmc_generic_init(0x10);
>
> --
> Pengutronix e.K.                           |                             |
> Industrial Linux Solutions                 | http://www.pengutronix.de/  |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
>