 658dbfeb5e
			
		
	
	
	658dbfeb5e
	
	
	
		
			
			<asm/boot.h> needs <asm/pgtable_types.h>, not <asm/page_types.h> in order to resolve PMD_SHIFT. Also, correct a +1 which really should be + THREAD_ORDER. This is a build error which was masked by a typoed #ifdef. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
		
			
				
	
	
		
			51 lines
		
	
	
	
		
			1.2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			51 lines
		
	
	
	
		
			1.2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| #ifndef _ASM_X86_BOOT_H
 | |
| #define _ASM_X86_BOOT_H
 | |
| 
 | |
| /* Internal svga startup constants */
 | |
| #define NORMAL_VGA	0xffff		/* 80x25 mode */
 | |
| #define EXTENDED_VGA	0xfffe		/* 80x50 mode */
 | |
| #define ASK_VGA		0xfffd		/* ask for it at bootup */
 | |
| 
 | |
| #ifdef __KERNEL__
 | |
| 
 | |
| #include <asm/pgtable_types.h>
 | |
| 
 | |
| /* Physical address where kernel should be loaded. */
 | |
| #define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
 | |
| 				+ (CONFIG_PHYSICAL_ALIGN - 1)) \
 | |
| 				& ~(CONFIG_PHYSICAL_ALIGN - 1))
 | |
| 
 | |
| /* Minimum kernel alignment, as a power of two */
 | |
| #ifdef CONFIG_X86_64
 | |
| #define MIN_KERNEL_ALIGN_LG2	PMD_SHIFT
 | |
| #else
 | |
| #define MIN_KERNEL_ALIGN_LG2	(PAGE_SHIFT + THREAD_ORDER)
 | |
| #endif
 | |
| #define MIN_KERNEL_ALIGN	(_AC(1, UL) << MIN_KERNEL_ALIGN_LG2)
 | |
| 
 | |
| #if (CONFIG_PHYSICAL_ALIGN & (CONFIG_PHYSICAL_ALIGN-1)) || \
 | |
| 	(CONFIG_PHYSICAL_ALIGN < (_AC(1, UL) << MIN_KERNEL_ALIGN_LG2))
 | |
| #error "Invalid value for CONFIG_PHYSICAL_ALIGN"
 | |
| #endif
 | |
| 
 | |
| #ifdef CONFIG_KERNEL_BZIP2
 | |
| #define BOOT_HEAP_SIZE             0x400000
 | |
| #else /* !CONFIG_KERNEL_BZIP2 */
 | |
| 
 | |
| #ifdef CONFIG_X86_64
 | |
| #define BOOT_HEAP_SIZE	0x7000
 | |
| #else
 | |
| #define BOOT_HEAP_SIZE	0x4000
 | |
| #endif
 | |
| 
 | |
| #endif /* !CONFIG_KERNEL_BZIP2 */
 | |
| 
 | |
| #ifdef CONFIG_X86_64
 | |
| #define BOOT_STACK_SIZE	0x4000
 | |
| #else
 | |
| #define BOOT_STACK_SIZE	0x1000
 | |
| #endif
 | |
| 
 | |
| #endif /* __KERNEL__ */
 | |
| 
 | |
| #endif /* _ASM_X86_BOOT_H */
 |