From 96221cf957bae569e3a3554c0c1dceaecb136a9b 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: I88bf5cc2da7c2f969ea184b5f12affaa94045a06 Signed-off-by: Patrick Georgi Original-Commit-Id: aa8ec24b63d11798fec1993091b113a0c0938c7a Original-Change-Id: I366391efc8e0a7c610584b50cea331a0164da6f3 Original-Signed-off-by: Julius Werner Original-Reviewed-on: https://chromium-review.googlesource.com/217674 Original-Reviewed-by: David Hendricks Reviewed-on: http://review.coreboot.org/8869 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/mainboard/google/Kconfig | 6 +++--- src/mainboard/google/{veyron => veyron_pinky}/Kconfig | 8 ++++---- .../google/{veyron => veyron_pinky}/Makefile.inc | 0 src/mainboard/google/{veyron => veyron_pinky}/chromeos.c | 0 .../google/{veyron => veyron_pinky}/devicetree.cb | 0 src/mainboard/google/{veyron => veyron_pinky}/mainboard.c | 0 src/mainboard/google/{veyron => veyron_pinky}/pmic.c | 0 src/mainboard/google/{veyron => veyron_pinky}/pmic.h | 0 src/mainboard/google/{veyron => veyron_pinky}/romstage.c | 0 .../google/{veyron => veyron_pinky}/sdram_configs.c | 0 .../sdram_inf/sdram-ddr3-hynix-2GB.inc | 0 .../sdram_inf/sdram-lpddr3-samsung-2GB.inc | 0 .../{veyron => veyron_pinky}/sdram_inf/sdram-unused.inc | 0 13 files changed, 7 insertions(+), 7 deletions(-) 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/src/mainboard/google/Kconfig b/src/mainboard/google/Kconfig index fb1ead6c16..7b227a4b53 100644 --- a/src/mainboard/google/Kconfig +++ b/src/mainboard/google/Kconfig @@ -59,8 +59,8 @@ config BOARD_GOOGLE_STORM bool "Storm" config BOARD_GOOGLE_STOUT bool "Stout" -config BOARD_GOOGLE_VEYRON - bool "Veyron" +config BOARD_GOOGLE_VEYRON_PINKY + bool "Veyron_Pinky" endchoice @@ -83,7 +83,7 @@ source "src/mainboard/google/samus/Kconfig" source "src/mainboard/google/slippy/Kconfig" source "src/mainboard/google/storm/Kconfig" source "src/mainboard/google/stout/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 f54917ccfc..ae616c7abc 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