diff options
| author | Martin Roth <martinroth@google.com> | 2017-11-17 09:25:02 -0700 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2017-11-19 01:43:04 +0000 |
| commit | 1cdb6f2a1d6ddb1814719c77f539a061735f705a (patch) | |
| tree | daf00f4b73f0fbbdab8b399d54a3f6dbaf20ad16 /src | |
| parent | c09c2a4883a1278af0f758d73f4705a939197a68 (diff) | |
| download | coreboot-1cdb6f2a1d6ddb1814719c77f539a061735f705a.tar.xz | |
mainboard/google/kahlee: Update memory.c
This fixes some issues with the initial implementation that was copied
from reef.
- The board ID value shouldn't be size_t - it's not a size.
- Kahlee doesn't even need the memory.c file - it uses an SoDIMM.
BUG=b:68293392
TEST=build stoney platforms, boot kahleebo
Change-Id: Ife5660d36912e887edfd0365a9f16c5a172c9c86
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/22515
Reviewed-by: Marc Jones <marc@marcjonesconsulting.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src')
4 files changed, 3 insertions, 34 deletions
diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h index b4e0891063..cf995fc59c 100644 --- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h @@ -23,6 +23,6 @@ const GPIO_CONTROL *get_gpio_table(void); const struct sci_source *get_gpe_table(size_t *num); -size_t variant_board_id(void); +uint8_t variant_board_id(void); #endif /* __BASEBOARD_VARIANTS_H__ */ diff --git a/src/mainboard/google/kahlee/variants/baseboard/memory.c b/src/mainboard/google/kahlee/variants/baseboard/memory.c index 511241f603..ae8734e9d9 100644 --- a/src/mainboard/google/kahlee/variants/baseboard/memory.c +++ b/src/mainboard/google/kahlee/variants/baseboard/memory.c @@ -17,7 +17,7 @@ #include <baseboard/variants.h> #include <variant/gpio.h> -size_t __attribute__((weak)) variant_board_id(void) +uint8_t __attribute__((weak)) variant_board_id(void) { gpio_t pads[] = { [3] = MEM_CONFIG3, @@ -26,5 +26,5 @@ size_t __attribute__((weak)) variant_board_id(void) [0] = MEM_CONFIG0, }; - return gpio_pullup_base2_value(pads, ARRAY_SIZE(pads)); + return gpio_base2_value(pads, ARRAY_SIZE(pads)); } diff --git a/src/mainboard/google/kahlee/variants/kahlee/Makefile.inc b/src/mainboard/google/kahlee/variants/kahlee/Makefile.inc index 94f388912c..c5aab8ea27 100644 --- a/src/mainboard/google/kahlee/variants/kahlee/Makefile.inc +++ b/src/mainboard/google/kahlee/variants/kahlee/Makefile.inc @@ -16,7 +16,5 @@ bootblock-y += gpio.c romstage-y += gpio.c -romstage-y += memory.c ramstage-y += gpio.c -ramstage-y += memory.c diff --git a/src/mainboard/google/kahlee/variants/kahlee/memory.c b/src/mainboard/google/kahlee/variants/kahlee/memory.c deleted file mode 100644 index 4341b824b5..0000000000 --- a/src/mainboard/google/kahlee/variants/kahlee/memory.c +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2017 Google Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <gpio.h> /* src/include/gpio.h */ -#include <baseboard/variants.h> -#include <baseboard/gpio.h> - -size_t variant_board_id(void) -{ - gpio_t pads[] = { - [2] = MEM_CONFIG2, - [1] = MEM_CONFIG1, - [0] = MEM_CONFIG0, - }; - - return gpio_pullup_base2_value(pads, ARRAY_SIZE(pads)); -} |