From aa8ec24b63d11798fec1993091b113a0c0938c7a Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Wed, 10 Sep 2014 15:10:45 -0700 Subject: [PATCH] veyron: Rename "veyron" board to "veyron_pinky" We retroactively decided to use the variant name "pinky" for the Rk3288 board we're currently bringing up, and retcon the unadorned "veyron" name to refer to the Rockchip evaluation board. Since we currently have no interest to maintain coreboot support for that board in our tree, let's rename everything to "veyron_pinky" and forget about "veyron". CQ-DEPEND=CL:217592 BUG=chrome-os-partner:30167 TEST='emerge-veyron libpayload coreboot' fails but 'emerge-veyron_pinky libpayload coreboot' succeeds. Change-Id: I366391efc8e0a7c610584b50cea331a0164da6f3 Signed-off-by: Julius Werner Reviewed-on: https://chromium-review.googlesource.com/217674 Reviewed-by: David Hendricks --- configs/{config.veyron => config.veyron_pinky} | 2 +- configs/{fwserial.veyron => fwserial.veyron_pinky} | 0 .../configs/{config.veyron => config.veyron_pinky} | 0 src/mainboard/google/Kconfig | 14 +++++++------- .../google/{veyron => veyron_pinky}/Kconfig | 8 ++++---- .../google/{veyron => veyron_pinky}/Makefile.inc | 0 .../google/{veyron => veyron_pinky}/chromeos.c | 0 .../google/{veyron => veyron_pinky}/devicetree.cb | 0 .../google/{veyron => veyron_pinky}/mainboard.c | 0 .../google/{veyron => veyron_pinky}/pmic.c | 0 .../google/{veyron => veyron_pinky}/pmic.h | 0 .../google/{veyron => veyron_pinky}/romstage.c | 0 .../{veyron => veyron_pinky}/sdram_configs.c | 0 .../sdram_inf/sdram-ddr3-hynix-2GB.inc | 0 .../sdram_inf/sdram-lpddr3-samsung-2GB.inc | 0 .../sdram_inf/sdram-unused.inc | 0 16 files changed, 12 insertions(+), 12 deletions(-) rename configs/{config.veyron => config.veyron_pinky} (82%) rename configs/{fwserial.veyron => fwserial.veyron_pinky} (100%) rename payloads/libpayload/configs/{config.veyron => config.veyron_pinky} (100%) rename src/mainboard/google/{veyron => veyron_pinky}/Kconfig (91%) rename src/mainboard/google/{veyron => veyron_pinky}/Makefile.inc (100%) rename src/mainboard/google/{veyron => veyron_pinky}/chromeos.c (100%) rename src/mainboard/google/{veyron => veyron_pinky}/devicetree.cb (100%) rename src/mainboard/google/{veyron => veyron_pinky}/mainboard.c (100%) rename src/mainboard/google/{veyron => veyron_pinky}/pmic.c (100%) rename src/mainboard/google/{veyron => veyron_pinky}/pmic.h (100%) rename src/mainboard/google/{veyron => veyron_pinky}/romstage.c (100%) rename src/mainboard/google/{veyron => veyron_pinky}/sdram_configs.c (100%) rename src/mainboard/google/{veyron => veyron_pinky}/sdram_inf/sdram-ddr3-hynix-2GB.inc (100%) rename src/mainboard/google/{veyron => veyron_pinky}/sdram_inf/sdram-lpddr3-samsung-2GB.inc (100%) rename src/mainboard/google/{veyron => veyron_pinky}/sdram_inf/sdram-unused.inc (100%) diff --git a/configs/config.veyron b/configs/config.veyron_pinky similarity index 82% rename from configs/config.veyron rename to configs/config.veyron_pinky index 1c9709d2d0..a9fa6bd812 100644 --- a/configs/config.veyron +++ b/configs/config.veyron_pinky @@ -1,5 +1,5 @@ CONFIG_VENDOR_GOOGLE=y -CONFIG_BOARD_GOOGLE_VEYRON=y +CONFIG_BOARD_GOOGLE_VEYRON_PINKY=y CONFIG_COREBOOT_ROMSIZE_KB_1024=y # CONFIG_CONSOLE_SERIAL is not set CONFIG_COLLECT_TIMESTAMPS=y diff --git a/configs/fwserial.veyron b/configs/fwserial.veyron_pinky similarity index 100% rename from configs/fwserial.veyron rename to configs/fwserial.veyron_pinky diff --git a/payloads/libpayload/configs/config.veyron b/payloads/libpayload/configs/config.veyron_pinky similarity index 100% rename from payloads/libpayload/configs/config.veyron rename to payloads/libpayload/configs/config.veyron_pinky diff --git a/src/mainboard/google/Kconfig b/src/mainboard/google/Kconfig index 5ee48716b9..de8b6c3573 100644 --- a/src/mainboard/google/Kconfig +++ b/src/mainboard/google/Kconfig @@ -179,13 +179,13 @@ config BOARD_GOOGLE_URARA Google Urara mainboard. Urara is an embedded device running on MIPS platorm based on the Danube SOC. -config BOARD_GOOGLE_VEYRON - bool "Veyron" +config BOARD_GOOGLE_VEYRON_PINKY + bool "Veyron_Pinky" help - Google Veyron mainboard. - Enable this config to select the Google Veyron mainboard. - Veyron is a Chrome OS mainboard. - Veyron is based on the Rockchip RK3288 platform. + Google Veyron_Pinky mainboard. + Enable this config to select the Google Veyron_Pinky mainboard. + Veyron_Pinky is a Chrome OS mainboard. + Veyron_Pinky is based on the Rockchip RK3288 platform. endchoice @@ -211,7 +211,7 @@ source "src/mainboard/google/slippy/Kconfig" source "src/mainboard/google/storm/Kconfig" source "src/mainboard/google/stout/Kconfig" source "src/mainboard/google/urara/Kconfig" -source "src/mainboard/google/veyron/Kconfig" +source "src/mainboard/google/veyron_pinky/Kconfig" config MAINBOARD_VENDOR string "Mainboard Vendor" diff --git a/src/mainboard/google/veyron/Kconfig b/src/mainboard/google/veyron_pinky/Kconfig similarity index 91% rename from src/mainboard/google/veyron/Kconfig rename to src/mainboard/google/veyron_pinky/Kconfig index 465b54ca30..90e7b87b05 100644 --- a/src/mainboard/google/veyron/Kconfig +++ b/src/mainboard/google/veyron_pinky/Kconfig @@ -17,7 +17,7 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -if BOARD_GOOGLE_VEYRON +if BOARD_GOOGLE_VEYRON_PINKY config BOARD_SPECIFIC_OPTIONS # dummy def_bool y @@ -30,11 +30,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy config MAINBOARD_DIR string - default google/veyron + default google/veyron_pinky config MAINBOARD_PART_NUMBER string - default "Veyron" + default "Veyron_Pinky" config MAINBOARD_VENDOR string @@ -60,4 +60,4 @@ config DRAM_SIZE_MB int default 2048 -endif # BOARD_GOOGLE_VEYRON +endif # BOARD_GOOGLE_VEYRON_PINKY diff --git a/src/mainboard/google/veyron/Makefile.inc b/src/mainboard/google/veyron_pinky/Makefile.inc similarity index 100% rename from src/mainboard/google/veyron/Makefile.inc rename to src/mainboard/google/veyron_pinky/Makefile.inc diff --git a/src/mainboard/google/veyron/chromeos.c b/src/mainboard/google/veyron_pinky/chromeos.c similarity index 100% rename from src/mainboard/google/veyron/chromeos.c rename to src/mainboard/google/veyron_pinky/chromeos.c diff --git a/src/mainboard/google/veyron/devicetree.cb b/src/mainboard/google/veyron_pinky/devicetree.cb similarity index 100% rename from src/mainboard/google/veyron/devicetree.cb rename to src/mainboard/google/veyron_pinky/devicetree.cb diff --git a/src/mainboard/google/veyron/mainboard.c b/src/mainboard/google/veyron_pinky/mainboard.c similarity index 100% rename from src/mainboard/google/veyron/mainboard.c rename to src/mainboard/google/veyron_pinky/mainboard.c diff --git a/src/mainboard/google/veyron/pmic.c b/src/mainboard/google/veyron_pinky/pmic.c similarity index 100% rename from src/mainboard/google/veyron/pmic.c rename to src/mainboard/google/veyron_pinky/pmic.c diff --git a/src/mainboard/google/veyron/pmic.h b/src/mainboard/google/veyron_pinky/pmic.h similarity index 100% rename from src/mainboard/google/veyron/pmic.h rename to src/mainboard/google/veyron_pinky/pmic.h diff --git a/src/mainboard/google/veyron/romstage.c b/src/mainboard/google/veyron_pinky/romstage.c similarity index 100% rename from src/mainboard/google/veyron/romstage.c rename to src/mainboard/google/veyron_pinky/romstage.c diff --git a/src/mainboard/google/veyron/sdram_configs.c b/src/mainboard/google/veyron_pinky/sdram_configs.c similarity index 100% rename from src/mainboard/google/veyron/sdram_configs.c rename to src/mainboard/google/veyron_pinky/sdram_configs.c diff --git a/src/mainboard/google/veyron/sdram_inf/sdram-ddr3-hynix-2GB.inc b/src/mainboard/google/veyron_pinky/sdram_inf/sdram-ddr3-hynix-2GB.inc similarity index 100% rename from src/mainboard/google/veyron/sdram_inf/sdram-ddr3-hynix-2GB.inc rename to src/mainboard/google/veyron_pinky/sdram_inf/sdram-ddr3-hynix-2GB.inc diff --git a/src/mainboard/google/veyron/sdram_inf/sdram-lpddr3-samsung-2GB.inc b/src/mainboard/google/veyron_pinky/sdram_inf/sdram-lpddr3-samsung-2GB.inc similarity index 100% rename from src/mainboard/google/veyron/sdram_inf/sdram-lpddr3-samsung-2GB.inc rename to src/mainboard/google/veyron_pinky/sdram_inf/sdram-lpddr3-samsung-2GB.inc diff --git a/src/mainboard/google/veyron/sdram_inf/sdram-unused.inc b/src/mainboard/google/veyron_pinky/sdram_inf/sdram-unused.inc similarity index 100% rename from src/mainboard/google/veyron/sdram_inf/sdram-unused.inc rename to src/mainboard/google/veyron_pinky/sdram_inf/sdram-unused.inc