From 9166e1ddaced09573abbc09ff5f7ac56c623fc86 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 5 Dec 2007 15:47:16 +0000 Subject: [PATCH] 2007-12-05 Daniel Hellstrom * shared/include/ambapp.h: Sync head and 4.8 branch. --- c/src/lib/libbsp/sparc/ChangeLog | 4 +++ .../lib/libbsp/sparc/shared/include/ambapp.h | 28 +++++++++---------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/c/src/lib/libbsp/sparc/ChangeLog b/c/src/lib/libbsp/sparc/ChangeLog index f26bf30b31..fe0495374a 100644 --- a/c/src/lib/libbsp/sparc/ChangeLog +++ b/c/src/lib/libbsp/sparc/ChangeLog @@ -1,3 +1,7 @@ +2007-12-05 Daniel Hellstrom + + * shared/include/ambapp.h: Sync head and 4.8 branch. + 2007-12-04 Joel Sherrill * shared/bspstart.c: Move interrupt_stack_size field from CPU Table to diff --git a/c/src/lib/libbsp/sparc/shared/include/ambapp.h b/c/src/lib/libbsp/sparc/shared/include/ambapp.h index 280bc33ded..4e76331c64 100644 --- a/c/src/lib/libbsp/sparc/shared/include/ambapp.h +++ b/c/src/lib/libbsp/sparc/shared/include/ambapp.h @@ -40,28 +40,26 @@ extern "C" { #define GAISLER_LEON3 0x03 #define GAISLER_LEON3DSU 0x04 #define GAISLER_ETHAHB 0x05 -#define GAISLER_APBMST 0x06 -#define GAISLER_AHBUART 0x07 -#define GAISLER_SRCTRL 0x08 +#define GAISLER_APBMST 0x06 +#define GAISLER_AHBUART 0x07 +#define GAISLER_SRCTRL 0x08 #define GAISLER_SDCTRL 0x09 -#define GAISLER_APBUART 0x0C -#define GAISLER_IRQMP 0x0D -#define GAISLER_AHBRAM 0x0E -#define GAISLER_GPTIMER 0x11 -#define GAISLER_PCITRG 0x12 -#define GAISLER_PCISBRG 0x13 -#define GAISLER_PCIFBRG 0x14 -#define GAISLER_PCITRACE 0x15 -#define GAISLER_DMACTRL 0x16 -#define GAISLER_OCCAN 0x19 +#define GAISLER_APBUART 0x0C +#define GAISLER_IRQMP 0x0D +#define GAISLER_AHBRAM 0x0E +#define GAISLER_GPTIMER 0x11 +#define GAISLER_PCITRG 0x12 +#define GAISLER_PCISBRG 0x13 +#define GAISLER_PCIFBRG 0x14 +#define GAISLER_PCITRACE 0x15 +#define GAISLER_DMACTRL 0x16 +#define GAISLER_OCCAN 0x19 #define GAISLER_PIOPORT 0x1A #define GAISLER_ETHMAC 0x1D #define GAISLER_SPACEWIRE 0x1f #define GAISLER_AHB2AHB 0x20 #define GAISLER_I2CMST 0x28 #define GAISLER_GRSPW2 0x29 -#define GAISLER_I2CMST 0x28 -#define GAISLER_GRSPW2 0x29 #define GAISLER_GRCAN 0x34 #define GAISLER_GRHCAN 0x3d #define GAISLER_GRFIFO 0x35