projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2019-10-08-master-imports'
[oweals/u-boot.git]
/
api
/
api_platform-powerpc.c
diff --git
a/api/api_platform-powerpc.c
b/api/api_platform-powerpc.c
index eb421d642d305b689b546d1ced6faafabcfe8a36..15930cfdb66286fbc31c99ebf4779434dc853cbb 100644
(file)
--- a/
api/api_platform-powerpc.c
+++ b/
api/api_platform-powerpc.c
@@
-1,10
+1,9
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2007 Semihalf
*
* Written by: Rafal Jaworowski <raj@semihalf.com>
*
/*
* (C) Copyright 2007 Semihalf
*
* Written by: Rafal Jaworowski <raj@semihalf.com>
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* This file contains routines that fetch data from PowerPC-dependent sources
* (bd_info etc.)
*/
* This file contains routines that fetch data from PowerPC-dependent sources
* (bd_info etc.)
*/
@@
-30,11
+29,8
@@
int platform_sys_info(struct sys_info *si)
si->clk_bus = gd->bus_clk;
si->clk_cpu = gd->cpu_clk;
si->clk_bus = gd->bus_clk;
si->clk_cpu = gd->cpu_clk;
-#if defined(CONFIG_5xx) || defined(CONFIG_8xx) || defined(CONFIG_8260) || \
- defined(CONFIG_E500) || defined(CONFIG_MPC86xx)
+#if defined(CONFIG_MPC8xx) || defined(CONFIG_E500) || defined(CONFIG_MPC86xx)
#define bi_bar bi_immr_base
#define bi_bar bi_immr_base
-#elif defined(CONFIG_MPC5xxx)
-#define bi_bar bi_mbar_base
#elif defined(CONFIG_MPC83xx)
#define bi_bar bi_immrbar
#endif
#elif defined(CONFIG_MPC83xx)
#define bi_bar bi_immrbar
#endif