diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2015-09-14 10:32:34 +0800 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2015-09-15 15:37:13 +1000 |
| commit | ef186c6ce6c9e730a91263aac38153e4257fb354 (patch) | |
| tree | 7022c6e6c79fbe176fcea765ace4147a9b45e598 /platforms | |
| parent | 52be3f7797d91e7cfb48eb900ad6628fe28a0f58 (diff) | |
| download | skiboot-ef186c6ce6c9e730a91263aac38153e4257fb354.zip skiboot-ef186c6ce6c9e730a91263aac38153e4257fb354.tar.gz skiboot-ef186c6ce6c9e730a91263aac38153e4257fb354.tar.bz2 | |
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 <jk@ozlabs.org>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'platforms')
| -rw-r--r-- | platforms/astbmc/common.c | 2 | ||||
| -rw-r--r-- | platforms/astbmc/firestone.c | 1 | ||||
| -rw-r--r-- | platforms/astbmc/habanero.c | 2 | ||||
| -rw-r--r-- | platforms/astbmc/palmetto.c | 2 |
4 files changed, 2 insertions, 5 deletions
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; } |