projects
/
karo-tx-uboot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5adfb00
)
arm: mxs: remove conflict markers from merge
author
Lothar Waßmann
<LW@KARO-electronics.de>
Fri, 21 Aug 2015 14:44:32 +0000
(16:44 +0200)
committer
Lothar Waßmann
<LW@KARO-electronics.de>
Fri, 21 Aug 2015 14:44:32 +0000
(16:44 +0200)
board/karo/tx28/tx28.c
patch
|
blob
|
history
diff --git
a/board/karo/tx28/tx28.c
b/board/karo/tx28/tx28.c
index
c578c06
..
b6ea8fb
100644
(file)
--- a/
board/karo/tx28/tx28.c
+++ b/
board/karo/tx28/tx28.c
@@
-100,7
+100,7
@@
static const iomux_cfg_t tx28_pads[] = {
/* provide at least _some_ sort of randomness */
#define MAX_LOOPS 100
-static u32 random;
+static u32 random
__attribute__((section("data")))
;
static inline void random_init(void)
{