[U-Boot] [PATCH v4 6/7] mv-common.h: Add support for ARMADA100 Platforms
Lei Wen
adrian.wenl at gmail.com
Tue Dec 7 16:32:22 CET 2010
Hi Prafulla,
On Wed, Dec 8, 2010 at 1:06 AM, Prafulla Wadaskar <prafulla at marvell.com> wrote:
> This patch adds commonly used macros for ARMADA100 based
> baords, Also some code reshuffled and updated for typos and comments
>
> Signed-off-by: Prafulla Wadaskar <prafulla at marvell.com>
> ---
> Changelog v3:
> CONFIG_ARCH_CPU_INIT moved out of #ifdef
>
> Changelog v4:
> CONFIG_MFP change to CONFIG_MARVELL_MFP
> some whitespaces removed
>
> include/configs/mv-common.h | 65 ++++++++++++++++++++++++++++++++----------
> 1 files changed, 49 insertions(+), 16 deletions(-)
>
> diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
> index 0a76163..067527a 100644
> --- a/include/configs/mv-common.h
> +++ b/include/configs/mv-common.h
> @@ -39,6 +39,7 @@
> #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 */
> @@ -54,27 +55,45 @@
> #define CONFIG_SYS_KWD_CONFIG $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage.cfg
> #endif /* CONFIG_SYS_KWD_CONFIG */
>
> -/*
> - * CONFIG_SYS_TEXT_BASE can be defined in board specific header file, if needed
> - */
> -#ifndef CONFIG_SYS_TEXT_BASE
> -#define CONFIG_SYS_TEXT_BASE 0x00600000
> -#endif /* CONFIG_SYS_TEXT_BASE */
> +/* 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_UART0_BASE KW_UART0_BASE
> +#define MV_UART_CONSOLE_BASE KW_UART0_BASE
Could we just define the uart base as hard coding one here? For it
must refer to the .h
file in the arch/arm/include directory, which make no sense for the
configure file.
> #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 */
I think you probably need to think to seperate armada100 sepecific and
kirkwood specific stuff from mv-common.h now.
For those two kind of definition makes mv-common not so common as it is.
> +#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_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"
> +#error "Unsupported SoC Platform..."
> #endif
>
> +/*
> + * Custom CONFIG_SYS_TEXT_BASE can be done in <board>.h
> + */
> +#ifndef CONFIG_SYS_TEXT_BASE
> +#define CONFIG_SYS_TEXT_BASE 0x00600000
> +#endif /* CONFIG_SYS_TEXT_BASE */
> +
> /* additions for new ARM relocation support */
> -#define CONFIG_SYS_SDRAM_BASE 0x00000000
> -/* Kirkwood has 2k of Security SRAM, use it for SP */
> -#define CONFIG_SYS_INIT_SP_ADDR 0xC8012000
> +#define CONFIG_SYS_SDRAM_BASE 0x00000000
>
> /*
> * CLKs configurations
> @@ -88,7 +107,7 @@
> #define CONFIG_SYS_NS16550_SERIAL
> #define CONFIG_SYS_NS16550_REG_SIZE (-4)
> #define CONFIG_SYS_NS16550_CLK CONFIG_SYS_TCLK
> -#define CONFIG_SYS_NS16550_COM1 MV_UART0_BASE
> +#define CONFIG_SYS_NS16550_COM1 MV_UART_CONSOLE_BASE
>
> /*
> * Serial Port configuration
> @@ -156,25 +175,37 @@
> #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_NR_DRAM_BANKS 4
> #define CONFIG_STACKSIZE 0x00100000 /* regular stack- 1M */
> #define CONFIG_SYS_LOAD_ADDR 0x00800000 /* default load adr- 8M */
> -#define CONFIG_SYS_MEMTEST_START 0x00400000 /* 4M */
> -#define CONFIG_SYS_MEMTEST_END 0x007fffff /*(_8M -1) */
> +#define CONFIG_SYS_MEMTEST_START 0x00800000 /* 8M */
> +#define CONFIG_SYS_MEMTEST_END 0x00ffffff /*(_16M -1) */
> #define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */
> #define CONFIG_SYS_MAXARGS 16 /* max number of command args */
>
> /*
> + * DRAM Banks configuration, Custom config can be done in <board>.h
> + */
> +#ifndef CONFIG_NR_DRAM_BANKS
> +#define CONFIG_NR_DRAM_BANKS CONFIG_NR_DRAM_BANKS_MAX
> +#else
> +#if (CONFIG_NR_DRAM_BANKS > CONFIG_NR_DRAM_BANKS_MAX)
> +#error CONFIG_NR_DRAM_BANKS Configurated more than available
> +#endif
> +#endif /* CONFIG_NR_DRAM_BANKS */
> +
> +/*
> * 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_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 */
> @@ -232,6 +263,7 @@
> /*
> * File system
> */
> +#ifndef CONFIG_ARMADA100 /* will be removed latter */
We may need think how to remove it later now...
> #define CONFIG_CMD_EXT2
> #define CONFIG_CMD_JFFS2
> #define CONFIG_CMD_FAT
> @@ -242,5 +274,6 @@
> #define CONFIG_MTD_PARTITIONS
> #define CONFIG_CMD_MTDPARTS
> #define CONFIG_LZO
> +#endif /* CONFIG_ARMADA100 */
>
> #endif /* _MV_COMMON_H */
> --
> 1.5.3.4
Best regards,
Lei
More information about the U-Boot
mailing list