| Message ID | 1316782252-29098-4-git-send-email-fabio.estevam@freescale.com |
|---|---|
| State | Rejected |
| Delegated to: | Stefano Babic |
| Headers | show |
On Friday, September 23, 2011 02:50:52 PM Fabio Estevam wrote: > Let common code set the machine ID. > This will need rework ... stefano, can we get the efikasb stuff mainline so Fabio can rework this ? Cheers > Cc: Marek Vasut <marek.vasut@gmail.com> > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> > --- > board/efikamx/efikamx.c | 1 - > include/configs/efikamx.h | 2 ++ > 2 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/board/efikamx/efikamx.c b/board/efikamx/efikamx.c > index 5be1f6c..be2a9a1 100644 > --- a/board/efikamx/efikamx.c > +++ b/board/efikamx/efikamx.c > @@ -607,7 +607,6 @@ int board_early_init_f(void) > > int board_init(void) > { > - gd->bd->bi_arch_number = MACH_TYPE_MX51_EFIKAMX; > gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100; > > return 0; > diff --git a/include/configs/efikamx.h b/include/configs/efikamx.h > index fdd0a14..0b5d2dc 100644 > --- a/include/configs/efikamx.h > +++ b/include/configs/efikamx.h > @@ -40,6 +40,8 @@ > > #define CONFIG_SYS_TEXT_BASE 0x97800000 > > +#define CONFIG_MACH_TYPE MACH_TYPE_MX51_EFIKAMX > + > /* > * Bootloader Components Configuration > */
On 09/23/2011 03:36 PM, Marek Vasut wrote: > On Friday, September 23, 2011 02:50:52 PM Fabio Estevam wrote: >> Let common code set the machine ID. >> > > This will need rework ... stefano, can we get the efikasb stuff mainline so > Fabio can rework this ? No..it is not a good idea to push a patch that is already required to be changed. As this patch addresses a comment in the EfikaMX/SB patchset, the best way is to fix this issue directly in that patchset. Best regards, Stefano Babic
On Friday, September 23, 2011 04:17:28 PM Stefano Babic wrote: > On 09/23/2011 03:36 PM, Marek Vasut wrote: > > On Friday, September 23, 2011 02:50:52 PM Fabio Estevam wrote: > >> Let common code set the machine ID. > > > > This will need rework ... stefano, can we get the efikasb stuff mainline > > so Fabio can rework this ? > > No..it is not a good idea to push a patch that is already required to be > changed. > > As this patch addresses a comment in the EfikaMX/SB patchset, the best > way is to fix this issue directly in that patchset. I also added that machine_is_() things so we'll have that all. Eventually, I plan to add MX/SB runtime detection, but that's not in place so far. > > Best regards, > Stefano Babic
Am 25/09/2011 01:26, schrieb Marek Vasut: > On Friday, September 23, 2011 04:17:28 PM Stefano Babic wrote: >> On 09/23/2011 03:36 PM, Marek Vasut wrote: >>> On Friday, September 23, 2011 02:50:52 PM Fabio Estevam wrote: >>>> Let common code set the machine ID. >>> >>> This will need rework ... stefano, can we get the efikasb stuff mainline >>> so Fabio can rework this ? >> >> No..it is not a good idea to push a patch that is already required to be >> changed. >> >> As this patch addresses a comment in the EfikaMX/SB patchset, the best >> way is to fix this issue directly in that patchset. > > I also added that machine_is_() things so we'll have that all. Eventually, I > plan to add MX/SB runtime detection, but that's not in place so far. Ok . So I will take patches 1..3 of this patchset, and you take care of Eifika board. Best regards, Stefano Babic
On Sunday, September 25, 2011 11:43:26 AM stefano babic wrote: > Am 25/09/2011 01:26, schrieb Marek Vasut: > > On Friday, September 23, 2011 04:17:28 PM Stefano Babic wrote: > >> On 09/23/2011 03:36 PM, Marek Vasut wrote: > >>> On Friday, September 23, 2011 02:50:52 PM Fabio Estevam wrote: > >>>> Let common code set the machine ID. > >>> > >>> This will need rework ... stefano, can we get the efikasb stuff > >>> mainline so Fabio can rework this ? > >> > >> No..it is not a good idea to push a patch that is already required to be > >> changed. > >> > >> As this patch addresses a comment in the EfikaMX/SB patchset, the best > >> way is to fix this issue directly in that patchset. > > > > I also added that machine_is_() things so we'll have that all. > > Eventually, I plan to add MX/SB runtime detection, but that's not in > > place so far. > > Ok . So I will take patches 1..3 of this patchset, and you take care of > Eifika board. I'm all for it. > > Best regards, > Stefano Babic
diff --git a/board/efikamx/efikamx.c b/board/efikamx/efikamx.c index 5be1f6c..be2a9a1 100644 --- a/board/efikamx/efikamx.c +++ b/board/efikamx/efikamx.c @@ -607,7 +607,6 @@ int board_early_init_f(void) int board_init(void) { - gd->bd->bi_arch_number = MACH_TYPE_MX51_EFIKAMX; gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100; return 0; diff --git a/include/configs/efikamx.h b/include/configs/efikamx.h index fdd0a14..0b5d2dc 100644 --- a/include/configs/efikamx.h +++ b/include/configs/efikamx.h @@ -40,6 +40,8 @@ #define CONFIG_SYS_TEXT_BASE 0x97800000 +#define CONFIG_MACH_TYPE MACH_TYPE_MX51_EFIKAMX + /* * Bootloader Components Configuration */
Let common code set the machine ID. Cc: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> --- board/efikamx/efikamx.c | 1 - include/configs/efikamx.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletions(-)