sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpayload: Drop CONFIG_LP_CHROMEOS

Browse Source 
This is adding complexity to the code more than it saves
space, plus some of the tables could potentially be interesting
outside of the ChromeOS context.

Change-Id: I4bf24608f3e26d3b7871a5031ae8f03bc2c8c21f
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: https://review.coreboot.org/14070
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
Stefan Reinauer
2016-03-12 12:12:14 -08:00
parent 96d14ac1c9
commit 8fda04449f
10 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
payloads/libpayload/Kconfig
View File

@ -80,12 +80,6 @@ config REMOTEGDB
help help
Enable Remote GDB debugging support. Enable Remote GDB debugging support.
config CHROMEOS
bool "ChromeOS specific features"
default n
help
Enable ChromeOS specific features.
endmenu endmenu
menu "Architecture Options" menu "Architecture Options"

1
payloads/libpayload/configs/config.arm64-generic
View File

@ -11,7 +11,6 @@
# CONFIG_LP_DEVELOPER is not set # CONFIG_LP_DEVELOPER is not set
CONFIG_LP_COMPILER_GCC=y CONFIG_LP_COMPILER_GCC=y
# CONFIG_LP_COMPILER_LLVM_CLANG is not set # CONFIG_LP_COMPILER_LLVM_CLANG is not set
CONFIG_LP_CHROMEOS=y
# #
# Architecture Options # Architecture Options

1
payloads/libpayload/configs/config.purin
View File

@ -12,7 +12,6 @@ CONFIG_LP_GPL=y
CONFIG_LP_COMPILER_GCC=y CONFIG_LP_COMPILER_GCC=y
# CONFIG_LP_COMPILER_LLVM_CLANG is not set # CONFIG_LP_COMPILER_LLVM_CLANG is not set
# CONFIG_LP_REMOTEGDB is not set # CONFIG_LP_REMOTEGDB is not set
CONFIG_LP_CHROMEOS=y
# #
# Architecture Options # Architecture Options

1
payloads/libpayload/configs/config.veyron
View File

@ -12,7 +12,6 @@ CONFIG_LP_GPL=y
CONFIG_LP_COMPILER_GCC=y CONFIG_LP_COMPILER_GCC=y
# CONFIG_LP_COMPILER_LLVM_CLANG is not set # CONFIG_LP_COMPILER_LLVM_CLANG is not set
# CONFIG_LP_REMOTEGDB is not set # CONFIG_LP_REMOTEGDB is not set
CONFIG_LP_CHROMEOS=y
# #
# Architecture Options # Architecture Options

1
payloads/libpayload/configs/defconfig
View File

@ -11,7 +11,6 @@
# CONFIG_LP_DEVELOPER is not set # CONFIG_LP_DEVELOPER is not set
CONFIG_LP_COMPILER_GCC=y CONFIG_LP_COMPILER_GCC=y
# CONFIG_LP_COMPILER_LLVM_CLANG is not set # CONFIG_LP_COMPILER_LLVM_CLANG is not set
# CONFIG_LP_CHROMEOS is not set
# #
# Architecture Options # Architecture Options

1
payloads/libpayload/configs/defconfig-arm
View File

@ -11,7 +11,6 @@
# CONFIG_LP_DEVELOPER is not set # CONFIG_LP_DEVELOPER is not set
CONFIG_LP_COMPILER_GCC=y CONFIG_LP_COMPILER_GCC=y
# CONFIG_LP_COMPILER_LLVM_CLANG is not set # CONFIG_LP_COMPILER_LLVM_CLANG is not set
# CONFIG_LP_CHROMEOS is not set
# #
# Architecture Options # Architecture Options

1
payloads/libpayload/configs/defconfig-mips
View File

@ -11,7 +11,6 @@
# CONFIG_LP_DEVELOPER is not set # CONFIG_LP_DEVELOPER is not set
CONFIG_LP_COMPILER_GCC=y CONFIG_LP_COMPILER_GCC=y
# CONFIG_LP_COMPILER_LLVM_CLANG is not set # CONFIG_LP_COMPILER_LLVM_CLANG is not set
# CONFIG_LP_CHROMEOS is not set
# #
# Architecture Options # Architecture Options

1
payloads/libpayload/configs/defconfig-tinycurses
View File

@ -11,7 +11,6 @@
# CONFIG_LP_DEVELOPER is not set # CONFIG_LP_DEVELOPER is not set
CONFIG_LP_COMPILER_GCC=y CONFIG_LP_COMPILER_GCC=y
# CONFIG_LP_COMPILER_LLVM_CLANG is not set # CONFIG_LP_COMPILER_LLVM_CLANG is not set
# CONFIG_LP_CHROMEOS is not set
# #
# Architecture Options # Architecture Options

6
payloads/libpayload/include/sysinfo.h
View File

@ -66,10 +66,8 @@ struct sysinfo_t {
u32 cmos_range_start; u32 cmos_range_start;
u32 cmos_range_end; u32 cmos_range_end;
u32 cmos_checksum_location; u32 cmos_checksum_location;
#if IS_ENABLED(CONFIG_LP_CHROMEOS)
u32 vbnv_start; u32 vbnv_start;
u32 vbnv_size; u32 vbnv_size;
#endif
char *version; char *version;
char *extra_version; char *extra_version;
@ -86,25 +84,21 @@ struct sysinfo_t {
struct cb_framebuffer *framebuffer; struct cb_framebuffer *framebuffer;
#if IS_ENABLED(CONFIG_LP_CHROMEOS)
int num_gpios; int num_gpios;
struct cb_gpio gpios[SYSINFO_MAX_GPIOS]; struct cb_gpio gpios[SYSINFO_MAX_GPIOS];
int num_macs; int num_macs;
struct mac_address macs[SYSINFO_MAX_MACS]; struct mac_address macs[SYSINFO_MAX_MACS];
char *serialno; char *serialno;
#endif
unsigned long *mbtable; /** Pointer to the multiboot table */ unsigned long *mbtable; /** Pointer to the multiboot table */
struct cb_header *header; struct cb_header *header;
struct cb_mainboard *mainboard; struct cb_mainboard *mainboard;
#if IS_ENABLED(CONFIG_LP_CHROMEOS)
void *vboot_handoff; void *vboot_handoff;
u32 vboot_handoff_size; u32 vboot_handoff_size;
void *vdat_addr; void *vdat_addr;
u32 vdat_size; u32 vdat_size;
#endif
#if IS_ENABLED(CONFIG_LP_ARCH_X86) #if IS_ENABLED(CONFIG_LP_ARCH_X86)
int x86_rom_var_mtrr_index; int x86_rom_var_mtrr_index;

5
payloads/libpayload/libc/coreboot.c
View File

@ -78,7 +78,6 @@ static void cb_parse_serial(void *ptr, struct sysinfo_t *info)
info->serial = ((struct cb_serial *)ptr); info->serial = ((struct cb_serial *)ptr);
} }
#if IS_ENABLED(CONFIG_LP_CHROMEOS)
static void cb_parse_vboot_handoff(unsigned char *ptr, struct sysinfo_t *info) static void cb_parse_vboot_handoff(unsigned char *ptr, struct sysinfo_t *info)
{ {
struct lb_range *vbho = (struct lb_range *)ptr; struct lb_range *vbho = (struct lb_range *)ptr;
@ -128,8 +127,6 @@ static void cb_parse_mac_addresses(unsigned char *ptr,
info->macs[i] = macs->mac_addrs[i]; info->macs[i] = macs->mac_addrs[i];
} }
#endif
static void cb_parse_tstamp(unsigned char *ptr, struct sysinfo_t *info) static void cb_parse_tstamp(unsigned char *ptr, struct sysinfo_t *info)
{ {
struct cb_cbmem_tab *const cbmem = (struct cb_cbmem_tab *)ptr; struct cb_cbmem_tab *const cbmem = (struct cb_cbmem_tab *)ptr;
@ -349,7 +346,6 @@ int cb_parse_header(void *addr, int len, struct sysinfo_t *info)
case CB_TAG_MAINBOARD: case CB_TAG_MAINBOARD:
info->mainboard = (struct cb_mainboard *)ptr; info->mainboard = (struct cb_mainboard *)ptr;
break; break;
#if IS_ENABLED(CONFIG_LP_CHROMEOS)
case CB_TAG_GPIO: case CB_TAG_GPIO:
cb_parse_gpios(ptr, info); cb_parse_gpios(ptr, info);
break; break;
@ -368,7 +364,6 @@ int cb_parse_header(void *addr, int len, struct sysinfo_t *info)
case CB_TAG_SERIALNO: case CB_TAG_SERIALNO:
cb_parse_string(ptr, &info->serialno); cb_parse_string(ptr, &info->serialno);
break; break;
#endif
case CB_TAG_TIMESTAMPS: case CB_TAG_TIMESTAMPS:
cb_parse_tstamp(ptr, info); cb_parse_tstamp(ptr, info);
break; break;