fdt: Implement weak arch_fixup_fdt()
Subsystems (5)
PATCH 1/1 fdt: Implement weak arch_fixup_fdt()
Only ARM and in some configs MIPS really implement arch_fixup_fdt(). Others just use the same boilerplate which is not good by itself, but what's worse if we try to build with disabled CONFIG_CMD_BOOTM and enabled CONFIG_OF_LIBFDT we'll hit an unknown symbol which was apparently implemented in arch/xxx/lib/bootm.c.
Now with weak arch_fixup_fdt() right in image-fdt.c where it is used we get both items highlighted above fixed.
--- arch/arc/lib/bootm.c | 5 ----- arch/microblaze/lib/bootm.c | 5 ----- arch/mips/lib/bootm.c | 6 ++---- arch/nds32/lib/bootm.c | 6 ------ arch/powerpc/lib/bootm.c | 5 ----- arch/sandbox/lib/bootm.c | 5 ----- arch/x86/lib/bootm.c | 5 ----- common/image-fdt.c | 5 +++++ 8 files changed, 7 insertions(+), 35 deletions(-)
arch/arc/lib/bootm.c +0 -5
@@ -37,11 +37,6 @@ void arch_lmb_reserve(struct lmb *lmb)lmb_reserve (lmb, sp, (CONFIG_SYS_SDRAM_BASE + gd->ram_size - sp)); } -int arch_fixup_fdt (void *blob) -{ -return 0 ; -} -static int cleanup_before_linux (void ) {disable_interrupts ();
arch/microblaze/lib/bootm.c +0 -5
@@ -17,11 +17,6 @@DECLARE_GLOBAL_DATA_PTR ; -int arch_fixup_fdt (void *blob) -{ -return 0 ; -} -int do_bootm_linux (int flag,int argc,char *const argv[],bootm_headers_t *images) {
arch/mips/lib/bootm.c +2 -4
@@ -253,17 +253,15 @@ static int boot_reloc_fdt(bootm_headers_t *images)#endif } +#if CONFIG_IS_ENABLED (MIPS_BOOT_FDT ) &&CONFIG_IS_ENABLED (OF_LIBFDT )int arch_fixup_fdt (void *blob) { -#if CONFIG_IS_ENABLED (MIPS_BOOT_FDT ) &&CONFIG_IS_ENABLED (OF_LIBFDT )u64 mem_start =virt_to_phys ((void *)gd->bd->bi_memstart);u64 mem_size = gd->ram_size;return fdt_fixup_memory_banks (blob, &mem_start, &mem_size,1 ); -#else -return 0 ; -#endif } +#endif static int boot_setup_fdt (bootm_headers_t *images) {
arch/nds32/lib/bootm.c +0 -6
@@ -15,12 +15,6 @@DECLARE_GLOBAL_DATA_PTR ; -int arch_fixup_fdt (void *blob) -{ -return 0 ; -} - - #if defined(CONFIG_SETUP_MEMORY_TAGS) || \ defined(CONFIG_CMDLINE_TAG) || \ defined(CONFIG_INITRD_TAG) || \
arch/powerpc/lib/bootm.c +0 -5
@@ -40,11 +40,6 @@ static void set_clocks_in_mhz (bd_t *kbd);#define CONFIG_SYS_LINUX_LOWMEM_MAX_SIZE (768*1024*1024)#endif -int arch_fixup_fdt (void *blob) -{ -return 0 ; -} -static void boot_jump_linux (bootm_headers_t *images) { void (*kernel)(bd_t *, ulong r4, ulong r5, ulong r6,
arch/sandbox/lib/bootm.c +0 -5
@@ -50,11 +50,6 @@ int bootz_setup(ulong image, ulong *start, ulong *end)return ret; } -int arch_fixup_fdt (void *blob) -{ -return 0 ; -} -int do_bootm_linux (int flag,int argc,char *argv[],bootm_headers_t *images) {if (flag & (BOOTM_STATE_OS_GO |BOOTM_STATE_OS_FAKE_GO )) {
arch/x86/lib/bootm.c +0 -5
@@ -28,11 +28,6 @@ DECLARE_GLOBAL_DATA_PTR;#define COMMAND_LINE_OFFSET 0x9000 -int arch_fixup_fdt (void *blob) -{ -return 0 ; -} -__weak void board_quiesce_devices (void ) { }
common/image-fdt.c +5 -0
@@ -454,6 +454,11 @@ __weak int ft_verify_fdt(void *fdt)return 1 ; } +__weak int arch_fixup_fdt (void *blob) +{ +return 0 ; +} +int image_setup_libfdt (bootm_headers_t *images,void *blob,int of_size,struct lmb *lmb) {
Signature · 1 line
2.14.3
PATCH 1/1 fdt: Implement weak arch_fixup_fdt()
Quoted 6 lines · Alexey Brodkin
Only ARM and in some configs MIPS really implement
arch_fixup_fdt(). Others just use the same boilerplate which is not good by itself, but what's worse if we try to build with disabledCONFIG_CMD_BOOTMand enabledCONFIG_OF_LIBFDTwe'll hit an unknown symbol which was apparently implemented inarch/xxx/lib/bootm.c.
Quoted 8 lines
Now with weak
arch_fixup_fdt()right inimage-fdt.cwhere it is used we get both items highlighted above fixed.Signed-off-by Alexey Brodkin <[email protected]>Cc Daniel Schwierzeck <[email protected]>Cc Simon Glass <[email protected]>Cc York Sun <[email protected]>Cc Stefan Roese <[email protected]>
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180124/0d6a50a5/attachment.sig>
PATCH 1/1 fdt: Implement weak arch_fixup_fdt()
In reply to Alexey BrodkinQuoted 14 lines · Alexey Brodkin
Only ARM and in some configs MIPS really implement
arch_fixup_fdt(). Others just use the same boilerplate which is not good by itself, but what's worse if we try to build with disabledCONFIG_CMD_BOOTMand enabledCONFIG_OF_LIBFDTwe'll hit an unknown symbol which was apparently implemented inarch/xxx/lib/bootm.c.Now with weak
arch_fixup_fdt()right inimage-fdt.cwhere it is used we get both items highlighted above fixed.Signed-off-by Alexey Brodkin <[email protected]>Cc Daniel Schwierzeck <[email protected]>Cc Simon Glass <[email protected]>Cc York Sun <[email protected]>Cc Stefan Roese <[email protected]>
Quoted 11 lines
--- arch/arc/lib/bootm.c | 5 ----- arch/microblaze/lib/bootm.c | 5 ----- arch/mips/lib/bootm.c | 6 ++---- arch/nds32/lib/bootm.c | 6 ------ arch/powerpc/lib/bootm.c | 5 ----- arch/sandbox/lib/bootm.c | 5 ----- arch/x86/lib/bootm.c | 5 ----- common/image-fdt.c | 5 +++++ 8 files changed, 7 insertions(+), 35 deletions(-)
Signature · 9 lines
- Daniel -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: OpenPGP digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180125/4ffac924/attachment.sig>