From bb798176fc850b690865c2883b81e75158d12cd1 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 16 May 2012 10:20:04 +0200 Subject: [PATCH] Common include files --- common/csrbase.h | 8 ++ {tools => common}/sfl.h | 0 {software/include/base => common}/version.h | 2 +- software/bios/ddrinit.c | 2 +- software/include.mak | 2 +- software/include/hw/dfii.h | 101 ++++++++++---------- software/include/hw/uart.h | 19 ++-- tools/Makefile | 2 +- 8 files changed, 75 insertions(+), 61 deletions(-) create mode 100644 common/csrbase.h rename {tools => common}/sfl.h (100%) rename {software/include/base => common}/version.h (73%) diff --git a/common/csrbase.h b/common/csrbase.h new file mode 100644 index 00000000..76d6a567 --- /dev/null +++ b/common/csrbase.h @@ -0,0 +1,8 @@ +#ifndef __CSRBASE_H +#define __CSRBASE_H + +#define UART_BASE 0xe0000000 +#define DFII_BASE 0xe0000800 +#define ID_BASE 0xe0001000 + +#endif /* __CSRBASE_H */ diff --git a/tools/sfl.h b/common/sfl.h similarity index 100% rename from tools/sfl.h rename to common/sfl.h diff --git a/software/include/base/version.h b/common/version.h similarity index 73% rename from software/include/base/version.h rename to common/version.h index 3f70d0eb..68bd4c97 100644 --- a/software/include/base/version.h +++ b/common/version.h @@ -1,6 +1,6 @@ #ifndef __VERSION_H #define __VERSION_H -#define VERSION "2.0-X" +#define VERSION "2.0" #endif /* __VERSION_H */ diff --git a/software/bios/ddrinit.c b/software/bios/ddrinit.c index 84990ac1..010efb74 100644 --- a/software/bios/ddrinit.c +++ b/software/bios/ddrinit.c @@ -204,7 +204,7 @@ void memtest(void) int ddrinit(void) { - printf("Initializing DDRAM...\n"); + printf("Initializing DDR SDRAM...\n"); init_sequence(); CSR_DFII_CONTROL = DFII_CONTROL_SEL|DFII_CONTROL_CKE; diff --git a/software/include.mak b/software/include.mak index 227ba3af..0f904505 100644 --- a/software/include.mak +++ b/software/include.mak @@ -36,7 +36,7 @@ endif # Toolchain options # INCLUDES_NOLIBC ?= -nostdinc -I$(M2DIR)/software/include/base -INCLUDES = $(INCLUDES_NOLIBC) -I$(M2DIR)/software/include -I$(M2DIR)/tools +INCLUDES = $(INCLUDES_NOLIBC) -I$(M2DIR)/software/include -I$(M2DIR)/common ASFLAGS = $(INCLUDES) -nostdinc CFLAGS = -O9 -Wall -Wstrict-prototypes -Wold-style-definition -Wshadow \ -Wmissing-prototypes -fsigned-char $(INCLUDES) diff --git a/software/include/hw/dfii.h b/software/include/hw/dfii.h index fc13090c..4cf07f3c 100644 --- a/software/include/hw/dfii.h +++ b/software/include/hw/dfii.h @@ -19,59 +19,62 @@ #define __HW_DFII_H #include +#include -#define CSR_DFII_CONTROL MMPTR(0xe0000800) +#define DFII_CSR(x) MMPTR(DFII_BASE+(x)) -#define DFII_CONTROL_SEL (0x01) -#define DFII_CONTROL_CKE (0x02) +#define CSR_DFII_CONTROL DFII_CSR(0x00) -#define CSR_DFII_COMMAND_P0 MMPTR(0xe0000804) -#define CSR_DFII_AH_P0 MMPTR(0xe0000808) -#define CSR_DFII_AL_P0 MMPTR(0xe000080C) -#define CSR_DFII_BA_P0 MMPTR(0xe0000810) -#define CSR_DFII_WD0_P0 MMPTR(0xe0000814) -#define CSR_DFII_WD1_P0 MMPTR(0xe0000818) -#define CSR_DFII_WD2_P0 MMPTR(0xe000081C) -#define CSR_DFII_WD3_P0 MMPTR(0xe0000820) -#define CSR_DFII_WD4_P0 MMPTR(0xe0000824) -#define CSR_DFII_WD5_P0 MMPTR(0xe0000828) -#define CSR_DFII_WD6_P0 MMPTR(0xe000082C) -#define CSR_DFII_WD7_P0 MMPTR(0xe0000830) -#define CSR_DFII_RD0_P0 MMPTR(0xe0000834) -#define CSR_DFII_RD1_P0 MMPTR(0xe0000838) -#define CSR_DFII_RD2_P0 MMPTR(0xe000083C) -#define CSR_DFII_RD3_P0 MMPTR(0xe0000840) -#define CSR_DFII_RD4_P0 MMPTR(0xe0000844) -#define CSR_DFII_RD5_P0 MMPTR(0xe0000848) -#define CSR_DFII_RD6_P0 MMPTR(0xe000084C) -#define CSR_DFII_RD7_P0 MMPTR(0xe0000850) +#define DFII_CONTROL_SEL 0x01 +#define DFII_CONTROL_CKE 0x02 -#define CSR_DFII_COMMAND_P1 MMPTR(0xe0000854) -#define CSR_DFII_AH_P1 MMPTR(0xe0000858) -#define CSR_DFII_AL_P1 MMPTR(0xe000085C) -#define CSR_DFII_BA_P1 MMPTR(0xe0000860) -#define CSR_DFII_WD0_P1 MMPTR(0xe0000864) -#define CSR_DFII_WD1_P1 MMPTR(0xe0000868) -#define CSR_DFII_WD2_P1 MMPTR(0xe000086C) -#define CSR_DFII_WD3_P1 MMPTR(0xe0000870) -#define CSR_DFII_WD4_P1 MMPTR(0xe0000874) -#define CSR_DFII_WD5_P1 MMPTR(0xe0000878) -#define CSR_DFII_WD6_P1 MMPTR(0xe000087C) -#define CSR_DFII_WD7_P1 MMPTR(0xe0000880) -#define CSR_DFII_RD0_P1 MMPTR(0xe0000884) -#define CSR_DFII_RD1_P1 MMPTR(0xe0000888) -#define CSR_DFII_RD2_P1 MMPTR(0xe000088C) -#define CSR_DFII_RD3_P1 MMPTR(0xe0000890) -#define CSR_DFII_RD4_P1 MMPTR(0xe0000894) -#define CSR_DFII_RD5_P1 MMPTR(0xe0000898) -#define CSR_DFII_RD6_P1 MMPTR(0xe000089C) -#define CSR_DFII_RD7_P1 MMPTR(0xe00008a0) +#define CSR_DFII_COMMAND_P0 DFII_CSR(0x04) +#define CSR_DFII_AH_P0 DFII_CSR(0x08) +#define CSR_DFII_AL_P0 DFII_CSR(0x0C) +#define CSR_DFII_BA_P0 DFII_CSR(0x10) +#define CSR_DFII_WD0_P0 DFII_CSR(0x14) +#define CSR_DFII_WD1_P0 DFII_CSR(0x18) +#define CSR_DFII_WD2_P0 DFII_CSR(0x1C) +#define CSR_DFII_WD3_P0 DFII_CSR(0x20) +#define CSR_DFII_WD4_P0 DFII_CSR(0x24) +#define CSR_DFII_WD5_P0 DFII_CSR(0x28) +#define CSR_DFII_WD6_P0 DFII_CSR(0x2C) +#define CSR_DFII_WD7_P0 DFII_CSR(0x30) +#define CSR_DFII_RD0_P0 DFII_CSR(0x34) +#define CSR_DFII_RD1_P0 DFII_CSR(0x38) +#define CSR_DFII_RD2_P0 DFII_CSR(0x3C) +#define CSR_DFII_RD3_P0 DFII_CSR(0x40) +#define CSR_DFII_RD4_P0 DFII_CSR(0x44) +#define CSR_DFII_RD5_P0 DFII_CSR(0x48) +#define CSR_DFII_RD6_P0 DFII_CSR(0x4C) +#define CSR_DFII_RD7_P0 DFII_CSR(0x50) -#define DFII_COMMAND_CS (0x01) -#define DFII_COMMAND_WE (0x02) -#define DFII_COMMAND_CAS (0x04) -#define DFII_COMMAND_RAS (0x08) -#define DFII_COMMAND_WRDATA (0x10) -#define DFII_COMMAND_RDDATA (0x20) +#define CSR_DFII_COMMAND_P1 DFII_CSR(0x54) +#define CSR_DFII_AH_P1 DFII_CSR(0x58) +#define CSR_DFII_AL_P1 DFII_CSR(0x5C) +#define CSR_DFII_BA_P1 DFII_CSR(0x60) +#define CSR_DFII_WD0_P1 DFII_CSR(0x64) +#define CSR_DFII_WD1_P1 DFII_CSR(0x68) +#define CSR_DFII_WD2_P1 DFII_CSR(0x6C) +#define CSR_DFII_WD3_P1 DFII_CSR(0x70) +#define CSR_DFII_WD4_P1 DFII_CSR(0x74) +#define CSR_DFII_WD5_P1 DFII_CSR(0x78) +#define CSR_DFII_WD6_P1 DFII_CSR(0x7C) +#define CSR_DFII_WD7_P1 DFII_CSR(0x80) +#define CSR_DFII_RD0_P1 DFII_CSR(0x84) +#define CSR_DFII_RD1_P1 DFII_CSR(0x88) +#define CSR_DFII_RD2_P1 DFII_CSR(0x8C) +#define CSR_DFII_RD3_P1 DFII_CSR(0x90) +#define CSR_DFII_RD4_P1 DFII_CSR(0x94) +#define CSR_DFII_RD5_P1 DFII_CSR(0x98) +#define CSR_DFII_RD6_P1 DFII_CSR(0x9C) +#define CSR_DFII_RD7_P1 DFII_CSR(0xA0) + +#define DFII_COMMAND_CS 0x01 +#define DFII_COMMAND_WE 0x02 +#define DFII_COMMAND_CAS 0x04 +#define DFII_COMMAND_RAS 0x08 +#define DFII_COMMAND_WRDATA 0x10 +#define DFII_COMMAND_RDDATA 0x20 #endif /* __HW_DFII_H */ diff --git a/software/include/hw/uart.h b/software/include/hw/uart.h index d472e5d7..1ee37869 100644 --- a/software/include/hw/uart.h +++ b/software/include/hw/uart.h @@ -19,16 +19,19 @@ #define __HW_UART_H #include +#include -#define CSR_UART_RXTX MMPTR(0xe0000000) -#define CSR_UART_DIVISORH MMPTR(0xe0000004) -#define CSR_UART_DIVISORL MMPTR(0xe0000008) +#define UART_CSR(x) MMPTR(UART_BASE+(x)) -#define CSR_UART_EV_STAT MMPTR(0xe000000c) -#define CSR_UART_EV_PENDING MMPTR(0xe0000010) -#define CSR_UART_EV_ENABLE MMPTR(0xe0000014) +#define CSR_UART_RXTX UART_CSR(0x00) +#define CSR_UART_DIVISORH UART_CSR(0x04) +#define CSR_UART_DIVISORL UART_CSR(0x08) -#define UART_EV_TX (0x1) -#define UART_EV_RX (0x2) +#define CSR_UART_EV_STAT UART_CSR(0x0c) +#define CSR_UART_EV_PENDING UART_CSR(0x10) +#define CSR_UART_EV_ENABLE UART_CSR(0x14) + +#define UART_EV_TX 0x1 +#define UART_EV_RX 0x2 #endif /* __HW_UART_H */ diff --git a/tools/Makefile b/tools/Makefile index a880230b..134be463 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -4,7 +4,7 @@ CC=clang all: $(TARGETS) %: %.c - $(CC) -O2 -Wall -I. -s -o $@ $< + $(CC) -O2 -Wall -I../common -s -o $@ $< install: mkmmimg flterm install -d /usr/local/bin -- 2.30.2