diff options
| author | Tom Rini <[email protected]> | 2022-06-06 12:09:41 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-06-06 12:09:41 -0400 |
| commit | 8bbbd6337361cadad96b163bde4ae675752b7778 (patch) | |
| tree | 82e207c8b1a509d069177fb4489b1dfcba467b15 /boot | |
| parent | 8f527342db4160a1f030de6fe4a1591787cce65a (diff) | |
| parent | 4151f4f822bb075c05e3407d184dfd018723724d (diff) | |
Merge branch '2022-06-06-finish-SPL-Kconfig-migration' into next
- Bring in a number of series of patches that migrate all remaining
CONFIG_SPL symbols to Kconfig, remove some dead code that this
uncovered and then start to tighten the dependencies in Kconfig now
that everything is migrated and these relationships can be clearly
expressed.
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/image-board.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/boot/image-board.c b/boot/image-board.c index 0d2e0fc9692..cfc1c658e3a 100644 --- a/boot/image-board.c +++ b/boot/image-board.c @@ -21,10 +21,6 @@ #include <asm/cache.h> #include <asm/global_data.h> -#ifndef CONFIG_SYS_BARGSIZE -#define CONFIG_SYS_BARGSIZE 512 -#endif - DECLARE_GLOBAL_DATA_PTR; #if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT) @@ -827,6 +823,7 @@ int boot_get_loadable(int argc, char *const argv[], bootm_headers_t *images, return 0; } +#ifdef CONFIG_SYS_BOOT_GET_CMDLINE /** * boot_get_cmdline - allocate and initialize kernel cmdline * @lmb: pointer to lmb handle, will be used for memory mgmt @@ -900,6 +897,7 @@ int boot_get_kbd(struct lmb *lmb, struct bd_info **kbd) return 0; } +#endif int image_setup_linux(bootm_headers_t *images) { |