| Message ID | 1417590049-500-5-git-send-email-b18965@freescale.com |
|---|---|
| State | Accepted |
| Delegated to: | York Sun |
| Headers | show |
On 12/02/2014 11:00 PM, Alison Wang 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: > v4: No change. > v3: Gave more explaination in the commit. > v2: No change. > Applied to u-boot-mpc85xx, awaiting upstream. York
diff --git a/common/Makefile b/common/Makefile index 9c47e20..c668a2f 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 @@ -272,4 +262,14 @@ endif obj-$(CONFIG_CMD_BLOB) += cmd_blob.o +# 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: v4: No change. v3: Gave more explaination in the commit. v2: No change. common/Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)