Skip to content

Commit 336fe1d

Browse files
arndbRussell King (Oracle)
authored andcommitted
ARM: 9140/1: allow compile-testing without machine record
A lot of randconfig builds end up not selecting any machine type at all. This is generally fine for the purpose of compile testing, but of course it means that the kernel is not usable on actual hardware, and it causes a warning about this fact. As most of the build bots now force-enable CONFIG_COMPILE_TEST for randconfig builds, use that as a guard to control whether we warn on this type of broken configuration. We could do the same for the missing-cpu-type warning, but those configurations fail to build much earlier. Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Russell King (Oracle) <[email protected]>
1 parent 8b5bd5a commit 336fe1d

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

arch/arm/kernel/vmlinux-xip.lds.S

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,9 @@ SECTIONS
162162
* binutils is too old (for other reasons as well)
163163
*/
164164
ASSERT((__proc_info_end - __proc_info_begin), "missing CPU support")
165+
#ifndef CONFIG_COMPILE_TEST
165166
ASSERT((__arch_info_end - __arch_info_begin), "no machine record defined")
167+
#endif
166168

167169
#ifdef CONFIG_XIP_DEFLATED_DATA
168170
/*

arch/arm/kernel/vmlinux.lds.S

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,8 @@ __start_rodata_section_aligned = ALIGN(__start_rodata, 1 << SECTION_SHIFT);
174174
* binutils is too old (for other reasons as well)
175175
*/
176176
ASSERT((__proc_info_end - __proc_info_begin), "missing CPU support")
177+
#ifndef CONFIG_COMPILE_TEST
177178
ASSERT((__arch_info_end - __arch_info_begin), "no machine record defined")
179+
#endif
178180

179181
#endif /* CONFIG_XIP_KERNEL */

0 commit comments

Comments
 (0)