ARM: tegra: Use common board name for sim
Jeff Smith [Wed, 22 Aug 2012 05:43:07 +0000 (22:43 -0700)]
Remove the _sim postfix on the board name. The sim
mode is now visible to user mode tests via sysfs.

This change is a part of the effort to enable runtime
platform detection and reduce compile-time conditionals.

Bug 1333554

Change-Id: Id2ef2a0428112ef6dd2d5f577f769e43f7c05f0f
Signed-off-by: Jeff Smith <jsmith@nvidia.com>
Signed-off-by: Chetan Kumar N G <chetankumarn@nvidia.com>
Reviewed-on: http://git-master/r/252549
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Alexander Van Brunt <avanbrunt@nvidia.com>

arch/arm/mach-tegra/board-bonaire.c
arch/arm/mach-tegra/board-bonaire.h

index 1b19ec8..234f5c4 100644 (file)
@@ -658,7 +658,7 @@ static const char * const bonaire_dt_board_compat[] = {
        NULL
 };
 
-MACHINE_START(BONAIRE, BONAIRE_BOARD_NAME)
+MACHINE_START(BONAIRE, "bonaire")
        .atag_offset    = 0x80000100,
        .map_io         = tegra_map_common_io,
        .reserve        = tegra_bonaire_reserve,
index 7727bdf..845ca56 100644 (file)
@@ -59,16 +59,5 @@ int bonaire_panel_init(void);
 int bonaire_sensors_init(void);
 int bonaire_suspend_init(void);
 
-#ifdef CONFIG_TEGRA_SIMULATION_PLATFORM
-
-#define BONAIRE_BOARD_NAME "bonaire_sim"
-
 int bonaire_power_off_init(void);
-
-#else
-
-#define BONAIRE_BOARD_NAME "bonaire"
-
-#endif
-
 #endif