From ef186c6ce6c9e730a91263aac38153e4257fb354 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Mon, 14 Sep 2015 10:32:34 +0800 Subject: platforms/astbmc: Move prd_init calls to astbmc_early_init() Currently, most astbmc platforms do their own call to prd_init(), but garrison is out-of-sync. This change moves the prd_init call to astbmc_early_init, so we don't need to enable it on every platform. Signed-off-by: Jeremy Kerr Reviewed-by: Joel Stanley Signed-off-by: Stewart Smith --- platforms/astbmc/common.c | 2 ++ platforms/astbmc/firestone.c | 1 - platforms/astbmc/habanero.c | 2 -- platforms/astbmc/palmetto.c | 2 -- 4 files changed, 2 insertions(+), 5 deletions(-) (limited to 'platforms') diff --git a/platforms/astbmc/common.c b/platforms/astbmc/common.c index 8d37785..40a9fc8 100644 --- a/platforms/astbmc/common.c +++ b/platforms/astbmc/common.c @@ -348,4 +348,6 @@ void astbmc_early_init(void) /* Setup UART and use it as console with interrupts */ uart_init(true); + + prd_init(); } diff --git a/platforms/astbmc/firestone.c b/platforms/astbmc/firestone.c index 4eed429..aaed13e 100644 --- a/platforms/astbmc/firestone.c +++ b/platforms/astbmc/firestone.c @@ -138,7 +138,6 @@ static bool firestone_probe(void) /* Lot of common early inits here */ astbmc_early_init(); - prd_init(); slot_table_init(firestone_phb_table); return true; diff --git a/platforms/astbmc/habanero.c b/platforms/astbmc/habanero.c index 4ab2cdc..738aa63 100644 --- a/platforms/astbmc/habanero.c +++ b/platforms/astbmc/habanero.c @@ -134,8 +134,6 @@ static bool habanero_probe(void) /* Lot of common early inits here */ astbmc_early_init(); - prd_init(); - slot_table_init(habanero_phb_table); return true; diff --git a/platforms/astbmc/palmetto.c b/platforms/astbmc/palmetto.c index ca91908..033f103 100644 --- a/platforms/astbmc/palmetto.c +++ b/platforms/astbmc/palmetto.c @@ -39,8 +39,6 @@ static bool palmetto_probe(void) /* Lot of common early inits here */ astbmc_early_init(); - prd_init(); - return true; } -- cgit v1.1