[U-Boot] [PATCH 1/2][NEXT] Davinci 8xx: Move common functions to share code
Ben Gardiner
bengardiner at nanometrics.ca
Wed Nov 17 17:26:47 CET 2010
Hi Stefano,
On Wed, Nov 17, 2010 at 5:09 AM, Stefano Babic <sbabic at denx.de> wrote:
> [...]
> diff --git a/arch/arm/include/asm/arch-davinci/da8xx_common.h b/arch/arm/include/asm/arch-davinci/da8xx_common.h
> deleted file mode 100644
> index 8b564f7..0000000
> --- a/arch/arm/include/asm/arch-davinci/da8xx_common.h
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -/*
> - * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/
> - *
> - * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
> - */
> -
> -#ifndef __COMMON_H
> -#define __COMMON_H
> -
> -struct lpsc_resource {
> - const int lpsc_no;
> -};
> -
> -void irq_init(void);
> -int da8xx_configure_lpsc_items(const struct lpsc_resource *item,
> - int n_items);
> -#if defined(CONFIG_DRIVER_TI_EMAC) && defined(CONFIG_MACH_DAVINCI_DA850_EVM)
> -void da850_emac_mii_mode_sel(int mode_sel);
> -#endif
I was unable to test this series on top of Sugosh's and my patches
even after re-basing my patch on top of his by moving the
da850_emac_mii_mode_sel declaration from
board/davinci/da8xxevm/common.h to the location from which you have
removed it above.
It looked like the removal of this file also needs to move the kick
register declarations that Sugosh added here.
I'm guessing you are working from a tree that is very close but not
quite equal to mainline plus the patches you referenced in the cover
letter.
I don't know what is the best way to proceed... I like the current
state of this patch series. I was unable to apply the three patch
series (Sugosh's, Yours and mine) in any order without conflicts.
Best Regards,
Ben Gardiner
---
Nanometrics Inc.
http://www.nanometrics.ca
More information about the U-Boot
mailing list