app: aboot: move display init/shutdown to aboot
Display initialization and shutdown need to be triggerd by aboot
in preparation for enhancing the functionality to specify the
panel to be initialized using fastboot command.
Change-Id: Ic2281e533119b60d8c68430d901fa04583af0069
diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
index 23a0736..5f5b54e 100755
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -521,6 +521,12 @@
/* Perform target specific cleanup */
target_uninit();
+ /* Turn off splash screen if enabled */
+#if DISPLAY_SPLASH_SCREEN
+ target_display_shutdown();
+#endif
+
+
dprintf(INFO, "booting linux @ %p, ramdisk @ %p (%d), tags/device tree @ %p\n",
entry, ramdisk, ramdisk_size, tags_phys);
@@ -2191,6 +2197,14 @@
read_device_info(&device);
+ /* Display splash screen if enabled */
+#if DISPLAY_SPLASH_SCREEN
+ dprintf(SPEW, "Display Init: Start\n");
+ target_display_init();
+ dprintf(SPEW, "Display Init: Done\n");
+#endif
+
+
target_serialno((unsigned char *) sn_buf);
dprintf(SPEW,"serial number: %s\n",sn_buf);
diff --git a/target/msm7627a/init.c b/target/msm7627a/init.c
index d44e6a5..41c9611 100644
--- a/target/msm7627a/init.c
+++ b/target/msm7627a/init.c
@@ -169,11 +169,6 @@
int target_is_emmc_boot(void);
-void target_uninit(void)
-{
- target_display_shutdown();
-}
-
void target_init(void)
{
unsigned offset;
@@ -191,12 +186,6 @@
keypad_init();
#endif
- /* Display splash screen if enabled */
-#if DISPLAY_SPLASH_SCREEN
- target_display_init();
- dprintf(SPEW, "Diplay initialized\n");
-#endif
-
if (target_is_emmc_boot()) {
/* Must wait for modem-up before we can intialize MMC.
*/
diff --git a/target/msm8226/init.c b/target/msm8226/init.c
index 484706a..286ef41 100644
--- a/target/msm8226/init.c
+++ b/target/msm8226/init.c
@@ -255,13 +255,6 @@
/* turn on vibrator to indicate that phone is booting up to end user */
vib_timed_turn_on(VIBRATE_TIME);
- /* Display splash screen if enabled */
-#if DISPLAY_SPLASH_SCREEN
- dprintf(SPEW, "Display Init: Start\n");
- target_display_init();
- dprintf(SPEW, "Display Init: Done\n");
-#endif
-
if (target_use_signed_kernel())
target_crypto_init_params();
}
@@ -420,8 +413,6 @@
if (target_is_ssd_enabled())
clock_ce_disable(SSD_CE_INSTANCE);
-
- target_display_shutdown();
}
void target_usb_init(void)
diff --git a/target/msm8610/init.c b/target/msm8610/init.c
index 79a2c9f..fb6d24c 100644
--- a/target/msm8610/init.c
+++ b/target/msm8610/init.c
@@ -163,17 +163,11 @@
target_keystatus();
target_sdc_init();
-
- /* Display splash screen if enabled */
- dprintf(SPEW, "Display Init: Start\n");
- target_display_init();
- dprintf(SPEW, "Display Init: Done\n");
}
void target_uninit(void)
{
mmc_put_card_to_sleep(dev);
- target_display_shutdown();
}
#define SSD_CE_INSTANCE 1
diff --git a/target/msm8960/init.c b/target/msm8960/init.c
index f0514c7..dcee3b4 100755
--- a/target/msm8960/init.c
+++ b/target/msm8960/init.c
@@ -90,11 +90,6 @@
dprintf(CRITICAL, "Shutdown failed.\n");
}
-void target_uninit(void)
-{
- target_display_shutdown();
-}
-
void target_init(void)
{
unsigned base_addr;
@@ -147,12 +142,6 @@
dprintf(CRITICAL,"Keyboard is not supported for platform: %d\n",platform_id);
};
- /* Display splash screen if enabled */
-#if DISPLAY_SPLASH_SCREEN
- target_display_init();
- dprintf(SPEW, "Diplay initialized\n");
-#endif
-
if ((platform_id == MSM8960) || (platform_id == MSM8960AB) ||
(platform_id == APQ8060AB) || (platform_id == MSM8260AB) ||
(platform_id == MSM8660AB) || (platform_id == MSM8660A) ||
diff --git a/target/msm8974/init.c b/target/msm8974/init.c
index df3e8fb..20d3b02 100644
--- a/target/msm8974/init.c
+++ b/target/msm8974/init.c
@@ -351,15 +351,6 @@
if (target_use_signed_kernel())
target_crypto_init_params();
- /* Display splash screen if enabled */
-#if DISPLAY_SPLASH_SCREEN
- dprintf(INFO, "Display Init: Start\n");
- if (board_hardware_subtype() != HW_PLATFORM_SUBTYPE_CDP_INTERPOSER)
- {
- target_display_init();
- }
- dprintf(INFO, "Display Init: Done\n");
-#endif
/*
* Set drive strength & pull ctrl for
@@ -698,8 +689,6 @@
/* Disable HC mode before jumping to kernel */
sdhci_mode_disable(&dev->host);
-
- target_display_shutdown();
}
void shutdown_device()