On Thu, May 16, 2013 at 04:36:02PM +0200, Peter Korsgaard wrote:
> >>>>> "Tom" == Tom Rini <tr...@ti.com> writes:
>
> Tom> From: Steve Kipisz <s-kipi...@ti.com>
> Tom> NOR requires that s_init be within the first 4KiB of the image so that
> Tom> we can perform the rest of the required pinmuxing to talk with the rest
> Tom> of NOR that we are found on. When NOR_BOOT is set we save our
> Tom> environment in NOR at 512KiB and a redundant copy at 768KiB. We avoid
> Tom> using SPL for this case and u-boot.bin is written directly to the start
> Tom> of NOR.
[snip]
> Tom> -#ifdef CONFIG_SPL_BUILD
> Tom> +#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_NOR_BOOT)
> Tom> +#ifdef CONFIG_TI81XX
> Tom> static struct dmm_lisa_map_regs *hw_lisa_map_regs =
> Tom> (struct dmm_lisa_map_regs *)DMM_BASE;
> Tom> +#endif
> Tom> static struct vtp_reg *vtpreg[2] = {
> Tom> (struct vtp_reg *)VTP0_CTRL_ADDR,
> Tom> (struct vtp_reg *)VTP1_CTRL_ADDR};
> Tom> @@ -53,6 +55,7 @@ static struct vtp_reg *vtpreg[2] = {
> Tom> static struct ddr_ctrl *ddrctrl = (struct ddr_ctrl *)DDR_CTRL_ADDR;
> Tom> #endif
>
> Tom> +#ifdef CONFIG_TI81XX
>
> Why are you adding the TI81XX dependency here? That doesn't have
> anything to do with nor boot, does it?dmm is TI81XX-only (for this file, it's also omap4+) and since main U-Boot doesn't use --ffunction-sections/--fdata-sections/--gc-sections we end up with a link error about not having enable_dmm_clocks(). This is OK on SPL since we do use --gc-sections and the link error is avoided as we discard config_dmm on am33xx builds. -- Tom
signature.asc
Description: Digital signature
_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
