veyron: Unify identical mainboards

Hardware / Coreboot - Julius Werner [chromium.org] - 8 September 2015 06:36 UTC

This patch removes a lot of code duplication between the virtually identical Veyron Chromebook variants by merging the code into a single directory and handling the different names solely within Kconfig. This also allows us to easily add all the other Chromebook variants that have only been kept in Google's firmware branch to avoid cluttering coreboot too much, making it possible to build these boards with upstream coreboot out of the box.

The only effective change this will have on the affected boards is removing quirks for early board revisions (since revision numbers differ between variants). Since all those quirks concerned early pre-MP revisions, I doubt this will bother anyone (and the old code is still available through the Google firmware branch if anyone needs it). It will also expand a recent fix in Jerry that increased an LCD power-on delay to make it compatible with another kind of panel to all boards, which is probably not a bad idea anyway.

Leaving all non-Chromebook boards as they are for now since they often contain more extensive differences.

BRANCH=None BUG=None TEST=Booted Jerry.

Change-Id: I4bd590429b9539a91f837459a804888904cd6f2d

dd07ef2 veyron: Unify identical mainboards
src/mainboard/google/veyron/Kconfig | 88 ++++++++
src/mainboard/google/veyron/Kconfig.name | 39 ++++
src/mainboard/google/veyron/Makefile.inc | 42 ++++
src/mainboard/google/veyron/board.h | 31 +++
src/mainboard/google/veyron/boardid.c | 49 +++++
src/mainboard/google/veyron/bootblock.c | 78 +++++++
src/mainboard/google/veyron/chromeos.c | 148 ++++++++++++++
src/mainboard/google/veyron/devicetree.cb | 26 +++
src/mainboard/google/veyron/mainboard.c | 148 ++++++++++++++
src/mainboard/google/veyron/memlayout.ld | 1 +
src/mainboard/google/veyron/reset.c | 30 +++
src/mainboard/google/veyron/romstage.c | 117 +++++++++++
src/mainboard/google/veyron/sdram_configs.c | 54 +++++
.../veyron/sdram_inf/sdram-ddr3-hynix-2GB.inc | 78 +++++++
.../veyron/sdram_inf/sdram-ddr3-hynix-4GB.inc | 78 +++++++
.../veyron/sdram_inf/sdram-ddr3-nanya-2GB.inc | 78 +++++++
.../veyron/sdram_inf/sdram-ddr3-samsung-2GB.inc | 78 +++++++
.../veyron/sdram_inf/sdram-ddr3-samsung-4GB.inc | 78 +++++++
.../veyron/sdram_inf/sdram-lpddr3-elpida-2GB.inc | 78 +++++++
.../veyron/sdram_inf/sdram-lpddr3-elpida-4GB.inc | 78 +++++++
.../veyron/sdram_inf/sdram-lpddr3-hynix-2GB.inc | 78 +++++++
.../veyron/sdram_inf/sdram-lpddr3-hynix-4GB.inc | 77 +++++++
.../veyron/sdram_inf/sdram-lpddr3-samsung-2GB.inc | 78 +++++++
.../veyron/sdram_inf/sdram-lpddr3-samsung-4GB.inc | 77 +++++++
.../google/veyron/sdram_inf/sdram-unused.inc | 3 +
src/mainboard/google/veyron_jerry/Kconfig | 85 --------
src/mainboard/google/veyron_jerry/Kconfig.name | 2 -
src/mainboard/google/veyron_jerry/Makefile.inc | 42 ----
src/mainboard/google/veyron_jerry/board.h | 31 ---
src/mainboard/google/veyron_jerry/boardid.c | 49 -----
src/mainboard/google/veyron_jerry/bootblock.c | 78 -------
src/mainboard/google/veyron_jerry/chromeos.c | 148 --------------
src/mainboard/google/veyron_jerry/devicetree.cb | 26 ---
src/mainboard/google/veyron_jerry/mainboard.c | 167 ---------------
src/mainboard/google/veyron_jerry/memlayout.ld | 1 -
src/mainboard/google/veyron_jerry/reset.c | 30 ---
src/mainboard/google/veyron_jerry/romstage.c | 117 -----------
src/mainboard/google/veyron_jerry/sdram_configs.c | 54 -----
.../sdram_inf/sdram-ddr3-hynix-2GB.inc | 78 -------
.../sdram_inf/sdram-ddr3-hynix-4GB.inc | 78 -------
.../sdram_inf/sdram-ddr3-nanya-2GB.inc | 78 -------
.../sdram_inf/sdram-ddr3-samsung-2GB.inc | 78 -------
.../sdram_inf/sdram-ddr3-samsung-4GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-elpida-2GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-elpida-4GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-hynix-2GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-hynix-4GB.inc | 77 -------
.../sdram_inf/sdram-lpddr3-samsung-2GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-samsung-4GB.inc | 77 -------
.../google/veyron_jerry/sdram_inf/sdram-unused.inc | 3 -
src/mainboard/google/veyron_mighty/Kconfig | 85 --------
src/mainboard/google/veyron_mighty/Kconfig.name | 2 -
src/mainboard/google/veyron_mighty/Makefile.inc | 42 ----
src/mainboard/google/veyron_mighty/board.h | 31 ---
src/mainboard/google/veyron_mighty/boardid.c | 49 -----
src/mainboard/google/veyron_mighty/bootblock.c | 78 -------
src/mainboard/google/veyron_mighty/chromeos.c | 148 --------------
src/mainboard/google/veyron_mighty/devicetree.cb | 26 ---
src/mainboard/google/veyron_mighty/mainboard.c | 167 ---------------
src/mainboard/google/veyron_mighty/memlayout.ld | 1 -
src/mainboard/google/veyron_mighty/reset.c | 30 ---
src/mainboard/google/veyron_mighty/romstage.c | 117 -----------
src/mainboard/google/veyron_mighty/sdram_configs.c | 54 -----
.../sdram_inf/sdram-ddr3-hynix-2GB.inc | 78 -------
.../sdram_inf/sdram-ddr3-hynix-4GB.inc | 78 -------
.../sdram_inf/sdram-ddr3-nanya-2GB.inc | 78 -------
.../sdram_inf/sdram-ddr3-samsung-2GB.inc | 78 -------
.../sdram_inf/sdram-ddr3-samsung-4GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-elpida-2GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-elpida-4GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-hynix-2GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-hynix-4GB.inc | 77 -------
.../sdram_inf/sdram-lpddr3-samsung-2GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-samsung-4GB.inc | 77 -------
.../veyron_mighty/sdram_inf/sdram-unused.inc | 3 -
src/mainboard/google/veyron_minnie/Kconfig | 85 --------
src/mainboard/google/veyron_minnie/Kconfig.name | 2 -
src/mainboard/google/veyron_minnie/Makefile.inc | 42 ----
src/mainboard/google/veyron_minnie/board.h | 31 ---
src/mainboard/google/veyron_minnie/board_info.txt | 1 -
src/mainboard/google/veyron_minnie/boardid.c | 49 -----
src/mainboard/google/veyron_minnie/bootblock.c | 78 -------
src/mainboard/google/veyron_minnie/chromeos.c | 148 --------------
src/mainboard/google/veyron_minnie/devicetree.cb | 26 ---
src/mainboard/google/veyron_minnie/mainboard.c | 148 --------------
src/mainboard/google/veyron_minnie/memlayout.ld | 1 -
src/mainboard/google/veyron_minnie/reset.c | 30 ---
src/mainboard/google/veyron_minnie/romstage.c | 118 -----------
src/mainboard/google/veyron_minnie/sdram_configs.c | 54 -----
.../sdram_inf/sdram-ddr3-hynix-2GB.inc | 78 -------
.../sdram_inf/sdram-ddr3-hynix-4GB.inc | 78 -------
.../sdram_inf/sdram-ddr3-nanya-2GB.inc | 78 -------
.../sdram_inf/sdram-ddr3-samsung-2GB.inc | 78 -------
.../sdram_inf/sdram-ddr3-samsung-4GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-elpida-2GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-elpida-4GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-hynix-2GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-hynix-4GB.inc | 77 -------
.../sdram_inf/sdram-lpddr3-samsung-2GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-samsung-4GB.inc | 77 -------
.../veyron_minnie/sdram_inf/sdram-unused.inc | 3 -
src/mainboard/google/veyron_pinky/Kconfig | 85 --------
src/mainboard/google/veyron_pinky/Kconfig.name | 2 -
src/mainboard/google/veyron_pinky/Makefile.inc | 42 ----
src/mainboard/google/veyron_pinky/board.h | 31 ---
src/mainboard/google/veyron_pinky/boardid.c | 49 -----
src/mainboard/google/veyron_pinky/bootblock.c | 78 -------
src/mainboard/google/veyron_pinky/chromeos.c | 149 --------------
src/mainboard/google/veyron_pinky/devicetree.cb | 26 ---
src/mainboard/google/veyron_pinky/mainboard.c | 213 --------------------
src/mainboard/google/veyron_pinky/memlayout.ld | 1 -
src/mainboard/google/veyron_pinky/reset.c | 30 ---
src/mainboard/google/veyron_pinky/romstage.c | 125 ------------
src/mainboard/google/veyron_pinky/sdram_configs.c | 54 -----
.../sdram_inf/sdram-ddr3-hynix-2GB.inc | 78 -------
.../sdram_inf/sdram-ddr3-hynix-4GB.inc | 78 -------
.../sdram_inf/sdram-ddr3-nanya-2GB.inc | 78 -------
.../sdram_inf/sdram-ddr3-samsung-2GB.inc | 78 -------
.../sdram_inf/sdram-ddr3-samsung-4GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-elpida-2GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-elpida-4GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-hynix-2GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-hynix-4GB.inc | 77 -------
.../sdram_inf/sdram-lpddr3-samsung-2GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-samsung-4GB.inc | 77 -------
.../google/veyron_pinky/sdram_inf/sdram-unused.inc | 3 -
src/mainboard/google/veyron_shark/Kconfig | 85 --------
src/mainboard/google/veyron_shark/Kconfig.name | 2 -
src/mainboard/google/veyron_shark/Makefile.inc | 42 ----
src/mainboard/google/veyron_shark/board.h | 31 ---
src/mainboard/google/veyron_shark/boardid.c | 49 -----
src/mainboard/google/veyron_shark/bootblock.c | 78 -------
src/mainboard/google/veyron_shark/chromeos.c | 148 --------------
src/mainboard/google/veyron_shark/devicetree.cb | 26 ---
src/mainboard/google/veyron_shark/mainboard.c | 157 ---------------
src/mainboard/google/veyron_shark/memlayout.ld | 1 -
src/mainboard/google/veyron_shark/reset.c | 30 ---
src/mainboard/google/veyron_shark/romstage.c | 118 -----------
src/mainboard/google/veyron_shark/sdram_configs.c | 54 -----
.../sdram_inf/sdram-ddr3-hynix-2GB.inc | 78 -------
.../sdram_inf/sdram-ddr3-hynix-4GB.inc | 78 -------
.../sdram_inf/sdram-ddr3-nanya-2GB.inc | 78 -------
.../sdram_inf/sdram-ddr3-samsung-2GB.inc | 78 -------
.../sdram_inf/sdram-ddr3-samsung-4GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-elpida-2GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-elpida-4GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-hynix-2GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-hynix-4GB.inc | 77 -------
.../sdram_inf/sdram-lpddr3-samsung-2GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-samsung-4GB.inc | 77 -------
.../google/veyron_shark/sdram_inf/sdram-unused.inc | 3 -
src/mainboard/google/veyron_speedy/Kconfig | 85 --------
src/mainboard/google/veyron_speedy/Kconfig.name | 2 -
src/mainboard/google/veyron_speedy/Makefile.inc | 42 ----
src/mainboard/google/veyron_speedy/board.h | 31 ---
src/mainboard/google/veyron_speedy/boardid.c | 49 -----
src/mainboard/google/veyron_speedy/bootblock.c | 78 -------
src/mainboard/google/veyron_speedy/chromeos.c | 148 --------------
src/mainboard/google/veyron_speedy/devicetree.cb | 26 ---
src/mainboard/google/veyron_speedy/mainboard.c | 167 ---------------
src/mainboard/google/veyron_speedy/memlayout.ld | 1 -
src/mainboard/google/veyron_speedy/reset.c | 30 ---
src/mainboard/google/veyron_speedy/romstage.c | 118 -----------
src/mainboard/google/veyron_speedy/sdram_configs.c | 54 -----
.../sdram_inf/sdram-ddr3-hynix-2GB.inc | 78 -------
.../sdram_inf/sdram-ddr3-hynix-4GB.inc | 78 -------
.../sdram_inf/sdram-ddr3-nanya-2GB.inc | 78 -------
.../sdram_inf/sdram-ddr3-samsung-2GB.inc | 78 -------
.../sdram_inf/sdram-ddr3-samsung-4GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-elpida-2GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-elpida-4GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-hynix-2GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-hynix-4GB.inc | 77 -------
.../sdram_inf/sdram-lpddr3-samsung-2GB.inc | 78 -------
.../sdram_inf/sdram-lpddr3-samsung-4GB.inc | 77 -------
.../veyron_speedy/sdram_inf/sdram-unused.inc | 3 -
176 files changed, 1710 insertions(+), 10164 deletions(-)

Upstream: review.coreboot.org

  • Share