[coreboot-gerrit] New patch to review for coreboot: libpayload: Drop CONFIG_LP_CHROMEOS
Stefan Reinauer (stefan.reinauer@coreboot.org)
gerrit at coreboot.org
Sat Mar 12 21:15:51 CET 2016
Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14070
-gerrit
commit 52182cc463c994d5e1ae9a6b117122c17ea572ec
Author: Stefan Reinauer <stefan.reinauer at coreboot.org>
Date: Sat Mar 12 12:12:14 2016 -0800
libpayload: Drop CONFIG_LP_CHROMEOS
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 at coreboot.org>
---
payloads/libpayload/Kconfig | 6 ------
payloads/libpayload/configs/config.arm64-generic | 1 -
payloads/libpayload/configs/config.purin | 1 -
payloads/libpayload/configs/config.veyron | 1 -
payloads/libpayload/configs/defconfig | 1 -
payloads/libpayload/configs/defconfig-arm | 1 -
payloads/libpayload/configs/defconfig-mips | 1 -
payloads/libpayload/configs/defconfig-tinycurses | 1 -
payloads/libpayload/include/sysinfo.h | 6 ------
payloads/libpayload/libc/coreboot.c | 5 -----
10 files changed, 24 deletions(-)
diff --git a/payloads/libpayload/Kconfig b/payloads/libpayload/Kconfig
index e95f31b..ef452ac 100644
--- a/payloads/libpayload/Kconfig
+++ b/payloads/libpayload/Kconfig
@@ -80,12 +80,6 @@ config REMOTEGDB
help
Enable Remote GDB debugging support.
-config CHROMEOS
- bool "ChromeOS specific features"
- default n
- help
- Enable ChromeOS specific features.
-
endmenu
menu "Architecture Options"
diff --git a/payloads/libpayload/configs/config.arm64-generic b/payloads/libpayload/configs/config.arm64-generic
index cca00b3..a2d596c 100644
--- a/payloads/libpayload/configs/config.arm64-generic
+++ b/payloads/libpayload/configs/config.arm64-generic
@@ -11,7 +11,6 @@
# CONFIG_LP_DEVELOPER is not set
CONFIG_LP_COMPILER_GCC=y
# CONFIG_LP_COMPILER_LLVM_CLANG is not set
-CONFIG_LP_CHROMEOS=y
#
# Architecture Options
diff --git a/payloads/libpayload/configs/config.purin b/payloads/libpayload/configs/config.purin
index adb93b1..c4f225b 100644
--- a/payloads/libpayload/configs/config.purin
+++ b/payloads/libpayload/configs/config.purin
@@ -12,7 +12,6 @@ CONFIG_LP_GPL=y
CONFIG_LP_COMPILER_GCC=y
# CONFIG_LP_COMPILER_LLVM_CLANG is not set
# CONFIG_LP_REMOTEGDB is not set
-CONFIG_LP_CHROMEOS=y
#
# Architecture Options
diff --git a/payloads/libpayload/configs/config.veyron b/payloads/libpayload/configs/config.veyron
index aca5817..47d54ea 100644
--- a/payloads/libpayload/configs/config.veyron
+++ b/payloads/libpayload/configs/config.veyron
@@ -12,7 +12,6 @@ CONFIG_LP_GPL=y
CONFIG_LP_COMPILER_GCC=y
# CONFIG_LP_COMPILER_LLVM_CLANG is not set
# CONFIG_LP_REMOTEGDB is not set
-CONFIG_LP_CHROMEOS=y
#
# Architecture Options
diff --git a/payloads/libpayload/configs/defconfig b/payloads/libpayload/configs/defconfig
index 1d516f7..53320e7 100644
--- a/payloads/libpayload/configs/defconfig
+++ b/payloads/libpayload/configs/defconfig
@@ -11,7 +11,6 @@
# CONFIG_LP_DEVELOPER is not set
CONFIG_LP_COMPILER_GCC=y
# CONFIG_LP_COMPILER_LLVM_CLANG is not set
-# CONFIG_LP_CHROMEOS is not set
#
# Architecture Options
diff --git a/payloads/libpayload/configs/defconfig-arm b/payloads/libpayload/configs/defconfig-arm
index fa7e4f6..5b0ebe6 100644
--- a/payloads/libpayload/configs/defconfig-arm
+++ b/payloads/libpayload/configs/defconfig-arm
@@ -11,7 +11,6 @@
# CONFIG_LP_DEVELOPER is not set
CONFIG_LP_COMPILER_GCC=y
# CONFIG_LP_COMPILER_LLVM_CLANG is not set
-# CONFIG_LP_CHROMEOS is not set
#
# Architecture Options
diff --git a/payloads/libpayload/configs/defconfig-mips b/payloads/libpayload/configs/defconfig-mips
index 0b05f87..5b78777 100644
--- a/payloads/libpayload/configs/defconfig-mips
+++ b/payloads/libpayload/configs/defconfig-mips
@@ -11,7 +11,6 @@
# CONFIG_LP_DEVELOPER is not set
CONFIG_LP_COMPILER_GCC=y
# CONFIG_LP_COMPILER_LLVM_CLANG is not set
-# CONFIG_LP_CHROMEOS is not set
#
# Architecture Options
diff --git a/payloads/libpayload/configs/defconfig-tinycurses b/payloads/libpayload/configs/defconfig-tinycurses
index 7e74fb2..ad0a8cf 100644
--- a/payloads/libpayload/configs/defconfig-tinycurses
+++ b/payloads/libpayload/configs/defconfig-tinycurses
@@ -11,7 +11,6 @@
# CONFIG_LP_DEVELOPER is not set
CONFIG_LP_COMPILER_GCC=y
# CONFIG_LP_COMPILER_LLVM_CLANG is not set
-# CONFIG_LP_CHROMEOS is not set
#
# Architecture Options
diff --git a/payloads/libpayload/include/sysinfo.h b/payloads/libpayload/include/sysinfo.h
index b97ae14..2110d88 100644
--- a/payloads/libpayload/include/sysinfo.h
+++ b/payloads/libpayload/include/sysinfo.h
@@ -66,10 +66,8 @@ struct sysinfo_t {
u32 cmos_range_start;
u32 cmos_range_end;
u32 cmos_checksum_location;
-#if IS_ENABLED(CONFIG_LP_CHROMEOS)
u32 vbnv_start;
u32 vbnv_size;
-#endif
char *version;
char *extra_version;
@@ -86,25 +84,21 @@ struct sysinfo_t {
struct cb_framebuffer *framebuffer;
-#if IS_ENABLED(CONFIG_LP_CHROMEOS)
int num_gpios;
struct cb_gpio gpios[SYSINFO_MAX_GPIOS];
int num_macs;
struct mac_address macs[SYSINFO_MAX_MACS];
char *serialno;
-#endif
unsigned long *mbtable; /** Pointer to the multiboot table */
struct cb_header *header;
struct cb_mainboard *mainboard;
-#if IS_ENABLED(CONFIG_LP_CHROMEOS)
void *vboot_handoff;
u32 vboot_handoff_size;
void *vdat_addr;
u32 vdat_size;
-#endif
#if IS_ENABLED(CONFIG_LP_ARCH_X86)
int x86_rom_var_mtrr_index;
diff --git a/payloads/libpayload/libc/coreboot.c b/payloads/libpayload/libc/coreboot.c
index 3abd610..7ad8e06 100644
--- a/payloads/libpayload/libc/coreboot.c
+++ b/payloads/libpayload/libc/coreboot.c
@@ -78,7 +78,6 @@ static void cb_parse_serial(void *ptr, struct sysinfo_t *info)
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)
{
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];
}
-#endif
-
static void cb_parse_tstamp(unsigned char *ptr, struct sysinfo_t *info)
{
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:
info->mainboard = (struct cb_mainboard *)ptr;
break;
-#if IS_ENABLED(CONFIG_LP_CHROMEOS)
case CB_TAG_GPIO:
cb_parse_gpios(ptr, info);
break;
@@ -368,7 +364,6 @@ int cb_parse_header(void *addr, int len, struct sysinfo_t *info)
case CB_TAG_SERIALNO:
cb_parse_string(ptr, &info->serialno);
break;
-#endif
case CB_TAG_TIMESTAMPS:
cb_parse_tstamp(ptr, info);
break;
More information about the coreboot-gerrit
mailing list