| Message ID | 1413532834-10380-5-git-send-email-b18965@freescale.com |
|---|---|
| State | Superseded |
| Delegated to: | York Sun |
| Headers | show |
Hello Alison, On Fri, 17 Oct 2014 16:00:30 +0800, Alison Wang <b18965@freescale.com> wrote: > To support interactive DDR debugger, cli_simple.o, cli.o, cli_readline.o, > command.o, s_record.o, xyzModem.o and cmd_disk.o are all needed for > drivers/ddr/fsl/interactive.c. > > In current common/Makefile, the above .o files are only produced when > CONFIG_SPL_BUILD is disabled. > > For LS102xA, interactive DDR debugger is needed in SD/NAND boot too, and > I enabled CONFIG_FSL_DDR_INTERACTIVE. But according to the current > common/Makfile, all the above .o files are not produced in SPL part > because CONFIG_SPL_BUILD is enabled in SPL part, the following error > will be shown, > > drivers/ddr/fsl/built-in.o: In function `fsl_ddr_interactive': > /home/wangh/layerscape/u-boot/drivers/ddr/fsl/interactive.c:1871: > undefined reference to `cli_readline_into_buffer' > /home/wangh/layerscape/u-boot/drivers/ddr/fsl/interactive.c:1873: > undefined reference to `cli_simple_parse_line' > make[1]: *** [spl/u-boot-spl] Error 1 > make: *** [spl/u-boot-spl] Error 2 > > So this patch fixed this issue and the above .o files will be produced > no matter CONFIG_SPL_BUILD is enabled or disabled. > > Signed-off-by: Alison Wang <alison.wang@freescale.com> > --- > Change log: > v3: Gave more explaination in the commit. > v2: No change. This does not apply cleanly. Could you rebase and resubmit? Amicalement,
Hello, Albert, > On Fri, 17 Oct 2014 16:00:30 +0800, Alison Wang <b18965@freescale.com> > wrote: > > To support interactive DDR debugger, cli_simple.o, cli.o, > > cli_readline.o, command.o, s_record.o, xyzModem.o and cmd_disk.o are > > all needed for drivers/ddr/fsl/interactive.c. > > > > In current common/Makefile, the above .o files are only produced when > > CONFIG_SPL_BUILD is disabled. > > > > For LS102xA, interactive DDR debugger is needed in SD/NAND boot too, > > and I enabled CONFIG_FSL_DDR_INTERACTIVE. But according to the > current > > common/Makfile, all the above .o files are not produced in SPL part > > because CONFIG_SPL_BUILD is enabled in SPL part, the following error > > will be shown, > > > > drivers/ddr/fsl/built-in.o: In function `fsl_ddr_interactive': > > /home/wangh/layerscape/u-boot/drivers/ddr/fsl/interactive.c:1871: > > undefined reference to `cli_readline_into_buffer' > > /home/wangh/layerscape/u-boot/drivers/ddr/fsl/interactive.c:1873: > > undefined reference to `cli_simple_parse_line' > > make[1]: *** [spl/u-boot-spl] Error 1 > > make: *** [spl/u-boot-spl] Error 2 > > > > So this patch fixed this issue and the above .o files will be > produced > > no matter CONFIG_SPL_BUILD is enabled or disabled. > > > > Signed-off-by: Alison Wang <alison.wang@freescale.com> > > --- > > Change log: > > v3: Gave more explaination in the commit. > > v2: No change. > > This does not apply cleanly. Could you rebase and resubmit? [Alison Wang] ok, I will rebase and resubmit the set. Thanks. Best Regards, Alison Wang
On 10/27/2014 02:29 AM, Albert ARIBAUD wrote: > Hello Alison, > > On Fri, 17 Oct 2014 16:00:30 +0800, Alison Wang <b18965@freescale.com> > wrote: >> To support interactive DDR debugger, cli_simple.o, cli.o, cli_readline.o, >> command.o, s_record.o, xyzModem.o and cmd_disk.o are all needed for >> drivers/ddr/fsl/interactive.c. >> >> In current common/Makefile, the above .o files are only produced when >> CONFIG_SPL_BUILD is disabled. >> >> For LS102xA, interactive DDR debugger is needed in SD/NAND boot too, and >> I enabled CONFIG_FSL_DDR_INTERACTIVE. But according to the current >> common/Makfile, all the above .o files are not produced in SPL part >> because CONFIG_SPL_BUILD is enabled in SPL part, the following error >> will be shown, >> >> drivers/ddr/fsl/built-in.o: In function `fsl_ddr_interactive': >> /home/wangh/layerscape/u-boot/drivers/ddr/fsl/interactive.c:1871: >> undefined reference to `cli_readline_into_buffer' >> /home/wangh/layerscape/u-boot/drivers/ddr/fsl/interactive.c:1873: >> undefined reference to `cli_simple_parse_line' >> make[1]: *** [spl/u-boot-spl] Error 1 >> make: *** [spl/u-boot-spl] Error 2 >> >> So this patch fixed this issue and the above .o files will be produced >> no matter CONFIG_SPL_BUILD is enabled or disabled. >> >> Signed-off-by: Alison Wang <alison.wang@freescale.com> >> --- >> Change log: >> v3: Gave more explaination in the commit. >> v2: No change. > > This does not apply cleanly. Could you rebase and resubmit? > Albert, Are you trying to test/apply this patch? York
On 10/27/2014 06:48 PM, Wang Huan-B18965 wrote: > Hello, Albert, > <snip> >>> --- >>> Change log: >>> v3: Gave more explaination in the commit. >>> v2: No change. >> >> This does not apply cleanly. Could you rebase and resubmit? > [Alison Wang] ok, I will rebase and resubmit the set. Thanks. > Alison, Where are we on this patch? If you haven't sent an update, I can take this one and resolve the conflict. Albert, This set primarily deals with FSL specific boards. I can take them in if you don't see any issue with the patches (except the conflicts). York
Hello York, On Mon, 17 Nov 2014 15:00:42 -0800, York Sun <yorksun@freescale.com> wrote: > On 10/27/2014 06:48 PM, Wang Huan-B18965 wrote: > > Hello, Albert, > > > > <snip> > >>> --- > >>> Change log: > >>> v3: Gave more explaination in the commit. > >>> v2: No change. > >> > >> This does not apply cleanly. Could you rebase and resubmit? > > [Alison Wang] ok, I will rebase and resubmit the set. Thanks. > > > > Alison, > > Where are we on this patch? If you haven't sent an update, I can take this one > and resolve the conflict. > > Albert, > > This set primarily deals with FSL specific boards. I can take them in if you > don't see any issue with the patches (except the conflicts). Thanks York for the proposal, but I would prefer the patch to be rebased and resubmitted, as rebasing does require some changes which could be trivial, and thus be handled by the custodian, or not trivial, and thus require review; best, therefore, to rebase and repost. > York Amicalement,
On 11/17/2014 11:02 PM, Albert ARIBAUD wrote: > Hello York, > > On Mon, 17 Nov 2014 15:00:42 -0800, York Sun <yorksun@freescale.com> > wrote: >> On 10/27/2014 06:48 PM, Wang Huan-B18965 wrote: >>> Hello, Albert, >>> >> >> <snip> >>>>> --- >>>>> Change log: >>>>> v3: Gave more explaination in the commit. >>>>> v2: No change. >>>> >>>> This does not apply cleanly. Could you rebase and resubmit? >>> [Alison Wang] ok, I will rebase and resubmit the set. Thanks. >>> >> >> Alison, >> >> Where are we on this patch? If you haven't sent an update, I can take this one >> and resolve the conflict. >> >> Albert, >> >> This set primarily deals with FSL specific boards. I can take them in if you >> don't see any issue with the patches (except the conflicts). > > Thanks York for the proposal, but I would prefer the patch to be > rebased and resubmitted, as rebasing does require some changes > which could be trivial, and thus be handled by the custodian, or not > trivial, and thus require review; best, therefore, to rebase and repost. > All right, then. Alison, please send a new set after you test it. I will mark this set "change requested". York
On 11/18/2014 09:07 AM, York Sun wrote: > On 11/17/2014 11:02 PM, Albert ARIBAUD wrote: >> Hello York, >> >> On Mon, 17 Nov 2014 15:00:42 -0800, York Sun <yorksun@freescale.com> >> wrote: >>> On 10/27/2014 06:48 PM, Wang Huan-B18965 wrote: >>>> Hello, Albert, >>>> >>> >>> <snip> >>>>>> --- >>>>>> Change log: >>>>>> v3: Gave more explaination in the commit. >>>>>> v2: No change. >>>>> >>>>> This does not apply cleanly. Could you rebase and resubmit? >>>> [Alison Wang] ok, I will rebase and resubmit the set. Thanks. >>>> >>> >>> Alison, >>> >>> Where are we on this patch? If you haven't sent an update, I can take this one >>> and resolve the conflict. >>> >>> Albert, >>> >>> This set primarily deals with FSL specific boards. I can take them in if you >>> don't see any issue with the patches (except the conflicts). >> >> Thanks York for the proposal, but I would prefer the patch to be >> rebased and resubmitted, as rebasing does require some changes >> which could be trivial, and thus be handled by the custodian, or not >> trivial, and thus require review; best, therefore, to rebase and repost. >> > > All right, then. Alison, please send a new set after you test it. I will mark > this set "change requested". > Albert, I haven't seen a new version yet. I need this patch to apply other patches. I can fix the conflict in this patch. Do you mind if I take this v3 set? I think other patches in this set are OK. York
Hi, York, > On 11/17/2014 11:02 PM, Albert ARIBAUD wrote: > > Hello York, > > > > On Mon, 17 Nov 2014 15:00:42 -0800, York Sun <yorksun@freescale.com> > > wrote: > >> On 10/27/2014 06:48 PM, Wang Huan-B18965 wrote: > >>> Hello, Albert, > >>> > >> > >> <snip> > >>>>> --- > >>>>> Change log: > >>>>> v3: Gave more explaination in the commit. > >>>>> v2: No change. > >>>> > >>>> This does not apply cleanly. Could you rebase and resubmit? > >>> [Alison Wang] ok, I will rebase and resubmit the set. Thanks. > >>> > >> > >> Alison, > >> > >> Where are we on this patch? If you haven't sent an update, I can > take > >> this one and resolve the conflict. > >> > >> Albert, > >> > >> This set primarily deals with FSL specific boards. I can take them > in > >> if you don't see any issue with the patches (except the conflicts). > > > > Thanks York for the proposal, but I would prefer the patch to be > > rebased and resubmitted, as rebasing does require some changes which > > could be trivial, and thus be handled by the custodian, or not > > trivial, and thus require review; best, therefore, to rebase and > repost. > > > > All right, then. Alison, please send a new set after you test it. I > will mark this set "change requested". [Alison Wang] I rebased, tested and submitted the new set. Please help to review it. Thanks. Best Regards, Alison Wang
diff --git a/common/Makefile b/common/Makefile index b19d379..a166e4c 100644 --- a/common/Makefile +++ b/common/Makefile @@ -8,22 +8,12 @@ # core ifndef CONFIG_SPL_BUILD obj-y += main.o -obj-y += command.o obj-y += exports.o obj-y += hash.o ifdef CONFIG_SYS_HUSH_PARSER obj-y += cli_hush.o endif -# We always have this since drivers/ddr/fs/interactive.c needs it -obj-y += cli_simple.o - -obj-y += cli.o -obj-y += cli_readline.o -obj-y += s_record.o -obj-y += xyzModem.o -obj-y += cmd_disk.o - # This option is not just y/n - it can have a numeric value ifdef CONFIG_BOOTDELAY obj-y += autoboot.o @@ -265,4 +255,14 @@ obj-y += aboot.o obj-y += fb_mmc.o endif +# We always have this since drivers/ddr/fs/interactive.c needs it +obj-y += cli_simple.o + +obj-y += cli.o +obj-y += cli_readline.o +obj-y += command.o +obj-y += s_record.o +obj-y += xyzModem.o +obj-y += cmd_disk.o + CFLAGS_env_embedded.o := -Wa,--no-warn -DENV_CRC=$(shell tools/envcrc 2>/dev/null)
To support interactive DDR debugger, cli_simple.o, cli.o, cli_readline.o, command.o, s_record.o, xyzModem.o and cmd_disk.o are all needed for drivers/ddr/fsl/interactive.c. In current common/Makefile, the above .o files are only produced when CONFIG_SPL_BUILD is disabled. For LS102xA, interactive DDR debugger is needed in SD/NAND boot too, and I enabled CONFIG_FSL_DDR_INTERACTIVE. But according to the current common/Makfile, all the above .o files are not produced in SPL part because CONFIG_SPL_BUILD is enabled in SPL part, the following error will be shown, drivers/ddr/fsl/built-in.o: In function `fsl_ddr_interactive': /home/wangh/layerscape/u-boot/drivers/ddr/fsl/interactive.c:1871: undefined reference to `cli_readline_into_buffer' /home/wangh/layerscape/u-boot/drivers/ddr/fsl/interactive.c:1873: undefined reference to `cli_simple_parse_line' make[1]: *** [spl/u-boot-spl] Error 1 make: *** [spl/u-boot-spl] Error 2 So this patch fixed this issue and the above .o files will be produced no matter CONFIG_SPL_BUILD is enabled or disabled. Signed-off-by: Alison Wang <alison.wang@freescale.com> --- Change log: v3: Gave more explaination in the commit. v2: No change. common/Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)