Add Pantheon soc and dkb board support

This patch set add the Pantheon soc and dkb board support.

-----Original Message-----
From: Lei Wen [mailto:leiwen at marvell.com]
Sent: Friday, January 28, 2011 1:19 AM
To: Albert ARIBAUD; Wolfgang Denk; u-boot at lists.denx.de; Prafulla Wadaskar; Yu Tang; Ashish Karkare; Prabhanjan Sarnaik; Lei Wen
Subject: [PATCH V8 0/5] Add Pantheon soc and dkb board support

This patch set add the Pantheon soc and dkb board support.

V2:
This patch seris update the seperate mv_common part as suggested.

V3:
Fix config.h include place and copyright claim year.

V4:
Add change log to each patch.

V5:
Add doc in Readme for new CONFIG_SYS_MVFS.
code style fix.

V6:
Rebase patch on latest u-boot-marvell.git.
And fix a build warning.

V7:
Fix CONFIG_SYS_INIT_SP_ADDR put place.
Fix timer read to avoid potential optimization out of loop. Correct comments in the fourth patch.

V8:
Fix copyright claim year.

Lei Wen (5):
mv: seperate kirkwood and armada from common setting
ARM: Add Support for Marvell Pantheon Familiy SoCs
serial: add pantheon soc support
mvmfp: add MFP configuration support for PANTHEON
Pantheon: Add Board Support for Marvell dkb board

 MAINTAINERS                                   |    4 +
 README                                        |    5 +
 arch/arm/cpu/arm926ejs/pantheon/Makefile      |   46 ++++++
 arch/arm/cpu/arm926ejs/pantheon/cpu.c         |   78 +++++++++
 arch/arm/cpu/arm926ejs/pantheon/dram.c        |  132 +++++++++++++++
 arch/arm/cpu/arm926ejs/pantheon/timer.c       |  214
+++++++++++++++++++++++++
 arch/arm/include/asm/arch-armada100/config.h  |   44 +++++
 arch/arm/include/asm/arch-kirkwood/config.h   |  145 +++++++++++++++++
 arch/arm/include/asm/arch-pantheon/config.h   |   38 +++++
 arch/arm/include/asm/arch-pantheon/cpu.h      |   79 +++++++++
 arch/arm/include/asm/arch-pantheon/mfp.h      |   41 +++++
 arch/arm/include/asm/arch-pantheon/pantheon.h |   54 ++++++
 board/Marvell/dkb/Makefile                    |   51 ++++++
 board/Marvell/dkb/dkb.c                       |   54 ++++++
 boards.cfg                                    |    1 +
 drivers/gpio/mvmfp.c                          |    2 +
 drivers/serial/serial.c                       |    2 +
 include/configs/aspenite.h                    |    8 +
 include/configs/dkb.h                         |   65 ++++++++
 include/configs/mv-common.h                   |  147 +++---------------
 20 files changed, 1084 insertions(+), 126 deletions(-)
 create mode 100644 arch/arm/cpu/arm926ejs/pantheon/Makefile
 create mode 100644 arch/arm/cpu/arm926ejs/pantheon/cpu.c
 create mode 100644 arch/arm/cpu/arm926ejs/pantheon/dram.c
 create mode 100644 arch/arm/cpu/arm926ejs/pantheon/timer.c
 create mode 100644 arch/arm/include/asm/arch-armada100/config.h

 create mode 100644 arch/arm/include/asm/arch-kirkwood/config.h
 create mode 100644 arch/arm/include/asm/arch-pantheon/config.h
 create mode 100644 arch/arm/include/asm/arch-pantheon/cpu.h
 create mode 100644 arch/arm/include/asm/arch-pantheon/mfp.h
 create mode 100644 arch/arm/include/asm/arch-pantheon/pantheon.h
 create mode 100644 board/Marvell/dkb/Makefile
 create mode 100644 board/Marvell/dkb/dkb.c
 create mode 100644 include/configs/dkb.h

arch/arm/include/asm/arch-armada100/config.h new file +42 -0

+ * Marvell Semiconductor<www.marvell.com>
+ * Written-by: Lei Wen<[email protected]>
+ *
+ * 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 */

arch/arm/include/asm/arch-kirkwood/config.h new file +0 -0

new file mode 100644
index 0000000..7c6d63b

arch/arm/include/asm/arch-kirkwood/config.h new file +43 -0

+ * Marvell Semiconductor<www.marvell.com>
+ * Written-by: Lei Wen<[email protected]>
+ *
+ * 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 */

arch/arm/include/asm/arch-kirkwood/config.h new file +90 -0

+#endif /* CONFIG_SYS_KWD_CONFIG */
+
+/* Kirkwood has 2k of Security SRAM, use it for SP */
+#define CONFIG_SYS_INIT_SP_ADDR		0xC8012000
+#define CONFIG_NR_DRAM_BANKS_MAX	2
+
+#define CONFIG_I2C_MVTWSI_BASE	KW_TWSI_BASE
+#define MV_UART_CONSOLE_BASE	KW_UART0_BASE
+#define MV_SATA_BASE		KW_SATA_BASE
+#define MV_SATA_PORT0_OFFSET	KW_SATA_PORT0_OFFSET
+#define MV_SATA_PORT1_OFFSET	KW_SATA_PORT1_OFFSET
+
+/*
+ * NAND configuration
+ */
+#ifdef CONFIG_CMD_NAND
+#define CONFIG_NAND_KIRKWOOD
+#define CONFIG_SYS_NAND_BASE		0xD8000000	/* MV_DEFADR_NANDF */
+#define NAND_ALLOW_ERASE_ALL		1
+#endif
+
+/*
+ * SPI Flash configuration
+ */
+#ifdef CONFIG_CMD_SF
+#define CONFIG_HARD_SPI			1
+#define CONFIG_KIRKWOOD_SPI		1
+#define CONFIG_ENV_SPI_BUS		0
+#define CONFIG_ENV_SPI_CS		0
+#define CONFIG_ENV_SPI_MAX_HZ		50000000	/*50Mhz */
+#endif
+
+/*
+ * Ethernet Driver configuration
+ */
+#ifdef CONFIG_CMD_NET
+#define CONFIG_CMD_MII
+#define CONFIG_NETCONSOLE	/* include NetConsole support   */
+#define CONFIG_NET_MULTI	/* specify more that one ports available */
+#define CONFIG_MII		/* expose smi ove miiphy interface */
+#define CONFIG_MVGBE		/* Enable Marvell Gbe Controller Driver */
+#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN	/* detect link using phy */
+#define CONFIG_ENV_OVERWRITE	/* ethaddr can be reprogrammed */
+#define CONFIG_RESET_PHY_R	/* use reset_phy() to init mv8831116 PHY */
+#endif /* CONFIG_CMD_NET */
+
+/*
+ * USB/EHCI
+ */
+#ifdef CONFIG_CMD_USB
+#define CONFIG_USB_EHCI_KIRKWOOD
+#define CONFIG_EHCI_IS_TDI
+#endif /* CONFIG_CMD_USB */
+
+/*
+ * IDE Support on SATA ports
+ */
+#ifdef CONFIG_CMD_IDE
+#define __io
+#define CONFIG_CMD_EXT2
+#define CONFIG_MVSATA_IDE
+#define CONFIG_IDE_PREINIT
+#define CONFIG_MVSATA_IDE_USE_PORT1
+/* Needs byte-swapping for ATA data register */
+#define CONFIG_IDE_SWAP_IO
+/* Data, registers and alternate blocks are at the same offset */
+#define CONFIG_SYS_ATA_DATA_OFFSET	(0x0100)
+#define CONFIG_SYS_ATA_REG_OFFSET	(0x0100)
+#define CONFIG_SYS_ATA_ALT_OFFSET	(0x0100)
+/* Each 8-bit ATA register is aligned to a 4-bytes address */
+#define CONFIG_SYS_ATA_STRIDE		4
+/* Controller supports 48-bits LBA addressing */
+#define CONFIG_LBA48
+/* CONFIG_CMD_IDE requires some #defines for ATA registers */
+#define CONFIG_SYS_IDE_MAXBUS		2
+#define CONFIG_SYS_IDE_MAXDEVICE	2
+/* ATA registers base is at SATA controller base */
+#define CONFIG_SYS_ATA_BASE_ADDR	MV_SATA_BASE
+#endif /* CONFIG_CMD_IDE */
+
+/*
+ * I2C related stuff
+ */
+#ifdef CONFIG_CMD_I2C
+#define CONFIG_I2C_MVTWSI
+#define CONFIG_SYS_I2C_SLAVE		0x0
+#define CONFIG_SYS_I2C_SPEED		100000
+#endif
+
+#endif /* _KW_CONFIG_H */

include/configs/aspenite.h +8 -0

index 706365f..fd35f3e 100644
@@ -41,6 +41,13 @@
  #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
 
  /*
+ * There is no internal RAM in ARMADA100, using DRAM
+ * TBD: dcache to be used for this
+ */
+#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_TEXT_BASE - 0x00200000)
+#define CONFIG_NR_DRAM_BANKS_MAX	2
+
+/*
   * Commands configuration
   */
  #define CONFIG_SYS_NO_FLASH		/* Declare no flash (NOR/SPI) */

@@ -53,6 +60,7 @@
   * to enable certain macros
   */
  #include "mv-common.h"
+#undef CONFIG_ARCH_MISC_INIT
 
  /*
   * Environment variables configurations

include/configs/mv-common.h +20 -125

index 97b6971..a8937dd 100644
@@ -37,54 +37,6 @@
   * High Level Configuration Options (easy to change)
   */
  #define CONFIG_MARVELL		1
-#define CONFIG_ARM926EJS	1	/* Basic Architecture */
-
-/* ====>  Kirkwood Platform Common Definations */
-#if defined(CONFIG_KIRKWOOD)
-#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
-#endif /* CONFIG_SYS_KWD_CONFIG */
-
-/* Kirkwood has 2k of Security SRAM, use it for SP */
-#define CONFIG_SYS_INIT_SP_ADDR		0xC8012000
-#define CONFIG_NR_DRAM_BANKS_MAX	2
-
-#define CONFIG_I2C_MVTWSI_BASE	KW_TWSI_BASE
-#define MV_UART_CONSOLE_BASE	KW_UART0_BASE
-#define MV_SATA_BASE		KW_SATA_BASE
-#define MV_SATA_PORT0_OFFSET	KW_SATA_PORT0_OFFSET
-#define MV_SATA_PORT1_OFFSET	KW_SATA_PORT1_OFFSET
-
-/* ====>  ARMADA100 Platform Common Definations */
-#elif defined (CONFIG_ARMADA100)
-
-#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 */
-/*
- * There is no internal RAM in ARMADA100, using DRAM
- * TBD: dcache to be used for this
- */
-#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_TEXT_BASE - 0x00200000)
-#define CONFIG_NR_DRAM_BANKS_MAX	2
-
-#else
-#error "Unsupported SoC Platform..."
-#endif
 
  /*
   * Custom CONFIG_SYS_TEXT_BASE can be done in<board>.h

@@ -138,31 +90,6 @@
  		+sizeof(CONFIG_SYS_PROMPT) + 16)	/* Print Buff */
 
  /*
- * NAND configuration
- */
-#ifdef CONFIG_CMD_NAND
-#define CONFIG_NAND_KIRKWOOD
-#define CONFIG_SYS_MAX_NAND_DEVICE	1
-#define NAND_MAX_CHIPS			1
-#define CONFIG_SYS_NAND_BASE		0xD8000000	/* MV_DEFADR_NANDF */
-#define NAND_ALLOW_ERASE_ALL		1
-#define CONFIG_SYS_64BIT_VSPRINTF	/* needed for nand_util.c */
-#endif
-
-/*
- * SPI Flash configuration
- */
-#ifdef CONFIG_CMD_SF
-#define CONFIG_SPI_FLASH		1
-#define CONFIG_HARD_SPI			1
-#define CONFIG_KIRKWOOD_SPI		1
-#define CONFIG_SPI_FLASH_MACRONIX	1
-#define CONFIG_ENV_SPI_BUS		0
-#define CONFIG_ENV_SPI_CS		0
-#define CONFIG_ENV_SPI_MAX_HZ		50000000	/*50Mhz */
-#endif
-
-/*
   * Size of malloc() pool
   */
  #define CONFIG_SYS_MALLOC_LEN	(1024 * 1024) /* 1MiB for malloc() */

@@ -176,9 +103,7 @@
  #define CONFIG_CMDLINE_EDITING
  #define CONFIG_CONSOLE_INFO_QUIET	/* some code reduction */
  #define CONFIG_ARCH_CPU_INIT	/* call arch_cpu_init() */
-#ifndef CONFIG_ARMADA100	/* will be removed latter */
  #define CONFIG_ARCH_MISC_INIT	/* call arch_misc_init() */
-#endif /* CONFIG_ARMADA100 */
  #define CONFIG_BOARD_EARLY_INIT_F /* call board_init_f for early inits */
  #define CONFIG_DISPLAY_CPUINFO	/* Display cpu info */
  #define CONFIG_STACKSIZE	0x00100000	/* regular stack- 1M */

@@ -199,27 +124,32 @@
  #endif
  #endif /* CONFIG_NR_DRAM_BANKS */
 
+/* ====>  Include platform Common Definations */
+#include<asm/arch/config.h>
+
+/* ====>  Include driver Common Definations */
  /*
- * Ethernet Driver configuration
+ * Common NAND configuration
   */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_CMD_MII
-#define CONFIG_NETCONSOLE	/* include NetConsole support   */
-#define CONFIG_NET_MULTI	/* specify more that one ports available */
-#define CONFIG_MII		/* expose smi ove miiphy interface */
-#define CONFIG_MVGBE		/* Enable Marvell Gbe Controller Driver */
-#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN	/* detect link using phy */
-#define CONFIG_ENV_OVERWRITE	/* ethaddr can be reprogrammed */
-#define CONFIG_RESET_PHY_R	/* use reset_phy() to init mv8831116 PHY */
-#endif /* CONFIG_CMD_NET */
+#ifdef CONFIG_CMD_NAND
+#define CONFIG_SYS_MAX_NAND_DEVICE     1
+#define NAND_MAX_CHIPS                 1
+#define CONFIG_SYS_64BIT_VSPRINTF      /* needed for nand_util.c */
+#endif
+
+/*
+ * Common SPI Flash configuration
+ */
+#ifdef CONFIG_CMD_SF
+#define CONFIG_SPI_FLASH		1
+#define CONFIG_SPI_FLASH_MACRONIX	1
+#endif
 
  /*
- * USB/EHCI
+ * Common USB/EHCI configuration
   */
  #ifdef CONFIG_CMD_USB
  #define CONFIG_USB_EHCI		/* Enable EHCI USB support */
-#define CONFIG_USB_EHCI_KIRKWOOD
-#define CONFIG_EHCI_IS_TDI
  #define CONFIG_USB_STORAGE
  #define CONFIG_DOS_PARTITION
  #define CONFIG_ISO_PARTITION

@@ -227,44 +157,9 @@
  #endif /* CONFIG_CMD_USB */
 
  /*
- * IDE Support on SATA ports
- */
-#ifdef CONFIG_CMD_IDE
-#define __io
-#define CONFIG_CMD_EXT2
-#define CONFIG_MVSATA_IDE
-#define CONFIG_IDE_PREINIT
-#define CONFIG_MVSATA_IDE_USE_PORT1
-/* Needs byte-swapping for ATA data register */
-#define CONFIG_IDE_SWAP_IO
-/* Data, registers and alternate blocks are at the same offset */
-#define CONFIG_SYS_ATA_DATA_OFFSET	(0x0100)
-#define CONFIG_SYS_ATA_REG_OFFSET	(0x0100)
-#define CONFIG_SYS_ATA_ALT_OFFSET	(0x0100)
-/* Each 8-bit ATA register is aligned to a 4-bytes address */
-#define CONFIG_SYS_ATA_STRIDE		4
-/* Controller supports 48-bits LBA addressing */
-#define CONFIG_LBA48
-/* CONFIG_CMD_IDE requires some #defines for ATA registers */
-#define CONFIG_SYS_IDE_MAXBUS		2
-#define CONFIG_SYS_IDE_MAXDEVICE	2
-/* ATA registers base is at SATA controller base */
-#define CONFIG_SYS_ATA_BASE_ADDR	MV_SATA_BASE
-#endif /* CONFIG_CMD_IDE */
-
-/*
- * I2C related stuff
- */
-#ifdef CONFIG_CMD_I2C
-#define CONFIG_I2C_MVTWSI
-#define CONFIG_SYS_I2C_SLAVE		0x0
-#define CONFIG_SYS_I2C_SPEED		100000
-#endif
-
-/*
   * File system
   */
-#ifndef CONFIG_ARMADA100	/* will be removed latter */
+#ifdef CONFIG_SYS_MVFS
  #define CONFIG_CMD_EXT2
  #define CONFIG_CMD_JFFS2
  #define CONFIG_CMD_FAT

Hi Lei Wen,

Le 26/01/2011 11:31, Lei Wen a ?crit :

Quoted 8 lines

README +0 -0

index 755d17c..e0341b5 100644
@@ -319,6 +319,11 @@ The following options need to be configured:

? ? ? ? ? ? ? ? ? ? ? CONFIG_SYS_PQ2FADS ? ? ?- PQ2FADS-ZU or PQ2FADS-VR ? ? ? ? ? ? ? ? ? ? ? CONFIG_SYS_8272ADS ? ? ?- MPC8272ADS

Quoted 3 lines

+- 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"?

Quoted 12 lines

+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? for marvell soc family +
? - MPC824X Family Member (if CONFIG_MPC824X is defined) ? ? ? ? ? ? ? Define exactly one of
? ? ? ? ? ? ? CONFIG_MPC8240, CONFIG_MPC8245

arch/arm/include/asm/arch-armada100/config.h new file +0 -0

new file mode 100644
index 0000000..f16806e

arch/arm/include/asm/arch-armada100/config.h line 2

Quoted 2 lines

arch/arm/include/asm/arch-armada100/config.h new file +2 -0

@@ -0,0 +1,44 @@
+/*
+ * (C) Copyright 2010

Maybe update the copyright year?

Quoted 49 lines

arch/arm/include/asm/arch-armada100/config.h new file +42 -0

+ * Marvell Semiconductor<www.marvell.com>
+ * Written-by: Lei Wen<[email protected]>
+ *
+ * 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 */

arch/arm/include/asm/arch-kirkwood/config.h new file +0 -0

new file mode 100644
index 0000000..7c6d63b

arch/arm/include/asm/arch-kirkwood/config.h line 2

Quoted 2 lines

arch/arm/include/asm/arch-kirkwood/config.h new file +2 -0

@@ -0,0 +1,145 @@
+/*
+ * (C) Copyright 2010

Ditto

Quoted 47 lines

arch/arm/include/asm/arch-kirkwood/config.h new file +47 -0

+ * Marvell Semiconductor<www.marvell.com>
+ * Written-by: Lei Wen<[email protected]>
+ *
+ * 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 */
+
+/*

arch/arm/include/asm/arch-kirkwood/config.h

Quoted 6 lines

arch/arm/include/asm/arch-kirkwood/config.h new file +6 -0

+ * 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 ?

Quoted 6 lines

Quoted 6 lines

arch/arm/include/asm/arch-kirkwood/config.h new file +0 -0

new file mode 100644
index 0000000..7c6d63b
@@ -0,0 +1,145 @@

Quoted 4 lines

arch/arm/include/asm/arch-kirkwood/config.h line 55

Quoted 2 lines

arch/arm/include/asm/arch-kirkwood/config.h new file +2 -0

+#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

Hi Lei,

Le 28/01/2011 02:28, Lei Wen a ?crit :

Quoted 7 lines

Quoted 7 lines

Quoted 7 lines

arch/arm/include/asm/arch-kirkwood/config.h new file +0 -0

new file mode 100644
index 0000000..7c6d63b
@@ -0,0 +1,145 @@

...

Quoted 6 lines

Quoted 5 lines

Quoted 3 lines

arch/arm/include/asm/arch-kirkwood/config.h new file +2 -0

+#ifndef CONFIG_SYS_KWD_CONFIG
+#define ? ? ?CONFIG_SYS_KWD_CONFIG

$(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage.cfg

What are the '$()' operators doing here ?

Quoted 7 lines

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 $< ?$@

What I would like to understand is, the '$(X)' macro expansion operator indeed has meaning and makes sense for some tools such as Make, but not for a C preprocessor or compiler. Is this ?config.h file included by a makefile somehow?

Hi Albert,

Quoted 28 lines · Albert ARIBAUD

Hi Lei,

Le 28/01/2011 02:28, Lei Wen a ?crit :

Quoted 7 lines

Quoted 7 lines

Quoted 7 lines

arch/arm/include/asm/arch-kirkwood/config.h new file +0 -0

new file mode 100644
index 0000000..7c6d63b
@@ -0,0 +1,145 @@

...

Quoted 6 lines

Quoted 5 lines

Quoted 3 lines

arch/arm/include/asm/arch-kirkwood/config.h new file +2 -0

+#ifndef CONFIG_SYS_KWD_CONFIG
+#define      CONFIG_SYS_KWD_CONFIG

$(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage.cfg

What are the '$()' operators doing here ?

Quoted 7 lines

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

$< $@

Quoted 5 lines

What I would like to understand is, the '$(X)' macro expansion operator indeed has meaning and makes sense for some tools such as Make, but not for a C preprocessor or compiler. Is this config.h file included by a makefile somehow?

Yes, it would be included by the makefile as below:
Makefile: line 471:
$(obj)include/autoconf.mk: $(obj)include/config.h

Take guruplug as example.
Its guruplug.h would be include in the include/config.h. While guruplug would involve the mv-common.h, in which the arch/arm/include/asm/arch-kirkwood/config.h would be included.

I know this maybe a little complicated, but that is what it works.

Best regards,
Lei

What I would like to understand is, the '$(X)' macro expansion operator indeed has meaning and makes sense for some tools such as Make, but not for a C preprocessor or compiler. Is this config.h file included by a makefile somehow?