Declare both defines FSBL_PARAM_MAGIC and LINUX_BOOT_PARAM_MAGIC in the same header file, as they both have a very similar uses and value. Signed-off-by: Jules Maselbas <jmaselbas@xxxxxxxxx> --- arch/kvx/include/asm/bootm.h | 11 ----------- arch/kvx/include/asm/common.h | 3 ++- arch/kvx/lib/bootm.c | 1 - 3 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 arch/kvx/include/asm/bootm.h diff --git a/arch/kvx/include/asm/bootm.h b/arch/kvx/include/asm/bootm.h deleted file mode 100644 index 7ad7e2e878..0000000000 --- a/arch/kvx/include/asm/bootm.h +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * Copyright (C) 2019 Kalray Inc. - */ - -#ifndef _ASM_KVX_BOOTM_H -#define _ASM_KVX_BOOTM_H - -#define LINUX_BOOT_PARAM_MAGIC 0x31564752414E494CULL - -#endif /* _ASM_KVX_BOOTM_H */ diff --git a/arch/kvx/include/asm/common.h b/arch/kvx/include/asm/common.h index a7e301e53a..754953962b 100644 --- a/arch/kvx/include/asm/common.h +++ b/arch/kvx/include/asm/common.h @@ -12,7 +12,8 @@ * Magic value passed in r0 to indicate valid parameters from FSBL when booting * If $r0 contains this value, then $r1 contains dtb pointer. */ -#define FSBL_PARAM_MAGIC 0x31564752414C414BULL +#define FSBL_PARAM_MAGIC 0x31564752414C414BULL /* KALARGV1 */ +#define LINUX_BOOT_PARAM_MAGIC 0x31564752414E494CULL /* LINARGV1 */ extern char _exception_start; extern char __end; diff --git a/arch/kvx/lib/bootm.c b/arch/kvx/lib/bootm.c index 4d17e1846d..3e9772c458 100644 --- a/arch/kvx/lib/bootm.c +++ b/arch/kvx/lib/bootm.c @@ -17,7 +17,6 @@ #include <linux/kernel.h> #include <asm/cache.h> -#include <asm/bootm.h> typedef void __noreturn (*boot_func_entry)(unsigned long, void *); -- 2.17.1 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
