Many different patches to fix compilation of coldfire boards.
Compilation could now be done in a different directory from the
sources one. Simple board config switched from Makefile to boards.cfg
EP2500 broken board removed from boards.cfg. Link files corrected to
remove zlib.o and multiple defined symbols.
Signed-off-by: Stany MARCEL <stany.mar...@novasys-ingenierie.com>
---
MAKEALL | 6 --
Makefile | 124 +++++-----------------------------
arch/m68k/cpu/mcf5227x/Makefile | 2 +-
arch/m68k/cpu/mcf523x/Makefile | 2 +-
arch/m68k/cpu/mcf532x/Makefile | 2 +-
arch/m68k/cpu/mcf5445x/Makefile | 2 +-
arch/m68k/cpu/mcf547x_8x/Makefile | 2 +-
board/BuS/EB+MCF-EV123/u-boot.lds | 8 --
board/cobra5272/u-boot.lds | 7 --
board/esd/tasreg/u-boot.lds | 7 --
board/freescale/m52277evb/.gitignore | 1 +
board/freescale/m5235evb/.gitignore | 1 +
board/freescale/m5235evb/u-boot.16 | 8 --
board/freescale/m5235evb/u-boot.32 | 16 -----
board/freescale/m5249evb/u-boot.lds | 7 --
board/freescale/m5253evbe/u-boot.lds | 7 --
board/freescale/m5272c3/u-boot.lds | 7 --
board/freescale/m5275evb/u-boot.lds | 6 --
board/freescale/m54451evb/.gitignore | 1 +
board/freescale/m54455evb/.gitignore | 1 +
board/idmr/u-boot.lds | 7 --
boards.cfg | 21 ++++++-
include/configs/M5329EVB.h | 8 +-
23 files changed, 50 insertions(+), 203 deletions(-)
create mode 100644 board/freescale/m52277evb/.gitignore
create mode 100644 board/freescale/m5235evb/.gitignore
create mode 100644 board/freescale/m54451evb/.gitignore
create mode 100644 board/freescale/m54455evb/.gitignore
diff --git a/MAKEALL b/MAKEALL
index e72a019..2cb5b38 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -495,18 +495,12 @@ LIST_microblaze="$(boards_by_arch microblaze)"
#########################################################################
LIST_coldfire="$(boards_by_arch m68k)
- astro_mcf5373l \
- cobra5272 \
EB+MCF-EV123 \
EB+MCF-EV123_internal \
M52277EVB \
M5235EVB \
- M5329AFEE \
- M5373EVB \
M54451EVB \
M54455EVB \
- M5475AFE \
- M5485AFE \
"
#########################################################################
diff --git a/Makefile b/Makefile
index d5a1f0a..39818f4 100644
--- a/Makefile
+++ b/Makefile
@@ -591,14 +591,11 @@ ucname = $(shell echo $(1) | sed -e
's/\(.*\)_config/\U\1/')
#########################################################################
## Coldfire
#########################################################################
-
-astro_mcf5373l_config \
-astro_mcf5373l_RAM_config : unconfig
- @$(MKCONFIG) -n $@ -t $@ astro_mcf5373l m68k mcf532x mcf5373l astro
-
M52277EVB_config \
M52277EVB_spansion_config \
M52277EVB_stmicro_config : unconfig
+ @mkdir -p $(obj)include
+ @mkdir -p $(obj)board/freescale/m52277evb
@case "$@" in \
M52277EVB_config) FLASH=SPANSION;; \
M52277EVB_spansion_config) FLASH=SPANSION;; \
@@ -607,19 +604,21 @@ M52277EVB_stmicro_config : unconfig
if [ "$${FLASH}" = "SPANSION" ] ; then \
echo "#define CONFIG_SYS_SPANSION_BOOT" >>
$(obj)include/config.h ; \
echo "CONFIG_SYS_TEXT_BASE = 0x00000000" >
$(obj)board/freescale/m52277evb/config.tmp ; \
- cp $(obj)board/freescale/m52277evb/u-boot.spa
$(obj)board/freescale/m52277evb/u-boot.lds ; \
+ cp board/freescale/m52277evb/u-boot.spa
board/freescale/m52277evb/u-boot.lds ; \
fi; \
if [ "$${FLASH}" = "STMICRO" ] ; then \
echo "#define CONFIG_CF_SBF" >> $(obj)include/config.h ; \
echo "#define CONFIG_SYS_STMICRO_BOOT" >>
$(obj)include/config.h ; \
echo "CONFIG_SYS_TEXT_BASE = 0x43E00000" >
$(obj)board/freescale/m52277evb/config.tmp ; \
- cp $(obj)board/freescale/m52277evb/u-boot.stm
$(obj)board/freescale/m52277evb/u-boot.lds ; \
+ cp board/freescale/m52277evb/u-boot.stm
board/freescale/m52277evb/u-boot.lds ; \
fi
@$(MKCONFIG) -n $@ -a M52277EVB m68k mcf5227x m52277evb freescale
M5235EVB_config \
M5235EVB_Flash16_config \
M5235EVB_Flash32_config: unconfig
+ @mkdir -p $(obj)include
+ @mkdir -p $(obj)board/freescale/m5235evb
@case "$@" in \
M5235EVB_config) FLASH=16;; \
M5235EVB_Flash16_config) FLASH=16;; \
@@ -628,63 +627,40 @@ M5235EVB_Flash32_config: unconfig
if [ "$${FLASH}" != "16" ] ; then \
echo "#define NORFLASH_PS32BIT 1" >> $(obj)include/config.h ; \
echo "CONFIG_SYS_TEXT_BASE = 0xFFC00000" >
$(obj)board/freescale/m5235evb/config.tmp ; \
- cp $(obj)board/freescale/m5235evb/u-boot.32
$(obj)board/freescale/m5235evb/u-boot.lds ; \
+ cp board/freescale/m5235evb/u-boot.32
board/freescale/m5235evb/u-boot.lds ; \
else \
echo "CONFIG_SYS_TEXT_BASE = 0xFFE00000" >
$(obj)board/freescale/m5235evb/config.tmp ; \
- cp $(obj)board/freescale/m5235evb/u-boot.16
$(obj)board/freescale/m5235evb/u-boot.lds ; \
+ cp board/freescale/m5235evb/u-boot.16
board/freescale/m5235evb/u-boot.lds ; \
fi
@$(MKCONFIG) -n $@ -a M5235EVB m68k mcf523x m5235evb freescale
-cobra5272_config : unconfig
- @$(MKCONFIG) $@ m68k mcf52x2 cobra5272
-
EB+MCF-EV123_config : unconfig
- @mkdir -p $(obj)include
@mkdir -p $(obj)board/BuS/EB+MCF-EV123
@echo "CONFIG_SYS_TEXT_BASE = 0xFFE00000"|tee
$(obj)board/BuS/EB+MCF-EV123/textbase.mk
@$(MKCONFIG) -n $@ EB+MCF-EV123 m68k mcf52x2 EB+MCF-EV123 BuS
EB+MCF-EV123_internal_config : unconfig
- @mkdir -p $(obj)include
@mkdir -p $(obj)board/BuS/EB+MCF-EV123
@echo "CONFIG_SYS_TEXT_BASE = 0xF0000000"|tee
$(obj)board/BuS/EB+MCF-EV123/textbase.mk
@$(MKCONFIG) -n $@ EB+MCF-EV123 m68k mcf52x2 EB+MCF-EV123 BuS
-M5329AFEE_config \
-M5329BFEE_config : unconfig
- @case "$@" in \
- M5329AFEE_config) NAND=0;; \
- M5329BFEE_config) NAND=16;; \
- esac; \
- if [ "$${NAND}" != "0" ] ; then \
- echo "#define NANDFLASH_SIZE $${NAND}" >
$(obj)include/config.h ; \
- fi
- @$(MKCONFIG) -n $@ -a M5329EVB m68k mcf532x m5329evb freescale
-
-M5373EVB_config : unconfig
- @case "$@" in \
- M5373EVB_config) NAND=16;; \
- esac; \
- if [ "$${NAND}" != "0" ] ; then \
- echo "#define NANDFLASH_SIZE $${NAND}" >
$(obj)include/config.h ; \
- fi
- @$(MKCONFIG) -a M5373EVB m68k mcf532x m5373evb freescale
-
M54451EVB_config \
M54451EVB_stmicro_config : unconfig
+ @mkdir -p $(obj)include
+ @mkdir -p $(obj)board/freescale/m54451evb
@case "$@" in \
M54451EVB_config) FLASH=NOR;; \
M54451EVB_stmicro_config) FLASH=STMICRO;; \
esac; \
if [ "$${FLASH}" = "NOR" ] ; then \
echo "CONFIG_SYS_TEXT_BASE = 0x00000000" >
$(obj)board/freescale/m54451evb/config.tmp ; \
- cp $(obj)board/freescale/m54451evb/u-boot.spa
$(obj)board/freescale/m54451evb/u-boot.lds ; \
+ cp board/freescale/m54451evb/u-boot.spa
board/freescale/m54451evb/u-boot.lds ; \
fi; \
if [ "$${FLASH}" = "STMICRO" ] ; then \
echo "#define CONFIG_CF_SBF" >> $(obj)include/config.h ; \
echo "#define CONFIG_SYS_STMICRO_BOOT" >>
$(obj)include/config.h ; \
echo "CONFIG_SYS_TEXT_BASE = 0x47E00000" >
$(obj)board/freescale/m54451evb/config.tmp ; \
- cp $(obj)board/freescale/m54451evb/u-boot.stm
$(obj)board/freescale/m54451evb/u-boot.lds ; \
+ cp board/freescale/m54451evb/u-boot.stm
board/freescale/m54451evb/u-boot.lds ; \
fi; \
echo "#define CONFIG_SYS_INPUT_CLKSRC 24000000" >>
$(obj)include/config.h ;
@$(MKCONFIG) -n $@ -a M54451EVB m68k mcf5445x m54451evb freescale
@@ -697,6 +673,8 @@ M54455EVB_a66_config \
M54455EVB_i33_config \
M54455EVB_i66_config \
M54455EVB_stm33_config : unconfig
+ @mkdir -p $(obj)include
+ @mkdir -p $(obj)board/freescale/m54455evb
@case "$@" in \
M54455EVB_config) FLASH=ATMEL; FREQ=33333333;; \
M54455EVB_atmel_config) FLASH=ATMEL; FREQ=33333333;; \
@@ -710,91 +688,23 @@ M54455EVB_stm33_config : unconfig
if [ "$${FLASH}" = "INTEL" ] ; then \
echo "#define CONFIG_SYS_INTEL_BOOT" >> $(obj)include/config.h
; \
echo "CONFIG_SYS_TEXT_BASE = 0x00000000" >
$(obj)board/freescale/m54455evb/config.tmp ; \
- cp $(obj)board/freescale/m54455evb/u-boot.int
$(obj)board/freescale/m54455evb/u-boot.lds ; \
+ cp board/freescale/m54455evb/u-boot.int
board/freescale/m54455evb/u-boot.lds ; \
fi; \
if [ "$${FLASH}" = "ATMEL" ] ; then \
echo "#define CONFIG_SYS_ATMEL_BOOT" >>
$(obj)include/config.h ; \
echo "CONFIG_SYS_TEXT_BASE = 0x04000000" >
$(obj)board/freescale/m54455evb/config.tmp ; \
- cp $(obj)board/freescale/m54455evb/u-boot.atm
$(obj)board/freescale/m54455evb/u-boot.lds ; \
+ cp board/freescale/m54455evb/u-boot.atm
board/freescale/m54455evb/u-boot.lds ; \
fi; \
if [ "$${FLASH}" = "STMICRO" ] ; then \
echo "#define CONFIG_CF_SBF" >> $(obj)include/config.h ; \
echo "#define CONFIG_SYS_STMICRO_BOOT" >>
$(obj)include/config.h ; \
echo "CONFIG_SYS_TEXT_BASE = 0x4FE00000" >
$(obj)board/freescale/m54455evb/config.tmp ; \
- cp $(obj)board/freescale/m54455evb/u-boot.stm
$(obj)board/freescale/m54455evb/u-boot.lds ; \
+ cp board/freescale/m54455evb/u-boot.stm
board/freescale/m54455evb/u-boot.lds ; \
fi; \
echo "#define CONFIG_SYS_INPUT_CLKSRC $${FREQ}" >>
$(obj)include/config.h ; \
$(XECHO) "... with $${FREQ}Hz input clock"
@$(MKCONFIG) -n $@ -a M54455EVB m68k mcf5445x m54455evb freescale
-M5475AFE_config \
-M5475BFE_config \
-M5475CFE_config \
-M5475DFE_config \
-M5475EFE_config \
-M5475FFE_config \
-M5475GFE_config : unconfig
- @case "$@" in \
- M5475AFE_config) BOOT=2;CODE=0;VID=0;USB=0;RAM=64;RAM1=0;; \
- M5475BFE_config) BOOT=2;CODE=16;VID=0;USB=0;RAM=64;RAM1=0;; \
- M5475CFE_config) BOOT=2;CODE=16;VID=1;USB=1;RAM=64;RAM1=0;; \
- M5475DFE_config) BOOT=2;CODE=0;VID=0;USB=1;RAM=64;RAM1=0;; \
- M5475EFE_config) BOOT=2;CODE=0;VID=1;USB=1;RAM=64;RAM1=0;; \
- M5475FFE_config) BOOT=2;CODE=32;VID=1;USB=1;RAM=64;RAM1=64;; \
- M5475GFE_config) BOOT=4;CODE=0;VID=0;USB=0;RAM=64;RAM1=0;; \
- esac; \
- echo "#define CONFIG_SYS_BUSCLK 133333333" > $(obj)include/config.h ; \
- echo "#define CONFIG_SYS_BOOTSZ $${BOOT}" >> $(obj)include/config.h ; \
- echo "#define CONFIG_SYS_DRAMSZ $${RAM}" >> $(obj)include/config.h ; \
- if [ "$${RAM1}" != "0" ] ; then \
- echo "#define CONFIG_SYS_DRAMSZ1 $${RAM1}" >>
$(obj)include/config.h ; \
- fi; \
- if [ "$${CODE}" != "0" ] ; then \
- echo "#define CONFIG_SYS_NOR1SZ $${CODE}" >>
$(obj)include/config.h ; \
- fi; \
- if [ "$${VID}" == "1" ] ; then \
- echo "#define CONFIG_SYS_VIDEO" >> $(obj)include/config.h ; \
- fi; \
- if [ "$${USB}" == "1" ] ; then \
- echo "#define CONFIG_SYS_USBCTRL" >> $(obj)include/config.h ; \
- fi
- @$(MKCONFIG) -n $@ -a M5475EVB m68k mcf547x_8x m547xevb freescale
-
-M5485AFE_config \
-M5485BFE_config \
-M5485CFE_config \
-M5485DFE_config \
-M5485EFE_config \
-M5485FFE_config \
-M5485GFE_config \
-M5485HFE_config : unconfig
- @case "$@" in \
- M5485AFE_config) BOOT=2;CODE=0;VID=0;USB=0;RAM=64;RAM1=0;; \
- M5485BFE_config) BOOT=2;CODE=16;VID=0;USB=0;RAM=64;RAM1=0;; \
- M5485CFE_config) BOOT=2;CODE=16;VID=1;USB=1;RAM=64;RAM1=0;; \
- M5485DFE_config) BOOT=2;CODE=0;VID=0;USB=1;RAM=64;RAM1=0;; \
- M5485EFE_config) BOOT=2;CODE=0;VID=1;USB=1;RAM=64;RAM1=0;; \
- M5485FFE_config) BOOT=2;CODE=32;VID=1;USB=1;RAM=64;RAM1=64;; \
- M5485GFE_config) BOOT=4;CODE=0;VID=0;USB=0;RAM=64;RAM1=0;; \
- M5485HFE_config) BOOT=2;CODE=16;VID=1;USB=0;RAM=64;RAM1=0;; \
- esac; \
- echo "#define CONFIG_SYS_BUSCLK 100000000" > $(obj)include/config.h ; \
- echo "#define CONFIG_SYS_BOOTSZ $${BOOT}" >> $(obj)include/config.h ; \
- echo "#define CONFIG_SYS_DRAMSZ $${RAM}" >> $(obj)include/config.h ; \
- if [ "$${RAM1}" != "0" ] ; then \
- echo "#define CONFIG_SYS_DRAMSZ1 $${RAM1}" >>
$(obj)include/config.h ; \
- fi; \
- if [ "$${CODE}" != "0" ] ; then \
- echo "#define CONFIG_SYS_NOR1SZ $${CODE}" >>
$(obj)include/config.h ; \
- fi; \
- if [ "$${VID}" == "1" ] ; then \
- echo "#define CONFIG_SYS_VIDEO" >> $(obj)include/config.h ; \
- fi; \
- if [ "$${USB}" == "1" ] ; then \
- echo "#define CONFIG_SYS_USBCTRL" >> $(obj)include/config.h ; \
- fi
- @$(MKCONFIG) -n $@ -a M5485EVB m68k mcf547x_8x m548xevb freescale
-
#========================================================================
# ARM
#========================================================================
diff --git a/arch/m68k/cpu/mcf5227x/Makefile b/arch/m68k/cpu/mcf5227x/Makefile
index eb36264..0490f0e 100644
--- a/arch/m68k/cpu/mcf5227x/Makefile
+++ b/arch/m68k/cpu/mcf5227x/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
# CFLAGS += -DET_DEBUG
-LIB = lib$(CPU).o
+LIB = $(obj)lib$(CPU).o
START = start.o
COBJS = cpu.o speed.o cpu_init.o interrupts.o
diff --git a/arch/m68k/cpu/mcf523x/Makefile b/arch/m68k/cpu/mcf523x/Makefile
index eb36264..0490f0e 100644
--- a/arch/m68k/cpu/mcf523x/Makefile
+++ b/arch/m68k/cpu/mcf523x/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
# CFLAGS += -DET_DEBUG
-LIB = lib$(CPU).o
+LIB = $(obj)lib$(CPU).o
START = start.o
COBJS = cpu.o speed.o cpu_init.o interrupts.o
diff --git a/arch/m68k/cpu/mcf532x/Makefile b/arch/m68k/cpu/mcf532x/Makefile
index 257d46d..eb043d9 100644
--- a/arch/m68k/cpu/mcf532x/Makefile
+++ b/arch/m68k/cpu/mcf532x/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
# CFLAGS += -DET_DEBUG
-LIB = lib$(CPU).o
+LIB = $(obj)lib$(CPU).o
START =
COBJS = cpu.o speed.o cpu_init.o interrupts.o
diff --git a/arch/m68k/cpu/mcf5445x/Makefile b/arch/m68k/cpu/mcf5445x/Makefile
index 047e35d..5b7ddd6 100644
--- a/arch/m68k/cpu/mcf5445x/Makefile
+++ b/arch/m68k/cpu/mcf5445x/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
# CFLAGS += -DET_DEBUG
-LIB = lib$(CPU).o
+LIB = $(obj)lib$(CPU).o
START = start.o
COBJS = cpu.o speed.o cpu_init.o interrupts.o pci.o
diff --git a/arch/m68k/cpu/mcf547x_8x/Makefile
b/arch/m68k/cpu/mcf547x_8x/Makefile
index e41ce68..a415aab 100644
--- a/arch/m68k/cpu/mcf547x_8x/Makefile
+++ b/arch/m68k/cpu/mcf547x_8x/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
# CFLAGS += -DET_DEBUG
-LIB = lib$(CPU).o
+LIB = $(obj)lib$(CPU).o
START =
COBJS = cpu.o speed.o cpu_init.o pci.o interrupts.o slicetimer.o
diff --git a/board/BuS/EB+MCF-EV123/u-boot.lds
b/board/BuS/EB+MCF-EV123/u-boot.lds
index e0359e3..99f9576 100644
--- a/board/BuS/EB+MCF-EV123/u-boot.lds
+++ b/board/BuS/EB+MCF-EV123/u-boot.lds
@@ -52,15 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- /* WARNING - the following is hand-optimized to fit within */
- /* the sector layout of our flash chips! XXX FIXME XXX */
-
arch/m68k/cpu/mcf52x2/start.o (.text)
- common/dlmalloc.o (.text)
- lib/string.o (.text)
- lib/vsprintf.o (.text)
- lib/crc32.o (.text)
- lib/zlib.o (.text)
/* . = env_offset; */
common/env_embedded.o(.text)
diff --git a/board/cobra5272/u-boot.lds b/board/cobra5272/u-boot.lds
index da14807..251cc6b 100644
--- a/board/cobra5272/u-boot.lds
+++ b/board/cobra5272/u-boot.lds
@@ -52,14 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- /* WARNING - the following is hand-optimized to fit within */
- /* the sector layout of our flash chips! XXX FIXME XXX */
arch/m68k/cpu/mcf52x2/start.o (.text)
- arch/m68k/cpu/mcf52x2/cpu_init.o (.text)
- arch/m68k/lib/traps.o (.text)
- arch/m68k/cpu/mcf52x2/interrupts.o (.text)
- common/dlmalloc.o (.text)
- lib/zlib.o (.text)
. = DEFINED(env_offset) ? env_offset : .;
common/env_embedded.o (.text)
diff --git a/board/esd/tasreg/u-boot.lds b/board/esd/tasreg/u-boot.lds
index 27a6b93..c9b4781 100644
--- a/board/esd/tasreg/u-boot.lds
+++ b/board/esd/tasreg/u-boot.lds
@@ -52,14 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- /* WARNING - the following is hand-optimized to fit within */
- /* the sector layout of our flash chips! XXX FIXME XXX */
-
arch/m68k/cpu/mcf52x2/start.o (.text)
- arch/m68k/lib/traps.o (.text)
- arch/m68k/cpu/mcf52x2/interrupts.o (.text)
- common/dlmalloc.o (.text)
- lib/zlib.o (.text)
. = DEFINED(env_offset) ? env_offset : .;
common/env_embedded.o (.text)
diff --git a/board/freescale/m52277evb/.gitignore
b/board/freescale/m52277evb/.gitignore
new file mode 100644
index 0000000..09f1be0
--- /dev/null
+++ b/board/freescale/m52277evb/.gitignore
@@ -0,0 +1 @@
+u-boot.lds
diff --git a/board/freescale/m5235evb/.gitignore
b/board/freescale/m5235evb/.gitignore
new file mode 100644
index 0000000..09f1be0
--- /dev/null
+++ b/board/freescale/m5235evb/.gitignore
@@ -0,0 +1 @@
+u-boot.lds
diff --git a/board/freescale/m5235evb/u-boot.16
b/board/freescale/m5235evb/u-boot.16
index 657cd9d..3183cba 100644
--- a/board/freescale/m5235evb/u-boot.16
+++ b/board/freescale/m5235evb/u-boot.16
@@ -52,15 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- /* WARNING - the following is hand-optimized to fit within */
- /* the sector layout of our flash chips! XXX FIXME XXX */
-
arch/m68k/cpu/mcf523x/start.o (.text)
- arch/m68k/cpu/mcf523x/cpu_init.o (.text)
- arch/m68k/lib/traps.o (.text)
- arch/m68k/lib/interrupts.o (.text)
- common/dlmalloc.o (.text)
- lib/zlib.o (.text)
. = DEFINED(env_offset) ? env_offset : .;
common/env_embedded.o (.text)
diff --git a/board/freescale/m5235evb/u-boot.32
b/board/freescale/m5235evb/u-boot.32
index 1f91994..3183cba 100644
--- a/board/freescale/m5235evb/u-boot.32
+++ b/board/freescale/m5235evb/u-boot.32
@@ -52,23 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- /* WARNING - the following is hand-optimized to fit within */
- /* the sector layout of our flash chips! XXX FIXME XXX */
-
arch/m68k/cpu/mcf523x/start.o (.text)
- arch/m68k/cpu/mcf523x/cpu.o (.text)
- arch/m68k/cpu/mcf523x/cpu_init.o (.text)
- arch/m68k/cpu/mcf523x/interrupts.o (.text)
- arch/m68k/cpu/mcf523x/speed.o (.text)
- arch/m68k/lib/libm68k.o (.text)
- common/dlmalloc.o (.text)
- common/cmd_bootm.o (.text)
- common/cmd_flash.o (.text)
- common/cmd_elf.o (.text)
- common/cmd_mem.o (.text)
- common/console.o (.text)
- common/main.o (.text)
- lib/libgeneric.o (.text)
. = DEFINED(env_offset) ? env_offset : .;
common/env_embedded.o (.text)
diff --git a/board/freescale/m5249evb/u-boot.lds
b/board/freescale/m5249evb/u-boot.lds
index 27a6b93..c9b4781 100644
--- a/board/freescale/m5249evb/u-boot.lds
+++ b/board/freescale/m5249evb/u-boot.lds
@@ -52,14 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- /* WARNING - the following is hand-optimized to fit within */
- /* the sector layout of our flash chips! XXX FIXME XXX */
-
arch/m68k/cpu/mcf52x2/start.o (.text)
- arch/m68k/lib/traps.o (.text)
- arch/m68k/cpu/mcf52x2/interrupts.o (.text)
- common/dlmalloc.o (.text)
- lib/zlib.o (.text)
. = DEFINED(env_offset) ? env_offset : .;
common/env_embedded.o (.text)
diff --git a/board/freescale/m5253evbe/u-boot.lds
b/board/freescale/m5253evbe/u-boot.lds
index 34aa73d..f0d4f0e 100644
--- a/board/freescale/m5253evbe/u-boot.lds
+++ b/board/freescale/m5253evbe/u-boot.lds
@@ -52,14 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- /* WARNING - the following is hand-optimized to fit within */
- /* the sector layout of our flash chips! XXX FIXME XXX */
-
arch/m68k/cpu/mcf52x2/start.o (.text)
- arch/m68k/lib/traps.o (.text)
- arch/m68k/cpu/mcf52x2/interrupts.o (.text)
- common/dlmalloc.o (.text)
- lib/zlib.o (.text)
. = DEFINED(env_offset) ? env_offset : .;
common/env_embedded.o (.text)
diff --git a/board/freescale/m5272c3/u-boot.lds
b/board/freescale/m5272c3/u-boot.lds
index ff5bfe6..251cc6b 100644
--- a/board/freescale/m5272c3/u-boot.lds
+++ b/board/freescale/m5272c3/u-boot.lds
@@ -52,14 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- /* WARNING - the following is hand-optimized to fit within */
- /* the sector layout of our flash chips! XXX FIXME XXX */
-
arch/m68k/cpu/mcf52x2/start.o (.text)
- arch/m68k/lib/traps.o (.text)
- arch/m68k/cpu/mcf52x2/interrupts.o (.text)
- common/dlmalloc.o (.text)
- lib/zlib.o (.text)
. = DEFINED(env_offset) ? env_offset : .;
common/env_embedded.o (.text)
diff --git a/board/freescale/m5275evb/u-boot.lds
b/board/freescale/m5275evb/u-boot.lds
index 8e792fe..0eb2a49 100644
--- a/board/freescale/m5275evb/u-boot.lds
+++ b/board/freescale/m5275evb/u-boot.lds
@@ -52,13 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- /* WARNING - the following is hand-optimized to fit within */
- /* the sector layout of our flash chips! XXX FIXME XXX */
-
arch/m68k/cpu/mcf52x2/start.o (.text)
- common/dlmalloc.o (.text)
- lib/string.o (.text)
- lib/zlib.o (.text)
. = DEFINED(env_offset) ? env_offset : .;
common/env_embedded.o(.text)
diff --git a/board/freescale/m54451evb/.gitignore
b/board/freescale/m54451evb/.gitignore
new file mode 100644
index 0000000..09f1be0
--- /dev/null
+++ b/board/freescale/m54451evb/.gitignore
@@ -0,0 +1 @@
+u-boot.lds
diff --git a/board/freescale/m54455evb/.gitignore
b/board/freescale/m54455evb/.gitignore
new file mode 100644
index 0000000..09f1be0
--- /dev/null
+++ b/board/freescale/m54455evb/.gitignore
@@ -0,0 +1 @@
+u-boot.lds
diff --git a/board/idmr/u-boot.lds b/board/idmr/u-boot.lds
index e16a266..46533b9 100644
--- a/board/idmr/u-boot.lds
+++ b/board/idmr/u-boot.lds
@@ -53,14 +53,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- /* WARNING - the following is hand-optimized to fit within */
- /* the sector layout of our flash chips! XXX FIXME XXX */
-
arch/m68k/cpu/mcf52x2/start.o (.text)
- arch/m68k/lib/traps.o (.text)
- arch/m68k/cpu/mcf52x2/interrupts.o (.text)
- common/dlmalloc.o (.text)
- lib/zlib.o (.text)
. = DEFINED(env_offset) ? env_offset : .;
common/env_embedded.o (.ppcenv)
diff --git a/boards.cfg b/boards.cfg
index 60723d5..16ea8f9 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -270,6 +270,7 @@ tcm-bf518 blackfin blackfin
tcm-bf537 blackfin blackfin
eNET x86 x86 eNET -
sc520 eNET:SYS_TEXT_BASE=0x38040000
eNET_SRAM x86 x86 eNET -
sc520 eNET:SYS_TEXT_BASE=0x19000000
+cobra5272 m68k mcf52x2 cobra5272 -
idmr m68k mcf52x2
TASREG m68k mcf52x2 tasreg esd
M5208EVBE m68k mcf52x2 m5208evbe
freescale
@@ -280,8 +281,26 @@ M5271EVB m68k mcf52x2
m5271evb freesca
M5272C3 m68k mcf52x2 m5272c3
freescale
M5275EVB m68k mcf52x2 m5275evb
freescale
M5282EVB m68k mcf52x2 m5282evb
freescale
+astro_mcf5373l m68k mcf532x mcf5373l astro
M53017EVB m68k mcf532x m53017evb
freescale
-EP2500 m68k mcf52x2 ep2500
Mercury
+M5329AFEE m68k mcf532x m5329evb
freescale - M5329EVB:NANDFLASH_SIZE=0
+M5329BFEE m68k mcf532x m5329evb
freescale - M5329EVB:NANDFLASH_SIZE=16
+M5373EVB m68k mcf532x m5373evb
freescale - M5373EVB:NANDFLASH_SIZE=16
+M5475AFE m68k mcf547x_8x m547xevb
freescale -
M5475EVB:SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64
+M5475BFE m68k mcf547x_8x m547xevb
freescale -
M5475EVB:SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16
+M5475CFE m68k mcf547x_8x m547xevb
freescale -
M5475EVB:SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO,SYS_USBCTRL
+M5475DFE m68k mcf547x_8x m547xevb
freescale -
M5475EVB:SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_USBCTRL
+M5475EFE m68k mcf547x_8x m547xevb
freescale -
M5475EVB:SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_VIDEO,SYS_USBCTRL
+M5475FFE m68k mcf547x_8x m547xevb
freescale -
M5475EVB:SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=32,SYS_VIDEO,SYS_USBCTRL,SYS_DRAMSZ1=64
+M5475GFE m68k mcf547x_8x m547xevb
freescale -
M5475EVB:SYS_BUSCLK=133333333,SYS_BOOTSZ=4,SYS_DRAMSZ=64
+M5485AFE m68k mcf547x_8x m548xevb
freescale -
M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64
+M5485BFE m68k mcf547x_8x m548xevb
freescale -
M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16
+M5485CFE m68k mcf547x_8x m548xevb
freescale -
M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO,SYS_USBCTRL
+M5485DFE m68k mcf547x_8x m548xevb
freescale -
M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_USBCTRL
+M5485EFE m68k mcf547x_8x m548xevb
freescale -
M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_VIDEO,SYS_USBCTRL
+M5485FFE m68k mcf547x_8x m548xevb
freescale -
M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=32,SYS_VIDEO,SYS_USBCTRL,SYS_DRAMSZ1=64
+M5485GFE m68k mcf547x_8x m548xevb
freescale -
M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=4,SYS_DRAMSZ=64
+M5485HFE m68k mcf547x_8x m548xevb
freescale -
M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO
microblaze-generic microblaze microblaze microblaze-generic xilinx
dbau1000 mips mips32 dbau1x00 -
au1x00 dbau1x00:DBAU1000
dbau1100 mips mips32 dbau1x00 -
au1x00 dbau1x00:DBAU1100
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 3adcf4d..4e7b735 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -60,7 +60,7 @@
#define CONFIG_CMD_PING
#define CONFIG_CMD_REGINFO
-#ifdef NANDFLASH_SIZE
+#ifdef CONFIG_NANDFLASH_SIZE
# define CONFIG_CMD_NAND
#endif
@@ -210,7 +210,7 @@
# define CONFIG_SYS_FLASH_PROTECTION /* "Real" (hardware) sectors
protection */
#endif
-#ifdef NANDFLASH_SIZE
+#ifdef CONFIG_NANDFLASH_SIZE
# define CONFIG_SYS_MAX_NAND_DEVICE 1
# define CONFIG_SYS_NAND_BASE CONFIG_SYS_CS2_BASE
# define CONFIG_SYS_NAND_SIZE 1
@@ -266,9 +266,9 @@
#define CONFIG_SYS_CS1_MASK 0x001f0001
#define CONFIG_SYS_CS1_CTRL 0x002A3780
-#ifdef NANDFLASH_SIZE
+#ifdef CONFIG_NANDFLASH_SIZE
#define CONFIG_SYS_CS2_BASE 0x20000000
-#define CONFIG_SYS_CS2_MASK ((NANDFLASH_SIZE << 20) | 1)
+#define CONFIG_SYS_CS2_MASK ((CONFIG_NANDFLASH_SIZE << 20) | 1)
#define CONFIG_SYS_CS2_CTRL 0x00001f60
#endif
--
1.7.1
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
