Evelyn Huang has uploaded this change for review. ( https://review.coreboot.org/20948
Change subject: Documentation: Update Lesson2.md
......................................................................
Documentation: Update Lesson2.md
Update Lesson2.md to include information about updating a commit after
it has been pushed to the remote repository.
Change-Id: Iebf86113b13d859d9c9e3db51e22ea44cb1144f6
Signed-off-by: Evelyn Huang <evhuang(a)google.com>
---
M Documentation/Lesson2.md
1 file changed, 28 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/48/20948/1
diff --git a/Documentation/Lesson2.md b/Documentation/Lesson2.md
index 55d8188..ee865c7 100644
--- a/Documentation/Lesson2.md
+++ b/Documentation/Lesson2.md
@@ -251,4 +251,31 @@
on https://github.com/magicmonty/bash-git-prompt. Listed in that section are
various lines that you can copy, uncomment and add to your .bashrc file to
change the configurations. Example configurations include avoid fetching remote
-status, and supporting versions of Git older than 1.7.10.
\ No newline at end of file
+status, and supporting versions of Git older than 1.7.10.
+
+## Appendix: Miscellaneous Advice
+
+### Updating a commit after running git push:
+
+Suppose you would like to update a commit that has already pushed to the
+remote repository. If the commit you wish to update is the most recent
+commit you have made, after making your desired changes, stage the files
+(either using git add or in git cola), and amend the commit. To do so,
+if you are using the command line, run "git commit --amend." If you are
+using git cola, click on the gear icon located on the upper left side under
+**Commit** and select **Amend Last Commit** in the drop down menu. Then, stage
+the files you have changed, commit the changes, and run git push to push the
+changes to the remote repository. Your change should be reflected in Gerrit as
+a new patch set.
+
+If, however, the commit you wish to update is not the most recent commit you
+have made, you will first need to checkout that commit. To do so, find the
+URL of the commit on <https://review.coreboot.org> and go to that page; if
+the commit is one that you previously pushed, it can be found by selecting
+**My** and then **Changes** in the upper left corner. To checkout this commit,
+in the upper right corner, click on **Download**, and copy the command listed
+next to checkout by clicking **Copy to clipboard**. Then, run the copied
+command in your coreboot repository. Now, the last commit should be the most
+recent commit to that patch; to update it, make your desired changes, stage
+the files, then amend and push the commit using the instructions in the above
+paragraph.
--
To view, visit https://review.coreboot.org/20948
To unsubscribe, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iebf86113b13d859d9c9e3db51e22ea44cb1144f6
Gerrit-Change-Number: 20948
Gerrit-PatchSet: 1
Gerrit-Owner: Evelyn Huang <evhuang(a)google.com>
Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/20947
Change subject: google/coral: Fetch SKU ID from EC
......................................................................
google/coral: Fetch SKU ID from EC
BUG=b:64468585
BRANCH=none
TEST=with the other sku-id related patches applied, coreboot obtains the
right SKU ID from EC
Change-Id: I96a0e030bbc5f1c98165e70353340c413f8dc352
Signed-off-by: Patrick Georgi <pgeorgi(a)google.com>
---
M src/mainboard/google/reef/variants/coral/mainboard.c
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/47/20947/1
diff --git a/src/mainboard/google/reef/variants/coral/mainboard.c b/src/mainboard/google/reef/variants/coral/mainboard.c
index 54c24f8..3da5456 100644
--- a/src/mainboard/google/reef/variants/coral/mainboard.c
+++ b/src/mainboard/google/reef/variants/coral/mainboard.c
@@ -14,11 +14,13 @@
*/
#include <stdint.h>
+#include <ec/google/chromeec/ec.h>
#include "baseboard/variants.h"
uint8_t variant_board_sku(void)
{
- return 0;
+ // we know that the values are in 0..255
+ return google_chromeec_get_sku_id();
}
void variant_nhlt_oem_overrides(const char **oem_id,
--
To view, visit https://review.coreboot.org/20947
To unsubscribe, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I96a0e030bbc5f1c98165e70353340c413f8dc352
Gerrit-Change-Number: 20947
Gerrit-PatchSet: 1
Gerrit-Owner: Patrick Georgi <pgeorgi(a)google.com>
Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/20945
Change subject: ec/google: update ec_commands.h
......................................................................
ec/google: update ec_commands.h
Copy from chrome-ec codebase, except for keeping the long-form license
header.
BUG=b:64468585
BRANCH=none
TEST=with the other sku-id related patches applied, coreboot obtains the
right SKU ID from EC
Change-Id: I513123547f3854945e827d2f7f6c0df6591886eb
Signed-off-by: Patrick Georgi <pgeorgi(a)google.com>
---
M src/ec/google/chromeec/ec_commands.h
1 file changed, 30 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/45/20945/1
diff --git a/src/ec/google/chromeec/ec_commands.h b/src/ec/google/chromeec/ec_commands.h
index 3e093f6..25ef584 100644
--- a/src/ec/google/chromeec/ec_commands.h
+++ b/src/ec/google/chromeec/ec_commands.h
@@ -31,7 +31,7 @@
#ifndef __CROS_EC_EC_COMMANDS_H
#define __CROS_EC_EC_COMMANDS_H
-#ifndef __ACPI__
+#if !defined(__ACPI__) && !defined(__KERNEL__)
#include <stdint.h>
#endif
@@ -1121,6 +1121,14 @@
};
/*****************************************************************************/
+/* Get the board's SKU ID from EC */
+#define EC_CMD_GET_SKU_ID 0x000E
+
+struct __ec_align4 ec_response_sku_id {
+ uint32_t sku_id;
+};
+
+/*****************************************************************************/
/* Flash commands */
/* Get flash info */
@@ -1151,6 +1159,13 @@
/* Flags for version 1+ flash info command */
/* EC flash erases bits to 0 instead of 1 */
#define EC_FLASH_INFO_ERASE_TO_0 (1 << 0)
+
+/* Flash must be selected for read/write/erase operations to succeed. This may
+ * be necessary on a chip where write/erase can be corrupted by other board
+ * activity, or where the chip needs to enable some sort of programming voltage,
+ * or where the read/write/erase operations require cleanly suspending other
+ * chip functionality. */
+#define EC_FLASH_INFO_SELECT_REQUIRED (1 << 1)
/*
* Version 1 returns the same initial fields as version 0, with additional
@@ -1421,6 +1436,16 @@
/* Status registers from command 0x05 and 0x35 */
uint8_t sr1, sr2;
};
+
+
+/* Select flash during flash operations */
+#define EC_CMD_FLASH_SELECT 0x0019
+
+struct __ec_align4 ec_params_flash_select {
+ /* 1 to select flash, 0 to deselect flash */
+ uint8_t select;
+};
+
/*****************************************************************************/
/* PWM commands */
@@ -2980,6 +3005,7 @@
#define EC_MKBP_POWER_BUTTON 0
#define EC_MKBP_VOL_UP 1
#define EC_MKBP_VOL_DOWN 2
+#define EC_MKBP_RECOVERY 3
/* Switches */
#define EC_MKBP_LID_OPEN 0
@@ -3935,6 +3961,9 @@
#define EC_CMD_USB_PD_PORTS 0x0102
+/* Maximum number of PD ports on a device, num_ports will be <= this */
+#define EC_USB_PD_MAX_PORTS 8
+
struct __ec_align1 ec_response_usb_pd_ports {
uint8_t num_ports;
};
--
To view, visit https://review.coreboot.org/20945
To unsubscribe, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I513123547f3854945e827d2f7f6c0df6591886eb
Gerrit-Change-Number: 20945
Gerrit-PatchSet: 1
Gerrit-Owner: Patrick Georgi <pgeorgi(a)google.com>