Re: [U-Boot] [PATCH V2] ARM: orion5x: reduce dependence of including platform file
Hi Prafulla, On Thu, Oct 27, 2011 at 5:02 PM, Prafulla Wadaskar wrote: > > >> -Original Message- >> From: Lei Wen [mailto:lei...@marvell.com] >> Sent: Wednesday, October 26, 2011 7:52 AM >> To: Wolfgang Denk; Albert ARIBAUD; Prafulla Wadaskar; u- >> b...@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 >> --- >> 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 000..6db3554 >> --- /dev/null >> +++ b/arch/arm/include/asm/arch-orion5x/config.h >> @@ -0,0 +1,135 @@ >> +/* >> + * (C) Copyright 2011 >> + * Marvell Semiconductor >> + * Written-by: Lei Wen >> + * >> + * 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 >> +#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 0x0003 >> +#define ORION5X_MPP8_15 0x >> +#define ORION5X_MPP16_23 0x >> + >> +/* >> + * 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 0x03fc >> +#define ORION5X_GPIO_OUT_VALUE 0x03fc > > 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 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V2] ARM: orion5x: reduce dependence of including platform file
> -Original Message- > From: Lei Wen [mailto:lei...@marvell.com] > Sent: Wednesday, October 26, 2011 7:52 AM > To: Wolfgang Denk; Albert ARIBAUD; Prafulla Wadaskar; u- > b...@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 > --- > 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 000..6db3554 > --- /dev/null > +++ b/arch/arm/include/asm/arch-orion5x/config.h > @@ -0,0 +1,135 @@ > +/* > + * (C) Copyright 2011 > + * Marvell Semiconductor > + * Written-by: Lei Wen > + * > + * 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 > +#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 0x0003 > +#define ORION5X_MPP8_15 0x > +#define ORION5X_MPP16_23 0x > + > +/* > + * 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 0x03fc > +#define ORION5X_GPIO_OUT_VALUE 0x03fc MPP and GPIO configs are specific to each board and must go to board config file Regards.. Prafulla .. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [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
---
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 +--
7 files changed, 141 insertions(+), 176 deletions(-)
create mode 100644 arch/arm/include/asm/arch-orion5x/config.h
diff --git a/arch/arm/cpu/arm926ejs/orion5x/cpu.c
b/arch/arm/cpu/arm926ejs/orion5x/cpu.c
index 05bd45c..2b0c760 100644
--- a/arch/arm/cpu/arm926ejs/orion5x/cpu.c
+++ b/arch/arm/cpu/arm926ejs/orion5x/cpu.c
@@ -28,7 +28,9 @@
#include
#include
#include
+#include
#include
+#include
#include
#include
diff --git a/arch/arm/cpu/arm926ejs/orion5x/dram.c
b/arch/arm/cpu/arm926ejs/orion5x/dram.c
index 5cc31a9..028f046 100644
--- a/arch/arm/cpu/arm926ejs/orion5x/dram.c
+++ b/arch/arm/cpu/arm926ejs/orion5x/dram.c
@@ -27,6 +27,7 @@
#include
#include
+#include
#include
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/cpu/arm926ejs/orion5x/timer.c
b/arch/arm/cpu/arm926ejs/orion5x/timer.c
index 17df68f..0b49b69 100644
--- a/arch/arm/cpu/arm926ejs/orion5x/timer.c
+++ b/arch/arm/cpu/arm926ejs/orion5x/timer.c
@@ -25,6 +25,7 @@
*/
#include
+#include
#include
#define UBOOT_CNTR 0 /* counter to use for uboot timer */
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 000..6db3554
--- /dev/null
+++ b/arch/arm/include/asm/arch-orion5x/config.h
@@ -0,0 +1,135 @@
+/*
+ * (C) Copyright 2011
+ * Marvell Semiconductor
+ * Written-by: Lei Wen
+ *
+ * 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
+#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 0x0003
+#define ORION5X_MPP8_150x
+#define ORION5X_MPP16_23 0x
+
+/*
+ * 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_ENABLE0x03fc
+#define ORION5X_GPIO_OUT_VALUE 0x03fc
+
+#define CONFIG_SYS_INIT_SP_ADDR\
+ (CONFIG_SYS_SDRAM_BASE + 0x1000 - GENERATED_GBL_DATA_SIZE)
+#define CONFIG_NR_DRAM_BANKS_MAX 1
+/*
+ * FLASH configuration
+ */
+#define CONFIG_SYS_FLASH_CFI
+#define CONFIG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_LEGACY
+#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max num of flash banks */
+#define CONFIG_SYS_MAX_FLASH_SECT 11 /* max num of sects on one chip */
+#define CONFIG_SYS_FLASH_BASE 0xfff8
+#define CONFIG_SYS_FLASH_SECTSZ \
+ {16384, 8192, 8192, 32768, \
+65536, 65536, 65536, 65536, 65536, 65536, 65536}
+
+/*
+ * Network
+ */
+
+#ifdef CONFIG_CMD_NET
+#define CONFIG_MVGBE /* Enable Marvell GbE Driver */
+#define CONFIG_MVGBE_PORTS {1} /* enable port 0 only */
+#define CONFIG_SKIP_LOCAL_MAC_RAND
