Davinci: add support for ea20 board
This patchset superseeds the patch with the same name. Common code is now shared for da8xx boards.
The patchset is based on the following patches:
Sughosh Ganu: Move and rename common headers from under board/davinci Ben Gardiner: da850evm: Add RMII support for EMAC
PATCH 1/2 Davinci 8xx: Move common functions to share code
As more Davinci 8xx board can be added, move common code to be shared between boards.
--- arch/arm/include/asm/arch-davinci/da8xx_common.h | 33 ---------- arch/arm/include/asm/arch-davinci/davinci_misc.h | 12 ++++ board/davinci/common/misc.c | 51 ++++++++++++++++ board/davinci/da8xxevm/Makefile | 1 - board/davinci/da8xxevm/common.c | 69 ---------------------- board/davinci/da8xxevm/da830evm.c | 1 - board/davinci/da8xxevm/da850evm.c | 3 +- 7 files changed, 64 insertions(+), 106 deletions(-) delete mode 100644 arch/arm/include/asm/arch-davinci/da8xx_common.h delete mode 100644 board/davinci/da8xxevm/common.c
arch/arm/include/asm/arch-davinci/da8xx_common.h deleted +0 -33
@@ -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 - -#endif /* __COMMON_H */
arch/arm/include/asm/arch-davinci/davinci_misc.h +12 -0
@@ -45,10 +45,22 @@ struct pinmux_resource { .n_pins = ARRAY_SIZE(item) \ } +struct lpsc_resource { +const int lpsc_no; +}; +int dvevm_read_mac_address (uint8_t *buf);void davinci_sync_env_enetaddr (uint8_t *rom_enetaddr);int davinci_configure_pin_mux (const struct pinmux_config *pins,int n_pins);int davinci_configure_pin_mux_items (const struct pinmux_resource *item,int n_items); +#if defined(CONFIG_DRIVER_TI_EMAC ) && defined(CONFIG_MACH_DAVINCI_DA850_EVM ) +void davinci_emac_mii_mode_sel (int mode_sel); +#endif +#if defined(CONFIG_SOC_DA8XX ) +void irq_init (void ); +int da8xx_configure_lpsc_items (const struct lpsc_resource *item, +const int n_items); +#endif #endif /* __MISC_H */
board/davinci/common/misc.c +51 -0
54 lines not on this page · raw message
board/davinci/da8xxevm/Makefile +0 -1
@@ -27,7 +27,6 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a -COBJS-y += common.o COBJS-$(CONFIG_MACH_DAVINCI_DA830_EVM) += da830evm.o COBJS-$(CONFIG_MACH_DAVINCI_DA850_EVM) += da850evm.o
board/davinci/da8xxevm/common.c deleted +0 -69
69 lines not on this page · raw message
board/davinci/da8xxevm/da830evm.c +0 -1
@@ -41,7 +41,6 @@#include <asm/arch/emac_defs.h> #include <asm/io.h> #include <asm/arch/davinci_misc.h> -#include <asm/arch/da8xx_common.h> DECLARE_GLOBAL_DATA_PTR ;
board/davinci/da8xxevm/da850evm.c +1 -2
@@ -30,7 +30,6 @@#include <asm/arch/emac_defs.h> #include <asm/io.h> #include <asm/arch/davinci_misc.h> -#include <asm/arch/da8xx_common.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -187,7 +186,7 @@ int board_init(void)if (davinci_configure_pin_mux (emac_pins,ARRAY_SIZE (emac_pins)) !=0 )return 1 ; -da850_emac_mii_mode_sel (HAS_RMII ); +davinci_emac_mii_mode_sel (HAS_RMII );#endif /* CONFIG_DRIVER_TI_EMAC */ /* enable the console UART */
Signature · 1 line
1.7.1
PATCH 1/2 Davinci 8xx: Move common functions to share code
Hi Stefano,
Quoted 28 lines · Stefano Babic
[...]
arch/arm/include/asm/arch-davinci/da8xx_common.h deleted +0
-21@@ -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 -
arch/arm/include/asm/arch-davinci/da8xx_common.h line 31
Quoted 10 lines
arch/arm/include/asm/arch-davinci/da8xx_common.h deleted +0
-10-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
PATCH 1/2 Davinci 8xx: Move common functions to share code
Quoted 2 lines · Ben Gardiner
Hi Stefano,
Hi Ben,
Quoted 6 lines
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_seldeclaration fromboard/davinci/da8xxevm/common.hto the location from which you have removed it above.
Quoted 6 lines
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.
Let's see. I am working on TOT of u-boot mainline, and I have applied Sugosh's and your patch. Last u-boot commit in mainline is:
commit 8ad25bf8d9233eb7d0b614612108622a59069354
Author: Ben Warren <[email protected]> Date: Tue Aug 31 23:05:04 2010 -0700
Net: clarify board/cpu_eth_init calls
I have then applied in the order the two SPI flash I have already sent and you tested, Sugosh's patch and your patch. At the very top there is my patchset. This is my git log, I drop some part of the commit id to avoid wrapping:
6a1b17dd5cdaeb4c Davinci: add support for the ea20 board 5195253f20d5bedb Davinci 8xx: Move common functions to share code 8e6ed317d74b3b4d da850: Add RMII support for EMAC 9c1455c63dafc292 Move and rename common headers from under board/davinci. 4ccdfedb55b65f30 da850: Enable SPI Flash0aacad5f81caac89 da8xx: Add cpu_is_da8xx macros 8ad25bf8d9233eb7 Net: clarify board/cpu_eth_init calls
^
|------- this is actual u-boot TOT
I think it is correct - patches are always sent on the actual u-boot TOT. However, in this case my patches need that other patches (yours and Sugosh's) are applied. I have tried to apply patches in the same order I have seen, but we can have a different order.
Quoted 3 lines
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.
Let's see if something is missing ;-)
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================
PATCH 1/2 Davinci 8xx: Move common functions to share code
Hi Stefano,
Sorry for the long delay. I thought rebasing my patch onto Sugosh's series would be a good start to getting all of our patches applied together. What I didn't realize was I that I still did not have the order of patches you listed below.
Quoted 10 lines · Stefano Babic
[...]
6a1b17dd5cdaeb4cDavinci: add support for the ea20 board5195253f20d5bedbDavinci 8xx: Move common functions to share code8e6ed317d74b3b4dda850: Add RMII support for EMAC9c1455c63dafc292Move and rename common headers from under board/davinci.4ccdfedb55b65f30da850: Enable SPI Flash0aacad5f81caac89da8xx: Addcpu_is_da8xxmacros8ad25bf8d9233eb7Net: clarify board/cpu_eth_init calls
? ^
? |------- this is actual u-boot TOT
The problem was that I was applying my RMII patch on top of Sugosh's patches without your SPI flash patches underneath. Another RMII version patch is coming.
Still, there were some merge conflicts due to the fact that you were basing your ea20 patches off of only 1 of Sugosh's patches. here is the 'git log --format="%s -- %Cgreen%an <%aE> %Cred%ai" u-boot/master^..HEAD' output after all the merging.
Davinci: add support for the ea20 board -- Stefano Babic <[email protected]> 2010-11-17 11:09:05 +0100
Davinci 8xx: Move common functions to share code -- Stefano Babic <[email protected]> 2010-11-17 11:09:04 +0100
[PATCH V4][NEXT] da850: Add RMII support for EMAC -- Sudhakar Rajashekhara <[email protected]> 2010-11-18 09:59:37 -0500 Add board support for hawkboard -- Sughosh Ganu <[email protected]> 2010-11-01 23:30:34 +0530 Remove board_init_f function from nand_boot.c -- Sughosh Ganu <[email protected]> 2010-11-01 23:29:27 +0530
Move and rename common headers from under board/davinci. -- Sughosh Ganu <[email protected]> 2010-11-01 23:28:38 +0530
da850: Enable SPI Flash -- Stefano Babic <[email protected]> 2010-11-11 15:38:02 +0100
da8xx: Add cpu_is_da8xx macros -- Sudhakar Rajashekhara <[email protected]> 2010-11-11 15:38:01 +0100
Net: clarify board/cpu_eth_init calls -- Ben Warren <[email protected]> 2010-08-31 23:05:04 -0700
You didn't have "Add board support for hawkboard" and "Remove board_init_f function from nand_boot.c" applied.
I hope you don't mind that I merged them and pushed the result to branch "testing-ea20-plus" ofgit://github.com/BenGardiner/u-boot-bg.git . I hope that saves us some time.
I will be sending a V4 of the RMII patch -- as can be seen from that series -- to the list. I hope you can use the merged patches in the branch I pushed to send your updated patches.
Best Regards,
Ben Gardiner
---
Nanometrics Inc.
http://www.nanometrics.ca
PATCH 1/2 Davinci 8xx: Move common functions to share code
Quoted 2 lines · Ben Gardiner
Hi Stefano,
Hi Ben,
Quoted 1 line
Sorry for the long delay.
No problem at all !
Quoted 6 lines
The problem was that I was applying my RMII patch on top of Sugosh's patches without your SPI flash patches underneath. Another RMII version patch is coming.
Still, there were some merge conflicts due to the fact that you were basing your ea20 patches off of only 1 of Sugosh's patches.
Right. Sugosh pointed me out to this patch and I have not seen that the patches for the hawkboard change something in common code, too.
Quoted 8 lines
You didn't have "Add board support for hawkboard" and "Remove
board_init_ffunction fromnand_boot.c" applied.I hope you don't mind that I merged them and pushed the result to branch "testing-ea20-plus" of
git://github.com/BenGardiner/u-boot-bg.git. I hope that saves us some time.
Thank you for doing that - we have already a working tree !
Quoted 4 lines
I will be sending a V4 of the RMII patch -- as can be seen from that series -- to the list. I hope you can use the merged patches in the branch I pushed to send your updated patches.
I will test today on ea20, but it seems all what I have to do is only to send them to the ML - thank you again for your work !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================
PATCH 1/2 Davinci 8xx: Move common functions to share code
In reply to Ben Gardinerhi Ben,
Quoted 19 lines · Ben Gardiner
Davinci: add support for the ea20 board -- Stefano Babic <[email protected]> 2010-11-17 11:09:05 +0100
Davinci 8xx: Move common functions to share code -- Stefano Babic <[email protected]> 2010-11-17 11:09:04 +0100
[PATCH V4][NEXT] da850: Add RMII support for EMAC -- Sudhakar Rajashekhara <[email protected]> 2010-11-18 09:59:37 -0500 Add board support for hawkboard -- Sughosh Ganu <[email protected]> 2010-11-01 23:30:34 +0530 Removeboard_init_ffunction fromnand_boot.c-- Sughosh Ganu <[email protected]> 2010-11-01 23:29:27 +0530
Move and rename common headers from under board/davinci. -- Sughosh Ganu <[email protected]> 2010-11-01 23:28:38 +0530
da850: Enable SPI Flash -- Stefano Babic <[email protected]> 2010-11-11 15:38:02 +0100
da8xx: Addcpu_is_da8xxmacros -- Sudhakar Rajashekhara <[email protected]> 2010-11-11 15:38:01 +0100
Net: clarify board/cpu_eth_init calls -- Ben Warren <[email protected]> 2010-08-31 23:05:04 -0700
Quoted 7 lines
You didn't have "Add board support for hawkboard" and "Remove
board_init_ffunction fromnand_boot.c" applied.I hope you don't mind that I merged them and pushed the result to branch "testing-ea20-plus" of
git://github.com/BenGardiner/u-boot-bg.git. I hope that saves us some time.
Thanks for all the work. I will be able to test these changes only next week. I will test them on hawkboard and update you. Thanks.
-sughosh
PATCH 1/2 Davinci 8xx: Move common functions to share code
In reply to Ben Gardinerhi Ben,
Quoted 28 lines · Ben Gardiner
Still, there were some merge conflicts due to the fact that you were basing your ea20 patches off of only 1 of Sugosh's patches. here is the 'git log --format="%s -- %Cgreen%an <%aE> %Cred%ai" u-boot/master^..HEAD' output after all the merging.
Davinci: add support for the ea20 board -- Stefano Babic <[email protected]> 2010-11-17 11:09:05 +0100
Davinci 8xx: Move common functions to share code -- Stefano Babic <[email protected]> 2010-11-17 11:09:04 +0100
[PATCH V4][NEXT] da850: Add RMII support for EMAC -- Sudhakar Rajashekhara <[email protected]> 2010-11-18 09:59:37 -0500 Add board support for hawkboard -- Sughosh Ganu <[email protected]> 2010-11-01 23:30:34 +0530 Removeboard_init_ffunction fromnand_boot.c-- Sughosh Ganu <[email protected]> 2010-11-01 23:29:27 +0530
Move and rename common headers from under board/davinci. -- Sughosh Ganu <[email protected]> 2010-11-01 23:28:38 +0530
da850: Enable SPI Flash -- Stefano Babic <[email protected]> 2010-11-11 15:38:02 +0100
da8xx: Addcpu_is_da8xxmacros -- Sudhakar Rajashekhara <[email protected]> 2010-11-11 15:38:01 +0100
Net: clarify board/cpu_eth_init calls -- Ben Warren <[email protected]> 2010-08-31 23:05:04 -0700You didn't have "Add board support for hawkboard" and "Remove
board_init_ffunction fromnand_boot.c" applied.
Quoted 10 lines
I hope you don't mind that I merged them and pushed the result to branch "testing-ea20-plus" of
git://github.com/BenGardiner/u-boot-bg.git. I hope that saves us some time.I will be sending a V4 of the RMII patch -- as can be seen from that series -- to the list. I hope you can use the merged patches in the branch I pushed to send your updated patches.
Tested on hawkboard with u-boot and nand_spl images built from Ben's tree.
I guess i will have to send an updated version from Ben's tree, as he has fixed some merge issues in "Add board support for hawkboard" patch. The patches would have to be committed in the same order as mentioned above.
-sughosh
PATCH 1/2 Davinci 8xx: Move common functions to share code
On 11/23/2010 05:55 PM, sughosh ganu wrote:
Hi,
Quoted 7 lines
Tested on hawkboard with u-boot and
nand_splimages built from Ben's tree.Tested-by Sughosh Ganu <[email protected]<mailto:[email protected]>>
I guess i will have to send an updated version from Ben's tree, as he has fixed some merge issues in "Add board support for hawkboard" patch.
Yes, I did the same for mine as Ben has rebased my patches and they are different as the ones I send to ML.
Stefano
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================
Paulraj
PATCH 1/2 Davinci 8xx: Move common functions to share code
Quoted 12 lines · sughosh ganu
Hi,
Quoted 1 line
Tested on hawkboard with u-boot and
nand_splimages built from Ben'stree.
Quoted 4 lines
Tested-by Sughosh Ganu <[email protected]<mailto:[email protected]>>
Quoted 8 lines
Quoted 2 lines
I guess i will have to send an updated version from Ben's tree, as he has fixed some merge issues in "Add board support for hawkboard" patch.
Yes, I did the same for mine as Ben has rebased my patches and they are different as the ones I send to ML.
Stefano
Hello All,
I have been tracking this e-mail chain for some time now and I have lost track of which patches to apply in which order.
Can someone please give me the correct order and the correct version of the patches?
Regards,
Sandeep
PATCH 1/2 Davinci 8xx: Move common functions to share code
Hi Sandeep,
Quoted 3 lines · Sandeep
I have been tracking this e-mail chain for some time now and I have lost track of which patches to apply in which order.
Can someone please give me the correct order and the correct version of the patches?
The correct order and correct versions of the patches can be found in branch "testing-ea20-plus" ofgit://github.com/BenGardiner/u-boot-bg.git. The commit messages there do not include Sugosh's Tested-by: tag on the hawkboard patches, nor has he re-sent them to the ML yet.
Best Regards,
Ben Gardiner
---
Nanometrics Inc.
http://www.nanometrics.ca
Paulraj
PATCH 1/2 Davinci 8xx: Move common functions to share code
Quoted 10 lines
Hi Sandeep,
Quoted 1 line · Sandeep
I have been tracking this e-mail chain for some time now and I have lost
track of which patches to apply in which order.
Quoted 1 line
Quoted 8 lines
Quoted 1 line
Can someone please give me the correct order and the correct version of
the patches?
The correct order and correct versions of the patches can be found in branch "testing-ea20-plus" of
git://github.com/BenGardiner/u-boot-bg.git. The commit messages there do not include Sugosh's Tested-by: tag on the hawkboard patches, nor has he re-sent them to the ML yet.
I tried to access that page but failed.
--Sandeep
PATCH 1/2 Davinci 8xx: Move common functions to share code
Quoted 1 line · Sandeep
I tried to access that page but failed.
Oh. Sorry, Sandeep. The webpage for the repo can be found at
http://github.com/BenGardiner/u-boot-bg -- that page contains three URL variants for access to the repo.
Best Regards,
Ben Gardiner
---
Nanometrics Inc.
http://www.nanometrics.ca
Paulraj
PATCH 1/2 Davinci 8xx: Move common functions to share code
In reply to PaulrajQuoted 18 lines
Quoted 11 lines
Hi Sandeep,
Quoted 1 line · Sandeep
I have been tracking this e-mail chain for some time now and I have
lost
Quoted 3 lines
track of which patches to apply in which order.
Quoted 2 lines
Can someone please give me the correct order and the correct version
of
Quoted 2 lines
the patches?
Quoted 7 lines
Quoted 5 lines
The correct order and correct versions of the patches can be found in branch "testing-ea20-plus" of
git://github.com/BenGardiner/u-boot-bg.git. The commit messages there do not include Sugosh's Tested-by: tag on the hawkboard patches, nor has he re-sent them to the ML yet.I tried to access that page but failed.
I am able to clone the tree but I am unable to access it on the web
PATCH 1/2 Davinci 8xx: Move common functions to share code
Quoted 1 line · Sandeep
I am able to clone the tree but I am unable to access it on the web
I'm very sorry for the trouble you've had accessing that repo -- I will happily switch to any other public git hosting service of your choosing for future merged series.
Best Regards,
Ben Gardiner
---
Nanometrics Inc.
http://www.nanometrics.ca
Paulraj
PATCH 1/2 Davinci 8xx: Move common functions to share code
Quoted 10 lines
Quoted 1 line · Sandeep
I am able to clone the tree but I am unable to access it on the web
I'm very sorry for the trouble you've had accessing that repo -- I will happily switch to any other public git hosting service of your choosing for future merged series.
Not an issue at all.
In this case because of some major changes and multiple patch versions I lost track. Usually I pick it from the mailing list.
After Wolfgang accept my previous pull request, I'll get on with the program of merging these patches.
Thanks,
Sandeep
PATCH 1/2 Davinci 8xx: Move common functions to share code
Quoted 5 lines · Sandeep
Not an issue at all.
In this case because of some major changes and multiple patch versions I lost track. Usually I pick it from the mailing list.
After Wolfgang accept my previous pull request, I'll get on with the program of merging these patches.
That is very exciting news! Thank you, Sandeep.
Best Regards,
Ben Gardiner
---
Nanometrics Inc.
http://www.nanometrics.ca
PATCH 1/2 Davinci 8xx: Move common functions to share code
In reply to Ben Gardinerhi,
Quoted 10 lines · Ben Gardiner
Quoted 3 lines · Sandeep
I have been tracking this e-mail chain for some time now and I have lost track of which patches to apply in which order.
Can someone please give me the correct order and the correct version of the patches?
The correct order and correct versions of the patches can be found in branch "testing-ea20-plus" of
git://github.com/BenGardiner/u-boot-bg.git. The commit messages there do not include Sugosh's Tested-by: tag on the hawkboard patches, nor has he re-sent them to the ML yet.
I will be sending the updated version based off Ben's tree tonight. Thanks.
-sughosh
PATCH 1/2 Davinci 8xx: Move common functions to share code
In reply to Ben Gardinerhi Ben,
Quoted 12 lines · Ben Gardiner
Hi Stefano,
Quoted 9 lines · Stefano Babic
[...]
arch/arm/include/asm/arch-davinci/da8xx_common.h deleted +0
-2@@ -1,33 +0,0 @@ -void irq_init (void ); -int da8xx_configure_lpsc_items(const struct lpsc_resource *item,
Quoted 8 lines
arch/arm/include/asm/arch-davinci/da8xx_common.h line 31
Quoted 4 lines
arch/arm/include/asm/arch-davinci/da8xx_common.h deleted +0
-4- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? 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 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.
I think you would need to rebase your patch 'da850: Add RMII support for EMAC', on top of my patches. I had made changes in the include/asm/arch-davinci/hardware.h and moved the board/davinci/da8xxevm/common.h, both of which you are making changes to. Stefano's patch series should then apply on top of your rebased patch. Missed out your patch, else would have flagged you in advance. Sorry about that.
-sughosh
PATCH 1/2 Davinci 8xx: Move common functions to share code
Hi Sugosh,
Quoted 25 lines · Sughosh Ganu
hi Ben,
Quoted 12 lines · Ben Gardiner
Hi Stefano,
Quoted 9 lines · Stefano Babic
[...]
arch/arm/include/asm/arch-davinci/da8xx_common.h deleted +0
-2@@ -1,33 +0,0 @@ -void irq_init (void ); -int da8xx_configure_lpsc_items(const struct lpsc_resource *item,Quoted 8 lines
arch/arm/include/asm/arch-davinci/da8xx_common.h line 31
Quoted 4 lines
arch/arm/include/asm/arch-davinci/da8xx_common.h deleted +0
-4- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? 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 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.
Quoted 2 lines
?I think you would need to rebase your patch 'da850: Add RMII ?support for EMAC', on top of my patches. I had made changes in the
I agree. A respin is on the way
Quoted 5 lines
?include/asm/arch-davinci/hardware.h and moved the ?board/davinci/da8xxevm/common.h, both of which you are making ?changes to. Stefano's patch series should then apply on top of your ?rebased patch. Missed out your patch, else would have flagged you in ?advance. Sorry about that.
No worries.
--
Best Regards,
Ben Gardiner
---
Nanometrics Inc.
http://www.nanometrics.ca
PATCH v2 1/2 Davinci 8xx: Move common functions to share code
In reply to Stefano BabicAs more Davinci 8xx board can be added, move common code to be shared between boards.
* rebased ontop of Sugosh's patches
* moving the HAWKBOARD_KICK{0,1}_UNLOCK defines to arch/arm/include/asm/arch-davinci/davinci_misc.h from to arch/arm/include/asm/arch-davinci/da8xx_common.h
* don't define dram functions in PRELOADER
* move sync_env_enetaddr into existing EMAC ifdef
* use misc.c in hawkboard nand_spl
---
The patch was rebased by Ben Gardiner on top of the other patches actually posted to the ML. Thanks Ben for your work !
arch/arm/include/asm/arch-davinci/da8xx_common.h | 37 ------------ arch/arm/include/asm/arch-davinci/davinci_misc.h | 15 +++++ board/davinci/common/misc.c | 54 +++++++++++++++++- board/davinci/da8xxevm/Makefile | 1 - board/davinci/da8xxevm/common.c | 69 ---------------------- board/davinci/da8xxevm/da830evm.c | 1 - board/davinci/da8xxevm/da850evm.c | 3 +- board/davinci/da8xxevm/hawkboard.c | 1 - board/davinci/da8xxevm/hawkboard_nand_spl.c | 1 - nand_spl/board/davinci/da8xxevm/Makefile | 6 +- 10 files changed, 72 insertions(+), 116 deletions(-) delete mode 100644 arch/arm/include/asm/arch-davinci/da8xx_common.h delete mode 100644 board/davinci/da8xxevm/common.c
arch/arm/include/asm/arch-davinci/da8xx_common.h deleted +0 -37
@@ -1,37 +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 - -#define HAWKBOARD_KICK0_UNLOCK 0x83e70b13 -#define HAWKBOARD_KICK1_UNLOCK 0x95a4f1e0 - -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 - -#endif /* __COMMON_H */
arch/arm/include/asm/arch-davinci/davinci_misc.h +15 -0
@@ -45,10 +45,25 @@ struct pinmux_resource { .n_pins = ARRAY_SIZE(item) \ } +#define HAWKBOARD_KICK0_UNLOCK 0x83e70b13 +#define HAWKBOARD_KICK1_UNLOCK 0x95a4f1e0 + +struct lpsc_resource { +const int lpsc_no; +}; +int dvevm_read_mac_address (uint8_t *buf);void davinci_sync_env_enetaddr (uint8_t *rom_enetaddr);int davinci_configure_pin_mux (const struct pinmux_config *pins,int n_pins);int davinci_configure_pin_mux_items (const struct pinmux_resource *item,int n_items); +#if defined(CONFIG_DRIVER_TI_EMAC ) && defined(CONFIG_MACH_DAVINCI_DA850_EVM ) +void davinci_emac_mii_mode_sel (int mode_sel); +#endif +#if defined(CONFIG_SOC_DA8XX ) +void irq_init (void ); +int da8xx_configure_lpsc_items (const struct lpsc_resource *item, +const int n_items); +#endif #endif /* __MISC_H */
board/davinci/common/misc.c +53 -1
75 lines not on this page · raw message
board/davinci/da8xxevm/Makefile +0 -1
@@ -27,7 +27,6 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a -COBJS-y += common.o COBJS-$(CONFIG_MACH_DAVINCI_DA830_EVM) += da830evm.o COBJS-$(CONFIG_MACH_DAVINCI_DA850_EVM) += da850evm.o COBJS-$(CONFIG_MACH_DAVINCI_HAWK) += hawkboard.o
board/davinci/da8xxevm/common.c deleted +0 -69
69 lines not on this page · raw message
board/davinci/da8xxevm/da830evm.c +0 -1
@@ -41,7 +41,6 @@#include <asm/arch/emac_defs.h> #include <asm/io.h> #include <asm/arch/davinci_misc.h> -#include <asm/arch/da8xx_common.h> DECLARE_GLOBAL_DATA_PTR ;
board/davinci/da8xxevm/da850evm.c +1 -2
@@ -30,7 +30,6 @@#include <asm/arch/emac_defs.h> #include <asm/io.h> #include <asm/arch/davinci_misc.h> -#include <asm/arch/da8xx_common.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -187,7 +186,7 @@ int board_init(void)if (davinci_configure_pin_mux (emac_pins,ARRAY_SIZE (emac_pins)) !=0 )return 1 ; -da850_emac_mii_mode_sel (HAS_RMII ); +davinci_emac_mii_mode_sel (HAS_RMII );#endif /* CONFIG_DRIVER_TI_EMAC */ /* enable the console UART */
board/davinci/da8xxevm/hawkboard.c +0 -1
@@ -28,7 +28,6 @@#include <asm/io.h> #include <asm/arch/davinci_misc.h> #include <ns16550.h> -#include <asm/arch/da8xx_common.h> DECLARE_GLOBAL_DATA_PTR ;
board/davinci/da8xxevm/hawkboard_nand_spl.c +0 -1
@@ -28,7 +28,6 @@#include <asm/io.h> #include <asm/arch/davinci_misc.h> #include <ns16550.h> -#include <asm/arch/da8xx_common.h> DECLARE_GLOBAL_DATA_PTR ;
nand_spl/board/davinci/da8xxevm/Makefile +3 -3
@@ -35,7 +35,7 @@ CFLAGS += -DCONFIG_PRELOADER -DCONFIG_NAND_SPL SOBJS = start.o _udivsi3.o _divsi3.o COBJS = cpu.o davinci_nand.o ns16550.o div0.o davinci_pinmux.o psc.o \ - common.o hawkboard_nand_spl.o nand_boot.o + misc.o hawkboard_nand_spl.o nand_boot.o SRCS := $(addprefix $(obj),$(SOBJS:.o=.S) $(COBJS:.o=.c)) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
@@ -116,9 +116,9 @@ $(obj)hawkboard_nand_spl.c: ln -s $(TOPDIR)/board/davinci/da8xxevm/hawkboard_nand_spl.c $@ # from board directory -$(obj)common.c: +$(obj)misc.c: @rm -f $@ - ln -s $(TOPDIR)/board/davinci/da8xxevm/common.c $@ + ln -s $(TOPDIR)/board/davinci/common/misc.c $@ $(obj)psc.c: @rm -f $@
Signature · 1 line
1.7.1
PATCH v2 1/2 Davinci 8xx: Move common functions to share code
Sugosh and Stefano,
Quoted 2 lines · Sughosh Ganu
?Thanks for all the work. I will be able to test these changes only ?next week. I will test them on hawkboard and update you. Thanks.
You're very welcome. Looking forward to it.
Quoted 3 lines · Stefano Babic
[...]
The patch was rebased by Ben Gardiner on top of the other patches actually posted to the ML. Thanks Ben for your work !
You're very welcome. I'm glad you found it useful.
We are happy to see the omap-L138 support in u-boot moving forward. We would like to get either SD or USB (or both) omapL138 support upstream next. Does the ea20 have USB or SD? Will the hawkboard u-boot support include USB or SD support?
Best Regards,
Ben Gardiner
---
Nanometrics Inc.
http://www.nanometrics.ca
PATCH v2 1/2 Davinci 8xx: Move common functions to share code
Quoted 5 lines · Ben Gardiner
You're very welcome. I'm glad you found it useful.
We are happy to see the omap-L138 support in u-boot moving forward. We would like to get either SD or USB (or both) omapL138 support upstream next. Does the ea20 have USB or SD?
Hi Ben,
there is at the moment no plan to add support to ea20 for USB or SD. However, Things could be changed when a new revision of hardware will become available (at the beginning of next years).
Patches to add SD support was already sent to the ML, I see the ACK by the MMC maintainer:
http://www.mail-archive.com/u-boot at lists.denx.de/msg32375.html
It seems to me the only reason the patch did not go to the mainline was to understand who should merge it and then push to Wolfgang.
Probably what we need is to check again the status of this patch. I cannot find it on patchwork, it looks like it was missed ;-(.
I see a patch to enable USB in da850evm, too::
http://patchwork.ozlabs.org/patch/71817/
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================
PATCH v2 1/2 Davinci 8xx: Move common functions to share code
Hi Stefano,
Quoted 4 lines · Stefano Babic
Quoted 1 line
[...]
there is at the moment no plan to add support to ea20 for USB or SD. However, Things could be changed when a new revision of hardware will become available (at the beginning of next years).
Thank you for the follow-up.
Quoted 8 lines
Patches to add SD support was already sent to the ML, I see the ACK by the MMC maintainer:
http://www.mail-archive.com/u-boot at lists.denx.de/msg32375.html
It seems to me the only reason the patch did not go to the mainline was to understand who should merge it and then push to Wolfgang.
Quoted 6 lines
Probably what we need is to check again the status of this patch. I cannot find it on patchwork, it looks like it was missed ;-(.
I see a patch to enable USB in da850evm, too::
Nice finds. Both of those patches look applicable -- thank you, Stefano. I can't say that I will be starting an effort to apply/port these to da850evm immeadiately. But now I have a great place to start when I do.
Best Regards,
Ben Gardiner
---
Nanometrics Inc.
http://www.nanometrics.ca
Paulraj
PATCH v2 1/2 Davinci 8xx: Move common functions to share code
In reply to Stefano BabicQuoted 4 lines
http://www.mail-archive.com/u-boot at lists.denx.de/msg32375.html
Sadly that patch never made it to the mainline
Quoted 3 lines
It seems to me the only reason the patch did not go to the mainline was to understand who should merge it and then push to Wolfgang.
Usually I take small changes to the other subsystems with an ACK from the maintainer and I merge it myself. The series in question was part of a set of I believe 9 patches which made quite a few changes to the MMC subsystem.
I asked the author to resubmit patches quite a few times but have not received a response. If anybody can do the rebasing and testing that would be welcome.
Quoted 8 lines
Probably what we need is to check again the status of this patch. I cannot find it on patchwork, it looks like it was missed ;-(.
I see a patch to enable USB in da850evm, too::
--Sandeep
PATCH v2 1/2 Davinci 8xx: Move common functions to share code
In reply to Ben Gardinerhi Ben,
Quoted 4 lines · Ben Gardiner
We are happy to see the omap-L138 support in u-boot moving forward. We would like to get either SD or USB (or both) omapL138 support upstream next. Does the ea20 have USB or SD? Will the hawkboard u-boot support include USB or SD support?
Sorry for the late response. I will start working on getting the USB stuff in after the base port has gone into mainline. This might take some time though, as i am not much familiar with the USB related code.
-sughosh
PATCH v2 1/2 Davinci 8xx: Move common functions to share code
Hi Sugosh,
Quoted 8 lines · Sughosh Ganu
hi Ben,
Quoted 4 lines · Ben Gardiner
We are happy to see the omap-L138 support in u-boot moving forward. We would like to get either SD or USB (or both) omapL138 support upstream next. Does the ea20 have USB or SD? Will the hawkboard u-boot support include USB or SD support?
Quoted 4 lines
?Sorry for the late response. I will start working on getting the USB ?stuff in after the base port has gone into mainline. This might take ?some time though, as i am not much familiar with the USB related ?code.
No problem. That's great news. We'll be happy to help test and/or review those patches when you're ready.
Best Regards,
Ben Gardiner
---
Nanometrics Inc.
http://www.nanometrics.ca
PATCH v2 2/2 Davinci: add support for the ea20 board
In reply to Stefano BabicThis board uses the OMAP-L138 SOM stacked on a
custom baseboard. It supports SPI Flash, Ethernet
with RMII.
rebased on top of Sugosh's patches. merge in boards.cfg
--- MAINTAINERS | 1 + board/davinci/ea20/Makefile | 53 ++++++++++++ board/davinci/ea20/ea20.c | 196 +++++++++++++++++++++++++++++++++++++++++++ boards.cfg | 1 + include/configs/ea20.h | 192 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 443 insertions(+), 0 deletions(-) create mode 100644 board/davinci/ea20/Makefile create mode 100644 board/davinci/ea20/ea20.c create mode 100644 include/configs/ea20.h
MAINTAINERS +1 -0
@@ -551,6 +551,7 @@ Rowel Atienza <[email protected]> Stefano Babic <[email protected]> + ea20 davinci polaris xscale trizepsiv xscale mx51evk i.MX51
board/davinci/ea20/Makefile new file +53 -0
53 lines not on this page · raw message
board/davinci/ea20/ea20.c new file +196 -0
196 lines not on this page · raw message
boards.cfg +1 -0
@@ -375,6 +375,7 @@ da850evm arm arm926ejs da8xxevm davinci davinci hawkboard arm arm926ejs da8xxevm davinci davinci hawkboard:SYS_TEXT_BASE=0xc1180000 hawkboard_nand arm arm926ejs da8xxevm davinci davinci hawkboard:SYS_TEXT_BASE=0xc1080000,NAND_U_BOOT hawkboard_uart arm arm926ejs da8xxevm davinci davinci hawkboard:SYS_TEXT_BASE=0xc1080000 +ea20 arm arm926ejs ea20 davinci davinci guruplug arm arm926ejs - Marvell kirkwood mv88f6281gtw_ge arm arm926ejs - Marvell kirkwood openrd_base arm arm926ejs - Marvell kirkwood
include/configs/ea20.h new file +192 -0
192 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH v6 2/2 Davinci: add support for the ea20 board
In reply to Stefano BabicThis board uses the OMAP-L138 SOM stacked on a
custom baseboard. It supports SPI Flash, Ethernet
with RMII.
--- MAINTAINERS | 1 + board/davinci/ea20/Makefile | 53 ++++++++++++ board/davinci/ea20/ea20.c | 196 +++++++++++++++++++++++++++++++++++++++++++ boards.cfg | 1 + include/configs/ea20.h | 192 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 443 insertions(+), 0 deletions(-) create mode 100644 board/davinci/ea20/Makefile create mode 100644 board/davinci/ea20/ea20.c create mode 100644 include/configs/ea20.h
MAINTAINERS +1 -0
@@ -551,6 +551,7 @@ Rowel Atienza <[email protected]> Stefano Babic <[email protected]> + ea20 davinci polaris xscale trizepsiv xscale mx51evk i.MX51
board/davinci/ea20/Makefile new file +53 -0
53 lines not on this page · raw message
board/davinci/ea20/ea20.c new file +196 -0
196 lines not on this page · raw message
boards.cfg +1 -0
@@ -372,6 +372,7 @@ davinci_sffsdr arm arm926ejs sffsdr davinci davinci davinci_sonata arm arm926ejs sonata davinci davinci da830evm arm arm926ejs da8xxevm davinci davinci da850evm arm arm926ejs da8xxevm davinci davinci +ea20 arm arm926ejs ea20 davinci davinci guruplug arm arm926ejs - Marvell kirkwood mv88f6281gtw_ge arm arm926ejs - Marvell kirkwood openrd_base arm arm926ejs - Marvell kirkwood
include/configs/ea20.h new file +192 -0
192 lines not on this page · raw message
Signature · 1 line
1.7.1