[U-Boot] [PATCH V2] ARM: orion5x: reduce dependence of including platform file

Lei Wen adrian.wenl at gmail.com
Mon Oct 31 15:38:00 CET 2011


Hi Prafulla,

On Thu, Oct 27, 2011 at 5:02 PM, Prafulla Wadaskar <prafulla at marvell.com> wrote:
>
>
>> -----Original Message-----
>> From: Lei Wen [mailto:leiwen at marvell.com]
>> Sent: Wednesday, October 26, 2011 7:52 AM
>> To: Wolfgang Denk; Albert ARIBAUD; Prafulla Wadaskar; u-
>> boot at lists.denx.de
>> Subject: [PATCH V2] ARM: orion5x: reduce dependence of
>> including platform file
>>
>> For files like the drivers/serial/serial.c, it must include the
>> platform file, as the CONFIG_SYS_NS16550_COM1 must reference to
>> the definition in the platform definition files.
>>
>> Include the platform definition file in the config file, so
>> that it
>> would decouple the dependence for the driver files.
>>
>> Signed-off-by: Lei Wen <leiwen at marvell.com>
>> ---
>> Changelog:
>> V2: seperate orion5x define structure as kirkwood and armada
>> does
>>
>>  arch/arm/cpu/arm926ejs/orion5x/cpu.c        |    2 +
>>  arch/arm/cpu/arm926ejs/orion5x/dram.c       |    1 +
>>  arch/arm/cpu/arm926ejs/orion5x/timer.c      |    1 +
>>  arch/arm/include/asm/arch-orion5x/config.h  |  135
>> ++++++++++++++++++++++
>>  arch/arm/include/asm/arch-orion5x/orion5x.h |    6 -
>>  common/cmd_ide.c                            |    6 -
>>  include/configs/edminiv2.h                  |  166 +--------
>
> I think you are mixing two objective in one patch here.
>
> 1. using mv-common.h for orion5x platforms.
> 2. orion5x: reduce dependence of including platform file (i.e. ide, serial)
>
> May you please split them accordingly?
>
> ...snip....
>> diff --git a/arch/arm/include/asm/arch-orion5x/config.h
>> b/arch/arm/include/asm/arch-orion5x/config.h
>> new file mode 100644
>> index 0000000..6db3554
>> --- /dev/null
>> +++ b/arch/arm/include/asm/arch-orion5x/config.h
>> @@ -0,0 +1,135 @@
>> +/*
>> + * (C) Copyright 2011
>> + * 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 Orion platform
>> + */
>> +
>> +#ifndef _ORION_CONFIG_H
>> +#define _ORION_CONFIG_H
>> +
>> +#include <asm/arch/orion5x.h>
>> +#define MV_UART_CONSOLE_BASE ORION5X_UART0_BASE
>> +
>> +/*
>> + * Board-specific values for Orion5x MPP low level init:
>> + * - MPPs 12 to 15 are SATA LEDs (mode 5)
>> + * - Others are GPIO/unused (mode 3 for MPP0, mode 5 for
>> + *   MPP16 to MPP19, mode 0 for others
>> + */
>> +
>> +#define ORION5X_MPP0_7               0x00000003
>> +#define ORION5X_MPP8_15              0x55550000
>> +#define ORION5X_MPP16_23     0x00005555
>> +
>> +/*
>> + * Board-specific values for Orion5x GPIO low level init:
>> + * - GPIO3 is input (RTC interrupt)
>> + * - GPIO16 is Power LED control (0 = on, 1 = off)
>> + * - GPIO17 is Power LED source select (0 = CPLD, 1 = GPIO16)
>> + * - GPIO18 is Power Button status (0 = Released, 1 = Pressed)
>> + * - Last GPIO is 26, further bits are supposed to be 0.
>> + * Enable mask has ones for INPUT, 0 for OUTPUT.
>> + * Default is LED ON.
>> + */
>> +
>> +#define ORION5X_GPIO_OUT_ENABLE      0x03fcffff
>> +#define ORION5X_GPIO_OUT_VALUE       0x03fcffff
>
> MPP and GPIO configs are specific to each board and must go to board config file
>

It seems to me that orion5x fixing patch already merged in both
u-boot-marvell.git
and u-boot-arm.git. And I try to build the edminiv2_config in both
git, no preview warning
at all...

So it seems this v2 patch could be abondoned...

Best regards,
Lei


More information about the U-Boot mailing list