diff options
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/Kconfig | 3 | ||||
| -rw-r--r-- | boot/fdt_support.c | 17 |
2 files changed, 7 insertions, 13 deletions
diff --git a/boot/Kconfig b/boot/Kconfig index dd047365754..eff05948b3a 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -1093,6 +1093,7 @@ config SYS_RAMBOOT config RAMBOOT_PBL bool "Freescale PBL(pre-boot loader) image format support" + depends on ARCH_LS1021A || PPC select SYS_RAMBOOT if PPC help Some SoCs use PBL to load RCW and/or pre-initialization instructions. @@ -1852,6 +1853,7 @@ config OF_BOARD_SETUP config OF_BOARD_SETUP_EXTENDED bool "Set up latest board-specific details in device tree before boot" + depends on !COMPILE_TEST imply OF_BOARD_SETUP help This causes U-Boot to call ft_board_setup_ex() before booting into @@ -1862,6 +1864,7 @@ config OF_BOARD_SETUP_EXTENDED config OF_SYSTEM_SETUP bool "Set up system-specific details in device tree before boot" + depends on !COMPILE_TEST help This causes U-Boot to call ft_system_setup() before booting into the Operating System. This function can set up various diff --git a/boot/fdt_support.c b/boot/fdt_support.c index b7331bb76b3..92f2f534ee0 100644 --- a/boot/fdt_support.c +++ b/boot/fdt_support.c @@ -224,24 +224,15 @@ int fdt_initrd(void *fdt, ulong initrd_start, ulong initrd_end) int is_u64; uint64_t addr, size; + /* just return if the size of initrd is zero */ + if (initrd_start == initrd_end) + return 0; + /* find or create "/chosen" node. */ nodeoffset = fdt_find_or_add_subnode(fdt, 0, "chosen"); if (nodeoffset < 0) return nodeoffset; - /* - * Although we didn't setup an initrd, there could be a stale - * initrd setting from the previous boot firmware in the live - * device tree. So, make sure there is no setting left if we - * don't want an initrd. - */ - if (initrd_start == initrd_end) { - fdt_delprop(fdt, nodeoffset, "linux,initrd-start"); - fdt_delprop(fdt, nodeoffset, "linux,initrd-end"); - - return 0; - } - total = fdt_num_mem_rsv(fdt); /* |