[U-Boot] [PATCH V7 1/5] mv: seperate kirkwood and armada from common setting

[Lei Wen]

Hi Albert,

On Fri, Jan 28, 2011 at 2:34 AM, Albert ARIBAUD <albert.aribaud at free.fr> wrote:
> Hi Lei Wen,
>
> Le 26/01/2011 11:31, Lei Wen a écrit :
>
>> diff --git a/README b/README
>> index 755d17c..e0341b5 100644
>> --- a/README
>> +++ b/README
>> @@ -319,6 +319,11 @@ The following options need to be configured:
>>                       CONFIG_SYS_PQ2FADS      - PQ2FADS-ZU or PQ2FADS-VR
>>                       CONFIG_SYS_8272ADS      - MPC8272ADS
>>
>> +- Marvell Family Member
>> +             CONFIG_SYS_MVFS         - define it if you want to enable
>> +                                       multiply fs option at one time
>
> Are you sure about this "multiply"?

Should be multiple...
>
>> +                                       for marvell soc family
>> +
>>   - MPC824X Family Member (if CONFIG_MPC824X is defined)
>>               Define exactly one of
>>               CONFIG_MPC8240, CONFIG_MPC8245
>> diff --git a/arch/arm/include/asm/arch-armada100/config.h b/arch/arm/include/asm/arch-armada100/config.h
>> new file mode 100644
>> index 0000000..f16806e
>> --- /dev/null
>> +++ b/arch/arm/include/asm/arch-armada100/config.h
>> @@ -0,0 +1,44 @@
>> +/*
>> + * (C) Copyright 2010
>
> Maybe update the copyright year?
My fault...

>
>> + * Marvell Semiconductor<www.marvell.com>
>> + * Written-by: Lei Wen<leiwen at marvell.com>
>> + *
>> + * See file CREDITS for list of people who contributed to this
>> + * project.
>> + *
>> + * This program is free software; you can redistribute it and/or
>> + * modify it under the terms of the GNU General Public License as
>> + * published by the Free Software Foundation; either version 2 of
>> + * the License, or (at your option) any later version.
>> + *
>> + * This program is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> + * GNU General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU General Public License
>> + * along with this program; if not, write to the Free Software
>> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
>> + * MA 02110-1301 USA
>> + */
>> +
>> +/*
>> + * This file should be included in board config header file.
>> + *
>> + * It supports common definitions for Armada100 platform
>> + */
>> +
>> +#ifndef _ARMD1_CONFIG_H
>> +#define _ARMD1_CONFIG_H
>> +
>> +#define CONFIG_ARM926EJS     1       /* Basic Architecture */
>> +
>> +#define CONFIG_SYS_TCLK              (14745600)      /* NS16550 clk config */
>> +#define CONFIG_SYS_HZ_CLOCK  (3250000)       /* Timer Freq. 3.25MHZ */
>> +#define CONFIG_MARVELL_MFP                   /* Enable mvmfp driver */
>> +#define MV_MFPR_BASE         ARMD1_MFPR_BASE
>> +#define MV_UART_CONSOLE_BASE ARMD1_UART1_BASE
>> +#define CONFIG_SYS_NS16550_IER       (1<<  6)        /* Bit 6 in UART_IER register
>> +                                             represents UART Unit Enable */
>> +
>> +#endif /* _ARMD1_CONFIG_H */
>> diff --git a/arch/arm/include/asm/arch-kirkwood/config.h b/arch/arm/include/asm/arch-kirkwood/config.h
>> new file mode 100644
>> index 0000000..7c6d63b
>> --- /dev/null
>> +++ b/arch/arm/include/asm/arch-kirkwood/config.h
>> @@ -0,0 +1,145 @@
>> +/*
>> + * (C) Copyright 2010
>
> Ditto
>
>> + * Marvell Semiconductor<www.marvell.com>
>> + * Written-by: Lei Wen<leiwen at marvell.com>
>> + *
>> + * See file CREDITS for list of people who contributed to this
>> + * project.
>> + *
>> + * This program is free software; you can redistribute it and/or
>> + * modify it under the terms of the GNU General Public License as
>> + * published by the Free Software Foundation; either version 2 of
>> + * the License, or (at your option) any later version.
>> + *
>> + * This program is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> + * GNU General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU General Public License
>> + * along with this program; if not, write to the Free Software
>> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
>> + * MA 02110-1301 USA
>> + */
>> +
>> +/*
>> + * This file should be included in board config header file.
>> + *
>> + * It supports common definitions for Kirkwood platform
>> + */
>> +
>> +#ifndef _KW_CONFIG_H
>> +#define _KW_CONFIG_H
>> +
>> +#if defined (CONFIG_KW88F6281)
>> +#include<asm/arch/kw88f6281.h>
>> +#elif defined (CONFIG_KW88F6192)
>> +#include<asm/arch/kw88f6192.h>
>> +#else
>> +#error "SOC Name not defined"
>> +#endif /* CONFIG_KW88F6281 */
>> +
>> +#define CONFIG_ARM926EJS     1       /* Basic Architecture */
>> +
>> +#define CONFIG_MD5   /* get_random_hex on krikwood needs MD5 support */
>> +#define CONFIG_KIRKWOOD_EGIGA_INIT   /* Enable GbePort0/1 for kernel */
>> +#define CONFIG_KIRKWOOD_RGMII_PAD_1V8        /* Set RGMII Pad voltage to 1.8V */
>> +#define CONFIG_KIRKWOOD_PCIE_INIT       /* Enable PCIE Port0 for kernel */
>> +
>> +/*
>> + * By default kwbimage.cfg from board specific folder is used
>> + * If for some board, different configuration file need to be used,
>> + * CONFIG_SYS_KWD_CONFIG should be defined in board specific header file
>> + */
>> +#ifndef CONFIG_SYS_KWD_CONFIG
>> +#define      CONFIG_SYS_KWD_CONFIG   $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage.cfg
>
> What are the '$()' operators doing here ?

This definition is served as generating kirkwood special image, which
I just move it from mv-common.h
$(obj)u-boot.kwb:       $(obj)u-boot.bin
                $(obj)tools/mkimage -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \
                -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d $< $@


Best regards,
Lei