diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/Kconfig | 8 | ||||
| -rw-r--r-- | common/Makefile | 6 | ||||
| -rw-r--r-- | common/fdt_support.c | 7 | ||||
| -rw-r--r-- | common/spl/spl_sdp.c | 4 |
4 files changed, 21 insertions, 4 deletions
diff --git a/common/Kconfig b/common/Kconfig index d5bc37e4c7b..b92d0e38366 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -519,6 +519,14 @@ config LOG_ERROR_RETURN endmenu +config SUPPORT_RAW_INITRD + bool "Enable raw initrd images" + help + Note, defining the SUPPORT_RAW_INITRD allows user to supply + kernel with raw initrd images. The syntax is slightly different, the + address of the initrd must be augmented by it's size, in the following + format: "<initrd address>:<initrd size>". + config DEFAULT_FDT_FILE string "Default fdt file" help diff --git a/common/Makefile b/common/Makefile index c7bde239c1e..7011dada993 100644 --- a/common/Makefile +++ b/common/Makefile @@ -66,7 +66,9 @@ endif # !CONFIG_SPL_BUILD obj-$(CONFIG_$(SPL_TPL_)BOOTSTAGE) += bootstage.o ifdef CONFIG_SPL_BUILD -obj-$(CONFIG_SPL_DFU_SUPPORT) += dfu.o +ifdef CONFIG_SPL_DFU_SUPPORT +obj-$(CONFIG_DFU_OVER_USB) += dfu.o +endif obj-$(CONFIG_SPL_DFU_SUPPORT) += cli_hush.o obj-$(CONFIG_SPL_HASH_SUPPORT) += hash.o obj-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o @@ -128,7 +130,7 @@ endif obj-y += cli.o obj-$(CONFIG_FSL_DDR_INTERACTIVE) += cli_simple.o cli_readline.o -obj-$(CONFIG_CMD_DFU) += dfu.o +obj-$(CONFIG_DFU_OVER_USB) += dfu.o obj-y += command.o obj-$(CONFIG_$(SPL_)LOG) += log.o obj-$(CONFIG_$(SPL_)LOG_CONSOLE) += log_console.o diff --git a/common/fdt_support.c b/common/fdt_support.c index bd0478de40c..b14853625f6 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -447,6 +447,13 @@ int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], int banks) return err; } + for (i = 0; i < banks; i++) { + if (start[i] == 0 && size[i] == 0) + break; + } + + banks = i; + if (!banks) return 0; diff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c index 333d518f4d6..0c4603a3db3 100644 --- a/common/spl/spl_sdp.c +++ b/common/spl/spl_sdp.c @@ -24,13 +24,13 @@ static int spl_sdp_load_image(struct spl_image_info *spl_image, ret = sdp_init(controller_index); if (ret) { - pr_err("SDP init failed: %d", ret); + pr_err("SDP init failed: %d\n", ret); return -ENODEV; } /* This command typically does not return but jumps to an image */ sdp_handle(controller_index); - pr_err("SDP ended"); + pr_err("SDP ended\n"); return -EINVAL; } |