mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 23:24:38 +00:00
Merge branch 'master' of git://git.denx.de/u-boot-coldfire
* 'master' of git://git.denx.de/u-boot-coldfire: ColdFire: The EB+MCF-EV123 boards config update ColdFire: Fix the compile issue for M52277 ColdFire:Moving the remaining coldfire boards to boards.cfg
This commit is contained in:
Wolfgang Denk
commit
7ba6d591b5
6 changed files with 17 additions and 115 deletions
108
Makefile
108
Makefile
|
|
@ -638,114 +638,6 @@ $(obj).boards.depend: boards.cfg
|
|||
lcname = $(shell echo $(1) | sed -e 's/\(.*\)_config/\L\1/')
|
||||
ucname = $(shell echo $(1) | sed -e 's/\(.*\)_config/\U\1/')
|
||||
|
||||
#########################################################################
|
||||
## Coldfire
|
||||
#########################################################################
|
||||
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;; \
|
||||
M52277EVB_stmicro_config) FLASH=STMICRO;; \
|
||||
esac; \
|
||||
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 ; \
|
||||
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 ; \
|
||||
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;; \
|
||||
M5235EVB_Flash32_config) FLASH=32;; \
|
||||
esac; \
|
||||
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 ; \
|
||||
else \
|
||||
echo "CONFIG_SYS_TEXT_BASE = 0xFFE00000" > $(obj)board/freescale/m5235evb/config.tmp ; \
|
||||
fi
|
||||
@$(MKCONFIG) -n $@ -a M5235EVB m68k mcf523x m5235evb freescale
|
||||
|
||||
EB+MCF-EV123_config : unconfig
|
||||
@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)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
|
||||
|
||||
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 ; \
|
||||
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 ; \
|
||||
fi; \
|
||||
echo "#define CONFIG_SYS_INPUT_CLKSRC 24000000" >> $(obj)include/config.h ;
|
||||
@$(MKCONFIG) -n $@ -a M54451EVB m68k mcf5445x m54451evb freescale
|
||||
|
||||
M54455EVB_config \
|
||||
M54455EVB_atmel_config \
|
||||
M54455EVB_intel_config \
|
||||
M54455EVB_a33_config \
|
||||
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;; \
|
||||
M54455EVB_intel_config) FLASH=INTEL; FREQ=33333333;; \
|
||||
M54455EVB_a33_config) FLASH=ATMEL; FREQ=33333333;; \
|
||||
M54455EVB_a66_config) FLASH=ATMEL; FREQ=66666666;; \
|
||||
M54455EVB_i33_config) FLASH=INTEL; FREQ=33333333;; \
|
||||
M54455EVB_i66_config) FLASH=INTEL; FREQ=66666666;; \
|
||||
M54455EVB_stm33_config) FLASH=STMICRO; FREQ=33333333;; \
|
||||
esac; \
|
||||
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 ; \
|
||||
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 ; \
|
||||
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 ; \
|
||||
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
|
||||
|
||||
#========================================================================
|
||||
# ARM
|
||||
#========================================================================
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@
|
|||
# MA 02111-1307 USA
|
||||
#
|
||||
|
||||
sinclude $(OBJTREE)/board/$(BOARDDIR)/textbase.mk
|
||||
ifndef CONFIG_SYS_TEXT_BASE
|
||||
CONFIG_SYS_TEXT_BASE = 0xFE000000
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_SYS_TEXT_BASE = 0xFFE00000
|
||||
|
|
@ -32,9 +32,6 @@ SECTIONS
|
|||
arch/m68k/cpu/mcf5227x/libmcf5227x.o (.text*)
|
||||
arch/m68k/lib/libm68k.o (.text*)
|
||||
|
||||
. = DEFINED(env_offset) ? env_offset : .;
|
||||
common/env_embedded.o (.text*)
|
||||
|
||||
*(.text*)
|
||||
}
|
||||
_etext = .;
|
||||
|
|
|
|||
13
boards.cfg
13
boards.cfg
|
|
@ -278,6 +278,19 @@ M5271EVB m68k mcf52x2 m5271evb freesca
|
|||
M5272C3 m68k mcf52x2 m5272c3 freescale
|
||||
M5275EVB m68k mcf52x2 m5275evb freescale
|
||||
M5282EVB m68k mcf52x2 m5282evb freescale
|
||||
M52277EVB m68k mcf5227x m52277evb freescale - M52277EVB:SYS_SPANSION_BOOT,SYS_TEXT_BASE=0x00000000
|
||||
M52277EVB_stmicro m68k mcf5227x m52277evb freescale - M52277EVB:CF_SBF,SYS_STMICRO_BOOT,SYS_TEXT_BASE=0x43E00000
|
||||
EB-MCF-EV123 m68k mcf52x2 EB+MCF-EV123 BuS - EB+MCF-EV123:SYS_TEXT_BASE=0xFFE00000
|
||||
EB-MCF-EV123_internal m68k mcf52x2 EB+MCF-EV123 BuS - EB+MCF-EV123:SYS_TEXT_BASE=0xF0000000
|
||||
M5235EVB m68k mcf523x m5235evb freescale - M5235EVB:SYS_TEXT_BASE=0xFFE00000
|
||||
M5235EVB_Flash32 m68k mcf523x m5235evb freescale - M5235EVB:NORFLASH_PS32BIT,SYS_TEXT_BASE=0xFFC00000
|
||||
M54455EVB m68k mcf5445x m54455evb freescale - M54455EVB:SYS_ATMEL_BOOT,SYS_TEXT_BASE=0x04000000,SYS_INPUT_CLKSRC=33333333
|
||||
M54455EVB_intel m68k mcf5445x m54455evb freescale - M54455EVB:SYS_INTEL_BOOT,SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=33333333
|
||||
M54455EVB_a66 m68k mcf5445x m54455evb freescale - M54455EVB:SYS_ATMEL_BOOT,SYS_TEXT_BASE=0x04000000,SYS_INPUT_CLKSRC=66666666
|
||||
M54455EVB_i66 m68k mcf5445x m54455evb freescale - M54455EVB:SYS_INTEL_BOOT,SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=66666666
|
||||
M54455EVB_stm33 m68k mcf5445x m54455evb freescale - M54455EVB:SYS_STMICRO_BOOT,CF_SBF,SYS_TEXT_BASE=0x4FE00000,SYS_INPUT_CLKSRC=33333333
|
||||
M54451EVB m68k mcf5445x m54451evb freescale - M54451EVB:SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=24000000
|
||||
M54451EVB_stmicro m68k mcf5445x m54451evb freescale - M54451EVB:CF_SBF,SYS_STMICRO_BOOT,SYS_TEXT_BASE=0x47e00000,SYS_INPUT_CLKSRC=24000000
|
||||
astro_mcf5373l m68k mcf532x mcf5373l astro
|
||||
M53017EVB m68k mcf532x m53017evb freescale
|
||||
M5329AFEE m68k mcf532x m5329evb freescale - M5329EVB:NANDFLASH_SIZE=0
|
||||
|
|
|
|||
|
|
@ -246,7 +246,8 @@
|
|||
|
||||
/*
|
||||
* Configuration for environment
|
||||
* Environment is embedded in u-boot in the second sector of the flash
|
||||
* Environment is not embedded in u-boot. First time runing may have env
|
||||
* crc error warning if there is no correct environment on the flash.
|
||||
*/
|
||||
#ifdef CONFIG_CF_SBF
|
||||
# define CONFIG_ENV_IS_IN_SPI_FLASH
|
||||
|
|
@ -261,6 +262,7 @@
|
|||
*/
|
||||
#ifdef CONFIG_SYS_STMICRO_BOOT
|
||||
# define CONFIG_SYS_FLASH_BASE CONFIG_SYS_CS0_BASE
|
||||
# define CONFIG_SYS_FLASH0_BASE CONFIG_SYS_CS0_BASE
|
||||
# define CONFIG_ENV_OFFSET 0x30000
|
||||
# define CONFIG_ENV_SIZE 0x1000
|
||||
# define CONFIG_ENV_SECT_SIZE 0x10000
|
||||
|
|
@ -268,7 +270,7 @@
|
|||
#ifdef CONFIG_SYS_SPANSION_BOOT
|
||||
# define CONFIG_SYS_FLASH_BASE CONFIG_SYS_CS0_BASE
|
||||
# define CONFIG_SYS_FLASH0_BASE CONFIG_SYS_CS0_BASE
|
||||
# define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x8000)
|
||||
# define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x40000)
|
||||
# define CONFIG_ENV_SIZE 0x1000
|
||||
# define CONFIG_ENV_SECT_SIZE 0x8000
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue