dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-04 02:02:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

arm: spl: For Falcon Mode, set a default machid of ~0

Browse Source 
With device trees, boards do not always set CONFIG_MACH_TYPE now, so we
must not rely on this define being set.  The kernel uses ~0 to see if we
have a valid machine number or not, so set that as the default, invalid
machine, id and only fix if CONFIG_MACH_TYPE is set.

Acked-by: Dan Murphy <dmurphy@ti.com>
Tested-by: Heiko Schocher <hs@denx.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Signed-off-by: Tom Rini <trini@ti.com>
This commit is contained in:
Tom Rini
2013-08-09 11:22:15 -04:00
parent 4db4076206
commit ec101fdb8d
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/lib/spl.c
View File

@@ -45,12 +45,17 @@ void __weak board_init_f(ulong dummy)
#ifdef CONFIG_SPL_OS_BOOT #ifdef CONFIG_SPL_OS_BOOT
void __noreturn jump_to_image_linux(void *arg) void __noreturn jump_to_image_linux(void *arg)
{ {
unsigned long machid = 0xffffffff;
#ifdef CONFIG_MACH_TYPE
machid = CONFIG_MACH_TYPE;
#endif
debug("Entering kernel arg pointer: 0x%p\n", arg); debug("Entering kernel arg pointer: 0x%p\n", arg);
typedef void (*image_entry_arg_t)(int, int, void *) typedef void (*image_entry_arg_t)(int, int, void *)
__attribute__ ((noreturn)); __attribute__ ((noreturn));
image_entry_arg_t image_entry = image_entry_arg_t image_entry =
(image_entry_arg_t) spl_image.entry_point; (image_entry_arg_t) spl_image.entry_point;
cleanup_before_linux(); cleanup_before_linux();
image_entry(0, CONFIG_MACH_TYPE, arg); image_entry(0, machid, arg);
} }
#endif #endif