coreboot: add linux-command-line parameter for CONFIG_LINUX_COMMAND_LINE
parent
184d2421b2
commit
0bf512385d
@ -0,0 +1,95 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 5c063e4..f657d2a 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -45,7 +45,7 @@ BUILD_DETAILS_FILE ?= build_details.txt
|
||||
WARNERROR ?= yes
|
||||
|
||||
ifeq ($(WARNERROR), yes)
|
||||
-CFLAGS += -Werror
|
||||
+#CFLAGS += -Werror
|
||||
endif
|
||||
|
||||
ifdef LIBS_BASE
|
||||
@@ -579,7 +579,7 @@ PROGRAMMER_OBJS += cros_ec_lpc.o it87spi.o it85spi.o mec1308.o sb600spi.o wbsio_
|
||||
PROGRAMMER_OBJS += ichspi.o ich_descriptors.o amd_imc.o
|
||||
else
|
||||
ifeq ($(ARCH),arm)
|
||||
-PROGRAMMER_OBJS += cros_ec_i2c.o
|
||||
+#PROGRAMMER_OBJS += cros_ec_i2c.o
|
||||
endif
|
||||
NEED_LIBPCI += CONFIG_INTERNAL
|
||||
endif
|
||||
diff --git a/cros_ec.c b/cros_ec.c
|
||||
index 4065d24..c25a207 100644
|
||||
--- a/cros_ec.c
|
||||
+++ b/cros_ec.c
|
||||
@@ -428,14 +428,16 @@ int cros_ec_prepare(uint8_t *image, int size) {
|
||||
return 1;
|
||||
} else if (wp_status == 1) {
|
||||
msg_pdbg("Attempting to disable EC soft WP.\n");
|
||||
+/*
|
||||
if (!set_wp(0)) {
|
||||
msg_pdbg("EC soft WP disabled successfully.\n");
|
||||
if (register_shutdown(cros_ec_restore_wp, NULL))
|
||||
return 1;
|
||||
} else {
|
||||
+*/
|
||||
msg_pdbg("Failed. Hardware WP might in effect or EC "
|
||||
"needs to be rebooted first.\n");
|
||||
- }
|
||||
+// }
|
||||
} else {
|
||||
msg_pdbg("EC soft WP is already disabled.\n");
|
||||
}
|
||||
diff --git a/flashrom.c b/flashrom.c
|
||||
index 1b26dda..8c0e560 100644
|
||||
--- a/flashrom.c
|
||||
+++ b/flashrom.c
|
||||
@@ -1074,16 +1074,19 @@ int probe_flash(int startchip, struct flashctx *fill_flash, int force)
|
||||
* needs to use (hwseq or swseq),
|
||||
* set the flashchips list here.
|
||||
*/
|
||||
+/*
|
||||
switch (ich_generation) {
|
||||
case CHIPSET_100_SERIES_SUNRISE_POINT:
|
||||
case CHIPSET_APL:
|
||||
flash_list = flashchips_hwseq;
|
||||
break;
|
||||
default:
|
||||
+*/
|
||||
flash_list = flashchips;
|
||||
+/*
|
||||
break;
|
||||
}
|
||||
-
|
||||
+*/
|
||||
for (flash = flash_list + startchip; flash && flash->name; flash++) {
|
||||
if (chip_to_probe && strcmp(flash->name, chip_to_probe) != 0)
|
||||
continue;
|
||||
diff --git a/internal.c b/internal.c
|
||||
index 441c9a2..9626c34 100644
|
||||
--- a/internal.c
|
||||
+++ b/internal.c
|
||||
@@ -347,7 +347,7 @@ int internal_init(void)
|
||||
* Give preference to the cros_ec dev interface if it exists
|
||||
* and passes the "hello" test, otherwise fall back on raw I2C.
|
||||
*/
|
||||
- if (!cros_ec_probe_dev() || !cros_ec_probe_i2c(NULL))
|
||||
+ if (!cros_ec_probe_dev() /*|| !cros_ec_probe_i2c(NULL)*/)
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
diff --git a/programmer.h b/programmer.h
|
||||
index 662ff33..f072138 100644
|
||||
--- a/programmer.h
|
||||
+++ b/programmer.h
|
||||
@@ -604,7 +604,7 @@ enum ich_chipset {
|
||||
};
|
||||
|
||||
#if CONFIG_INTERNAL == 1
|
||||
-enum ich_chipset ich_generation;
|
||||
+//extern enum ich_chipset ich_generation;
|
||||
extern uint32_t ichspi_bbar;
|
||||
int ich_init_spi(struct pci_dev *dev, uint32_t base, void *rcrb,
|
||||
enum ich_chipset ich_generation);
|
Loading…
Reference in New Issue