Revert "efi_memory: do not add U-Boot memory to the memory map"

A bisect of Ubuntu 2022.04 boot-failure on qemu-x86_64 resulted in this
patch. I am not sure how to investigate it.

The boot hangs at some point during booting of the install image, before
the Ubuntu logo appears.

I will sent a series with a script showing how it is run.

Series-to: u-boot
Series-cc: sughosh, trini

This reverts commit a68c9ac5d8.

lib/efi_loader/efi_memory.c

@@ -799,6 +799,18 @@ static void add_u_boot_and_runtime(void)
 {
 	unsigned long runtime_start, runtime_end, runtime_pages;
 	unsigned long runtime_mask = EFI_PAGE_MASK;
+	unsigned long uboot_start, uboot_pages;
+	unsigned long uboot_stack_size = CONFIG_STACK_SIZE;
+
+	if (!IS_ENABLED(CONFIG_SANDBOX)) {
+		/* Add U-Boot */
+		uboot_start = ((uintptr_t)map_sysmem(gd->start_addr_sp, 0) -
+			       uboot_stack_size) & ~EFI_PAGE_MASK;
+		uboot_pages = ((uintptr_t)map_sysmem(gd->ram_top - 1, 0) -
+			       uboot_start + EFI_PAGE_MASK) >> EFI_PAGE_SHIFT;
+		efi_add_memory_map_pg(uboot_start, uboot_pages,
+				      EFI_BOOT_SERVICES_CODE, false);
+	}
 
 #if defined(__aarch64__)
 	/*