summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoachim Naulet2008-11-07 16:05:30 +0100
committerJoachim Naulet2008-11-07 16:05:30 +0100
commita33127e2a77a84371edffa319a89bb4ec672aca3 (patch)
tree914db3e26b431f91d5a775ef99013b3f74b73f48
parent40f52153796601e814f53b84371addef112df41c (diff)
Fixed bootloader compilation errors
-rw-r--r--bootloader/lib/newlib/libc.abin0 -> 2623058 bytes
-rwxr-xr-xbootloader/src/Makefile11
-rw-r--r--bootloader/src/bootloader_16m.c4
-rwxr-xr-xbootloader/src/image_run.c2
-rw-r--r--include/lisa/lisa.h2
-rw-r--r--include/platform.h2
6 files changed, 11 insertions, 10 deletions
diff --git a/bootloader/lib/newlib/libc.a b/bootloader/lib/newlib/libc.a
new file mode 100644
index 0000000000..98ea00020c
--- /dev/null
+++ b/bootloader/lib/newlib/libc.a
Binary files differ
diff --git a/bootloader/src/Makefile b/bootloader/src/Makefile
index 91a58ddc9f..ffd3526a8b 100755
--- a/bootloader/src/Makefile
+++ b/bootloader/src/Makefile
@@ -74,10 +74,10 @@ RAM_DEVICE=MT48LC64M16x2
endif
endif
-CFLAGS_SCR200e-all-32M := -DSP_CRISTINA -DANGELINA
-CFLAGS_SCR200e-slave-16M := -DSP_CRISTINA -DANGELINA -DVERSION_16M
-CFLAGS_SCR200c-all-32M := -DSP_LISA -DMONA
-CFLAGS_SCR200c-slave-16M := -DSP_LISA -DMONA -DVERSION_16M
+CFLAGS_SCR200e-all-32M := -DCONFIG_ARCH_SPK200 -DANGELINA
+CFLAGS_SCR200e-slave-16M := -DCONFIG_ARCH_SPK200 -DANGELINA -DCONFIG_VERSION_16M
+CFLAGS_SCR200c-all-32M := -DCONFIG_ARCH_SPC2XXC -DCONFIG_MONA
+CFLAGS_SCR200c-slave-16M := -DCONFIG_ARCH_SPC2XXC -DCONFIG_MONA -DCONFIG_VERSION_16M
# use gcc as assembler to get preprocessing
INCLUDES=-I$(BASEROOT)/include -I../inc -I../inc/newlib -I$(BASEROOT)/include/$(PLATFORM_INC) -I../inc/$(BSP) $(AUXINC)
@@ -89,7 +89,8 @@ AS=arm-uclinux-gcc
ASFLAGS=-c -D__asm__ $(CFLAGS_$(PLATFORM)) $(INCLUDES) -Wa,-k
CC=arm-uclinux-gcc
-CFLAGS=$(CFLAGS_$(PLATFORM)) -Wall $(INCLUDES) -DINLINE=__inline__ $(CFLAGS_CONF)
+CFLAGS=$(CFLAGS_$(PLATFORM)) -Wall $(INCLUDES) -DINLINE=__inline__ $(CFLAGS_CONF) -D__spidboot__
+
ifeq ($(DEBUG),YES)
ASFLAGS+=-DDEBUG
CFLAGS+=-g -DDEBUG
diff --git a/bootloader/src/bootloader_16m.c b/bootloader/src/bootloader_16m.c
index 171be6817d..05731eb3c8 100644
--- a/bootloader/src/bootloader_16m.c
+++ b/bootloader/src/bootloader_16m.c
@@ -26,7 +26,7 @@
#include "wait.h"
#include "jump.h"
-#include "boottable.h"
+#include "image_desc.h"
#include "nvram.h"
#ifdef SP_LISA
@@ -189,7 +189,7 @@ int main(void) {
size_t flash_code_size;
spidcom_image_desc_t boot, *boot0, *boot1;
- polux_nvram_t *nvram = (polux_nvram_t*)NVRAM_BASE_ADDRESS;
+ spidcom_nvram_t *nvram = (spidcom_nvram_t*)NVRAM_BASE_ADDRESS;
spidcom_image_desc_t *image0 = (void*)nvram->imageAddress0;
spidcom_image_desc_t *image1 = (void*)nvram->imageAddress1;
diff --git a/bootloader/src/image_run.c b/bootloader/src/image_run.c
index 15f1144a4f..534d828c08 100755
--- a/bootloader/src/image_run.c
+++ b/bootloader/src/image_run.c
@@ -26,8 +26,6 @@ DATE | AUTHOR | Version | Description
#include "flash_device.h"
#include "gpio_management.h"
-#include "boottable.h"
-
#if defined(MT48LC8M32) || defined(MT48LC64M16x2) || defined(MT48LC8M16x2)
#include "micron_sdram_device.h"
#elif defined(HY57V281620)
diff --git a/include/lisa/lisa.h b/include/lisa/lisa.h
index 7719c040dd..dd25cd0643 100644
--- a/include/lisa/lisa.h
+++ b/include/lisa/lisa.h
@@ -147,7 +147,7 @@
#define SDRAM_BASE (0xB0000000)
#define SDRAM_CFG_BASE (0xA2000000)
#define SRAM_BASE (0x00000000)
-//#define SRAM_CFG_BASE (0x14000000)
+#define SRAM_CFG_BASE (0x14000000)
/*
diff --git a/include/platform.h b/include/platform.h
index 39bfd37d24..71defdcbaa 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -1,7 +1,9 @@
#ifndef PLATFORM_H
#define PLATFORM_H
+#ifndef __spidboot__
#include <linux/autoconf.h>
+#endif
/*
* TODO