From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kristian Amlie Date: Mon, 2 Mar 2020 14:15:01 +0100 Subject: [PATCH 1/1] vexpress_ca9x4: Enable use of correct DTB file and restore EFI loader. In-Reply-To: <20200302130109.GQ18302@bill-the-cat> References: <20200225172216.28472-1-kristian.amlie@northern.tech> <20200228153205.GI18302@bill-the-cat> <124bb61f-b980-dc5e-9695-4da5da2f0b37@northern.tech> <20200302130109.GQ18302@bill-the-cat> Message-ID: <3288fd8e-420f-fb41-78f5-164aeb4f3402@northern.tech> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 02/03/2020 14:01, Tom Rini wrote: > On Mon, Mar 02, 2020 at 11:22:27AM +0100, Kristian Amlie wrote: >> On 28/02/2020 16:32, Tom Rini wrote: >>> On Tue, Feb 25, 2020 at 06:22:16PM +0100, Kristian Amlie wrote: >>> >>>> EFI was disabled in f95b8a4b5f64f because of the missing DTB file, >>>> and indeed, the DTB file is required to load recent versions of GRUB >>>> (2.04) correctly. >>>> >>>> Signed-off-by: Kristian Amlie >>>> --- >>>> configs/vexpress_ca9x4_defconfig | 2 +- >>>> include/configs/vexpress_common.h | 3 ++- >>>> 2 files changed, 3 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/configs/vexpress_ca9x4_defconfig b/configs/vexpress_ca9x4_defconfig >>>> index 2119df6b10..6bd1f253b6 100644 >>>> --- a/configs/vexpress_ca9x4_defconfig >>>> +++ b/configs/vexpress_ca9x4_defconfig >>>> @@ -34,4 +34,4 @@ CONFIG_SMC911X_32_BIT=y >>>> CONFIG_BAUDRATE=38400 >>>> CONFIG_CONS_INDEX=0 >>>> CONFIG_OF_LIBFDT=y >>>> -# CONFIG_EFI_LOADER is not set >>>> +CONFIG_DEFAULT_FDT_FILE="vexpress-v2p-ca9.dtb" >>>> diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h >>>> index 7f215a6707..e73658a9e6 100644 >>>> --- a/include/configs/vexpress_common.h >>>> +++ b/include/configs/vexpress_common.h >>>> @@ -207,7 +207,8 @@ >>>> "devtmpfs.mount=0 vmalloc=256M\0" \ >>>> "bootflash=run flashargs; " \ >>>> "cp ${ramdisk_addr} ${ramdisk_addr_r} ${maxramdisk}; " \ >>>> - "bootm ${kernel_addr} ${ramdisk_addr_r}\0" >>>> + "bootm ${kernel_addr} ${ramdisk_addr_r}\0" \ >>>> + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" >>>> >>>> /* FLASH and environment organization */ >>>> #define PHYS_FLASH_SIZE 0x04000000 /* 64MB */ >>> >>> Did you test build all of the vexpress platforms? There's a common file >>> for the 5 different ones. Thanks! >> >> The two boards vexpress_aemv8a_juno_defconfig and >> vexpress_aemv8a_semi_defconfig don't compile at all, even without the >> patch. The other three compile just fine both with and without the patch. > > Don't compile where / how? All 5 compile with their defconfigs today. > Thanks! Oh, those are 64-bit boards, sorry I missed that part. All five are compiling fine then, both with and without the patch! -- Kristian -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 488 bytes Desc: OpenPGP digital signature URL: