[U-Boot] [PATCH v6] Marvell Kirkwood family SOC support
Jean-Christophe PLAGNIOL-VILLARD
plagnioj at jcrosoft.com
Tue May 5 00:08:37 CEST 2009
> +#ifdef CONFIG_KIRKWOOD_EGIGA_INIT
> + /*
> + * Set egiga port0/1 in normal functional mode
> + * This is required becasue on kirkwood by default ports are in reset mode
> + * OS egiga driver may not have provision to set them in normal mode
> + * and if u-boot is build without network support, network may fail at OS level
> + */
> + reg = readl((KW_EGIGA0_BASE + 0x44c)); /* PORT_SERIAL_CONTROL1_REG */
so please define it and use
it
> + reg &= ~(1 << 4); /* Clear PortReset Bit */
> + writel(reg, (KW_EGIGA0_BASE + 0x44c)); /* PORT_SERIAL_CONTROL1_REG */
> + reg = readl((KW_EGIGA1_BASE + 0x44c)); /* PORT_SERIAL_CONTROL1_REG */
> + reg &= ~(1 << 4); /* Clear PortReset Bit */
> + writel(reg, (KW_EGIGA1_BASE + 0x44c)); /* PORT_SERIAL_CONTROL1_REG */
> +#endif
> +#ifdef CONFIG_KIRKWOOD_PCIE_INIT
> + /*
> + * Enable PCI Express Port0
> + */
> + reg = readl(KW_REG_CPU_CTRL_STAT);
> + reg |= (1 << 0); /* Set PEX0En Bit */
> + writel(reg, KW_REG_CPU_CTRL_STAT);
> +#endif
> + return 0;
> +}
> +#endif /* CONFIG_ARCH_CPU_INIT */
> diff --git a/include/asm-arm/config.h b/include/asm-arm/config.h
> index 049c44e..5d52f15 100644
> --- a/include/asm-arm/config.h
> +++ b/include/asm-arm/config.h
> @@ -21,4 +21,8 @@
> #ifndef _ASM_CONFIG_H_
> #define _ASM_CONFIG_H_
>
> +#if defined (CONFIG_KIRKWOOD)
> +#include <asm-arm/arch-kirkwood/kirkwood.h>
> +#endif /* CONFIG_KIRKWOOD */
a header must only be include in the file that need it
please remove from here
> +
> #endif
> diff --git a/include/common.h b/include/common.h
> index 30fff7d..9e4b859 100644
> --- a/include/common.h
> +++ b/include/common.h
> @@ -294,6 +294,7 @@ void pciinfo (int, int);
> #endif
> #endif
>
> +int arch_misc_init (void);
please move to include/asm-arm/u-boot-arm.h
Best Regards,
J.
More information about the U-Boot
mailing list