summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--boards.cfg9
-rw-r--r--include/configs/chromeos_coreboot.h (renamed from include/configs/chromeos-coreboot.h)2
-rw-r--r--include/configs/chromeos_seaboard.h (renamed from include/configs/chromeos_tegra2_twostop.h)6
3 files changed, 10 insertions, 7 deletions
diff --git a/boards.cfg b/boards.cfg
index 749b22d1720..a86afeb968d 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -247,7 +247,7 @@ tcm-bf518 blackfin blackfin
tcm-bf537 blackfin blackfin
eNET x86 x86 eNET - sc520 eNET:SYS_TEXT_BASE=0x38040000
eNET_SRAM x86 x86 eNET - sc520 eNET:SYS_TEXT_BASE=0x19000000
-coreboot-x86 x86 x86 coreboot chromebook-x86 coreboot chromeos-coreboot
+coreboot-x86 x86 x86 coreboot chromebook-x86 coreboot coreboot
idmr m68k mcf52x2
TASREG m68k mcf52x2 tasreg esd
M5208EVBE m68k mcf52x2 m5208evbe freescale
@@ -860,7 +860,10 @@ gr_cpci_ax2000 sparc leon3 - gaisler
gr_ep2s60 sparc leon3 - gaisler
grsim sparc leon3 - gaisler
gr_xc3s_1500 sparc leon3 - gaisler
-chromeos_seaboard_vboot arm armv7 seaboard nvidia tegra2
-chromeos_tegra2_twostop arm armv7 seaboard nvidia tegra2
+chromeos_tegra2_twostop arm armv7 seaboard nvidia tegra2 chromeos_seaboard
+chromeos_coreboot x86 x86 coreboot chromebook-x86 coreboot
+chromeos_seaboard arm armv7 seaboard nvidia tegra2
+# TODO(clchiou): Switch chromeos_waluigi to use verified boot enabled header
+chromeos_waluigi arm armv7 cardhu nvidia tegra3 waluigi
# Target ARCH CPU Board name Vendor SoC Options
########################################################################################################################
diff --git a/include/configs/chromeos-coreboot.h b/include/configs/chromeos_coreboot.h
index 73f122306e2..7c0cb73ad52 100644
--- a/include/configs/chromeos-coreboot.h
+++ b/include/configs/chromeos_coreboot.h
@@ -15,4 +15,4 @@
#include "chromeos.h"
-#endif /* __configs_chromeos_tegra2_twostop_h__ */
+#endif /* __configs_chromeos_coreboot_h__ */
diff --git a/include/configs/chromeos_tegra2_twostop.h b/include/configs/chromeos_seaboard.h
index 2b2990af894..6cd1302d5a5 100644
--- a/include/configs/chromeos_tegra2_twostop.h
+++ b/include/configs/chromeos_seaboard.h
@@ -4,8 +4,8 @@
* found in the LICENSE file.
*/
-#ifndef __configs_chromeos_tegra2_twostop_h__
-#define __configs_chromeos_tegra2_twostop_h__
+#ifndef __configs_chromeos_seaboard_h__
+#define __configs_chromeos_seaboard_h__
/* So far all our tegra2-based boards share the seaboard config. */
#include <configs/seaboard.h>
@@ -21,4 +21,4 @@
/* Store the VbNvContext in the first block of the disk. */
#define CHROMEOS_VBNVCONTEXT_LBA 0
-#endif /* __configs_chromeos_tegra2_twostop_h__ */
+#endif /* __configs_chromeos_seaboard_h__ */