From 897e1dc86af7b2b9d58c71345c585d130b16232d Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Sat, 27 Feb 2016 22:57:59 -0800 Subject: [PATCH] x86: Use a macro for ROM table alignment Define ROM_TABLE_ALIGN instead of using 1024 directly. Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- arch/x86/include/asm/tables.h | 2 ++ arch/x86/lib/tables.c | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/tables.h b/arch/x86/include/asm/tables.h index 0aa6d9b33e..9e6754f2a5 100644 --- a/arch/x86/include/asm/tables.h +++ b/arch/x86/include/asm/tables.h @@ -14,6 +14,8 @@ */ #define ROM_TABLE_ADDR 0xf0000 +#define ROM_TABLE_ALIGN 1024 + /** * table_compute_checksum() - Compute a table checksum * diff --git a/arch/x86/lib/tables.c b/arch/x86/lib/tables.c index fc6c0d852a..19b0260935 100644 --- a/arch/x86/lib/tables.c +++ b/arch/x86/lib/tables.c @@ -44,27 +44,27 @@ void write_tables(void) #ifdef CONFIG_GENERATE_PIRQ_TABLE rom_table_end = write_pirq_routing_table(rom_table_start); - rom_table_end = ALIGN(rom_table_end, 1024); + rom_table_end = ALIGN(rom_table_end, ROM_TABLE_ALIGN); rom_table_start = rom_table_end; #endif #ifdef CONFIG_GENERATE_SFI_TABLE rom_table_end = write_sfi_table(rom_table_start); - rom_table_end = ALIGN(rom_table_end, 1024); + rom_table_end = ALIGN(rom_table_end, ROM_TABLE_ALIGN); rom_table_start = rom_table_end; #endif #ifdef CONFIG_GENERATE_MP_TABLE rom_table_end = write_mp_table(rom_table_start); - rom_table_end = ALIGN(rom_table_end, 1024); + rom_table_end = ALIGN(rom_table_end, ROM_TABLE_ALIGN); rom_table_start = rom_table_end; #endif #ifdef CONFIG_GENERATE_ACPI_TABLE rom_table_end = write_acpi_tables(rom_table_start); - rom_table_end = ALIGN(rom_table_end, 1024); + rom_table_end = ALIGN(rom_table_end, ROM_TABLE_ALIGN); rom_table_start = rom_table_end; #endif #ifdef CONFIG_GENERATE_SMBIOS_TABLE rom_table_end = write_smbios_table(rom_table_start); - rom_table_end = ALIGN(rom_table_end, 1024); + rom_table_end = ALIGN(rom_table_end, ROM_TABLE_ALIGN); rom_table_start = rom_table_end; #endif } -- 2.39.5