diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2011-09-02 17:30:14 -0700 |
|---|---|---|
| committer | Vadim Bendebury <vbendeb@chromium.org> | 2011-09-06 13:43:44 -0700 |
| commit | d110b42aafb68a8f92f101e98d58d912bb97ed4f (patch) | |
| tree | 1af6881849339175ba81b589efac3353c92a3595 /include/configs | |
| parent | 51511b60489063b404f6d7809b761d56e1d3d426 (diff) | |
Make SATA default storage type on ChromeOS x86 systems.
This adds the appropriate configuration to include the SATA driver in
the coreboot image and use the SATA device as the default kernel
location.
The only device currently supported is the NM10 AHCI controller,
the driver will have to be extended to allow for different PCI
device IDs.
BUG=chromium-os:19837
TEST=manual
. program the updated image (including vbexport extensions and AHCI
driver fixes) on an Alex.
. restart the machine and enter `vboot_twostop' at u-boot prompt.
Observe ChromeOS booting all the way to login screen.
Change-Id: Ie952754a3b8ef07d5e7b4eb92c85abd825da6201
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: http://gerrit.chromium.org/gerrit/7233
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/coreboot.h | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h index e87f2ce54d..c5b0965c4c 100644 --- a/include/configs/coreboot.h +++ b/include/configs/coreboot.h @@ -51,6 +51,18 @@ #define CONFIG_VBGLOBAL_BASE 0x00FB0000 #define CONFIG_SYS_TEXT_BASE 0x00FC0000 +#define CONFIG_SCSI_AHCI + +#ifdef CONFIG_SCSI_AHCI +#define CONFIG_SATA_INTEL 1 +#define CONFIG_SCSI_VEND_ID PCI_VENDOR_ID_INTEL +#define CONFIG_SCSI_DEV_ID PCI_DEVICE_ID_INTEL_NM10_AHCI + +#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 +#define CONFIG_SYS_SCSI_MAX_LUN 1 +#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ + CONFIG_SYS_SCSI_MAX_LUN) +#endif /*----------------------------------------------------------------------- * Watchdog Configuration @@ -136,9 +148,8 @@ /* This value is just to get the chromeos library to compile. */ #define CHROMEOS_VBNVCONTEXT_LBA 0 -/* Support USB and IDE booting */ +/* Support USB booting */ #define CONFIG_CHROMEOS_USB -#define CONFIG_CHROMEOS_IDE /*----------------------------------------------------------------------- * Command line configuration. @@ -170,7 +181,7 @@ #define CONFIG_CMD_SOURCE #define CONFIG_CMD_SPI #define CONFIG_CMD_XIMG -#define CONFIG_CMD_IDE +#define CONFIG_CMD_SCSI #define CONFIG_CMD_CBFS #define CONFIG_CMD_FAT #define CONFIG_CMD_EXT2 @@ -183,7 +194,7 @@ "fatload ${devtype} ${devnum}:c 3000000 syslinux/vmlinuz.a; "\ "zboot 3000000; " -#define CONFIG_EXTRA_ENV_SETTINGS "devtype=ide\0"\ +#define CONFIG_EXTRA_ENV_SETTINGS "devtype=scsi\0"\ "devnum=0\0"\ "devname=sda\0"\ CONFIG_STD_DEVICES_SETTINGS \ |