diff options
| author | Simon Glass <sjg@chromium.org> | 2011-09-13 16:48:33 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2011-09-19 13:46:53 -0700 |
| commit | 6dd131fb8562d016e400093428f7a118a5954f27 (patch) | |
| tree | 4dea817fab5507360d386d74c6abe7080dae769f /include | |
| parent | 16c575f7855771a8bcd966f216ff2195134461bc (diff) | |
CHROMIUM: config: Remove unneeded CONFIG options
These options have now moved to the fdt.
BUG=chromium-os:17062
TEST=build for Seaboard, x86-mario
Change-Id: I93283c86f114f34311c915085175554a9e19c74f
Reviewed-on: http://gerrit.chromium.org/gerrit/7682
Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/chromeos.h | 19 | ||||
| -rw-r--r-- | include/configs/coreboot.h | 9 |
2 files changed, 2 insertions, 26 deletions
diff --git a/include/configs/chromeos.h b/include/configs/chromeos.h index 411182d21f..5241f69b7d 100644 --- a/include/configs/chromeos.h +++ b/include/configs/chromeos.h @@ -43,25 +43,6 @@ #define CONFIG_OF_UPDATE_FDT_BEFORE_BOOT /* - * We use fixed memory address for the parameters --- this should be simpler - * than atags or a register holding the address of the parameters. Besides, - * Chrome OS kernel is loaded to a fixed location, we could simply use this - * location as our anchor for the location of the parameters. - */ -/* - * Layout: first, the kernel buffer, then the crossystem data (and the - * VbSharedData), and finally, the GBB. - */ -/* For security reason, Chrome OS kernel must be loaded to specific location. */ -#define CHROMEOS_KERNEL_LOADADDR 0x00100000 -#define CHROMEOS_KERNEL_BUFSIZE 0x00800000 -#define CROSSYSTEM_DATA_ADDRESS \ - (CHROMEOS_KERNEL_LOADADDR + CHROMEOS_KERNEL_BUFSIZE) -#define CROSSYSTEM_DATA_MAXSIZE 0x8000 -#define GBB_ADDRESS \ - (CROSSYSTEM_DATA_ADDRESS + CROSSYSTEM_DATA_MAXSIZE) - -/* * This is the default kernel command line to a Chrome OS kernel. An ending * space character helps us concatenate more arguments. */ diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h index f24e094994..ca91b713e5 100644 --- a/include/configs/coreboot.h +++ b/include/configs/coreboot.h @@ -40,13 +40,8 @@ /*----------------------------------------------------------------------- * Memory layout */ -#define CHROMEOS_KERNEL_LOADADDR 0x00100000 -#define CHROMEOS_KERNEL_BUFSIZE 0x00800000 -#define CROSSYSTEM_DATA_ADDRESS \ - (CHROMEOS_KERNEL_LOADADDR + CHROMEOS_KERNEL_BUFSIZE) -#define CROSSYSTEM_DATA_MAXSIZE 0x8000 -#define GBB_ADDRESS \ - (CROSSYSTEM_DATA_ADDRESS + CROSSYSTEM_DATA_MAXSIZE) +/* TODO(sjg): Move these two to the fdt */ +#define CONFIG_VBGLOBAL_BASE 0x00FB0000 #define CONFIG_SYS_TEXT_BASE 0x00FC0000 #define CONFIG_SCSI_AHCI |