HEAD-1858 ipxe's tests rely on L'x' which not all compilers interpret correctly
merge: include new cpuid and memmap settings