Fix u-boot compilation warnings.
U-boot compiler frowns at C++ style comments and escaped lines in
the end of the file, causing u-boot compilation warnings, which
go unnoticed and bury more serious problems in the compiler
output.
This change modifies the config files to make tegra2 u-boot
compile cleanly.
BUG=chromium-os:16410
TEST=manual:
This test requires the corresponding change in the
chromeos-u-boot tree. Run the following commands:
emerge-tegra2_kaen --unmerge chromeos-u-boot-config
emerge-tegra2_kaen u-boot-config
emerge-tegra2_kaen chromeos-u-boot
Observe clean compilation.
Change-Id: I9144093238e7f86b2c4e35ea6d49a10d59c4ad69
Signed-off-by: Vadim Bendebury <[email protected]>
Reviewed-on: http://gerrit.chromium.org/gerrit/2463
Reviewed-by: Tom Warren <[email protected]>
diff --git a/developer.h b/developer.h
index d47a188..3ff8a37 100644
--- a/developer.h
+++ b/developer.h
@@ -115,4 +115,4 @@
-#endif //__configs_chromeos_developer_h__
+#endif /* __configs_chromeos_developer_h__ */
diff --git a/flasher.h b/flasher.h
index e482b0e..dc6c94d 100644
--- a/flasher.h
+++ b/flasher.h
@@ -19,4 +19,4 @@
#define CONFIG_ENV_IS_NOWHERE
-#endif //__configs_chromeos_flasher_h__
+#endif /* __configs_chromeos_flasher_h__ */
diff --git a/legacy.h b/legacy.h
index 64bc9b9..5d24e7e 100644
--- a/legacy.h
+++ b/legacy.h
@@ -116,4 +116,4 @@
-#endif //__configs_chromeos_legacy_h__
+#endif /* __configs_chromeos_legacy_h__ */
diff --git a/normal.h b/normal.h
index d05f50a..9ba2fcf 100644
--- a/normal.h
+++ b/normal.h
@@ -24,4 +24,4 @@
#define CONFIG_CMD_MMC
#define CONFIG_CMD_FAT
-#endif //__configs_chromeos_normal_h__
+#endif /* __configs_chromeos_normal_h__ */
diff --git a/recovery.h b/recovery.h
index 4ff8683..ff67ead 100644
--- a/recovery.h
+++ b/recovery.h
@@ -32,4 +32,4 @@
#define CONFIG_CMD_CROS_REC
#define CONFIG_BOOTCOMMAND "cros_rec"
-#endif //__configs_chromeos_recovery_h__
+#endif /* __configs_chromeos_recovery_h__ */
diff --git a/stub.h b/stub.h
index 9123aa2..1edacfa 100644
--- a/stub.h
+++ b/stub.h
@@ -24,4 +24,4 @@
#define CONFIG_BOOTCOMMAND "cros_bootstub"
-#endif //__configs_chromeos_stub_h__
+#endif /* __configs_chromeos_stub_h__ */
diff --git a/tegra2/developer.h b/tegra2/developer.h
index 157952d..899bdbc 100644
--- a/tegra2/developer.h
+++ b/tegra2/developer.h
@@ -151,4 +151,4 @@
#define CONFIG_BOOTCOMMAND "cros_developer_firmware"
-#endif //__configs_chromeos_tegra2_developer_h__
+#endif /* __configs_chromeos_tegra2_developer_h__ */
diff --git a/tegra2/flasher.h b/tegra2/flasher.h
index 6ce2096..90567cb 100644
--- a/tegra2/flasher.h
+++ b/tegra2/flasher.h
@@ -12,7 +12,7 @@
#include <configs/chromeos/tegra2/parts/nand.h>
-#define SCRIPT_ADDRESS 0xe48000 // TEXT_BASE + 0x40000
+#define SCRIPT_ADDRESS 0xe48000 /* TEXT_BASE + 0x40000 */
/*
* Flasher is supposed to be loaded to fixed location, and so does not have
@@ -23,4 +23,4 @@
#define CONFIG_EXTRA_ENV_SETTINGS_ARCH CONFIG_EXTRA_ENV_SETTINGS_ARCH_COMMON
#define CONFIG_BOOTCOMMAND "source " QUOTE(SCRIPT_ADDRESS)
-#endif //__configs_chromeos_tegra2_flasher_h__
+#endif /* __configs_chromeos_tegra2_flasher_h__ */
diff --git a/tegra2/legacy.h b/tegra2/legacy.h
index 242f372..7db83b5 100644
--- a/tegra2/legacy.h
+++ b/tegra2/legacy.h
@@ -188,4 +188,4 @@
"run mmc0_boot"
-#endif //__configs_chromeos_tegra2_legacy_h__
+#endif /* __configs_chromeos_tegra2_legacy_h__ */
diff --git a/tegra2/normal.h b/tegra2/normal.h
index 0174697..132792c 100644
--- a/tegra2/normal.h
+++ b/tegra2/normal.h
@@ -14,4 +14,4 @@
#define CONFIG_EXTRA_ENV_SETTINGS_ARCH CONFIG_EXTRA_ENV_SETTINGS_ARCH_COMMON
-#endif //__configs_chromeos_tegra2_normal_h__
+#endif /* __configs_chromeos_tegra2_normal_h__ */
diff --git a/tegra2/parts/lcd.h b/tegra2/parts/lcd.h
index c98bcd9..49d34a3 100644
--- a/tegra2/parts/lcd.h
+++ b/tegra2/parts/lcd.h
@@ -72,4 +72,4 @@
TEGRA_PANEL(h_back_porch, 58) \
TEGRA_PANEL(v_back_porch, 4) \
TEGRA_PANEL(h_front_porch, 58) \
- TEGRA_PANEL(v_front_porch, 4)
\ No newline at end of file
+ TEGRA_PANEL(v_front_porch, 4)
diff --git a/tegra2/recovery.h b/tegra2/recovery.h
index 33217d3..a8185b5 100644
--- a/tegra2/recovery.h
+++ b/tegra2/recovery.h
@@ -14,4 +14,4 @@
#define CONFIG_EXTRA_ENV_SETTINGS_ARCH CONFIG_EXTRA_ENV_SETTINGS_ARCH_COMMON
-#endif //__configs_chromeos_tegra2_recovery_h__
+#endif /* __configs_chromeos_tegra2_recovery_h__ */
diff --git a/tegra2/stub.h b/tegra2/stub.h
index dd5d1a5..6c766dc 100644
--- a/tegra2/stub.h
+++ b/tegra2/stub.h
@@ -18,4 +18,4 @@
*/
#define CONFIG_SKIP_RELOCATE_UBOOT
-#endif //__configs_chromeos_tegra2_stub_h__
+#endif /* __configs_chromeos_tegra2_stub_h__ */
diff --git a/x86/developer.h b/x86/developer.h
index e867047..d99ab65 100644
--- a/x86/developer.h
+++ b/x86/developer.h
@@ -9,4 +9,4 @@
#include <configs/chromeos/developer.h>
-#endif //__configs_chromeos_x86_developer_h__
+#endif /* __configs_chromeos_x86_developer_h__ */
diff --git a/x86/flasher.h b/x86/flasher.h
index 41e1a4b..9228cff 100644
--- a/x86/flasher.h
+++ b/x86/flasher.h
@@ -9,4 +9,4 @@
#include <configs/chromeos/flasher.h>
-#endif //__configs_chromeos_x86_flasher_h__
+#endif /* __configs_chromeos_x86_flasher_h__ */
diff --git a/x86/legacy.h b/x86/legacy.h
index 3bbff80..3a49e72 100644
--- a/x86/legacy.h
+++ b/x86/legacy.h
@@ -9,4 +9,4 @@
#include <configs/chromeos/legacy.h>
-#endif //__configs_chromeos_x86_legacy_h__
+#endif /* __configs_chromeos_x86_legacy_h__ */
diff --git a/x86/normal.h b/x86/normal.h
index 8fec2e5..188d61b 100644
--- a/x86/normal.h
+++ b/x86/normal.h
@@ -9,4 +9,4 @@
#include <configs/chromeos/normal.h>
-#endif //__configs_chromeos_x86_normal_h__
+#endif /* __configs_chromeos_x86_normal_h__ */
diff --git a/x86/recovery.h b/x86/recovery.h
index 666948b..b4c93e1 100644
--- a/x86/recovery.h
+++ b/x86/recovery.h
@@ -9,4 +9,4 @@
#include <configs/chromeos/recovery.h>
-#endif //__configs_chromeos_x86_recovery_h__
+#endif /* __configs_chromeos_x86_recovery_h__ */
diff --git a/x86/stub.h b/x86/stub.h
index 6d64381..12aafa3 100644
--- a/x86/stub.h
+++ b/x86/stub.h
@@ -9,4 +9,4 @@
#include <configs/chromeos/stub.h>
-#endif //__configs_chromeos_x86_stub_h__
+#endif /* __configs_chromeos_x86_stub_h__ */
