From 9ff25f8625650a6fc3485ba44381a936c46a339c Mon Sep 17 00:00:00 2001 From: Alessandro Rubini <rubini@gnudd.com> Date: Wed, 20 Mar 2013 17:12:30 +0100 Subject: [PATCH] memlayout.h: define variables as extern I personally dislike "common" variables, as they hid bugs a few times for me. Thus, ppsi has "-fno-common" by now. This commit adds extern to memlayout.h and creates the variables in dev/sdb.c . This builds whether or not -fno-common is there and has no effect on a ptp-noposix build. Signed-off-by: Alessandro Rubini <rubini@gnudd.com> --- dev/sdb.c | 9 +++++++++ include/hw/memlayout.h | 16 ++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dev/sdb.c b/dev/sdb.c index 78613ff47..ef135bb9f 100644 --- a/dev/sdb.c +++ b/dev/sdb.c @@ -10,6 +10,15 @@ #include <wrc.h> #include "hw/memlayout.h" +unsigned char *BASE_MINIC; +unsigned char *BASE_EP; +unsigned char *BASE_SOFTPLL; +unsigned char *BASE_PPS_GEN; +unsigned char *BASE_SYSCON; +unsigned char *BASE_UART; +unsigned char *BASE_ONEWIRE; +unsigned char *BASE_ETHERBONE_CFG; + #define SDB_INTERCONNET 0x00 #define SDB_DEVICE 0x01 #define SDB_BRIDGE 0x02 diff --git a/include/hw/memlayout.h b/include/hw/memlayout.h index bf8ba7a85..09086084e 100644 --- a/include/hw/memlayout.h +++ b/include/hw/memlayout.h @@ -3,14 +3,14 @@ #define SDB_ADDRESS 0x30000 -unsigned char *BASE_MINIC; -unsigned char *BASE_EP; -unsigned char *BASE_SOFTPLL; -unsigned char *BASE_PPS_GEN; -unsigned char *BASE_SYSCON; -unsigned char *BASE_UART; -unsigned char *BASE_ONEWIRE; -unsigned char *BASE_ETHERBONE_CFG; +extern unsigned char *BASE_MINIC; +extern unsigned char *BASE_EP; +extern unsigned char *BASE_SOFTPLL; +extern unsigned char *BASE_PPS_GEN; +extern unsigned char *BASE_SYSCON; +extern unsigned char *BASE_UART; +extern unsigned char *BASE_ONEWIRE; +extern unsigned char *BASE_ETHERBONE_CFG; #define FMC_EEPROM_ADR 0x50 -- GitLab