LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename TEXT_BASE into CONFIG_SYS_TEXT_BASE 

The change is currently needed to be able to remove the board
configuration scripting from the top level Makefile and replace it by
a simple, table driven script.

Moving this configuration setting into the "CONFIG_*" name space is
also desirable because it is needed if we ever should move forward to
a Kconfig driven configuration system.

Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk 2010-10-07 21:51:12 +02:00
parent d24f2d321d
commit 14d0a02a16
797 changed files with 1493 additions and 1435 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
Makefile
View File

@ -330,18 +330,18 @@ $(obj)u-boot.ldr.srec: $(obj)u-boot.ldr
$(obj)u-boot.img: $(obj)u-boot.bin $(obj)u-boot.img: $(obj)u-boot.bin
$(obj)tools/mkimage -A $(ARCH) -T firmware -C none \ $(obj)tools/mkimage -A $(ARCH) -T firmware -C none \
-a $(TEXT_BASE) -e 0 \ -a $(CONFIG_SYS_TEXT_BASE) -e 0 \
-n $(shell sed -n -e 's/.*U_BOOT_VERSION//p' $(VERSION_FILE) | \ -n $(shell sed -n -e 's/.*U_BOOT_VERSION//p' $(VERSION_FILE) | \
sed -e 's/"[ ]*$$/ for $(BOARD) board"/') \ sed -e 's/"[ ]*$$/ for $(BOARD) board"/') \
-d $< $@ -d $< $@
$(obj)u-boot.imx: $(obj)u-boot.bin $(obj)u-boot.imx: $(obj)u-boot.bin
$(obj)tools/mkimage -n $(IMX_CONFIG) -T imximage \ $(obj)tools/mkimage -n $(IMX_CONFIG) -T imximage \
-e $(TEXT_BASE) -d $< $@ -e $(CONFIG_SYS_TEXT_BASE) -d $< $@
$(obj)u-boot.kwb: $(obj)u-boot.bin $(obj)u-boot.kwb: $(obj)u-boot.bin
$(obj)tools/mkimage -n $(KWD_CONFIG) -T kwbimage \ $(obj)tools/mkimage -n $(KWD_CONFIG) -T kwbimage \
-a $(TEXT_BASE) -e $(TEXT_BASE) -d $< $@ -a $(CONFIG_SYS_TEXT_BASE) -e $(TEXT_BASE) -d $< $@
$(obj)u-boot.sha1: $(obj)u-boot.bin $(obj)u-boot.sha1: $(obj)u-boot.bin
$(obj)tools/ubsha1 $(obj)u-boot.bin $(obj)tools/ubsha1 $(obj)u-boot.bin
@ -518,9 +518,9 @@ digsy_mtc_RAMBOOT_config: unconfig
@mkdir -p $(obj)board/digsy_mtc @mkdir -p $(obj)board/digsy_mtc
@ >$(obj)include/config.h @ >$(obj)include/config.h
@[ -z "$(findstring LOWBOOT_,$@)" ] || \ @[ -z "$(findstring LOWBOOT_,$@)" ] || \
echo "TEXT_BASE = 0xFF000000" >$(obj)board/digsy_mtc/config.tmp echo "CONFIG_SYS_TEXT_BASE = 0xFF000000" >$(obj)board/digsy_mtc/config.tmp
@[ -z "$(findstring RAMBOOT_,$@)" ] || \ @[ -z "$(findstring RAMBOOT_,$@)" ] || \
echo "TEXT_BASE = 0x00100000" >$(obj)board/digsy_mtc/config.tmp echo "CONFIG_SYS_TEXT_BASE = 0x00100000" >$(obj)board/digsy_mtc/config.tmp
@$(MKCONFIG) -n $@ -a digsy_mtc powerpc mpc5xxx digsy_mtc @$(MKCONFIG) -n $@ -a digsy_mtc powerpc mpc5xxx digsy_mtc
galaxy5200_LOWBOOT_config \ galaxy5200_LOWBOOT_config \
@ -542,11 +542,11 @@ icecube_5200_DDR_LOWBOOT08_config: unconfig
@mkdir -p $(obj)board/icecube @mkdir -p $(obj)board/icecube
@[ -z "$(findstring LOWBOOT_,$@)" ] || \ @[ -z "$(findstring LOWBOOT_,$@)" ] || \
if [ "$(findstring DDR,$@)" ] ; \ if [ "$(findstring DDR,$@)" ] ; \
then echo "TEXT_BASE = 0xFF800000" >$(obj)board/icecube/config.tmp ; \ then echo "CONFIG_SYS_TEXT_BASE = 0xFF800000" >$(obj)board/icecube/config.tmp ; \
else echo "TEXT_BASE = 0xFF000000" >$(obj)board/icecube/config.tmp ; \ else echo "CONFIG_SYS_TEXT_BASE = 0xFF000000" >$(obj)board/icecube/config.tmp ; \
fi fi
@[ -z "$(findstring LOWBOOT08,$@)" ] || \ @[ -z "$(findstring LOWBOOT08,$@)" ] || \
echo "TEXT_BASE = 0xFF800000" >$(obj)board/icecube/config.tmp echo "CONFIG_SYS_TEXT_BASE = 0xFF800000" >$(obj)board/icecube/config.tmp
@[ -z "$(findstring DDR,$@)" ] || \ @[ -z "$(findstring DDR,$@)" ] || \
echo "#define CONFIG_MPC5200_DDR" >>$(obj)include/config.h echo "#define CONFIG_MPC5200_DDR" >>$(obj)include/config.h
@$(MKCONFIG) -n $@ -a IceCube powerpc mpc5xxx icecube @$(MKCONFIG) -n $@ -a IceCube powerpc mpc5xxx icecube
@ -561,7 +561,7 @@ lite5200b_LOWBOOT_config: unconfig
@[ -z "$(findstring _PM_,$@)" ] || \ @[ -z "$(findstring _PM_,$@)" ] || \
echo "#define CONFIG_LITE5200B_PM" >>$(obj)include/config.h echo "#define CONFIG_LITE5200B_PM" >>$(obj)include/config.h
@[ -z "$(findstring LOWBOOT_,$@)" ] || \ @[ -z "$(findstring LOWBOOT_,$@)" ] || \
echo "TEXT_BASE = 0xFF000000" >$(obj)board/icecube/config.tmp echo "CONFIG_SYS_TEXT_BASE = 0xFF000000" >$(obj)board/icecube/config.tmp
@$(MKCONFIG) -n $@ -a IceCube powerpc mpc5xxx icecube @$(MKCONFIG) -n $@ -a IceCube powerpc mpc5xxx icecube
mcc200_config \ mcc200_config \
@ -579,7 +579,7 @@ prs200_highboot_DDR_config: unconfig
@mkdir -p $(obj)include @mkdir -p $(obj)include
@mkdir -p $(obj)board/mcc200 @mkdir -p $(obj)board/mcc200
@[ -z "$(findstring highboot,$@)" ] || \ @[ -z "$(findstring highboot,$@)" ] || \
echo "TEXT_BASE = 0xFFF00000" >$(obj)board/mcc200/config.tmp echo "CONFIG_SYS_TEXT_BASE = 0xFFF00000" >$(obj)board/mcc200/config.tmp
@[ -n "$(findstring _SDRAM,$@)" ] || \ @[ -n "$(findstring _SDRAM,$@)" ] || \
if [ -n "$(findstring prs200,$@)" ]; \ if [ -n "$(findstring prs200,$@)" ]; \
then \ then \
@ -614,7 +614,7 @@ pcm030_LOWBOOT_config: unconfig
@mkdir -p $(obj)include $(obj)board/phytec/pcm030 @mkdir -p $(obj)include $(obj)board/phytec/pcm030
@ >$(obj)include/config.h @ >$(obj)include/config.h
@[ -z "$(findstring LOWBOOT_,$@)" ] || \ @[ -z "$(findstring LOWBOOT_,$@)" ] || \
echo "TEXT_BASE = 0xFF000000" >$(obj)board/phytec/pcm030/config.tmp echo "CONFIG_SYS_TEXT_BASE = 0xFF000000" >$(obj)board/phytec/pcm030/config.tmp
@$(MKCONFIG) -n $@ -a pcm030 powerpc mpc5xxx pcm030 phytec @$(MKCONFIG) -n $@ -a pcm030 powerpc mpc5xxx pcm030 phytec
PM520_config \ PM520_config \
@ -653,7 +653,7 @@ Total5200_Rev2_lowboot_config: unconfig
@[ -z "$(findstring Rev2_,$@)" ] || \ @[ -z "$(findstring Rev2_,$@)" ] || \
echo "#define CONFIG_TOTAL5200_REV 2" >>$(obj)include/config.h echo "#define CONFIG_TOTAL5200_REV 2" >>$(obj)include/config.h
@[ -z "$(findstring lowboot_,$@)" ] || \ @[ -z "$(findstring lowboot_,$@)" ] || \
echo "TEXT_BASE = 0xFE000000" >$(obj)board/total5200/config.tmp echo "CONFIG_SYS_TEXT_BASE = 0xFE000000" >$(obj)board/total5200/config.tmp
@$(MKCONFIG) -n $@ -a Total5200 powerpc mpc5xxx total5200 @$(MKCONFIG) -n $@ -a Total5200 powerpc mpc5xxx total5200
cam5200_config \ cam5200_config \
@ -688,7 +688,7 @@ TQM5200_STK100_config: unconfig
echo "#define CONFIG_TQM5200_B" >>$(obj)include/config.h ; \ echo "#define CONFIG_TQM5200_B" >>$(obj)include/config.h ; \
} }
@[ -z "$(findstring HIGHBOOT,$@)" ] || \ @[ -z "$(findstring HIGHBOOT,$@)" ] || \
echo "TEXT_BASE = 0xFFF00000" >$(obj)board/tqm5200/config.tmp echo "CONFIG_SYS_TEXT_BASE = 0xFFF00000" >$(obj)board/tqm5200/config.tmp
@$(MKCONFIG) -n $@ -a TQM5200 powerpc mpc5xxx tqm5200 tqc @$(MKCONFIG) -n $@ -a TQM5200 powerpc mpc5xxx tqm5200 tqc
######################################################################### #########################################################################
@ -921,7 +921,7 @@ acadia_nand_config: unconfig
@mkdir -p $(obj)include $(obj)board/amcc/acadia @mkdir -p $(obj)include $(obj)board/amcc/acadia
@mkdir -p $(obj)nand_spl/board/amcc/acadia @mkdir -p $(obj)nand_spl/board/amcc/acadia
@echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
@echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/acadia/config.tmp @echo "CONFIG_SYS_TEXT_BASE = 0x01000000" > $(obj)board/amcc/acadia/config.tmp
@echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
@$(MKCONFIG) -n $@ -a acadia powerpc ppc4xx acadia amcc @$(MKCONFIG) -n $@ -a acadia powerpc ppc4xx acadia amcc
@ -929,7 +929,7 @@ bamboo_nand_config: unconfig
@mkdir -p $(obj)include $(obj)board/amcc/bamboo @mkdir -p $(obj)include $(obj)board/amcc/bamboo
@mkdir -p $(obj)nand_spl/board/amcc/bamboo @mkdir -p $(obj)nand_spl/board/amcc/bamboo
@echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
@echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/bamboo/config.tmp @echo "CONFIG_SYS_TEXT_BASE = 0x01000000" > $(obj)board/amcc/bamboo/config.tmp
@echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
@$(MKCONFIG) -n $@ -a bamboo powerpc ppc4xx bamboo amcc @$(MKCONFIG) -n $@ -a bamboo powerpc ppc4xx bamboo amcc
@ -949,7 +949,7 @@ glacier_nand_config: unconfig
@echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
@echo "#define CONFIG_$$(echo $(subst ,,$(@:_nand_config=)) | \ @echo "#define CONFIG_$$(echo $(subst ,,$(@:_nand_config=)) | \
tr '[:lower:]' '[:upper:]')" >> $(obj)include/config.h tr '[:lower:]' '[:upper:]')" >> $(obj)include/config.h
@echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/canyonlands/config.tmp @echo "CONFIG_SYS_TEXT_BASE = 0x01000000" > $(obj)board/amcc/canyonlands/config.tmp
@echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
@$(MKCONFIG) -n $@ -a canyonlands powerpc ppc4xx canyonlands amcc @$(MKCONFIG) -n $@ -a canyonlands powerpc ppc4xx canyonlands amcc
@ -977,7 +977,7 @@ fx12mm_flash_config: unconfig
@mkdir -p $(obj)include $(obj)board/avnet/fx12mm @mkdir -p $(obj)include $(obj)board/avnet/fx12mm
@echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-rom.lds"\ @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-rom.lds"\
> $(obj)board/avnet/fx12mm/config.tmp > $(obj)board/avnet/fx12mm/config.tmp
@echo "TEXT_BASE := 0xFFCB0000" \ @echo "CONFIG_SYS_TEXT_BASE := 0xFFCB0000" \
>> $(obj)board/avnet/fx12mm/config.tmp >> $(obj)board/avnet/fx12mm/config.tmp
@$(MKCONFIG) fx12mm powerpc ppc4xx fx12mm avnet @$(MKCONFIG) fx12mm powerpc ppc4xx fx12mm avnet
@ -986,7 +986,7 @@ fx12mm_config: unconfig
@mkdir -p $(obj)include $(obj)board/avnet/fx12mm @mkdir -p $(obj)include $(obj)board/avnet/fx12mm
@echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-ram.lds"\ @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-ram.lds"\
> $(obj)board/avnet/fx12mm/config.tmp > $(obj)board/avnet/fx12mm/config.tmp
@echo "TEXT_BASE := 0x03000000" \ @echo "CONFIG_SYS_TEXT_BASE := 0x03000000" \
>> $(obj)board/avnet/fx12mm/config.tmp >> $(obj)board/avnet/fx12mm/config.tmp
@$(MKCONFIG) fx12mm powerpc ppc4xx fx12mm avnet @$(MKCONFIG) fx12mm powerpc ppc4xx fx12mm avnet
@ -1014,7 +1014,7 @@ haleakala_nand_config: unconfig
@mkdir -p $(obj)include $(obj)board/amcc/kilauea @mkdir -p $(obj)include $(obj)board/amcc/kilauea
@mkdir -p $(obj)nand_spl/board/amcc/kilauea @mkdir -p $(obj)nand_spl/board/amcc/kilauea
@echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
@echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/kilauea/config.tmp @echo "CONFIG_SYS_TEXT_BASE = 0x01000000" > $(obj)board/amcc/kilauea/config.tmp
@echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
@$(MKCONFIG) -n $@ -a kilauea powerpc ppc4xx kilauea amcc @$(MKCONFIG) -n $@ -a kilauea powerpc ppc4xx kilauea amcc
@ -1029,7 +1029,7 @@ ml507_flash_config: unconfig
@mkdir -p $(obj)include $(obj)board/xilinx/ml507 @mkdir -p $(obj)include $(obj)board/xilinx/ml507
@echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds"\ @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds"\
> $(obj)board/xilinx/ml507/config.tmp > $(obj)board/xilinx/ml507/config.tmp
@echo "TEXT_BASE := 0xFE360000" \ @echo "CONFIG_SYS_TEXT_BASE := 0xFE360000" \
>> $(obj)board/xilinx/ml507/config.tmp >> $(obj)board/xilinx/ml507/config.tmp
@$(MKCONFIG) ml507 powerpc ppc4xx ml507 xilinx @$(MKCONFIG) ml507 powerpc ppc4xx ml507 xilinx
@ -1038,7 +1038,7 @@ ml507_config: unconfig
@mkdir -p $(obj)include $(obj)board/xilinx/ml507 @mkdir -p $(obj)include $(obj)board/xilinx/ml507
@echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-ram.lds"\ @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-ram.lds"\
> $(obj)board/xilinx/ml507/config.tmp > $(obj)board/xilinx/ml507/config.tmp
@echo "TEXT_BASE := 0x04000000" \ @echo "CONFIG_SYS_TEXT_BASE := 0x04000000" \
>> $(obj)board/xilinx/ml507/config.tmp >> $(obj)board/xilinx/ml507/config.tmp
@$(MKCONFIG) $@ powerpc ppc4xx ml507 xilinx @$(MKCONFIG) $@ powerpc ppc4xx ml507 xilinx
@ -1080,7 +1080,7 @@ rainier_nand_config: unconfig
@echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
@echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \ @echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \
tr '[:lower:]' '[:upper:]')" >> $(obj)include/config.h tr '[:lower:]' '[:upper:]')" >> $(obj)include/config.h
@echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/sequoia/config.tmp @echo "CONFIG_SYS_TEXT_BASE = 0x01000000" > $(obj)board/amcc/sequoia/config.tmp
@echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
@$(MKCONFIG) -n $@ -a sequoia powerpc ppc4xx sequoia amcc @$(MKCONFIG) -n $@ -a sequoia powerpc ppc4xx sequoia amcc
@ -1090,7 +1090,7 @@ rainier_ramboot_config: unconfig
@echo "#define CONFIG_SYS_RAMBOOT" > $(obj)include/config.h @echo "#define CONFIG_SYS_RAMBOOT" > $(obj)include/config.h
@echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \ @echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \
tr '[:lower:]' '[:upper:]')" >> $(obj)include/config.h tr '[:lower:]' '[:upper:]')" >> $(obj)include/config.h
@echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/sequoia/config.tmp @echo "CONFIG_SYS_TEXT_BASE = 0x01000000" > $(obj)board/amcc/sequoia/config.tmp
@echo "LDSCRIPT = board/amcc/sequoia/u-boot-ram.lds" >> \ @echo "LDSCRIPT = board/amcc/sequoia/u-boot-ram.lds" >> \
$(obj)board/amcc/sequoia/config.tmp $(obj)board/amcc/sequoia/config.tmp
@$(MKCONFIG) -n $@ -a sequoia powerpc ppc4xx sequoia amcc @$(MKCONFIG) -n $@ -a sequoia powerpc ppc4xx sequoia amcc
@ -1100,7 +1100,7 @@ v5fx30teval_config: unconfig
@mkdir -p $(obj)include $(obj)board/avnet/v5fx30teval @mkdir -p $(obj)include $(obj)board/avnet/v5fx30teval
@echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-ram.lds"\ @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-ram.lds"\
> $(obj)board/avnet/v5fx30teval/config.tmp > $(obj)board/avnet/v5fx30teval/config.tmp
@echo "TEXT_BASE := 0x03000000" \ @echo "CONFIG_SYS_TEXT_BASE := 0x03000000" \
>> $(obj)board/avnet/v5fx30teval/config.tmp >> $(obj)board/avnet/v5fx30teval/config.tmp
@$(MKCONFIG) $@ powerpc ppc4xx v5fx30teval avnet @$(MKCONFIG) $@ powerpc ppc4xx v5fx30teval avnet
@ -1109,7 +1109,7 @@ v5fx30teval_flash_config: unconfig
@mkdir -p $(obj)include $(obj)board/avnet/v5fx30teval @mkdir -p $(obj)include $(obj)board/avnet/v5fx30teval
@echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds"\ @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds"\
> $(obj)board/avnet/v5fx30teval/config.tmp > $(obj)board/avnet/v5fx30teval/config.tmp
@echo "TEXT_BASE := 0xFF1C0000" \ @echo "CONFIG_SYS_TEXT_BASE := 0xFF1C0000" \
>> $(obj)board/avnet/v5fx30teval/config.tmp >> $(obj)board/avnet/v5fx30teval/config.tmp
@$(MKCONFIG) v5fx30teval powerpc ppc4xx v5fx30teval avnet @$(MKCONFIG) v5fx30teval powerpc ppc4xx v5fx30teval avnet
@ -1126,7 +1126,7 @@ xilinx-ppc405-generic_flash_config: unconfig
@mkdir -p $(obj)include $(obj)board/xilinx/ppc405-generic @mkdir -p $(obj)include $(obj)board/xilinx/ppc405-generic
@echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-rom.lds"\ @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-rom.lds"\
> $(obj)board/xilinx/ppc405-generic/config.tmp > $(obj)board/xilinx/ppc405-generic/config.tmp
@echo "TEXT_BASE := 0xFE360000" \ @echo "CONFIG_SYS_TEXT_BASE := 0xFE360000" \
>> $(obj)board/xilinx/ppc405-generic/config.tmp >> $(obj)board/xilinx/ppc405-generic/config.tmp
@$(MKCONFIG) xilinx-ppc405-generic powerpc ppc4xx ppc405-generic xilinx @$(MKCONFIG) xilinx-ppc405-generic powerpc ppc4xx ppc405-generic xilinx
@ -1134,7 +1134,7 @@ xilinx-ppc405-generic_config: unconfig
@mkdir -p $(obj)include $(obj)board/xilinx/ppc405-generic @mkdir -p $(obj)include $(obj)board/xilinx/ppc405-generic
@echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-ram.lds"\ @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-ram.lds"\
> $(obj)board/xilinx/ppc405-generic/config.tmp > $(obj)board/xilinx/ppc405-generic/config.tmp
@echo "TEXT_BASE := 0x04000000" \ @echo "CONFIG_SYS_TEXT_BASE := 0x04000000" \
>> $(obj)board/xilinx/ppc405-generic/config.tmp >> $(obj)board/xilinx/ppc405-generic/config.tmp
@$(MKCONFIG) xilinx-ppc405-generic powerpc ppc4xx ppc405-generic xilinx @$(MKCONFIG) xilinx-ppc405-generic powerpc ppc4xx ppc405-generic xilinx
@ -1142,7 +1142,7 @@ xilinx-ppc440-generic_flash_config: unconfig
@mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
@echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds"\ @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds"\
> $(obj)board/xilinx/ppc440-generic/config.tmp > $(obj)board/xilinx/ppc440-generic/config.tmp
@echo "TEXT_BASE := 0xFE360000" \ @echo "CONFIG_SYS_TEXT_BASE := 0xFE360000" \
>> $(obj)board/xilinx/ppc440-generic/config.tmp >> $(obj)board/xilinx/ppc440-generic/config.tmp
@$(MKCONFIG) xilinx-ppc440-generic powerpc ppc4xx ppc440-generic xilinx @$(MKCONFIG) xilinx-ppc440-generic powerpc ppc4xx ppc440-generic xilinx
@ -1150,7 +1150,7 @@ xilinx-ppc440-generic_config: unconfig
@mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
@echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-ram.lds"\ @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-ram.lds"\
> $(obj)board/xilinx/ppc440-generic/config.tmp > $(obj)board/xilinx/ppc440-generic/config.tmp
@echo "TEXT_BASE := 0x04000000" \ @echo "CONFIG_SYS_TEXT_BASE := 0x04000000" \
>> $(obj)board/xilinx/ppc440-generic/config.tmp >> $(obj)board/xilinx/ppc440-generic/config.tmp
@$(MKCONFIG) xilinx-ppc440-generic powerpc ppc4xx ppc440-generic xilinx @$(MKCONFIG) xilinx-ppc440-generic powerpc ppc4xx ppc440-generic xilinx
@ -1265,7 +1265,7 @@ PQ2FADS-ZU_66MHz_lowboot_config \
$(if $(findstring VR,$@), \ $(if $(findstring VR,$@), \
@echo "#define CONFIG_8260_CLKIN 66000000" >> $(obj)include/config.h)) @echo "#define CONFIG_8260_CLKIN 66000000" >> $(obj)include/config.h))
@[ -z "$(findstring lowboot_,$@)" ] || \ @[ -z "$(findstring lowboot_,$@)" ] || \
echo "TEXT_BASE = 0xFF800000" >$(obj)board/freescale/mpc8260ads/config.tmp echo "CONFIG_SYS_TEXT_BASE = 0xFF800000" >$(obj)board/freescale/mpc8260ads/config.tmp
@$(MKCONFIG) -n $@ -a MPC8260ADS powerpc mpc8260 mpc8260ads freescale @$(MKCONFIG) -n $@ -a MPC8260ADS powerpc mpc8260 mpc8260ads freescale
muas3001_dev_config \ muas3001_dev_config \
@ -1295,7 +1295,7 @@ PM826_ROMBOOT_BIGFLASH_config: unconfig
fi fi
@if [ "$(findstring _ROMBOOT_,$@)" ] ; then \ @if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
echo "#define CONFIG_BOOT_ROM" >>$(obj)include/config.h ; \ echo "#define CONFIG_BOOT_ROM" >>$(obj)include/config.h ; \
echo "TEXT_BASE = 0xFF800000" >$(obj)board/pm826/config.tmp ; \ echo "CONFIG_SYS_TEXT_BASE = 0xFF800000" >$(obj)board/pm826/config.tmp ; \
if [ "$(findstring _BIGFLASH_,$@)" ] ; then \ if [ "$(findstring _BIGFLASH_,$@)" ] ; then \
echo "#define CONFIG_FLASH_32MB" >>$(obj)include/config.h ; \ echo "#define CONFIG_FLASH_32MB" >>$(obj)include/config.h ; \
fi; \ fi; \
@ -1303,9 +1303,9 @@ PM826_ROMBOOT_BIGFLASH_config: unconfig
if [ "$(findstring _BIGFLASH_,$@)" ] ; then \ if [ "$(findstring _BIGFLASH_,$@)" ] ; then \
$(XECHO) "... with 32 MB Flash" ; \ $(XECHO) "... with 32 MB Flash" ; \
echo "#define CONFIG_FLASH_32MB" >>$(obj)include/config.h ; \ echo "#define CONFIG_FLASH_32MB" >>$(obj)include/config.h ; \
echo "TEXT_BASE = 0x40000000" >$(obj)board/pm826/config.tmp ; \ echo "CONFIG_SYS_TEXT_BASE = 0x40000000" >$(obj)board/pm826/config.tmp ; \
else \ else \
echo "TEXT_BASE = 0xFF000000" >$(obj)board/pm826/config.tmp ; \ echo "CONFIG_SYS_TEXT_BASE = 0xFF000000" >$(obj)board/pm826/config.tmp ; \
fi; \ fi; \
fi fi
@$(MKCONFIG) -n $@ -a PM826 powerpc mpc8260 pm826 @$(MKCONFIG) -n $@ -a PM826 powerpc mpc8260 pm826
@ -1321,7 +1321,7 @@ PM828_ROMBOOT_PCI_config: unconfig
fi fi
@if [ "$(findstring _ROMBOOT_,$@)" ] ; then \ @if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
echo "#define CONFIG_BOOT_ROM" >>$(obj)include/config.h ; \ echo "#define CONFIG_BOOT_ROM" >>$(obj)include/config.h ; \
echo "TEXT_BASE = 0xFF800000" >$(obj)board/pm826/config.tmp ; \ echo "CONFIG_SYS_TEXT_BASE = 0xFF800000" >$(obj)board/pm826/config.tmp ; \
fi fi
@$(MKCONFIG) -n $@ -a PM828 powerpc mpc8260 pm828 @$(MKCONFIG) -n $@ -a PM828 powerpc mpc8260 pm828
@ -1397,13 +1397,13 @@ M52277EVB_stmicro_config : unconfig
esac; \ esac; \
if [ "$${FLASH}" = "SPANSION" ] ; then \ if [ "$${FLASH}" = "SPANSION" ] ; then \
echo "#define CONFIG_SYS_SPANSION_BOOT" >> $(obj)include/config.h ; \ echo "#define CONFIG_SYS_SPANSION_BOOT" >> $(obj)include/config.h ; \
echo "TEXT_BASE = 0x00000000" > $(obj)board/freescale/m52277evb/config.tmp ; \ 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 $(obj)board/freescale/m52277evb/u-boot.spa $(obj)board/freescale/m52277evb/u-boot.lds ; \
fi; \ fi; \
if [ "$${FLASH}" = "STMICRO" ] ; then \ if [ "$${FLASH}" = "STMICRO" ] ; then \
echo "#define CONFIG_CF_SBF" >> $(obj)include/config.h ; \ echo "#define CONFIG_CF_SBF" >> $(obj)include/config.h ; \
echo "#define CONFIG_SYS_STMICRO_BOOT" >> $(obj)include/config.h ; \ echo "#define CONFIG_SYS_STMICRO_BOOT" >> $(obj)include/config.h ; \
echo "TEXT_BASE = 0x43E00000" > $(obj)board/freescale/m52277evb/config.tmp ; \ 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 $(obj)board/freescale/m52277evb/u-boot.stm $(obj)board/freescale/m52277evb/u-boot.lds ; \
fi fi
@$(MKCONFIG) -n $@ -a M52277EVB m68k mcf5227x m52277evb freescale @$(MKCONFIG) -n $@ -a M52277EVB m68k mcf5227x m52277evb freescale
@ -1418,10 +1418,10 @@ M5235EVB_Flash32_config: unconfig
esac; \ esac; \
if [ "$${FLASH}" != "16" ] ; then \ if [ "$${FLASH}" != "16" ] ; then \
echo "#define NORFLASH_PS32BIT 1" >> $(obj)include/config.h ; \ echo "#define NORFLASH_PS32BIT 1" >> $(obj)include/config.h ; \
echo "TEXT_BASE = 0xFFC00000" > $(obj)board/freescale/m5235evb/config.tmp ; \ 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 $(obj)board/freescale/m5235evb/u-boot.32 $(obj)board/freescale/m5235evb/u-boot.lds ; \
else \ else \
echo "TEXT_BASE = 0xFFE00000" > $(obj)board/freescale/m5235evb/config.tmp ; \ 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 $(obj)board/freescale/m5235evb/u-boot.16 $(obj)board/freescale/m5235evb/u-boot.lds ; \
fi fi
@$(MKCONFIG) -n $@ -a M5235EVB m68k mcf523x m5235evb freescale @$(MKCONFIG) -n $@ -a M5235EVB m68k mcf523x m5235evb freescale
@ -1432,13 +1432,13 @@ cobra5272_config : unconfig
EB+MCF-EV123_config : unconfig EB+MCF-EV123_config : unconfig
@mkdir -p $(obj)include @mkdir -p $(obj)include
@mkdir -p $(obj)board/BuS/EB+MCF-EV123 @mkdir -p $(obj)board/BuS/EB+MCF-EV123
@echo "TEXT_BASE = 0xFFE00000"|tee $(obj)board/BuS/EB+MCF-EV123/textbase.mk @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 @$(MKCONFIG) -n $@ EB+MCF-EV123 m68k mcf52x2 EB+MCF-EV123 BuS
EB+MCF-EV123_internal_config : unconfig EB+MCF-EV123_internal_config : unconfig
@mkdir -p $(obj)include @mkdir -p $(obj)include
@mkdir -p $(obj)board/BuS/EB+MCF-EV123 @mkdir -p $(obj)board/BuS/EB+MCF-EV123
@echo "TEXT_BASE = 0xF0000000"|tee $(obj)board/BuS/EB+MCF-EV123/textbase.mk @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 @$(MKCONFIG) -n $@ EB+MCF-EV123 m68k mcf52x2 EB+MCF-EV123 BuS
M5329AFEE_config \ M5329AFEE_config \
@ -1468,13 +1468,13 @@ M54451EVB_stmicro_config : unconfig
M54451EVB_stmicro_config) FLASH=STMICRO;; \ M54451EVB_stmicro_config) FLASH=STMICRO;; \
esac; \ esac; \
if [ "$${FLASH}" = "NOR" ] ; then \ if [ "$${FLASH}" = "NOR" ] ; then \
echo "TEXT_BASE = 0x00000000" > $(obj)board/freescale/m54451evb/config.tmp ; \ 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 $(obj)board/freescale/m54451evb/u-boot.spa $(obj)board/freescale/m54451evb/u-boot.lds ; \
fi; \ fi; \
if [ "$${FLASH}" = "STMICRO" ] ; then \ if [ "$${FLASH}" = "STMICRO" ] ; then \
echo "#define CONFIG_CF_SBF" >> $(obj)include/config.h ; \ echo "#define CONFIG_CF_SBF" >> $(obj)include/config.h ; \
echo "#define CONFIG_SYS_STMICRO_BOOT" >> $(obj)include/config.h ; \ echo "#define CONFIG_SYS_STMICRO_BOOT" >> $(obj)include/config.h ; \
echo "TEXT_BASE = 0x47E00000" > $(obj)board/freescale/m54451evb/config.tmp ; \ 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 $(obj)board/freescale/m54451evb/u-boot.stm $(obj)board/freescale/m54451evb/u-boot.lds ; \
fi; \ fi; \
echo "#define CONFIG_SYS_INPUT_CLKSRC 24000000" >> $(obj)include/config.h ; echo "#define CONFIG_SYS_INPUT_CLKSRC 24000000" >> $(obj)include/config.h ;
@ -1500,18 +1500,18 @@ M54455EVB_stm33_config : unconfig
esac; \ esac; \
if [ "$${FLASH}" = "INTEL" ] ; then \ if [ "$${FLASH}" = "INTEL" ] ; then \
echo "#define CONFIG_SYS_INTEL_BOOT" >> $(obj)include/config.h ; \ echo "#define CONFIG_SYS_INTEL_BOOT" >> $(obj)include/config.h ; \
echo "TEXT_BASE = 0x00000000" > $(obj)board/freescale/m54455evb/config.tmp ; \ 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 $(obj)board/freescale/m54455evb/u-boot.int $(obj)board/freescale/m54455evb/u-boot.lds ; \
fi; \ fi; \
if [ "$${FLASH}" = "ATMEL" ] ; then \ if [ "$${FLASH}" = "ATMEL" ] ; then \
echo "#define CONFIG_SYS_ATMEL_BOOT" >> $(obj)include/config.h ; \ echo "#define CONFIG_SYS_ATMEL_BOOT" >> $(obj)include/config.h ; \
echo "TEXT_BASE = 0x04000000" > $(obj)board/freescale/m54455evb/config.tmp ; \ 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 $(obj)board/freescale/m54455evb/u-boot.atm $(obj)board/freescale/m54455evb/u-boot.lds ; \
fi; \ fi; \
if [ "$${FLASH}" = "STMICRO" ] ; then \ if [ "$${FLASH}" = "STMICRO" ] ; then \
echo "#define CONFIG_CF_SBF" >> $(obj)include/config.h ; \ echo "#define CONFIG_CF_SBF" >> $(obj)include/config.h ; \
echo "#define CONFIG_SYS_STMICRO_BOOT" >> $(obj)include/config.h ; \ echo "#define CONFIG_SYS_STMICRO_BOOT" >> $(obj)include/config.h ; \
echo "TEXT_BASE = 0x4FE00000" > $(obj)board/freescale/m54455evb/config.tmp ; \ 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 $(obj)board/freescale/m54455evb/u-boot.stm $(obj)board/freescale/m54455evb/u-boot.lds ; \
fi; \ fi; \
echo "#define CONFIG_SYS_INPUT_CLKSRC $${FREQ}" >> $(obj)include/config.h ; \ echo "#define CONFIG_SYS_INPUT_CLKSRC $${FREQ}" >> $(obj)include/config.h ; \
@ -1602,7 +1602,7 @@ MPC8313ERDB_NAND_66_config: unconfig
echo "#define CONFIG_SYS_66MHZ" >>$(obj)include/config.h ; \ echo "#define CONFIG_SYS_66MHZ" >>$(obj)include/config.h ; \
fi ; \ fi ; \
if [ "$(findstring _NAND_,$@)" ] ; then \ if [ "$(findstring _NAND_,$@)" ] ; then \
echo "TEXT_BASE = 0x00100000" > $(obj)board/freescale/mpc8313erdb/config.tmp ; \ echo "CONFIG_SYS_TEXT_BASE = 0x00100000" > $(obj)board/freescale/mpc8313erdb/config.tmp ; \
echo "#define CONFIG_NAND_U_BOOT" >>$(obj)include/config.h ; \ echo "#define CONFIG_NAND_U_BOOT" >>$(obj)include/config.h ; \
fi ; fi ;
@if [ "$(findstring _NAND_,$@)" ] ; then \ @if [ "$(findstring _NAND_,$@)" ] ; then \
@ -1648,10 +1648,10 @@ MPC8349ITXGP_config: unconfig
@mkdir -p $(obj)board/freescale/mpc8349itx @mkdir -p $(obj)board/freescale/mpc8349itx
@echo "#define CONFIG_$(subst _LOWBOOT,,$(@:_config=))" >> $(obj)include/config.h @echo "#define CONFIG_$(subst _LOWBOOT,,$(@:_config=))" >> $(obj)include/config.h
@if [ "$(findstring GP,$@)" ] ; then \ @if [ "$(findstring GP,$@)" ] ; then \
echo "TEXT_BASE = 0xFE000000" >$(obj)board/freescale/mpc8349itx/config.tmp ; \ echo "CONFIG_SYS_TEXT_BASE = 0xFE000000" >$(obj)board/freescale/mpc8349itx/config.tmp ; \
fi fi
@if [ "$(findstring LOWBOOT,$@)" ] ; then \ @if [ "$(findstring LOWBOOT,$@)" ] ; then \
echo "TEXT_BASE = 0xFE000000" >$(obj)board/freescale/mpc8349itx/config.tmp ; \ echo "CONFIG_SYS_TEXT_BASE = 0xFE000000" >$(obj)board/freescale/mpc8349itx/config.tmp ; \
fi fi
@$(MKCONFIG) -n $@ -a MPC8349ITX powerpc mpc83xx mpc8349itx freescale @$(MKCONFIG) -n $@ -a MPC8349ITX powerpc mpc83xx mpc8349itx freescale
@ -2135,12 +2135,12 @@ trab_old_config: unconfig
@[ -z "$(findstring _bigflash,$@)" ] || \ @[ -z "$(findstring _bigflash,$@)" ] || \
{ echo "#define CONFIG_FLASH_16MB" >>$(obj)include/config.h ; \ { echo "#define CONFIG_FLASH_16MB" >>$(obj)include/config.h ; \
echo "#define CONFIG_RAM_16MB" >>$(obj)include/config.h ; \ echo "#define CONFIG_RAM_16MB" >>$(obj)include/config.h ; \
echo "TEXT_BASE = 0x0CF40000" >$(obj)board/trab/config.tmp ; \ echo "CONFIG_SYS_TEXT_BASE = 0x0CF40000" >$(obj)board/trab/config.tmp ; \
} }
@[ -z "$(findstring _old,$@)" ] || \ @[ -z "$(findstring _old,$@)" ] || \
{ echo "#define CONFIG_FLASH_8MB" >>$(obj)include/config.h ; \ { echo "#define CONFIG_FLASH_8MB" >>$(obj)include/config.h ; \
echo "#define CONFIG_RAM_16MB" >>$(obj)include/config.h ; \ echo "#define CONFIG_RAM_16MB" >>$(obj)include/config.h ; \
echo "TEXT_BASE = 0x0CF40000" >$(obj)board/trab/config.tmp ; \ echo "CONFIG_SYS_TEXT_BASE = 0x0CF40000" >$(obj)board/trab/config.tmp ; \
} }
@$(MKCONFIG) -n $@ -a trab arm arm920t trab - s3c24x0 @$(MKCONFIG) -n $@ -a trab arm arm920t trab - s3c24x0
@ -2420,7 +2420,7 @@ sh7785lcr_config : unconfig
@echo "#define CONFIG_SH7785LCR 1" > $(obj)include/config.h @echo "#define CONFIG_SH7785LCR 1" > $(obj)include/config.h
@if [ "$(findstring 32bit, $@)" ] ; then \ @if [ "$(findstring 32bit, $@)" ] ; then \
echo "#define CONFIG_SH_32BIT 1" >> $(obj)include/config.h ; \ echo "#define CONFIG_SH_32BIT 1" >> $(obj)include/config.h ; \
echo "TEXT_BASE = 0x8ff80000" > \ echo "CONFIG_SYS_TEXT_BASE = 0x8ff80000" > \
$(obj)board/renesas/sh7785lcr/config.tmp ; \ $(obj)board/renesas/sh7785lcr/config.tmp ; \
fi fi
@$(MKCONFIG) -n $@ -a sh7785lcr sh sh4 sh7785lcr renesas @$(MKCONFIG) -n $@ -a sh7785lcr sh sh4 sh7785lcr renesas

2
README
View File

@ -2248,7 +2248,7 @@ Configuration Settings:
- CONFIG_SYS_MONITOR_BASE: - CONFIG_SYS_MONITOR_BASE:
Physical start address of boot monitor code (set by Physical start address of boot monitor code (set by
make config files to be same as the text base address make config files to be same as the text base address
(TEXT_BASE) used when linking) - same as (CONFIG_SYS_TEXT_BASE) used when linking) - same as
CONFIG_SYS_FLASH_BASE when booting from flash. CONFIG_SYS_FLASH_BASE when booting from flash.
- CONFIG_SYS_MONITOR_LEN: - CONFIG_SYS_MONITOR_LEN:

2
arch/arm/cpu/arm1136/start.S
View File

@ -87,7 +87,7 @@ _end_vect:
.globl _TEXT_BASE .globl _TEXT_BASE
_TEXT_BASE: _TEXT_BASE:
.word TEXT_BASE .word CONFIG_SYS_TEXT_BASE
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC) #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
.globl _armboot_start .globl _armboot_start

6
arch/arm/cpu/arm1176/start.S
View File

@ -97,7 +97,7 @@ _end_vect:
.globl _TEXT_BASE .globl _TEXT_BASE
_TEXT_BASE: _TEXT_BASE:
.word TEXT_BASE .word CONFIG_SYS_TEXT_BASE
/* /*
* Below variable is very important because we use MMU in U-Boot. * Below variable is very important because we use MMU in U-Boot.
@ -205,7 +205,7 @@ cpu_init_crit:
/* Prepare to disable the MMU */ /* Prepare to disable the MMU */
adr r2, mmu_disable_phys adr r2, mmu_disable_phys
sub r2, r2, #(CONFIG_SYS_PHY_UBOOT_BASE - TEXT_BASE) sub r2, r2, #(CONFIG_SYS_PHY_UBOOT_BASE - CONFIG_SYS_TEXT_BASE)
b mmu_disable b mmu_disable
.align 5 .align 5
@ -444,7 +444,7 @@ cpu_init_crit:
/* Prepare to disable the MMU */ /* Prepare to disable the MMU */
adr r2, mmu_disable_phys adr r2, mmu_disable_phys
sub r2, r2, #(CONFIG_SYS_PHY_UBOOT_BASE - TEXT_BASE) sub r2, r2, #(CONFIG_SYS_PHY_UBOOT_BASE - CONFIG_SYS_TEXT_BASE)
b mmu_disable b mmu_disable
.align 5 .align 5

8
arch/arm/cpu/arm720t/start.S
View File

@ -77,7 +77,7 @@ _fiq: .word fiq
.globl _TEXT_BASE .globl _TEXT_BASE
_TEXT_BASE: _TEXT_BASE:
.word TEXT_BASE .word CONFIG_SYS_TEXT_BASE
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC) #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
.globl _armboot_start .globl _armboot_start
@ -298,11 +298,11 @@ relocate: /* relocate U-Boot to RAM */
cmp r0, r1 /* don't reloc during debug */ cmp r0, r1 /* don't reloc during debug */
beq stack_setup beq stack_setup
#if TEXT_BASE #if CONFIG_SYS_TEXT_BASE
#ifndef CONFIG_LPC2292 /* already done in lowlevel_init */ #ifndef CONFIG_LPC2292 /* already done in lowlevel_init */
ldr r2, =0x0 /* Relocate the exception vectors */ ldr r2, =0x0 /* Relocate the exception vectors */
cmp r1, r2 /* and associated data to address */ cmp r1, r2 /* and associated data to address */
ldmneia r0!, {r3-r10} /* 0x0. Do nothing if TEXT_BASE is */ ldmneia r0!, {r3-r10} /* 0x0. Do nothing if CONFIG_SYS_TEXT_BASE is */
stmneia r2!, {r3-r10} /* 0x0. Copy the first 15 words. */ stmneia r2!, {r3-r10} /* 0x0. Copy the first 15 words. */
ldmneia r0, {r3-r9} ldmneia r0, {r3-r9}
stmneia r2, {r3-r9} stmneia r2, {r3-r9}
@ -755,7 +755,7 @@ reset_cpu:
ldr r0, [r1, #+NETARM_MEM_CS0_BASE_ADDR] ldr r0, [r1, #+NETARM_MEM_CS0_BASE_ADDR]
ldr r1, =0xFFFFF000 ldr r1, =0xFFFFF000
and r0, r1, r0 and r0, r1, r0
ldr r1, =(relocate-TEXT_BASE) ldr r1, =(relocate-CONFIG_SYS_TEXT_BASE)
add r0, r1, r0 add r0, r1, r0
ldr r4, =NETARM_GEN_MODULE_BASE ldr r4, =NETARM_GEN_MODULE_BASE
ldr r1, =NETARM_GEN_SW_SVC_RESETA ldr r1, =NETARM_GEN_SW_SVC_RESETA

4
arch/arm/cpu/arm920t/at91/lowlevel_init.S
View File

@ -39,9 +39,9 @@
_MTEXT_BASE: _MTEXT_BASE:
#undef START_FROM_MEM #undef START_FROM_MEM
#ifdef START_FROM_MEM #ifdef START_FROM_MEM
.word TEXT_BASE-PHYS_FLASH_1 .word CONFIG_SYS_TEXT_BASE-PHYS_FLASH_1
#else #else
.word TEXT_BASE .word CONFIG_SYS_TEXT_BASE
#endif #endif
.globl lowlevel_init .globl lowlevel_init

4
arch/arm/cpu/arm920t/at91rm9200/lowlevel_init.S
View File

@ -43,9 +43,9 @@
_MTEXT_BASE: _MTEXT_BASE:
#undef START_FROM_MEM #undef START_FROM_MEM
#ifdef START_FROM_MEM #ifdef START_FROM_MEM
.word TEXT_BASE-PHYS_FLASH_1 .word CONFIG_SYS_TEXT_BASE-PHYS_FLASH_1
#else #else
.word TEXT_BASE .word CONFIG_SYS_TEXT_BASE
#endif #endif
.globl lowlevel_init .globl lowlevel_init

2
arch/arm/cpu/arm920t/start.S
View File

@ -72,7 +72,7 @@ _fiq: .word fiq
.globl _TEXT_BASE .globl _TEXT_BASE
_TEXT_BASE: _TEXT_BASE:
.word TEXT_BASE .word CONFIG_SYS_TEXT_BASE
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC) #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
.globl _armboot_start .globl _armboot_start

2
arch/arm/cpu/arm925t/start.S
View File

@ -83,7 +83,7 @@ _fiq: .word fiq
.globl _TEXT_BASE .globl _TEXT_BASE
_TEXT_BASE: _TEXT_BASE:
.word TEXT_BASE .word CONFIG_SYS_TEXT_BASE
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC) #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
.globl _armboot_start .globl _armboot_start

4
arch/arm/cpu/arm926ejs/at91/lowlevel_init.S
View File

@ -43,7 +43,7 @@
#endif #endif
_TEXT_BASE: _TEXT_BASE:
.word TEXT_BASE .word CONFIG_SYS_TEXT_BASE
.globl lowlevel_init .globl lowlevel_init
.type lowlevel_init,function .type lowlevel_init,function
@ -54,7 +54,7 @@ POS1:
ldr r0, =POS1 /* r0 = POS1 compile */ ldr r0, =POS1 /* r0 = POS1 compile */
ldr r2, _TEXT_BASE ldr r2, _TEXT_BASE
sub r0, r0, r2 /* r0 = POS1-_TEXT_BASE (POS1 relative) */ sub r0, r0, r2 /* r0 = POS1-_TEXT_BASE (POS1 relative) */
sub r5, r5, r0 /* r0 = TEXT_BASE-1 */ sub r5, r5, r0 /* r0 = CONFIG_SYS_TEXT_BASE-1 */
sub r5, r5, #4 /* r1 = text base - current */ sub r5, r5, #4 /* r1 = text base - current */
/* memory control configuration 1 */ /* memory control configuration 1 */

2
arch/arm/cpu/arm926ejs/start.S
View File

@ -116,7 +116,7 @@ _fiq:
.globl _TEXT_BASE .globl _TEXT_BASE
_TEXT_BASE: _TEXT_BASE:
.word TEXT_BASE .word CONFIG_SYS_TEXT_BASE
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC) #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
.globl _armboot_start .globl _armboot_start

2
arch/arm/cpu/arm946es/start.S
View File

@ -87,7 +87,7 @@ _fiq:
.globl _TEXT_BASE .globl _TEXT_BASE
_TEXT_BASE: _TEXT_BASE:
.word TEXT_BASE .word CONFIG_SYS_TEXT_BASE
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC) #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
.globl _armboot_start .globl _armboot_start

2
arch/arm/cpu/arm_intcm/start.S
View File

@ -85,7 +85,7 @@ _fiq:
.globl _TEXT_BASE .globl _TEXT_BASE
_TEXT_BASE: _TEXT_BASE:
.word TEXT_BASE /* address of _start in the linked image */ .word CONFIG_SYS_TEXT_BASE /* address of _start in the linked image */
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC) #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
.globl _armboot_start .globl _armboot_start

2
arch/arm/cpu/armv7/omap3/lowlevel_init.S
View File

@ -33,7 +33,7 @@
#include <asm/arch/clocks_omap3.h> #include <asm/arch/clocks_omap3.h>
_TEXT_BASE: _TEXT_BASE:
.word TEXT_BASE /* sdram load addr from config.mk */ .word CONFIG_SYS_TEXT_BASE /* sdram load addr from config.mk */
#if !defined(CONFIG_SYS_NAND_BOOT) && !defined(CONFIG_SYS_NAND_BOOT) #if !defined(CONFIG_SYS_NAND_BOOT) && !defined(CONFIG_SYS_NAND_BOOT)
/************************************************************************** /**************************************************************************

2
arch/arm/cpu/armv7/start.S
View File

@ -67,7 +67,7 @@ _end_vect:
.globl _TEXT_BASE .globl _TEXT_BASE
_TEXT_BASE: _TEXT_BASE:
.word TEXT_BASE .word CONFIG_SYS_TEXT_BASE
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC) #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
.globl _armboot_start .globl _armboot_start

2
arch/arm/cpu/ixp/start.S
View File

@ -95,7 +95,7 @@ _fiq: .word fiq
.globl _TEXT_BASE .globl _TEXT_BASE
_TEXT_BASE: _TEXT_BASE:
.word TEXT_BASE .word CONFIG_SYS_TEXT_BASE
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC) #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
.globl _armboot_start .globl _armboot_start

2
arch/arm/cpu/lh7a40x/start.S
View File

@ -74,7 +74,7 @@ _fiq: .word fiq
.globl _TEXT_BASE .globl _TEXT_BASE
_TEXT_BASE: _TEXT_BASE:
.word TEXT_BASE .word CONFIG_SYS_TEXT_BASE
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC) #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
.globl _armboot_start .globl _armboot_start

2
arch/arm/cpu/pxa/start.S
View File

@ -84,7 +84,7 @@ _fiq: .word fiq
.globl _TEXT_BASE .globl _TEXT_BASE
_TEXT_BASE: _TEXT_BASE:
.word TEXT_BASE .word CONFIG_SYS_TEXT_BASE
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC) #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
.globl _armboot_start .globl _armboot_start

2
arch/arm/cpu/s3c44b0/start.S
View File

@ -65,7 +65,7 @@ _start: b reset
.globl _TEXT_BASE .globl _TEXT_BASE
_TEXT_BASE: _TEXT_BASE:
.word TEXT_BASE .word CONFIG_SYS_TEXT_BASE
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC) #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
.globl _armboot_start .globl _armboot_start

2
arch/arm/cpu/sa1100/start.S
View File

@ -75,7 +75,7 @@ _fiq: .word fiq
.globl _TEXT_BASE .globl _TEXT_BASE
_TEXT_BASE: _TEXT_BASE:
.word TEXT_BASE .word CONFIG_SYS_TEXT_BASE
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC) #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
.globl _armboot_start .globl _armboot_start

4
arch/i386/lib/board.c
View File

@ -221,8 +221,8 @@ void board_init_f (ulong gdp)
re_end = (Elf32_Rel *)(rel_dyn_end + ((gd_t *)gdp)->load_off); re_end = (Elf32_Rel *)(rel_dyn_end + ((gd_t *)gdp)->load_off);
do { do {
if (re_src->r_offset >= TEXT_BASE) if (re_src->r_offset >= CONFIG_SYS_TEXT_BASE)
if (*(Elf32_Addr *)(re_src->r_offset - rel_offset) >= TEXT_BASE) if (*(Elf32_Addr *)(re_src->r_offset - rel_offset) >= CONFIG_SYS_TEXT_BASE)
*(Elf32_Addr *)(re_src->r_offset - rel_offset) -= rel_offset; *(Elf32_Addr *)(re_src->r_offset - rel_offset) -= rel_offset;
} while (re_src++ < re_end); } while (re_src++ < re_end);

10
arch/m68k/cpu/mcf5227x/start.S
View File

@ -44,8 +44,8 @@
rte; rte;
#if defined(CONFIG_CF_SBF) #if defined(CONFIG_CF_SBF)
#define ASM_DRAMINIT (asm_dram_init - TEXT_BASE + CONFIG_SYS_INIT_RAM_ADDR) #define ASM_DRAMINIT (asm_dram_init - CONFIG_SYS_TEXT_BASE + CONFIG_SYS_INIT_RAM_ADDR)
#define ASM_SBF_IMG_HDR (asm_sbf_img_hdr - TEXT_BASE + CONFIG_SYS_INIT_RAM_ADDR) #define ASM_SBF_IMG_HDR (asm_sbf_img_hdr - CONFIG_SYS_TEXT_BASE + CONFIG_SYS_INIT_RAM_ADDR)
#endif #endif
.text .text
@ -138,7 +138,7 @@ vector192_255:
asm_sbf_img_hdr: asm_sbf_img_hdr:
.long 0x00000000 /* checksum, not yet implemented */ .long 0x00000000 /* checksum, not yet implemented */
.long 0x00020000 /* image length */ .long 0x00020000 /* image length */
.long TEXT_BASE /* image to be relocated at */ .long CONFIG_SYS_TEXT_BASE /* image to be relocated at */
asm_dram_init: asm_dram_init:
move.l #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_CTRL), %d0 move.l #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_CTRL), %d0
@ -330,7 +330,7 @@ asm_dspi_rd_loop2:
jsr asm_dspi_rd_status jsr asm_dspi_rd_status
/* jump to memory and execute */ /* jump to memory and execute */
move.l #(TEXT_BASE + 0x400), %a0 move.l #(CONFIG_SYS_TEXT_BASE + 0x400), %a0
move.l %a0, (%a1) move.l %a0, (%a1)
jmp (%a0) jmp (%a0)
@ -364,7 +364,7 @@ _start:
/* Set vector base register at the beginning of the Flash */ /* Set vector base register at the beginning of the Flash */
#if defined(CONFIG_CF_SBF) #if defined(CONFIG_CF_SBF)
move.l #TEXT_BASE, %d0 move.l #CONFIG_SYS_TEXT_BASE, %d0
movec %d0, %VBR movec %d0, %VBR
#else #else
move.l #CONFIG_SYS_FLASH_BASE, %d0 move.l #CONFIG_SYS_FLASH_BASE, %d0

14
arch/m68k/cpu/mcf52x2/start.S
View File

@ -57,8 +57,8 @@
_vectors: _vectors:
.long 0x00000000 /* Flash offset is 0 until we setup CS0 */ .long 0x00000000 /* Flash offset is 0 until we setup CS0 */
#if defined(CONFIG_M5282) && (TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE) #if defined(CONFIG_M5282) && (CONFIG_SYS_TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE)
.long _start - TEXT_BASE .long _start - CONFIG_SYS_TEXT_BASE
#else #else
.long _START .long _START
#endif #endif
@ -106,7 +106,7 @@ _vectors:
#if defined(CONFIG_SYS_INT_FLASH_BASE) && \ #if defined(CONFIG_SYS_INT_FLASH_BASE) && \
(defined(CONFIG_M5282) || defined(CONFIG_M5281)) (defined(CONFIG_M5282) || defined(CONFIG_M5281))
#if (TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE) #if (CONFIG_SYS_TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE)
.long 0x55AA55AA,0xAA55AA55 /* CFM Backdoorkey */ .long 0x55AA55AA,0xAA55AA55 /* CFM Backdoorkey */
.long 0xFFFFFFFF /* all sectors protected */ .long 0xFFFFFFFF /* all sectors protected */
.long 0x00000000 /* supervisor/User restriction */ .long 0x00000000 /* supervisor/User restriction */
@ -150,7 +150,7 @@ _start:
movec %d0, %RAMBAR1 movec %d0, %RAMBAR1
#if defined(CONFIG_M5282) #if defined(CONFIG_M5282)
#if (TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE) #if (CONFIG_SYS_TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE)
/* Setup code in SRAM to initialize FLASHBAR, if start from internal Flash */ /* Setup code in SRAM to initialize FLASHBAR, if start from internal Flash */
move.l #(_flashbar_setup-CONFIG_SYS_INT_FLASH_BASE), %a0 move.l #(_flashbar_setup-CONFIG_SYS_INT_FLASH_BASE), %a0
@ -174,7 +174,7 @@ _after_flashbar_copy:
/* Setup code to initialize FLASHBAR, if start from external Memory */ /* Setup code to initialize FLASHBAR, if start from external Memory */
move.l #(CONFIG_SYS_INT_FLASH_BASE + CONFIG_SYS_INT_FLASH_ENABLE), %d0 move.l #(CONFIG_SYS_INT_FLASH_BASE + CONFIG_SYS_INT_FLASH_ENABLE), %d0
movec %d0, %FLASHBAR movec %d0, %FLASHBAR
#endif /* (TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE) */ #endif /* (CONFIG_SYS_TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE) */
#endif #endif
#endif #endif
@ -182,7 +182,7 @@ _after_flashbar_copy:
* therefore no VBR to set * therefore no VBR to set
*/ */
#if !defined(CONFIG_MONITOR_IS_IN_RAM) #if !defined(CONFIG_MONITOR_IS_IN_RAM)
#if defined(CONFIG_M5282) && (TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE) #if defined(CONFIG_M5282) && (CONFIG_SYS_TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE)
move.l #CONFIG_SYS_INT_FLASH_BASE, %d0 move.l #CONFIG_SYS_INT_FLASH_BASE, %d0
#else #else
move.l #CONFIG_SYS_FLASH_BASE, %d0 move.l #CONFIG_SYS_FLASH_BASE, %d0
@ -297,7 +297,7 @@ clear_bss:
/* set parameters for board_init_r */ /* set parameters for board_init_r */
move.l %a0,-(%sp) /* dest_addr */ move.l %a0,-(%sp) /* dest_addr */
move.l %d0,-(%sp) /* gd */ move.l %d0,-(%sp) /* gd */
#if defined(DEBUG) && (TEXT_BASE != CONFIG_SYS_INT_FLASH_BASE) && \ #if defined(DEBUG) && (CONFIG_SYS_TEXT_BASE != CONFIG_SYS_INT_FLASH_BASE) && \
defined(CONFIG_SYS_HALT_BEFOR_RAM_JUMP) defined(CONFIG_SYS_HALT_BEFOR_RAM_JUMP)
halt halt
#endif #endif

8
arch/m68k/cpu/mcf5445x/start.S
View File

@ -44,8 +44,8 @@
rte; rte;
#if defined(CONFIG_CF_SBF) #if defined(CONFIG_CF_SBF)
#define ASM_DRAMINIT (asm_dram_init - TEXT_BASE + CONFIG_SYS_INIT_RAM_ADDR) #define ASM_DRAMINIT (asm_dram_init - CONFIG_SYS_TEXT_BASE + CONFIG_SYS_INIT_RAM_ADDR)
#define ASM_SBF_IMG_HDR (asm_sbf_img_hdr - TEXT_BASE + CONFIG_SYS_INIT_RAM_ADDR) #define ASM_SBF_IMG_HDR (asm_sbf_img_hdr - CONFIG_SYS_TEXT_BASE + CONFIG_SYS_INIT_RAM_ADDR)
#endif #endif
.text .text
@ -143,7 +143,7 @@ vector192_255:
asm_sbf_img_hdr: asm_sbf_img_hdr:
.long 0x00000000 /* checksum, not yet implemented */ .long 0x00000000 /* checksum, not yet implemented */
.long 0x00030000 /* image length */ .long 0x00030000 /* image length */
.long TEXT_BASE /* image to be relocated at */ .long CONFIG_SYS_TEXT_BASE /* image to be relocated at */
asm_dram_init: asm_dram_init:
move.w #0x2700,%sr /* Mask off Interrupt */ move.w #0x2700,%sr /* Mask off Interrupt */
@ -358,7 +358,7 @@ asm_dspi_rd_loop2:
jsr asm_dspi_rd_status jsr asm_dspi_rd_status
/* jump to memory and execute */ /* jump to memory and execute */
move.l #(TEXT_BASE + 0x400), %a0 move.l #(CONFIG_SYS_TEXT_BASE + 0x400), %a0
jmp (%a0) jmp (%a0)
asm_dspi_wr_status: asm_dspi_wr_status:

4
arch/microblaze/cpu/start.S
View File

@ -69,10 +69,10 @@ _start:
shi r7, r0, 0x2 shi r7, r0, 0x2
shi r6, r0, 0x6 shi r6, r0, 0x6
/* /*
* Copy U-Boot code to TEXT_BASE * Copy U-Boot code to CONFIG_SYS_TEXT_BASE
* solve problem with sbrk_base * solve problem with sbrk_base
*/ */
#if (CONFIG_SYS_RESET_ADDRESS != TEXT_BASE) #if (CONFIG_SYS_RESET_ADDRESS != CONFIG_SYS_TEXT_BASE)
addi r4, r0, __end addi r4, r0, __end
addi r5, r0, __text_start addi r5, r0, __text_start
rsub r4, r5, r4 /* size = __end - __text_start */ rsub r4, r5, r4 /* size = __end - __text_start */

2
arch/microblaze/lib/board.c
View File

@ -122,7 +122,7 @@ void board_init (void)
puts ("SDRAM :\n"); puts ("SDRAM :\n");
printf ("\t\tIcache:%s\n", icache_status() ? "ON" : "OFF"); printf ("\t\tIcache:%s\n", icache_status() ? "ON" : "OFF");
printf ("\t\tDcache:%s\n", dcache_status() ? "ON" : "OFF"); printf ("\t\tDcache:%s\n", dcache_status() ? "ON" : "OFF");
printf ("\tU-Boot Start:0x%08x\n", TEXT_BASE); printf ("\tU-Boot Start:0x%08x\n", CONFIG_SYS_TEXT_BASE);
#if defined(CONFIG_CMD_FLASH) #if defined(CONFIG_CMD_FLASH)
puts ("FLASH: "); puts ("FLASH: ");

18
arch/powerpc/cpu/mpc85xx/start.S
View File

@ -145,7 +145,7 @@ _start_e500:
beq 2b beq 2b
/* Setup interrupt vectors */ /* Setup interrupt vectors */
lis r1,TEXT_BASE@h lis r1,CONFIG_SYS_TEXT_BASE@h
mtspr IVPR,r1 mtspr IVPR,r1
li r1,0x0100 li r1,0x0100
@ -291,25 +291,25 @@ _start_e500:
lis r7,FSL_BOOKE_MAS1(1, 1, 0, 1, BOOKE_PAGESZ_4M)@h lis r7,FSL_BOOKE_MAS1(1, 1, 0, 1, BOOKE_PAGESZ_4M)@h
ori r7,r7,FSL_BOOKE_MAS1(1, 1, 0, 1, BOOKE_PAGESZ_4M)@l ori r7,r7,FSL_BOOKE_MAS1(1, 1, 0, 1, BOOKE_PAGESZ_4M)@l
lis r8,FSL_BOOKE_MAS2(TEXT_BASE & 0xffc00000, (MAS2_I|MAS2_G))@h lis r8,FSL_BOOKE_MAS2(CONFIG_SYS_TEXT_BASE & 0xffc00000, (MAS2_I|MAS2_G))@h
ori r8,r8,FSL_BOOKE_MAS2(TEXT_BASE & 0xffc00000, (MAS2_I|MAS2_G))@l ori r8,r8,FSL_BOOKE_MAS2(CONFIG_SYS_TEXT_BASE & 0xffc00000, (MAS2_I|MAS2_G))@l
/* The 85xx has the default boot window 0xff800000 - 0xffffffff */ /* The 85xx has the default boot window 0xff800000 - 0xffffffff */
lis r9,FSL_BOOKE_MAS3(0xffc00000, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@h lis r9,FSL_BOOKE_MAS3(0xffc00000, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@h
ori r9,r9,FSL_BOOKE_MAS3(0xffc00000, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@l ori r9,r9,FSL_BOOKE_MAS3(0xffc00000, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@l
#else #else
/* /*
* create a temp mapping in AS=1 to the 1M TEXT_BASE space, the main * create a temp mapping in AS=1 to the 1M CONFIG_SYS_TEXT_BASE space, the main
* image has been relocated to TEXT_BASE on the second stage. * image has been relocated to CONFIG_SYS_TEXT_BASE on the second stage.
*/ */
lis r7,FSL_BOOKE_MAS1(1, 1, 0, 1, BOOKE_PAGESZ_1M)@h lis r7,FSL_BOOKE_MAS1(1, 1, 0, 1, BOOKE_PAGESZ_1M)@h
ori r7,r7,FSL_BOOKE_MAS1(1, 1, 0, 1, BOOKE_PAGESZ_1M)@l ori r7,r7,FSL_BOOKE_MAS1(1, 1, 0, 1, BOOKE_PAGESZ_1M)@l
lis r8,FSL_BOOKE_MAS2(TEXT_BASE, (MAS2_I|MAS2_G))@h lis r8,FSL_BOOKE_MAS2(CONFIG_SYS_TEXT_BASE, (MAS2_I|MAS2_G))@h
ori r8,r8,FSL_BOOKE_MAS2(TEXT_BASE, (MAS2_I|MAS2_G))@l ori r8,r8,FSL_BOOKE_MAS2(CONFIG_SYS_TEXT_BASE, (MAS2_I|MAS2_G))@l
lis r9,FSL_BOOKE_MAS3(TEXT_BASE, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@h lis r9,FSL_BOOKE_MAS3(CONFIG_SYS_TEXT_BASE, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@h
ori r9,r9,FSL_BOOKE_MAS3(TEXT_BASE, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@l ori r9,r9,FSL_BOOKE_MAS3(CONFIG_SYS_TEXT_BASE, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@l
#endif #endif
mtspr MAS0,r6 mtspr MAS0,r6

4
arch/powerpc/cpu/mpc86xx/start.S
View File

@ -848,8 +848,8 @@ setup_ccsrbar:
stw r5, 0(r4) /* Store physical value of CCSR */ stw r5, 0(r4) /* Store physical value of CCSR */
isync isync
lis r5, TEXT_BASE@h lis r5, CONFIG_SYS_TEXT_BASE@h
ori r5,r5,TEXT_BASE@l ori r5,r5,CONFIG_SYS_TEXT_BASE@l
lwz r5, 0(r5) lwz r5, 0(r5)
isync isync

2
arch/powerpc/lib/board.c
View File

@ -734,7 +734,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
# if defined(CONFIG_OXC) || defined(CONFIG_RMU) # if defined(CONFIG_OXC) || defined(CONFIG_RMU)
/* flash mapped at end of memory map */ /* flash mapped at end of memory map */
bd->bi_flashoffset = TEXT_BASE + flash_size; bd->bi_flashoffset = CONFIG_SYS_TEXT_BASE + flash_size;
# elif CONFIG_SYS_MONITOR_BASE == CONFIG_SYS_FLASH_BASE # elif CONFIG_SYS_MONITOR_BASE == CONFIG_SYS_FLASH_BASE
bd->bi_flashoffset = monitor_flash_len; /* reserved area for startup monitor */ bd->bi_flashoffset = monitor_flash_len; /* reserved area for startup monitor */
# endif # endif

2
arch/sh/config.mk
View File

@ -29,6 +29,6 @@ STANDALONE_LOAD_ADDR += -EB
endif endif
PLATFORM_CPPFLAGS += -DCONFIG_SH -D__SH__ PLATFORM_CPPFLAGS += -DCONFIG_SH -D__SH__
PLATFORM_LDFLAGS += -e $(TEXT_BASE) --defsym reloc_dst=$(TEXT_BASE) PLATFORM_LDFLAGS += -e $(CONFIG_SYS_TEXT_BASE) --defsym reloc_dst=$(TEXT_BASE)
LDSCRIPT := $(SRCTREE)/$(CPUDIR)/u-boot.lds LDSCRIPT := $(SRCTREE)/$(CPUDIR)/u-boot.lds

2
arch/sh/lib/board.c
View File

@ -89,7 +89,7 @@ static int sh_pci_init(void)
static int sh_mem_env_init(void) static int sh_mem_env_init(void)
{ {
mem_malloc_init(TEXT_BASE - CONFIG_SYS_GBL_DATA_SIZE - mem_malloc_init(CONFIG_SYS_TEXT_BASE - CONFIG_SYS_GBL_DATA_SIZE -
CONFIG_SYS_MALLOC_LEN, CONFIG_SYS_MALLOC_LEN - 16); CONFIG_SYS_MALLOC_LEN, CONFIG_SYS_MALLOC_LEN - 16);
env_relocate(); env_relocate();
jumptable_init(); jumptable_init();

5
arch/sparc/cpu/leon2/Makefile
View File

@ -44,8 +44,9 @@ $(LIB): $(OBJS)
include $(SRCTREE)/rules.mk include $(SRCTREE)/rules.mk
$(START): $(START:.o=.S) $(START): $(START:.o=.S)
$(CC) -D__ASSEMBLY__ $(DBGFLAGS) $(OPTFLAGS) -D__KERNEL__ -DTEXT_BASE=$(TEXT_BASE) \ $(CC) -D__ASSEMBLY__ $(DBGFLAGS) $(OPTFLAGS) -D__KERNEL__ \
-I$(TOPDIR)/include -fno-builtin -ffreestanding -nostdinc -isystem $(gccincdir) -pipe \ -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) -I$(TOPDIR)/include \
-fno-builtin -ffreestanding -nostdinc -isystem $(gccincdir) -pipe \
$(PLATFORM_CPPFLAGS) -Wall -Wstrict-prototypes \ $(PLATFORM_CPPFLAGS) -Wall -Wstrict-prototypes \
-I$(TOPDIR)/board -c -o $(START) $(START:.o=.S) -I$(TOPDIR)/board -c -o $(START) $(START:.o=.S)

4
arch/sparc/cpu/leon2/prom.c
View File

@ -50,9 +50,9 @@ extern int __prom_start;
#define PROM_SIZE_MASK (PROM_OFFS-1) #define PROM_SIZE_MASK (PROM_OFFS-1)
#define __va(x) ( \ #define __va(x) ( \
(void *)( ((unsigned long)(x))-PROM_OFFS+ \ (void *)( ((unsigned long)(x))-PROM_OFFS+ \
(CONFIG_SYS_PROM_OFFSET-phys_base)+PAGE_OFFSET-TEXT_BASE ) \ (CONFIG_SYS_PROM_OFFSET-phys_base)+PAGE_OFFSET-CONFIG_SYS_TEXT_BASE ) \
) )
#define __phy(x) ((void *)(((unsigned long)(x))-PROM_OFFS+CONFIG_SYS_PROM_OFFSET-TEXT_BASE)) #define __phy(x) ((void *)(((unsigned long)(x))-PROM_OFFS+CONFIG_SYS_PROM_OFFSET-CONFIG_SYS_TEXT_BASE))
struct property { struct property {
char *name; char *name;

2
arch/sparc/cpu/leon2/start.S
View File

@ -455,7 +455,7 @@ _irq_entry:
WRITE_PAUSE WRITE_PAUSE
mov %l7, %o0 ! irq level mov %l7, %o0 ! irq level
set handler_irq, %o1 set handler_irq, %o1
set (CONFIG_SYS_RELOC_MONITOR_BASE-TEXT_BASE), %o2 set (CONFIG_SYS_RELOC_MONITOR_BASE-CONFIG_SYS_TEXT_BASE), %o2
add %o1, %o2, %o1 add %o1, %o2, %o1
call %o1 call %o1
add %sp, SF_REGS_SZ, %o1 ! pt_regs ptr add %sp, SF_REGS_SZ, %o1 ! pt_regs ptr

5
arch/sparc/cpu/leon3/Makefile
View File

@ -44,8 +44,9 @@ $(LIB): $(OBJS)
include $(SRCTREE)/rules.mk include $(SRCTREE)/rules.mk
$(START): $(START:.o=.S) $(START): $(START:.o=.S)
$(CC) -D__ASSEMBLY__ $(DBGFLAGS) $(OPTFLAGS) -D__KERNEL__ -DTEXT_BASE=$(TEXT_BASE) \ $(CC) -D__ASSEMBLY__ $(DBGFLAGS) $(OPTFLAGS) -D__KERNEL__ \
-I$(TOPDIR)/include -fno-builtin -ffreestanding -nostdinc -isystem $(gccincdir) -pipe \ -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) -I$(TOPDIR)/include \
-fno-builtin -ffreestanding -nostdinc -isystem $(gccincdir) -pipe \
$(PLATFORM_CPPFLAGS) -Wall -Wstrict-prototypes \ $(PLATFORM_CPPFLAGS) -Wall -Wstrict-prototypes \
-I$(TOPDIR)/board -c -o $(START) $(START:.o=.S) -I$(TOPDIR)/board -c -o $(START) $(START:.o=.S)

4
arch/sparc/cpu/leon3/prom.c
View File

@ -54,9 +54,9 @@ extern int __prom_start;
#define PROM_SIZE_MASK (PROM_OFFS-1) #define PROM_SIZE_MASK (PROM_OFFS-1)
#define __va(x) ( \ #define __va(x) ( \
(void *)( ((unsigned long)(x))-PROM_OFFS+ \ (void *)( ((unsigned long)(x))-PROM_OFFS+ \
(CONFIG_SYS_PROM_OFFSET-phys_base)+PAGE_OFFSET-TEXT_BASE ) \ (CONFIG_SYS_PROM_OFFSET-phys_base)+PAGE_OFFSET-CONFIG_SYS_TEXT_BASE ) \
) )
#define __phy(x) ((void *)(((unsigned long)(x))-PROM_OFFS+CONFIG_SYS_PROM_OFFSET-TEXT_BASE)) #define __phy(x) ((void *)(((unsigned long)(x))-PROM_OFFS+CONFIG_SYS_PROM_OFFSET-CONFIG_SYS_TEXT_BASE))
struct property { struct property {
char *name; char *name;

6
arch/sparc/cpu/leon3/start.S
View File

@ -369,8 +369,8 @@ snoop_detect:
sethi %hi(0x00800000), %o0 sethi %hi(0x00800000), %o0
lda [%g0] 2, %o1 lda [%g0] 2, %o1
and %o0, %o1, %o0 and %o0, %o1, %o0
sethi %hi(leon3_snooping_avail+CONFIG_SYS_RELOC_MONITOR_BASE-TEXT_BASE), %o1 sethi %hi(leon3_snooping_avail+CONFIG_SYS_RELOC_MONITOR_BASE-CONFIG_SYS_TEXT_BASE), %o1
st %o0, [%lo(leon3_snooping_avail+CONFIG_SYS_RELOC_MONITOR_BASE-TEXT_BASE)+%o1] st %o0, [%lo(leon3_snooping_avail+CONFIG_SYS_RELOC_MONITOR_BASE-CONFIG_SYS_TEXT_BASE)+%o1]
/* call relocate*/ /* call relocate*/
nop nop
@ -410,7 +410,7 @@ _irq_entry:
WRITE_PAUSE WRITE_PAUSE
mov %l7, %o0 ! irq level mov %l7, %o0 ! irq level
set handler_irq, %o1 set handler_irq, %o1
set (CONFIG_SYS_RELOC_MONITOR_BASE-TEXT_BASE), %o2 set (CONFIG_SYS_RELOC_MONITOR_BASE-CONFIG_SYS_TEXT_BASE), %o2
add %o1, %o2, %o1 add %o1, %o2, %o1
call %o1 call %o1
add %sp, SF_REGS_SZ, %o1 ! pt_regs ptr add %sp, SF_REGS_SZ, %o1 ! pt_regs ptr

4
arch/sparc/include/asm/asmmacro.h
View File

@ -33,8 +33,8 @@
* c-code can be called. * c-code can be called.
*/ */
#define SAVE_ALL_HEAD \ #define SAVE_ALL_HEAD \
sethi %hi(trap_setup+(CONFIG_SYS_RELOC_MONITOR_BASE-TEXT_BASE)), %l4; \ sethi %hi(trap_setup+(CONFIG_SYS_RELOC_MONITOR_BASE-CONFIG_SYS_TEXT_BASE)), %l4; \
jmpl %l4 + %lo(trap_setup+(CONFIG_SYS_RELOC_MONITOR_BASE-TEXT_BASE)), %l6; jmpl %l4 + %lo(trap_setup+(CONFIG_SYS_RELOC_MONITOR_BASE-CONFIG_SYS_TEXT_BASE)), %l6;
#define SAVE_ALL \ #define SAVE_ALL \
SAVE_ALL_HEAD \ SAVE_ALL_HEAD \
nop; nop;

2
board/BuS/EB+MCF-EV123/EB+MCF-EV123.c
View File

@ -43,7 +43,7 @@ unsigned long display_height;
int checkboard (void) int checkboard (void)
{ {
puts ("Board: MCF-EV1 + MCF-EV23 (BuS Elektronik GmbH & Co. KG)\n"); puts ("Board: MCF-EV1 + MCF-EV23 (BuS Elektronik GmbH & Co. KG)\n");
#if (TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE) #if (CONFIG_SYS_TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE)
puts (" Boot from Internal FLASH\n"); puts (" Boot from Internal FLASH\n");
#endif #endif

4
board/BuS/EB+MCF-EV123/config.mk
View File

@ -23,6 +23,6 @@
# #
sinclude $(OBJTREE)/board/$(BOARDDIR)/textbase.mk sinclude $(OBJTREE)/board/$(BOARDDIR)/textbase.mk
ifndef TEXT_BASE ifndef CONFIG_SYS_TEXT_BASE
TEXT_BASE = 0xFE000000 CONFIG_SYS_TEXT_BASE = 0xFE000000
endif endif

2
board/BuS/EB+MCF-EV123/textbase.mk
View File

@ -1 +1 @@
TEXT_BASE = 0xFFE00000 CONFIG_SYS_TEXT_BASE = 0xFFE00000

2
board/BuS/eb_cpux9k2/config.mk
View File

@ -1 +1 @@
TEXT_BASE = 0x23f00000 CONFIG_SYS_TEXT_BASE = 0x23f00000

4
board/LEOX/elpt860/config.mk
View File

@ -32,5 +32,5 @@
# ELPT860 board # ELPT860 board
# #
TEXT_BASE = 0x02000000 CONFIG_SYS_TEXT_BASE = 0x02000000
#TEXT_BASE = 0x00FB0000 #CONFIG_SYS_TEXT_BASE = 0x00FB0000

2
board/LaCie/edminiv2/config.mk
View File

@ -24,4 +24,4 @@
# MA 02110-1301 USA # MA 02110-1301 USA
# #
TEXT_BASE = 0x00100000 CONFIG_SYS_TEXT_BASE = 0x00100000

2
board/Marvell/db64360/config.mk
View File

@ -25,4 +25,4 @@
# EVB64360 boards # EVB64360 boards
# #
TEXT_BASE = 0xfff00000 CONFIG_SYS_TEXT_BASE = 0xfff00000

2
board/Marvell/db64460/config.mk
View File

@ -25,4 +25,4 @@
# EVB64460 boards # EVB64460 boards
# #
TEXT_BASE = 0xfff00000 CONFIG_SYS_TEXT_BASE = 0xfff00000

2
board/Marvell/guruplug/config.mk
View File

@ -22,6 +22,6 @@
# MA 02110-1301 USA # MA 02110-1301 USA
# #
TEXT_BASE = 0x00600000 CONFIG_SYS_TEXT_BASE = 0x00600000
KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg

2
board/Marvell/mv88f6281gtw_ge/config.mk
View File

@ -22,7 +22,7 @@
# MA 02110-1301 USA # MA 02110-1301 USA
# #
TEXT_BASE = 0x00600000 CONFIG_SYS_TEXT_BASE = 0x00600000
# Kirkwood Boot Image configuration file # Kirkwood Boot Image configuration file
KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg

2
board/Marvell/openrd_base/config.mk
View File

@ -27,7 +27,7 @@
# MA 02110-1301 USA # MA 02110-1301 USA
# #
TEXT_BASE = 0x00600000 CONFIG_SYS_TEXT_BASE = 0x00600000
# Kirkwood Boot Image configuration file # Kirkwood Boot Image configuration file
KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg

2
board/Marvell/rd6281a/config.mk
View File

@ -22,7 +22,7 @@
# MA 02110-1301 USA # MA 02110-1301 USA
# #
TEXT_BASE = 0x00600000 CONFIG_SYS_TEXT_BASE = 0x00600000
# Kirkwood Boot Image configuration file # Kirkwood Boot Image configuration file
KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg

2
board/Marvell/sheevaplug/config.mk
View File

@ -22,7 +22,7 @@
# MA 02110-1301 USA # MA 02110-1301 USA
# #
TEXT_BASE = 0x00600000 CONFIG_SYS_TEXT_BASE = 0x00600000
# Kirkwood Boot Image configuration file # Kirkwood Boot Image configuration file
KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg

2
board/RPXClassic/config.mk
View File

@ -26,4 +26,4 @@
# MA 02111-1307 USA # MA 02111-1307 USA
# #
TEXT_BASE = 0xff000000 CONFIG_SYS_TEXT_BASE = 0xff000000

2
board/RPXlite/config.mk
View File

@ -25,4 +25,4 @@
# RPXlite boards # RPXlite boards
# #
TEXT_BASE = 0xfff00000 CONFIG_SYS_TEXT_BASE = 0xfff00000

2
board/RPXlite_dw/config.mk
View File

@ -26,4 +26,4 @@
# RPXlite dw boards : lite_dw # RPXlite dw boards : lite_dw
# #
TEXT_BASE = 0xff000000 CONFIG_SYS_TEXT_BASE = 0xff000000

2
board/RRvision/config.mk
View File

@ -25,4 +25,4 @@
# RedRock vision boards # RedRock vision boards
# #
TEXT_BASE = 0x40000000 CONFIG_SYS_TEXT_BASE = 0x40000000

4
board/a3000/config.mk
View File

@ -25,6 +25,6 @@
# Artis A-3000 boards # Artis A-3000 boards
# #
TEXT_BASE = 0xFFF00000 CONFIG_SYS_TEXT_BASE = 0xFFF00000
PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)

2
board/actux1/config.mk
View File

@ -1,4 +1,4 @@
TEXT_BASE = 0x00e00000 CONFIG_SYS_TEXT_BASE = 0x00e00000
# include NPE ethernet driver # include NPE ethernet driver
BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a

2
board/actux2/config.mk
View File

@ -1,4 +1,4 @@
TEXT_BASE = 0x00e00000 CONFIG_SYS_TEXT_BASE = 0x00e00000
# include NPE ethernet driver # include NPE ethernet driver
BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a

2
board/actux3/config.mk
View File

@ -1,4 +1,4 @@
TEXT_BASE = 0x00e00000 CONFIG_SYS_TEXT_BASE = 0x00e00000
# include NPE ethernet driver # include NPE ethernet driver
BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a

2
board/actux4/config.mk
View File

@ -1,4 +1,4 @@
TEXT_BASE = 0x00e00000 CONFIG_SYS_TEXT_BASE = 0x00e00000
# include NPE ethernet driver # include NPE ethernet driver
BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a

2
board/adder/config.mk
View File

@ -24,4 +24,4 @@
# #
# Analogue&Micro Adder boards family # Analogue&Micro Adder boards family
# #
TEXT_BASE = 0xFE000000 CONFIG_SYS_TEXT_BASE = 0xFE000000

2
board/afeb9260/config.mk
View File

@ -1 +1 @@
TEXT_BASE = 0x21f00000 CONFIG_SYS_TEXT_BASE = 0x21f00000

7
board/alaska/config.mk
View File

@ -25,7 +25,8 @@
# alaska board # alaska board
# #
TEXT_BASE = 0xfff00000 CONFIG_SYS_TEXT_BASE = 0xfff00000
# TEXT_BASE = 0x00100000 # CONFIG_SYS_TEXT_BASE = 0x00100000
PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
-I$(TOPDIR)/board

2
board/altera/nios2-generic/config.mk
View File

@ -22,7 +22,7 @@
# #
# we get text_base from board config header, so do not use this # we get text_base from board config header, so do not use this
#TEXT_BASE = do-not-use-me #CONFIG_SYS_TEXT_BASE = do-not-use-me
PLATFORM_CPPFLAGS += -mno-hw-div -mno-hw-mul PLATFORM_CPPFLAGS += -mno-hw-div -mno-hw-mul
PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(VENDOR)/include PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(VENDOR)/include

4
board/amcc/acadia/config.mk
View File

@ -27,8 +27,8 @@
sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
ifndef TEXT_BASE ifndef CONFIG_SYS_TEXT_BASE
TEXT_BASE = 0xFFF80000 CONFIG_SYS_TEXT_BASE = 0xFFF80000
endif endif
ifeq ($(debug),1) ifeq ($(debug),1)

4
board/amcc/bamboo/config.mk
View File

@ -23,8 +23,8 @@
sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
ifndef TEXT_BASE ifndef CONFIG_SYS_TEXT_BASE
TEXT_BASE = 0xFFFA0000 CONFIG_SYS_TEXT_BASE = 0xFFFA0000
endif endif
PLATFORM_CPPFLAGS += -DCONFIG_440=1 PLATFORM_CPPFLAGS += -DCONFIG_440=1

4
board/amcc/bluestone/config.mk
View File

@ -25,8 +25,8 @@
sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
ifndef TEXT_BASE ifndef CONFIG_SYS_TEXT_BASE
TEXT_BASE = 0xFFFA0000 CONFIG_SYS_TEXT_BASE = 0xFFFA0000
endif endif
PLATFORM_CPPFLAGS += -DCONFIG_440=1 PLATFORM_CPPFLAGS += -DCONFIG_440=1

2
board/amcc/bubinga/config.mk
View File

@ -21,4 +21,4 @@
# MA 02111-1307 USA # MA 02111-1307 USA
# #
TEXT_BASE = 0xFFFC0000 CONFIG_SYS_TEXT_BASE = 0xFFFC0000

4
board/amcc/canyonlands/config.mk
View File

@ -26,8 +26,8 @@
sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
ifndef TEXT_BASE ifndef CONFIG_SYS_TEXT_BASE
TEXT_BASE = 0xFFF80000 CONFIG_SYS_TEXT_BASE = 0xFFF80000
endif endif
PLATFORM_CPPFLAGS += -DCONFIG_440=1 PLATFORM_CPPFLAGS += -DCONFIG_440=1

6
board/amcc/ebony/config.mk
View File

@ -25,12 +25,12 @@
# esd ADCIOP boards # esd ADCIOP boards
# #
#TEXT_BASE = 0xFFFE0000 #CONFIG_SYS_TEXT_BASE = 0xFFFE0000
ifeq ($(ramsym),1) ifeq ($(ramsym),1)
TEXT_BASE = 0x07FD0000 CONFIG_SYS_TEXT_BASE = 0x07FD0000
else else
TEXT_BASE = 0xFFFC0000 CONFIG_SYS_TEXT_BASE = 0xFFFC0000
endif endif
PLATFORM_CPPFLAGS += -DCONFIG_440=1 PLATFORM_CPPFLAGS += -DCONFIG_440=1

2
board/amcc/katmai/config.mk
View File

@ -25,7 +25,7 @@
# AMCC 440SPe Evaluation (Katmai) board # AMCC 440SPe Evaluation (Katmai) board
# #
TEXT_BASE = 0xFFFA0000 CONFIG_SYS_TEXT_BASE = 0xFFFA0000
PLATFORM_CPPFLAGS += -DCONFIG_440=1 PLATFORM_CPPFLAGS += -DCONFIG_440=1

4
board/amcc/kilauea/config.mk
View File

@ -23,8 +23,8 @@
sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
ifndef TEXT_BASE ifndef CONFIG_SYS_TEXT_BASE
TEXT_BASE = 0xFFFA0000 CONFIG_SYS_TEXT_BASE = 0xFFFA0000
endif endif
ifeq ($(debug),1) ifeq ($(debug),1)

6
board/amcc/luan/config.mk
View File

@ -25,12 +25,12 @@
# esd ADCIOP boards # esd ADCIOP boards
# #
#TEXT_BASE = 0x00001000 #CONFIG_SYS_TEXT_BASE = 0x00001000
ifeq ($(ramsym),1) ifeq ($(ramsym),1)
TEXT_BASE = 0xFBD00000 CONFIG_SYS_TEXT_BASE = 0xFBD00000
else else
TEXT_BASE = 0xFFFB0000 CONFIG_SYS_TEXT_BASE = 0xFFFB0000
endif endif
PLATFORM_CPPFLAGS += -DCONFIG_440=1 PLATFORM_CPPFLAGS += -DCONFIG_440=1

2
board/amcc/makalu/config.mk
View File

@ -21,4 +21,4 @@
# MA 02111-1307 USA # MA 02111-1307 USA
# #
TEXT_BASE = 0xFFFA0000 CONFIG_SYS_TEXT_BASE = 0xFFFA0000

6
board/amcc/ocotea/config.mk
View File

@ -25,12 +25,12 @@
# AMCC 440GX Reference Platform (Ocotea) board # AMCC 440GX Reference Platform (Ocotea) board
# #
#TEXT_BASE = 0xFFFE0000 #CONFIG_SYS_TEXT_BASE = 0xFFFE0000
ifeq ($(ramsym),1) ifeq ($(ramsym),1)
TEXT_BASE = 0x07FD0000 CONFIG_SYS_TEXT_BASE = 0x07FD0000
else else
TEXT_BASE = 0xFFFC0000 CONFIG_SYS_TEXT_BASE = 0xFFFC0000
endif endif
PLATFORM_CPPFLAGS += -DCONFIG_440=1 PLATFORM_CPPFLAGS += -DCONFIG_440=1

4
board/amcc/redwood/config.mk
View File

@ -26,9 +26,9 @@
# #
ifeq ($(ramsym),1) ifeq ($(ramsym),1)
TEXT_BASE = 0x07FD0000 CONFIG_SYS_TEXT_BASE = 0x07FD0000
else else
TEXT_BASE = 0xfffb0000 CONFIG_SYS_TEXT_BASE = 0xfffb0000
endif endif
PLATFORM_CPPFLAGS += -DCONFIG_440=1 PLATFORM_CPPFLAGS += -DCONFIG_440=1

4
board/amcc/sequoia/config.mk
View File

@ -26,8 +26,8 @@
sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
ifndef TEXT_BASE ifndef CONFIG_SYS_TEXT_BASE
TEXT_BASE = 0xFFF80000 CONFIG_SYS_TEXT_BASE = 0xFFF80000
endif endif
PLATFORM_CPPFLAGS += -DCONFIG_440=1 PLATFORM_CPPFLAGS += -DCONFIG_440=1

2
board/amcc/taihu/config.mk
View File

@ -21,4 +21,4 @@
# MA 02111-1307 USA # MA 02111-1307 USA
# #
TEXT_BASE = 0xFFFC0000 CONFIG_SYS_TEXT_BASE = 0xFFFC0000

6
board/amcc/taishan/config.mk
View File

@ -25,12 +25,12 @@
# AMCC 440GX Reference Platform (Taishan) board # AMCC 440GX Reference Platform (Taishan) board
# #
#TEXT_BASE = 0xFFFE0000 #CONFIG_SYS_TEXT_BASE = 0xFFFE0000
ifeq ($(ramsym),1) ifeq ($(ramsym),1)
TEXT_BASE = 0x07FD0000 CONFIG_SYS_TEXT_BASE = 0x07FD0000
else else
TEXT_BASE = 0xFFFC0000 CONFIG_SYS_TEXT_BASE = 0xFFFC0000
endif endif
PLATFORM_CPPFLAGS += -DCONFIG_440=1 PLATFORM_CPPFLAGS += -DCONFIG_440=1

2
board/amcc/walnut/config.mk
View File

@ -21,4 +21,4 @@
# MA 02111-1307 USA # MA 02111-1307 USA
# #
TEXT_BASE = 0xFFFC0000 CONFIG_SYS_TEXT_BASE = 0xFFFC0000

6
board/amcc/yosemite/config.mk
View File

@ -25,12 +25,12 @@
# esd ADCIOP boards # esd ADCIOP boards
# #
#TEXT_BASE = 0x00001000 #CONFIG_SYS_TEXT_BASE = 0x00001000
ifeq ($(ramsym),1) ifeq ($(ramsym),1)
TEXT_BASE = 0xFBD00000 CONFIG_SYS_TEXT_BASE = 0xFBD00000
else else
TEXT_BASE = 0xFFF80000 CONFIG_SYS_TEXT_BASE = 0xFFF80000
endif endif
PLATFORM_CPPFLAGS += -DCONFIG_440=1 PLATFORM_CPPFLAGS += -DCONFIG_440=1

4
board/amcc/yucca/config.mk
View File

@ -26,9 +26,9 @@
# #
ifeq ($(ramsym),1) ifeq ($(ramsym),1)
TEXT_BASE = 0x07FD0000 CONFIG_SYS_TEXT_BASE = 0x07FD0000
else else
TEXT_BASE = 0xfffb0000 CONFIG_SYS_TEXT_BASE = 0xfffb0000
endif endif
PLATFORM_CPPFLAGS += -DCONFIG_440=1 PLATFORM_CPPFLAGS += -DCONFIG_440=1

2
board/amirix/ap1000/config.mk
View File

@ -24,7 +24,7 @@
# Start at bottom of RAM, but at an aliased address so that it looks # Start at bottom of RAM, but at an aliased address so that it looks
# like it's not in RAM. This is a bit of voodoo to allow it to be # like it's not in RAM. This is a bit of voodoo to allow it to be
# run from RAM instead of Flash. # run from RAM instead of Flash.
TEXT_BASE = 0x08000000 CONFIG_SYS_TEXT_BASE = 0x08000000
# Use board specific linker script # Use board specific linker script
LDSCRIPT := $(SRCTREE)/board/amirix/ap1000/u-boot.lds LDSCRIPT := $(SRCTREE)/board/amirix/ap1000/u-boot.lds

8
board/apollon/config.mk
View File

@ -13,13 +13,13 @@
# Linux-Kernel is expected to be at 8000'8000, entry 8000'8000 # Linux-Kernel is expected to be at 8000'8000, entry 8000'8000
# (mem base + reserved) # (mem base + reserved)
# For use with external or internal boots. # For use with external or internal boots.
TEXT_BASE = 0x83e80000 CONFIG_SYS_TEXT_BASE = 0x83e80000
# Used with full SRAM boot. # Used with full SRAM boot.
# This is either with a GP system or a signed boot image. # This is either with a GP system or a signed boot image.
# easiest, and safest way to go if you can. # easiest, and safest way to go if you can.
#TEXT_BASE = 0x40270000 #CONFIG_SYS_TEXT_BASE = 0x40270000
# Handy to get symbols to debug ROM version. # Handy to get symbols to debug ROM version.
#TEXT_BASE = 0x0 #CONFIG_SYS_TEXT_BASE = 0x0
#TEXT_BASE = 0x08000000 #CONFIG_SYS_TEXT_BASE = 0x08000000

2
board/apollon/lowlevel_init.S
View File

@ -46,7 +46,7 @@
#define SDRAM_BASE_ADDRESS 0x80008000 #define SDRAM_BASE_ADDRESS 0x80008000
_TEXT_BASE: _TEXT_BASE:
.word TEXT_BASE /* sdram load addr from config.mk */ .word CONFIG_SYS_TEXT_BASE /* sdram load addr from config.mk */
.globl lowlevel_init .globl lowlevel_init
lowlevel_init: lowlevel_init:

2
board/armadillo/config.mk
View File

@ -26,4 +26,4 @@
# #
#address where u-boot will be relocated #address where u-boot will be relocated
TEXT_BASE = 0xc0f80000 CONFIG_SYS_TEXT_BASE = 0xc0f80000

2
board/armltd/integrator/config.mk
View File

@ -2,4 +2,4 @@
# image should be loaded at 0x01000000 # image should be loaded at 0x01000000
# #
TEXT_BASE = 0x01000000 CONFIG_SYS_TEXT_BASE = 0x01000000

2
board/armltd/versatile/config.mk
View File

@ -2,4 +2,4 @@
# image should be loaded at 0x01000000 # image should be loaded at 0x01000000
# #
TEXT_BASE = 0x01000000 CONFIG_SYS_TEXT_BASE = 0x01000000

2
board/assabet/config.mk
View File

@ -4,4 +4,4 @@
# The Intel Assabet 1 bank of 32 MiB SDRAM # The Intel Assabet 1 bank of 32 MiB SDRAM
# #
TEXT_BASE = 0xc1f00000 CONFIG_SYS_TEXT_BASE = 0xc1f00000

4
board/astro/mcf5373l/config.mk
View File

@ -22,6 +22,4 @@
# MA 02111-1307 USA # MA 02111-1307 USA
# #
TEXT_BASE = $(CONFIG_TEXT_BASE) PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)
PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE)

7
board/atc/config.mk
View File

@ -30,9 +30,10 @@
# in RAM where U-Boot is loaded at for debugging. # in RAM where U-Boot is loaded at for debugging.
# #
TEXT_BASE := 0xFF000000 CONFIG_SYS_TEXT_BASE := 0xFF000000
# RAM version # RAM version
#TEXT_BASE := 0x100000 #CONFIG_SYS_TEXT_BASE := 0x100000
PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
-I$(TOPDIR)

2
board/atmel/at91cap9adk/config.mk
View File

@ -1 +1 @@
TEXT_BASE = 0x73000000 CONFIG_SYS_TEXT_BASE = 0x73000000

2
board/atmel/at91rm9200dk/config.mk
View File

@ -1 +1 @@
TEXT_BASE = 0x21f00000 CONFIG_SYS_TEXT_BASE = 0x21f00000

2
board/atmel/at91rm9200ek/config.mk
View File

@ -1 +1 @@
TEXT_BASE = 0x21f00000 CONFIG_SYS_TEXT_BASE = 0x21f00000

2
board/atmel/at91sam9260ek/config.mk
View File

@ -1 +1 @@
TEXT_BASE = 0x23f00000 CONFIG_SYS_TEXT_BASE = 0x23f00000

2
board/atmel/at91sam9261ek/config.mk
View File

@ -1 +1 @@
TEXT_BASE = 0x23f00000 CONFIG_SYS_TEXT_BASE = 0x23f00000

2
board/atmel/at91sam9263ek/config.mk
View File

@ -1 +1 @@
TEXT_BASE = 0x23f00000 CONFIG_SYS_TEXT_BASE = 0x23f00000

2
board/atmel/at91sam9m10g45ek/config.mk
View File

@ -1 +1 @@
TEXT_BASE = 0x73f00000 CONFIG_SYS_TEXT_BASE = 0x73f00000

2
board/atmel/at91sam9rlek/config.mk
View File

@ -1 +1 @@
TEXT_BASE = 0x23f00000 CONFIG_SYS_TEXT_BASE = 0x23f00000

2
board/atmel/atngw100/config.mk
View File

@ -1,3 +1,3 @@
TEXT_BASE = 0x00000000 CONFIG_SYS_TEXT_BASE = 0x00000000
PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
PLATFORM_LDFLAGS += --gc-sections PLATFORM_LDFLAGS += --gc-sections

Some files were not shown because too many files have changed in this diff Show More