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

libpayload: Change CONFIG_* to CONFIG_LP_* in the kconfig.

Browse Source 
When libpayload header files are included in the payload itself, it's possible
that the payloads config settings will conflict with the ones in libpayload.
It's also possible for the libpayload config settings to conflict with the
payloads. To avoid that, the libpayload config settings have _LP_ (for
libpayload) added to them. The symbols themselves as defined in the Config.in files
are still the same, but the prefix added to them is now CONFIG_LP_ instead of just
CONFIG_.

Change-Id: Ib8a46d202e7880afdeac7924d69a949bfbcc5f97
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: https://gerrit.chromium.org/gerrit/65303
Reviewed-by: Stefan Reinauer <reinauer@google.com>
Tested-by: Gabe Black <gabeblack@chromium.org>
Commit-Queue: Gabe Black <gabeblack@chromium.org>
(cherry picked from commit 23e866da20862cace0ed2a67d6fb74056bc9ea9a)
Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com>
Reviewed-on: http://review.coreboot.org/6427
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Marc Jones <marc.jones@se-eng.com>
This commit is contained in:
Gabe Black
2013-08-09 04:27:35 -07:00
committed by Isaac Christensen
parent b77431336e
commit 1ee2c6dbdf
58 changed files with 523 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
payloads/libpayload/util/kconfig/confdata.c
View File

@@ -219,22 +219,22 @@ load:
sym = NULL;
switch (line[0]) {
case '#':
if (memcmp(line + 2, "CONFIG_", 7))
if (memcmp(line + 2, "CONFIG_LP_", 10))
continue;
p = strchr(line + 9, ' ');
p = strchr(line + 12, ' ');
if (!p)
continue;
*p++ = 0;
if (strncmp(p, "is not set", 10))
continue;
if (def == S_DEF_USER) {
sym = sym_find(line + 9);
sym = sym_find(line + 12);
if (!sym) {
conf_warning("trying to assign nonexistent symbol %s", line + 9);
conf_warning("trying to assign nonexistent symbol %s", line + 12);
break;
}
} else {
sym = sym_lookup(line + 9, 0);
sym = sym_lookup(line + 12, 0);
if (sym->type == S_UNKNOWN)
sym->type = S_BOOLEAN;
}
@@ -252,11 +252,11 @@ load:
}
break;
case 'C':
if (memcmp(line, "CONFIG_", 7)) {
if (memcmp(line, "CONFIG_LP_", 10)) {
conf_warning("unexpected data");
continue;
}
p = strchr(line + 7, '=');
p = strchr(line + 10, '=');
if (!p)
continue;
*p++ = 0;
@@ -267,13 +267,13 @@ load:
*p2 = 0;
}
if (def == S_DEF_USER) {
sym = sym_find(line + 7);
sym = sym_find(line + 10);
if (!sym) {
conf_warning("trying to assign nonexistent symbol %s", line + 7);
conf_warning("trying to assign nonexistent symbol %s", line + 10);
break;
}
} else {
sym = sym_lookup(line + 7, 0);
sym = sym_lookup(line + 10, 0);
if (sym->type == S_UNKNOWN)
sym->type = S_OTHER;
}
@@ -489,19 +489,19 @@ int conf_write(const char *name)
case S_TRISTATE:
switch (sym_get_tristate_value(sym)) {
case no:
fprintf(out, "# CONFIG_%s is not set\n", sym->name);
fprintf(out, "# CONFIG_LP_%s is not set\n", sym->name);
break;
case mod:
fprintf(out, "CONFIG_%s=m\n", sym->name);
fprintf(out, "CONFIG_LP_%s=m\n", sym->name);
break;
case yes:
fprintf(out, "CONFIG_%s=y\n", sym->name);
fprintf(out, "CONFIG_LP_%s=y\n", sym->name);
break;
}
break;
case S_STRING:
str = sym_get_string_value(sym);
fprintf(out, "CONFIG_%s=\"", sym->name);
fprintf(out, "CONFIG_LP_%s=\"", sym->name);
while (1) {
l = strcspn(str, "\"\\");
if (l) {
@@ -517,12 +517,12 @@ int conf_write(const char *name)
case S_HEX:
str = sym_get_string_value(sym);
if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {
fprintf(out, "CONFIG_%s=%s\n", sym->name, str);
fprintf(out, "CONFIG_LP_%s=%s\n", sym->name, str);
break;
}
case S_INT:
str = sym_get_string_value(sym);
fprintf(out, "CONFIG_%s=%s\n", sym->name, str);
fprintf(out, "CONFIG_LP_%s=%s\n", sym->name, str);
break;
}
}
@@ -730,19 +730,19 @@ int conf_write_autoconf(void)
case no:
break;
case mod:
fprintf(out, "CONFIG_%s=m\n", sym->name);
fprintf(out_h, "#define CONFIG_%s_MODULE 1\n", sym->name);
fprintf(out, "CONFIG_LP_%s=m\n", sym->name);
fprintf(out_h, "#define CONFIG_LP_%s_MODULE 1\n", sym->name);
break;
case yes:
fprintf(out, "CONFIG_%s=y\n", sym->name);
fprintf(out_h, "#define CONFIG_%s 1\n", sym->name);
fprintf(out, "CONFIG_LP_%s=y\n", sym->name);
fprintf(out_h, "#define CONFIG_LP_%s 1\n", sym->name);
break;
}
break;
case S_STRING:
str = sym_get_string_value(sym);
fprintf(out, "CONFIG_%s=\"", sym->name);
fprintf(out_h, "#define CONFIG_%s \"", sym->name);
fprintf(out, "CONFIG_LP_%s=\"", sym->name);
fprintf(out_h, "#define CONFIG_LP_%s \"", sym->name);
while (1) {
l = strcspn(str, "\"\\");
if (l) {
@@ -762,14 +762,14 @@ int conf_write_autoconf(void)
case S_HEX:
str = sym_get_string_value(sym);
if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {
fprintf(out, "CONFIG_%s=%s\n", sym->name, str);
fprintf(out_h, "#define CONFIG_%s 0x%s\n", sym->name, str);
fprintf(out, "CONFIG_LP_%s=%s\n", sym->name, str);
fprintf(out_h, "#define CONFIG_LP_%s 0x%s\n", sym->name, str);
break;
}
case S_INT:
str = sym_get_string_value(sym);
fprintf(out, "CONFIG_%s=%s\n", sym->name, str);
fprintf(out_h, "#define CONFIG_%s %s\n", sym->name, str);
fprintf(out, "CONFIG_LP_%s=%s\n", sym->name, str);
fprintf(out_h, "#define CONFIG_LP_%s %s\n", sym->name, str);
break;
default:
break;