GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

coreboot_table: Convert some CONFIG(CHROMEOS) preprocessor 

Change-Id: I1e63a419db92642df6b7956050c39540c2ae11d6
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48781
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Kyösti Mälkki 2020-12-19 22:21:23 +02:00 committed by Angel Pons
parent 673698636f
commit 2c626f332b
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/coreboot_table.c
View File

@ -152,7 +152,6 @@ void lb_add_gpios(struct lb_gpios *gpios, const struct lb_gpio *gpio_table,
gpios->size += table_size; gpios->size += table_size;
} }
#if CONFIG(CHROMEOS)
static void lb_gpios(struct lb_header *header) static void lb_gpios(struct lb_header *header)
{ {
struct lb_gpios *gpios; struct lb_gpios *gpios;
@ -191,6 +190,7 @@ static void lb_gpios(struct lb_header *header)
} }
} }
#if CONFIG(CHROMEOS)
static void lb_vbnv(struct lb_header *header) static void lb_vbnv(struct lb_header *header)
{ {
#if CONFIG(PC80_SYSTEM) #if CONFIG(PC80_SYSTEM)
@ -487,10 +487,11 @@ static uintptr_t write_coreboot_table(uintptr_t rom_table_end)
/* Record our framebuffer */ /* Record our framebuffer */
lb_framebuffer(head); lb_framebuffer(head);
#if CONFIG(CHROMEOS)
/* Record our GPIO settings (ChromeOS specific) */ /* Record our GPIO settings (ChromeOS specific) */
lb_gpios(head); if (CONFIG(CHROMEOS))
lb_gpios(head);
#if CONFIG(CHROMEOS)
/* pass along VBNV offsets in CMOS */ /* pass along VBNV offsets in CMOS */
lb_vbnv(head); lb_vbnv(head);
#endif #endif
@ -511,9 +512,8 @@ static uintptr_t write_coreboot_table(uintptr_t rom_table_end)
/* Add board-specific table entries, if any. */ /* Add board-specific table entries, if any. */
lb_board(head); lb_board(head);
#if CONFIG(CHROMEOS_RAMOOPS) if (CONFIG(CHROMEOS_RAMOOPS))
lb_ramoops(head); lb_ramoops(head);
#endif
lb_boot_media_params(head); lb_boot_media_params(head);

6
src/mainboard/google/smaug/mainboard.c
View File

@ -203,8 +203,8 @@ struct chip_operations mainboard_ops = {
void lb_board(struct lb_header *header) void lb_board(struct lb_header *header)
{ {
#if CONFIG(CHROMEOS) if (CONFIG(CHROMEOS))
lb_table_add_serialno_from_vpd(header); lb_table_add_serialno_from_vpd(header);
#endif
soc_add_mtc(header); soc_add_mtc(header);
} }

5
src/mainboard/google/storm/mainboard.c
View File

@ -110,8 +110,7 @@ void lb_board(struct lb_header *header)
dma->range_start = (uintptr_t)_dma_coherent; dma->range_start = (uintptr_t)_dma_coherent;
dma->range_size = REGION_SIZE(dma_coherent); dma->range_size = REGION_SIZE(dma_coherent);
#if CONFIG(CHROMEOS)
/* Retrieve the switch interface MAC addresses. */ /* Retrieve the switch interface MAC addresses. */
lb_table_add_macs_from_vpd(header); if (CONFIG(CHROMEOS))
#endif lb_table_add_macs_from_vpd(header);
} }