From f752d013b0cede9e7d4a8463827b6ef3a8238e0d Mon Sep 17 00:00:00 2001 From: Vadim Bendebury Date: Thu, 10 Jul 2014 15:24:18 -0700 Subject: storm: Provide ability to build ap148 variant With BOARD_VARIANT_AP148 configuration option enabled the image will be built for 512MB DRAM instead of 1024MB and the mainboard_part_number field in the lb_mainboard entry will be set to "AP148" instead of "Storm". BUG=chrome-os-partner:30440 TEST=manual . built and booted both AP148 and proto0 all the way to reading the kernel . verified that the config file includes correct part number and memory size . verified proper machine IDs reportted when starting the kernel Original-Change-Id: Ie609544a460fc991e66e8b95e8d7a3ed5e845f7b Original-Signed-off-by: Vadim Bendebury Original-Reviewed-on: https://chromium-review.googlesource.com/207427 Original-Reviewed-by: Trevor Bourget Original-Reviewed-by: David Hendricks (cherry picked from commit a80ab00f27eef9e3aa2f761659d6945d6fce2ef6) Signed-off-by: Marc Jones Change-Id: I477e672dc4f48fa9c9893bf0759704501ea07b1a Reviewed-on: http://review.coreboot.org/8590 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: David Hendricks --- src/mainboard/google/storm/Kconfig | 6 ++++++ src/mainboard/google/storm/mainboard.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/src/mainboard/google/storm/Kconfig b/src/mainboard/google/storm/Kconfig index 5e34802ddf..10c0f1bf3e 100644 --- a/src/mainboard/google/storm/Kconfig +++ b/src/mainboard/google/storm/Kconfig @@ -28,16 +28,22 @@ config BOARD_SPECIFIC_OPTIONS select SPI_FLASH select SPI_FLASH_SPANSION +config BOARD_VARIANT_AP148 + bool "pick this to build an image for ap148" + default n + config MAINBOARD_DIR string default google/storm config MAINBOARD_PART_NUMBER string + default "AP148" if BOARD_VARIANT_AP148 default "Storm" config DRAM_SIZE_MB int + default 512 if BOARD_VARIANT_AP148 default 1024 config DRAM_DMA_START diff --git a/src/mainboard/google/storm/mainboard.c b/src/mainboard/google/storm/mainboard.c index d5adf2d855..bb4cff8ff0 100644 --- a/src/mainboard/google/storm/mainboard.c +++ b/src/mainboard/google/storm/mainboard.c @@ -37,8 +37,10 @@ static void setup_usb(void) { +#if !CONFIG_BOARD_VARIANT_AP148 gpio_tlmm_config_set(USB_ENABLE_GPIO, FUNC_SEL_GPIO, GPIO_PULL_UP, GPIO_10MA, GPIO_ENABLE); +#endif usb_clock_config(); setup_usb_host1(); -- cgit v1.2.3