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>

diff --git a/Makefile b/Makefile
index 4fa13bc..ad09a5f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -330,18 +330,18 @@ $(obj)u-boot.ldr.srec:    $(obj)u-boot.ldr
 
 $(obj)u-boot.img:      $(obj)u-boot.bin
                $(obj)tools/mkimage -A $(ARCH) -T firmware -C none \
 
 $(obj)u-boot.img:      $(obj)u-boot.bin
                $(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) | \
                        sed -e 's/"[     ]*$$/ for $(BOARD) board"/') \
                -d $< $@
 
 $(obj)u-boot.imx:       $(obj)u-boot.bin
                $(obj)tools/mkimage -n $(IMX_CONFIG) -T imximage \
                -n $(shell sed -n -e 's/.*U_BOOT_VERSION//p' $(VERSION_FILE) | \
                        sed -e 's/"[     ]*$$/ for $(BOARD) board"/') \
                -d $< $@
 
 $(obj)u-boot.imx:       $(obj)u-boot.bin
                $(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)tools/mkimage -n $(KWD_CONFIG) -T kwbimage \
 
 $(obj)u-boot.kwb:       $(obj)u-boot.bin
                $(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)tools/ubsha1 $(obj)u-boot.bin
 
 $(obj)u-boot.sha1:     $(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
        @ >$(obj)include/config.h
        @[ -z "$(findstring LOWBOOT_,$@)" ] || \
        @mkdir -p $(obj)board/digsy_mtc
        @ >$(obj)include/config.h
        @[ -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
 
 galaxy5200_LOWBOOT_config \
        @$(MKCONFIG) -n $@ -a digsy_mtc powerpc mpc5xxx digsy_mtc
 
 galaxy5200_LOWBOOT_config \


@@ -542,11 +542,11 @@ icecube_5200_DDR_LOWBOOT08_config:        unconfig
        @mkdir -p $(obj)board/icecube
        @[ -z "$(findstring LOWBOOT_,$@)" ] || \
                if [ "$(findstring DDR,$@)" ] ; \
        @mkdir -p $(obj)board/icecube
        @[ -z "$(findstring LOWBOOT_,$@)" ] || \
                if [ "$(findstring DDR,$@)" ] ; \

-                       then echo "TEXT_BASE = 0xFF800000" >$(obj)board/icecube/config.tmp ; \
-                       else echo "TEXT_BASE = 0xFF000000" >$(obj)board/icecube/config.tmp ; \
+                       then echo "CONFIG_SYS_TEXT_BASE = 0xFF800000" >$(obj)board/icecube/config.tmp ; \
+                       else echo "CONFIG_SYS_TEXT_BASE = 0xFF000000" >$(obj)board/icecube/config.tmp ; \

                fi
        @[ -z "$(findstring LOWBOOT08,$@)" ] || \
                fi
        @[ -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,$@)" ] || \
                echo "#define CONFIG_MPC5200_DDR" >>$(obj)include/config.h
        @$(MKCONFIG) -n $@ -a IceCube powerpc mpc5xxx icecube
        @[ -z "$(findstring DDR,$@)" ] || \
                echo "#define CONFIG_MPC5200_DDR" >>$(obj)include/config.h
        @$(MKCONFIG) -n $@ -a IceCube powerpc mpc5xxx icecube


@@ -561,7 +561,7 @@ lite5200b_LOWBOOT_config:   unconfig
        @[ -z "$(findstring _PM_,$@)" ] || \
                echo "#define CONFIG_LITE5200B_PM" >>$(obj)include/config.h
        @[ -z "$(findstring LOWBOOT_,$@)" ] || \
        @[ -z "$(findstring _PM_,$@)" ] || \
                echo "#define CONFIG_LITE5200B_PM" >>$(obj)include/config.h
        @[ -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
 
 mcc200_config  \
        @$(MKCONFIG) -n $@ -a IceCube  powerpc mpc5xxx icecube
 
 mcc200_config  \


@@ -579,7 +579,7 @@ prs200_highboot_DDR_config: unconfig
        @mkdir -p $(obj)include
        @mkdir -p $(obj)board/mcc200
        @[ -z "$(findstring highboot,$@)" ] || \
        @mkdir -p $(obj)include
        @mkdir -p $(obj)board/mcc200
        @[ -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,$@)" ] || \
                if [ -n "$(findstring prs200,$@)" ]; \
                then \
        @[ -n "$(findstring _SDRAM,$@)" ] || \
                if [ -n "$(findstring prs200,$@)" ]; \
                then \


@@ -614,7 +614,7 @@ pcm030_LOWBOOT_config:      unconfig
        @mkdir -p $(obj)include $(obj)board/phytec/pcm030
        @ >$(obj)include/config.h
        @[ -z "$(findstring LOWBOOT_,$@)" ] || \
        @mkdir -p $(obj)include $(obj)board/phytec/pcm030
        @ >$(obj)include/config.h
        @[ -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
 
 PM520_config \
        @$(MKCONFIG) -n $@ -a pcm030 powerpc mpc5xxx pcm030 phytec
 
 PM520_config \


@@ -653,7 +653,7 @@ Total5200_Rev2_lowboot_config:      unconfig
        @[ -z "$(findstring Rev2_,$@)" ] || \
                echo "#define CONFIG_TOTAL5200_REV 2" >>$(obj)include/config.h
        @[ -z "$(findstring lowboot_,$@)" ] || \
        @[ -z "$(findstring Rev2_,$@)" ] || \
                echo "#define CONFIG_TOTAL5200_REV 2" >>$(obj)include/config.h
        @[ -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
 
 cam5200_config \
        @$(MKCONFIG) -n $@ -a Total5200 powerpc mpc5xxx total5200
 
 cam5200_config \


@@ -688,7 +688,7 @@ TQM5200_STK100_config:      unconfig
                  echo "#define CONFIG_TQM5200_B" >>$(obj)include/config.h ; \
                }
        @[ -z "$(findstring HIGHBOOT,$@)" ] || \
                  echo "#define CONFIG_TQM5200_B" >>$(obj)include/config.h ; \
                }
        @[ -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)nand_spl/board/amcc/acadia
        @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
        @mkdir -p $(obj)include $(obj)board/amcc/acadia
        @mkdir -p $(obj)nand_spl/board/amcc/acadia
        @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
        @$(MKCONFIG) -n $@ -a acadia powerpc ppc4xx acadia amcc
 
        @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
        @$(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)nand_spl/board/amcc/bamboo
        @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
        @mkdir -p $(obj)include $(obj)board/amcc/bamboo
        @mkdir -p $(obj)nand_spl/board/amcc/bamboo
        @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
        @$(MKCONFIG) -n $@ -a bamboo powerpc ppc4xx bamboo amcc
 
        @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
        @$(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_$$(echo $(subst ,,$(@:_nand_config=)) | \
                tr '[:lower:]' '[:upper:]')" >> $(obj)include/config.h
        @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
        @echo "#define CONFIG_$$(echo $(subst ,,$(@:_nand_config=)) | \
                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
        @$(MKCONFIG) -n $@ -a canyonlands powerpc ppc4xx canyonlands amcc
 
        @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
        @$(MKCONFIG) -n $@ -a canyonlands powerpc ppc4xx canyonlands amcc
 


@@ -977,7 +977,7 @@ fx12mm_flash_config: unconfig
        @mkdir -p $(obj)include $(obj)board/avnet/fx12mm
        @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-rom.lds"\
                > $(obj)board/avnet/fx12mm/config.tmp
        @mkdir -p $(obj)include $(obj)board/avnet/fx12mm
        @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-rom.lds"\
                > $(obj)board/avnet/fx12mm/config.tmp

-       @echo "TEXT_BASE := 0xFFCB0000" \
+       @echo "CONFIG_SYS_TEXT_BASE := 0xFFCB0000" \

                >> $(obj)board/avnet/fx12mm/config.tmp
        @$(MKCONFIG) fx12mm powerpc ppc4xx fx12mm avnet
 
                >> $(obj)board/avnet/fx12mm/config.tmp
        @$(MKCONFIG) fx12mm powerpc ppc4xx fx12mm avnet
 


@@ -986,7 +986,7 @@ fx12mm_config: unconfig
        @mkdir -p $(obj)include $(obj)board/avnet/fx12mm
        @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-ram.lds"\
                > $(obj)board/avnet/fx12mm/config.tmp
        @mkdir -p $(obj)include $(obj)board/avnet/fx12mm
        @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-ram.lds"\
                > $(obj)board/avnet/fx12mm/config.tmp

-       @echo "TEXT_BASE := 0x03000000" \
+       @echo "CONFIG_SYS_TEXT_BASE := 0x03000000" \

                >> $(obj)board/avnet/fx12mm/config.tmp
        @$(MKCONFIG) fx12mm powerpc ppc4xx fx12mm avnet
 
                >> $(obj)board/avnet/fx12mm/config.tmp
        @$(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)nand_spl/board/amcc/kilauea
        @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
        @mkdir -p $(obj)include $(obj)board/amcc/kilauea
        @mkdir -p $(obj)nand_spl/board/amcc/kilauea
        @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
        @$(MKCONFIG) -n $@ -a kilauea powerpc ppc4xx kilauea amcc
 
        @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
        @$(MKCONFIG) -n $@ -a kilauea powerpc ppc4xx kilauea amcc
 


@@ -1029,7 +1029,7 @@ ml507_flash_config: unconfig
        @mkdir -p $(obj)include $(obj)board/xilinx/ml507
        @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds"\
                > $(obj)board/xilinx/ml507/config.tmp
        @mkdir -p $(obj)include $(obj)board/xilinx/ml507
        @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds"\
                > $(obj)board/xilinx/ml507/config.tmp

-       @echo "TEXT_BASE := 0xFE360000" \
+       @echo "CONFIG_SYS_TEXT_BASE := 0xFE360000" \

                >> $(obj)board/xilinx/ml507/config.tmp
        @$(MKCONFIG) ml507 powerpc ppc4xx ml507 xilinx
 
                >> $(obj)board/xilinx/ml507/config.tmp
        @$(MKCONFIG) ml507 powerpc ppc4xx ml507 xilinx
 


@@ -1038,7 +1038,7 @@ ml507_config: unconfig
        @mkdir -p $(obj)include $(obj)board/xilinx/ml507
        @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-ram.lds"\
                > $(obj)board/xilinx/ml507/config.tmp
        @mkdir -p $(obj)include $(obj)board/xilinx/ml507
        @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-ram.lds"\
                > $(obj)board/xilinx/ml507/config.tmp

-       @echo "TEXT_BASE := 0x04000000"  \
+       @echo "CONFIG_SYS_TEXT_BASE := 0x04000000"  \

                >> $(obj)board/xilinx/ml507/config.tmp
        @$(MKCONFIG) $@ powerpc ppc4xx ml507 xilinx
 
                >> $(obj)board/xilinx/ml507/config.tmp
        @$(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_$$(echo $(subst ,,$(@:_config=)) | \
                tr '[:lower:]' '[:upper:]')" >> $(obj)include/config.h
        @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
        @echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \
                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
        @$(MKCONFIG) -n $@ -a sequoia powerpc ppc4xx sequoia amcc
 
        @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
        @$(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_$$(echo $(subst ,,$(@:_config=)) | \
                tr '[:lower:]' '[:upper:]')" >> $(obj)include/config.h
        @echo "#define CONFIG_SYS_RAMBOOT" > $(obj)include/config.h
        @echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \
                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" >> \
                $(obj)board/amcc/sequoia/config.tmp
        @$(MKCONFIG) -n $@ -a sequoia powerpc ppc4xx sequoia amcc
        @echo "LDSCRIPT = board/amcc/sequoia/u-boot-ram.lds" >> \
                $(obj)board/amcc/sequoia/config.tmp
        @$(MKCONFIG) -n $@ -a sequoia powerpc ppc4xx sequoia amcc


@@ -1100,7 +1100,7 @@ v5fx30teval_config: unconfig
        @mkdir -p $(obj)include $(obj)board/avnet/v5fx30teval
        @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-ram.lds"\
                > $(obj)board/avnet/v5fx30teval/config.tmp
        @mkdir -p $(obj)include $(obj)board/avnet/v5fx30teval
        @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-ram.lds"\
                > $(obj)board/avnet/v5fx30teval/config.tmp

-       @echo "TEXT_BASE := 0x03000000" \
+       @echo "CONFIG_SYS_TEXT_BASE := 0x03000000" \

                >> $(obj)board/avnet/v5fx30teval/config.tmp
        @$(MKCONFIG) $@ powerpc ppc4xx v5fx30teval avnet
 
                >> $(obj)board/avnet/v5fx30teval/config.tmp
        @$(MKCONFIG) $@ powerpc ppc4xx v5fx30teval avnet
 


@@ -1109,7 +1109,7 @@ v5fx30teval_flash_config: unconfig
        @mkdir -p $(obj)include $(obj)board/avnet/v5fx30teval
        @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds"\
                > $(obj)board/avnet/v5fx30teval/config.tmp
        @mkdir -p $(obj)include $(obj)board/avnet/v5fx30teval
        @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds"\
                > $(obj)board/avnet/v5fx30teval/config.tmp

-       @echo "TEXT_BASE := 0xFF1C0000" \
+       @echo "CONFIG_SYS_TEXT_BASE := 0xFF1C0000" \

                >> $(obj)board/avnet/v5fx30teval/config.tmp
        @$(MKCONFIG) v5fx30teval powerpc ppc4xx v5fx30teval avnet
 
                >> $(obj)board/avnet/v5fx30teval/config.tmp
        @$(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
        @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-rom.lds"\
                > $(obj)board/xilinx/ppc405-generic/config.tmp
        @mkdir -p $(obj)include $(obj)board/xilinx/ppc405-generic
        @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-rom.lds"\
                > $(obj)board/xilinx/ppc405-generic/config.tmp

-       @echo "TEXT_BASE := 0xFE360000" \
+       @echo "CONFIG_SYS_TEXT_BASE := 0xFE360000" \

                >> $(obj)board/xilinx/ppc405-generic/config.tmp
        @$(MKCONFIG) xilinx-ppc405-generic powerpc ppc4xx ppc405-generic xilinx
 
                >> $(obj)board/xilinx/ppc405-generic/config.tmp
        @$(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
        @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-ram.lds"\
                > $(obj)board/xilinx/ppc405-generic/config.tmp
        @mkdir -p $(obj)include $(obj)board/xilinx/ppc405-generic
        @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-ram.lds"\
                > $(obj)board/xilinx/ppc405-generic/config.tmp

-       @echo "TEXT_BASE := 0x04000000" \
+       @echo "CONFIG_SYS_TEXT_BASE := 0x04000000" \

                >> $(obj)board/xilinx/ppc405-generic/config.tmp
        @$(MKCONFIG) xilinx-ppc405-generic powerpc ppc4xx ppc405-generic xilinx
 
                >> $(obj)board/xilinx/ppc405-generic/config.tmp
        @$(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
        @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds"\
                > $(obj)board/xilinx/ppc440-generic/config.tmp
        @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
        @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds"\
                > $(obj)board/xilinx/ppc440-generic/config.tmp

-       @echo "TEXT_BASE := 0xFE360000" \
+       @echo "CONFIG_SYS_TEXT_BASE := 0xFE360000" \

                >> $(obj)board/xilinx/ppc440-generic/config.tmp
        @$(MKCONFIG) xilinx-ppc440-generic powerpc ppc4xx ppc440-generic xilinx
 
                >> $(obj)board/xilinx/ppc440-generic/config.tmp
        @$(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
        @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-ram.lds"\
                > $(obj)board/xilinx/ppc440-generic/config.tmp
        @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
        @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-ram.lds"\
                > $(obj)board/xilinx/ppc440-generic/config.tmp

-       @echo "TEXT_BASE := 0x04000000" \
+       @echo "CONFIG_SYS_TEXT_BASE := 0x04000000" \

                >> $(obj)board/xilinx/ppc440-generic/config.tmp
        @$(MKCONFIG) xilinx-ppc440-generic powerpc ppc4xx ppc440-generic xilinx
 
                >> $(obj)board/xilinx/ppc440-generic/config.tmp
        @$(MKCONFIG) xilinx-ppc440-generic powerpc ppc4xx ppc440-generic xilinx
 


@@ -1265,7 +1265,7 @@ PQ2FADS-ZU_66MHz_lowboot_config   \
        $(if $(findstring VR,$@), \
        @echo "#define CONFIG_8260_CLKIN 66000000" >> $(obj)include/config.h))
        @[ -z "$(findstring lowboot_,$@)" ] || \
        $(if $(findstring VR,$@), \
        @echo "#define CONFIG_8260_CLKIN 66000000" >> $(obj)include/config.h))
        @[ -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
 
 muas3001_dev_config \
        @$(MKCONFIG) -n $@ -a MPC8260ADS powerpc mpc8260 mpc8260ads freescale
 
 muas3001_dev_config \


@@ -1295,7 +1295,7 @@ PM826_ROMBOOT_BIGFLASH_config:    unconfig
        fi
        @if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
                echo "#define CONFIG_BOOT_ROM" >>$(obj)include/config.h ; \
        fi
        @if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
                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 \
                        echo "#define CONFIG_FLASH_32MB" >>$(obj)include/config.h ; \
                fi; \
                if [ "$(findstring _BIGFLASH_,$@)" ] ; then \
                        echo "#define CONFIG_FLASH_32MB" >>$(obj)include/config.h ; \
                fi; \


@@ -1303,9 +1303,9 @@ PM826_ROMBOOT_BIGFLASH_config:    unconfig
                if [ "$(findstring _BIGFLASH_,$@)" ] ; then \
                        $(XECHO) "... with 32 MB Flash" ; \
                        echo "#define CONFIG_FLASH_32MB" >>$(obj)include/config.h ; \
                if [ "$(findstring _BIGFLASH_,$@)" ] ; then \
                        $(XECHO) "... with 32 MB Flash" ; \
                        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
        @$(MKCONFIG) -n $@ -a PM826 powerpc mpc8260 pm826
                fi; \
        fi
        @$(MKCONFIG) -n $@ -a PM826 powerpc mpc8260 pm826


@@ -1321,7 +1321,7 @@ PM828_ROMBOOT_PCI_config: unconfig
        fi
        @if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
                echo "#define CONFIG_BOOT_ROM" >>$(obj)include/config.h ; \
        fi
        @if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
                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
        @$(MKCONFIG) -n $@ -a PM828 powerpc mpc8260 pm828
 
        fi
        @$(MKCONFIG) -n $@ -a PM828 powerpc mpc8260 pm828
 


@@ -1397,13 +1397,13 @@ M52277EVB_stmicro_config :      unconfig
        esac; \
        if [ "$${FLASH}" = "SPANSION" ] ; then \
                echo "#define CONFIG_SYS_SPANSION_BOOT" >> $(obj)include/config.h ; \
        esac; \
        if [ "$${FLASH}" = "SPANSION" ] ; then \
                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 ; \
        fi; \
        if [ "$${FLASH}" = "STMICRO" ] ; then \
                echo "#define CONFIG_CF_SBF"    >> $(obj)include/config.h ; \
                echo "#define CONFIG_SYS_STMICRO_BOOT"  >> $(obj)include/config.h ; \
                cp $(obj)board/freescale/m52277evb/u-boot.spa $(obj)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 "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 ; \
        fi
        @$(MKCONFIG) -n $@ -a M52277EVB m68k mcf5227x m52277evb freescale
                cp $(obj)board/freescale/m52277evb/u-boot.stm $(obj)board/freescale/m52277evb/u-boot.lds ; \
        fi
        @$(MKCONFIG) -n $@ -a M52277EVB m68k mcf5227x m52277evb freescale


@@ -1418,10 +1418,10 @@ M5235EVB_Flash32_config:        unconfig
        esac; \
        if [ "$${FLASH}" != "16" ] ; then \
                echo "#define NORFLASH_PS32BIT  1" >> $(obj)include/config.h ; \
        esac; \
        if [ "$${FLASH}" != "16" ] ; then \
                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 ; \
        else \
                cp $(obj)board/freescale/m5235evb/u-boot.32 $(obj)board/freescale/m5235evb/u-boot.lds ; \
        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 ; \
        fi
        @$(MKCONFIG) -n $@ -a M5235EVB m68k mcf523x m5235evb freescale
                cp $(obj)board/freescale/m5235evb/u-boot.16 $(obj)board/freescale/m5235evb/u-boot.lds ; \
        fi
        @$(MKCONFIG) -n $@ -a M5235EVB m68k mcf523x m5235evb freescale


@@ -1432,13 +1432,13 @@ cobra5272_config :              unconfig
 EB+MCF-EV123_config :          unconfig
        @mkdir -p $(obj)include
        @mkdir -p $(obj)board/BuS/EB+MCF-EV123
 EB+MCF-EV123_config :          unconfig
        @mkdir -p $(obj)include
        @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
 
 EB+MCF-EV123_internal_config : unconfig
        @mkdir -p $(obj)include
        @mkdir -p $(obj)board/BuS/EB+MCF-EV123
        @$(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 "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
 
 M5329AFEE_config \
        @$(MKCONFIG) -n $@ EB+MCF-EV123 m68k mcf52x2 EB+MCF-EV123 BuS
 
 M5329AFEE_config \


@@ -1468,13 +1468,13 @@ M54451EVB_stmicro_config :      unconfig
        M54451EVB_stmicro_config)       FLASH=STMICRO;; \
        esac; \
        if [ "$${FLASH}" = "NOR" ] ; then \
        M54451EVB_stmicro_config)       FLASH=STMICRO;; \
        esac; \
        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 ; \
        fi; \
        if [ "$${FLASH}" = "STMICRO" ] ; then \
                echo "#define CONFIG_CF_SBF"    >> $(obj)include/config.h ; \
                echo "#define CONFIG_SYS_STMICRO_BOOT"  >> $(obj)include/config.h ; \
                cp $(obj)board/freescale/m54451evb/u-boot.spa $(obj)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 "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 ; \
        fi; \
        echo "#define CONFIG_SYS_INPUT_CLKSRC 24000000" >> $(obj)include/config.h ;
                cp $(obj)board/freescale/m54451evb/u-boot.stm $(obj)board/freescale/m54451evb/u-boot.lds ; \
        fi; \
        echo "#define CONFIG_SYS_INPUT_CLKSRC 24000000" >> $(obj)include/config.h ;


@@ -1500,18 +1500,18 @@ M54455EVB_stm33_config :        unconfig
        esac; \
        if [ "$${FLASH}" = "INTEL" ] ; then \
                echo "#define CONFIG_SYS_INTEL_BOOT" >> $(obj)include/config.h ; \
        esac; \
        if [ "$${FLASH}" = "INTEL" ] ; then \
                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 ; \
        fi; \
        if [ "$${FLASH}" = "ATMEL" ] ; then \
                echo "#define CONFIG_SYS_ATMEL_BOOT"    >> $(obj)include/config.h ; \
                cp $(obj)board/freescale/m54455evb/u-boot.int $(obj)board/freescale/m54455evb/u-boot.lds ; \
        fi; \
        if [ "$${FLASH}" = "ATMEL" ] ; then \
                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 ; \
        fi; \
        if [ "$${FLASH}" = "STMICRO" ] ; then \
                echo "#define CONFIG_CF_SBF"    >> $(obj)include/config.h ; \
                echo "#define CONFIG_SYS_STMICRO_BOOT"  >> $(obj)include/config.h ; \
                cp $(obj)board/freescale/m54455evb/u-boot.atm $(obj)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 "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 ; \
        fi; \
        echo "#define CONFIG_SYS_INPUT_CLKSRC $${FREQ}" >> $(obj)include/config.h ; \
                cp $(obj)board/freescale/m54455evb/u-boot.stm $(obj)board/freescale/m54455evb/u-boot.lds ; \
        fi; \
        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 ; \
        fi ; \
        if [ "$(findstring _NAND_,$@)" ] ; then \
                echo "#define CONFIG_SYS_66MHZ" >>$(obj)include/config.h ; \
        fi ; \
        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 ; \
        fi ;
        @if [ "$(findstring _NAND_,$@)" ] ; then \
                echo "#define CONFIG_NAND_U_BOOT" >>$(obj)include/config.h ; \
        fi ;
        @if [ "$(findstring _NAND_,$@)" ] ; then \


@@ -1648,10 +1648,10 @@ MPC8349ITXGP_config:    unconfig
        @mkdir -p $(obj)board/freescale/mpc8349itx
        @echo "#define CONFIG_$(subst _LOWBOOT,,$(@:_config=))" >> $(obj)include/config.h
        @if [ "$(findstring GP,$@)" ] ; then \
        @mkdir -p $(obj)board/freescale/mpc8349itx
        @echo "#define CONFIG_$(subst _LOWBOOT,,$(@:_config=))" >> $(obj)include/config.h
        @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
        @if [ "$(findstring LOWBOOT,$@)" ] ; then \
        fi
        @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
        @$(MKCONFIG) -n $@ -a MPC8349ITX powerpc mpc83xx mpc8349itx freescale
 
        fi
        @$(MKCONFIG) -n $@ -a MPC8349ITX powerpc mpc83xx mpc8349itx freescale
 


@@ -2135,12 +2135,12 @@ trab_old_config:        unconfig
        @[ -z "$(findstring _bigflash,$@)" ] || \
                { echo "#define CONFIG_FLASH_16MB" >>$(obj)include/config.h ; \
                  echo "#define CONFIG_RAM_16MB"   >>$(obj)include/config.h ; \
        @[ -z "$(findstring _bigflash,$@)" ] || \
                { echo "#define CONFIG_FLASH_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,$@)" ] || \
                { echo "#define CONFIG_FLASH_8MB"  >>$(obj)include/config.h ; \
                  echo "#define CONFIG_RAM_16MB"   >>$(obj)include/config.h ; \
                }
        @[ -z "$(findstring _old,$@)" ] || \
                { echo "#define CONFIG_FLASH_8MB"  >>$(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
        @if [ "$(findstring 32bit, $@)" ] ; then \
                echo "#define CONFIG_SH_32BIT 1" >> $(obj)include/config.h ; \
        @echo "#define CONFIG_SH7785LCR 1" > $(obj)include/config.h
        @if [ "$(findstring 32bit, $@)" ] ; then \
                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 ; \
        fi
        @$(MKCONFIG) -n $@ -a sh7785lcr sh sh4 sh7785lcr renesas
                        $(obj)board/renesas/sh7785lcr/config.tmp ; \
        fi
        @$(MKCONFIG) -n $@ -a sh7785lcr sh sh4 sh7785lcr renesas

diff --git a/README b/README
index 197804e..a52f3bf 100644 (file)
--- a/README
+++ b/README
@@ -2248,7 +2248,7 @@ Configuration Settings:
 - CONFIG_SYS_MONITOR_BASE:
                Physical start address of boot monitor code (set by
                make config files to be same as the text base address
 - CONFIG_SYS_MONITOR_BASE:
                Physical start address of boot monitor code (set by
                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_MONITOR_LEN:
                CONFIG_SYS_FLASH_BASE when booting from flash.
 
 - CONFIG_SYS_MONITOR_LEN:

diff --git a/arch/arm/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S
index 494768e..5008ac6 100644 (file)
--- a/arch/arm/cpu/arm1136/start.S
+++ b/arch/arm/cpu/arm1136/start.S
@@ -87,7 +87,7 @@ _end_vect:
 
 .globl _TEXT_BASE
 _TEXT_BASE:
 
 .globl _TEXT_BASE
 _TEXT_BASE:

-       .word   TEXT_BASE
+       .word   CONFIG_SYS_TEXT_BASE

 
 #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 .globl _armboot_start
 
 #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 .globl _armboot_start

diff --git a/arch/arm/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S
index 6277ae0..24e5bf4 100644 (file)
--- a/arch/arm/cpu/arm1176/start.S
+++ b/arch/arm/cpu/arm1176/start.S
@@ -97,7 +97,7 @@ _end_vect:
 
 .globl _TEXT_BASE
 _TEXT_BASE:
 
 .globl _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 */
        adr     r2, mmu_disable_phys
 
        /* Prepare to disable the MMU */
        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
 
        .align 5
        b       mmu_disable
 
        .align 5


@@ -444,7 +444,7 @@ cpu_init_crit:
 
        /* Prepare to disable the MMU */
        adr     r2, mmu_disable_phys
 
        /* Prepare to disable the MMU */
        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
 
        .align 5
        b       mmu_disable
 
        .align 5

diff --git a/arch/arm/cpu/arm720t/start.S b/arch/arm/cpu/arm720t/start.S
index 6a8d57b..d93911f 100644 (file)
--- a/arch/arm/cpu/arm720t/start.S
+++ b/arch/arm/cpu/arm720t/start.S
@@ -77,7 +77,7 @@ _fiq:                 .word fiq
 
 .globl _TEXT_BASE
 _TEXT_BASE:
 
 .globl _TEXT_BASE
 _TEXT_BASE:

-       .word   TEXT_BASE
+       .word   CONFIG_SYS_TEXT_BASE

 
 #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 .globl _armboot_start
 
 #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 .globl _armboot_start


@@ -298,11 +298,11 @@ relocate:                         /* relocate U-Boot to RAM           */
        cmp     r0, r1                  /* don't reloc during debug         */
        beq     stack_setup
 
        cmp     r0, r1                  /* don't reloc during debug         */
        beq     stack_setup
 

-#if TEXT_BASE
+#if CONFIG_SYS_TEXT_BASE

 #ifndef CONFIG_LPC2292 /* already done in lowlevel_init */
        ldr     r2, =0x0                /* Relocate the exception vectors   */
        cmp     r1, r2                  /* and associated data to address   */
 #ifndef CONFIG_LPC2292 /* already done in lowlevel_init */
        ldr     r2, =0x0                /* Relocate the exception vectors   */
        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.    */
        ldmneia r0, {r3-r9}
        stmneia r2, {r3-r9}
        stmneia r2!, {r3-r10}           /* 0x0. Copy the first 15 words.    */
        ldmneia r0, {r3-r9}
        stmneia r2, {r3-r9}


@@ -755,7 +755,7 @@ reset_cpu:
        ldr     r0, [r1, #+NETARM_MEM_CS0_BASE_ADDR]
        ldr     r1, =0xFFFFF000
        and     r0, r1, r0
        ldr     r0, [r1, #+NETARM_MEM_CS0_BASE_ADDR]
        ldr     r1, =0xFFFFF000
        and     r0, r1, r0

-       ldr     r1, =(relocate-TEXT_BASE)
+       ldr     r1, =(relocate-CONFIG_SYS_TEXT_BASE)

        add     r0, r1, r0
        ldr     r4, =NETARM_GEN_MODULE_BASE
        ldr     r1, =NETARM_GEN_SW_SVC_RESETA
        add     r0, r1, r0
        ldr     r4, =NETARM_GEN_MODULE_BASE
        ldr     r1, =NETARM_GEN_SW_SVC_RESETA

diff --git a/arch/arm/cpu/arm920t/at91/lowlevel_init.S b/arch/arm/cpu/arm920t/at91/lowlevel_init.S
index 22fc86c..eaea9d2 100644 (file)
--- a/arch/arm/cpu/arm920t/at91/lowlevel_init.S
+++ b/arch/arm/cpu/arm920t/at91/lowlevel_init.S
@@ -39,9 +39,9 @@
 _MTEXT_BASE:
 #undef START_FROM_MEM
 #ifdef START_FROM_MEM
 _MTEXT_BASE:
 #undef 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
 
 .globl lowlevel_init
 #endif
 
 .globl lowlevel_init

diff --git a/arch/arm/cpu/arm920t/at91rm9200/lowlevel_init.S b/arch/arm/cpu/arm920t/at91rm9200/lowlevel_init.S
index d8bb960..2e7160f 100644 (file)
--- a/arch/arm/cpu/arm920t/at91rm9200/lowlevel_init.S
+++ b/arch/arm/cpu/arm920t/at91rm9200/lowlevel_init.S
@@ -43,9 +43,9 @@
 _MTEXT_BASE:
 #undef START_FROM_MEM
 #ifdef START_FROM_MEM
 _MTEXT_BASE:
 #undef 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
 
 .globl lowlevel_init
 #endif
 
 .globl lowlevel_init

diff --git a/arch/arm/cpu/arm920t/start.S b/arch/arm/cpu/arm920t/start.S
index 09ee815..343a760 100644 (file)
--- a/arch/arm/cpu/arm920t/start.S
+++ b/arch/arm/cpu/arm920t/start.S
@@ -72,7 +72,7 @@ _fiq:                 .word fiq
 
 .globl _TEXT_BASE
 _TEXT_BASE:
 
 .globl _TEXT_BASE
 _TEXT_BASE:

-       .word   TEXT_BASE
+       .word   CONFIG_SYS_TEXT_BASE

 
 #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 .globl _armboot_start
 
 #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 .globl _armboot_start

diff --git a/arch/arm/cpu/arm925t/start.S b/arch/arm/cpu/arm925t/start.S
index f173400..cf18a01 100644 (file)
--- a/arch/arm/cpu/arm925t/start.S
+++ b/arch/arm/cpu/arm925t/start.S
@@ -83,7 +83,7 @@ _fiq:                 .word fiq
 
 .globl _TEXT_BASE
 _TEXT_BASE:
 
 .globl _TEXT_BASE
 _TEXT_BASE:

-       .word   TEXT_BASE
+       .word   CONFIG_SYS_TEXT_BASE

 
 #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 .globl _armboot_start
 
 #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 .globl _armboot_start

diff --git a/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S b/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S
index 559c35c..7f7ca5e 100644 (file)
--- a/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S
+++ b/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S
@@ -43,7 +43,7 @@
 #endif
 
 _TEXT_BASE:
 #endif
 
 _TEXT_BASE:

-       .word   TEXT_BASE
+       .word   CONFIG_SYS_TEXT_BASE

 
 .globl lowlevel_init
 .type lowlevel_init,function
 
 .globl lowlevel_init
 .type lowlevel_init,function


@@ -54,7 +54,7 @@ POS1:
        ldr     r0, =POS1       /* r0 = POS1 compile */
        ldr     r2, _TEXT_BASE
        sub     r0, r0, r2      /* r0 = POS1-_TEXT_BASE (POS1 relative) */
        ldr     r0, =POS1       /* r0 = POS1 compile */
        ldr     r2, _TEXT_BASE
        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 */
 
        /* memory control configuration 1 */
        sub     r5, r5, #4      /* r1 = text base - current */
 
        /* memory control configuration 1 */

diff --git a/arch/arm/cpu/arm926ejs/start.S b/arch/arm/cpu/arm926ejs/start.S
index a960689..8cbe3e7 100644 (file)
--- a/arch/arm/cpu/arm926ejs/start.S
+++ b/arch/arm/cpu/arm926ejs/start.S
@@ -116,7 +116,7 @@ _fiq:
 
 .globl _TEXT_BASE
 _TEXT_BASE:
 
 .globl _TEXT_BASE
 _TEXT_BASE:

-       .word   TEXT_BASE
+       .word   CONFIG_SYS_TEXT_BASE

 
 #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 .globl _armboot_start
 
 #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 .globl _armboot_start

diff --git a/arch/arm/cpu/arm946es/start.S b/arch/arm/cpu/arm946es/start.S
index 4f062e5..077886f 100644 (file)
--- a/arch/arm/cpu/arm946es/start.S
+++ b/arch/arm/cpu/arm946es/start.S
@@ -87,7 +87,7 @@ _fiq:
 
 .globl _TEXT_BASE
 _TEXT_BASE:
 
 .globl _TEXT_BASE
 _TEXT_BASE:

-       .word   TEXT_BASE
+       .word   CONFIG_SYS_TEXT_BASE

 
 #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 .globl _armboot_start
 
 #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 .globl _armboot_start

diff --git a/arch/arm/cpu/arm_intcm/start.S b/arch/arm/cpu/arm_intcm/start.S
index 79ef517..07356cb 100644 (file)
--- a/arch/arm/cpu/arm_intcm/start.S
+++ b/arch/arm/cpu/arm_intcm/start.S
@@ -85,7 +85,7 @@ _fiq:
 
 .globl _TEXT_BASE
 _TEXT_BASE:
 
 .globl _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)
 .globl _armboot_start
 
 #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 .globl _armboot_start

diff --git a/arch/arm/cpu/armv7/omap3/lowlevel_init.S b/arch/arm/cpu/armv7/omap3/lowlevel_init.S
index 935bbb6..109481e 100644 (file)
--- a/arch/arm/cpu/armv7/omap3/lowlevel_init.S
+++ b/arch/arm/cpu/armv7/omap3/lowlevel_init.S
@@ -33,7 +33,7 @@
 #include <asm/arch/clocks_omap3.h>
 
 _TEXT_BASE:
 #include <asm/arch/clocks_omap3.h>
 
 _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)
 /**************************************************************************

diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
index c392c5d..26f335a 100644 (file)
--- a/arch/arm/cpu/armv7/start.S
+++ b/arch/arm/cpu/armv7/start.S
@@ -67,7 +67,7 @@ _end_vect:
 
 .globl _TEXT_BASE
 _TEXT_BASE:
 
 .globl _TEXT_BASE
 _TEXT_BASE:

-       .word   TEXT_BASE
+       .word   CONFIG_SYS_TEXT_BASE

 
 #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 .globl _armboot_start
 
 #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 .globl _armboot_start

diff --git a/arch/arm/cpu/ixp/start.S b/arch/arm/cpu/ixp/start.S
index 940d45d..836c33b 100644 (file)
--- a/arch/arm/cpu/ixp/start.S
+++ b/arch/arm/cpu/ixp/start.S
@@ -95,7 +95,7 @@ _fiq:                 .word fiq
 
 .globl _TEXT_BASE
 _TEXT_BASE:
 
 .globl _TEXT_BASE
 _TEXT_BASE:

-       .word   TEXT_BASE
+       .word   CONFIG_SYS_TEXT_BASE

 
 #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 .globl _armboot_start
 
 #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 .globl _armboot_start

diff --git a/arch/arm/cpu/lh7a40x/start.S b/arch/arm/cpu/lh7a40x/start.S
index b8cf1b8..d944860 100644 (file)
--- a/arch/arm/cpu/lh7a40x/start.S
+++ b/arch/arm/cpu/lh7a40x/start.S
@@ -74,7 +74,7 @@ _fiq:                 .word fiq
 
 .globl _TEXT_BASE
 _TEXT_BASE:
 
 .globl _TEXT_BASE
 _TEXT_BASE:

-       .word   TEXT_BASE
+       .word   CONFIG_SYS_TEXT_BASE

 
 #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 .globl _armboot_start
 
 #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 .globl _armboot_start

diff --git a/arch/arm/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S
index cfb9411..9c5023b 100644 (file)
--- a/arch/arm/cpu/pxa/start.S
+++ b/arch/arm/cpu/pxa/start.S
@@ -84,7 +84,7 @@ _fiq:                 .word fiq
 
 .globl _TEXT_BASE
 _TEXT_BASE:
 
 .globl _TEXT_BASE
 _TEXT_BASE:

-       .word   TEXT_BASE
+       .word   CONFIG_SYS_TEXT_BASE

 
 #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 .globl _armboot_start
 
 #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 .globl _armboot_start

diff --git a/arch/arm/cpu/s3c44b0/start.S b/arch/arm/cpu/s3c44b0/start.S
index c5a67dc..20091b2 100644 (file)
--- a/arch/arm/cpu/s3c44b0/start.S
+++ b/arch/arm/cpu/s3c44b0/start.S
@@ -65,7 +65,7 @@ _start:       b       reset
 
 .globl _TEXT_BASE
 _TEXT_BASE:
 
 .globl _TEXT_BASE
 _TEXT_BASE:

-       .word   TEXT_BASE
+       .word   CONFIG_SYS_TEXT_BASE

 
 #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 .globl _armboot_start
 
 #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 .globl _armboot_start

diff --git a/arch/arm/cpu/sa1100/start.S b/arch/arm/cpu/sa1100/start.S
index d1262ad..8eabb66 100644 (file)
--- a/arch/arm/cpu/sa1100/start.S
+++ b/arch/arm/cpu/sa1100/start.S
@@ -75,7 +75,7 @@ _fiq:                 .word fiq
 
 .globl _TEXT_BASE
 _TEXT_BASE:
 
 .globl _TEXT_BASE
 _TEXT_BASE:

-       .word   TEXT_BASE
+       .word   CONFIG_SYS_TEXT_BASE

 
 #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 .globl _armboot_start
 
 #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 .globl _armboot_start

diff --git a/arch/i386/lib/board.c b/arch/i386/lib/board.c
index 1129918..30cb9a2 100644 (file)
--- a/arch/i386/lib/board.c
+++ b/arch/i386/lib/board.c
@@ -221,8 +221,8 @@ void board_init_f (ulong gdp)
        re_end = (Elf32_Rel *)(rel_dyn_end + ((gd_t *)gdp)->load_off);
 
        do {
        re_end = (Elf32_Rel *)(rel_dyn_end + ((gd_t *)gdp)->load_off);
 
        do {

-               if (re_src->r_offset >= TEXT_BASE)
-                       if (*(Elf32_Addr *)(re_src->r_offset - rel_offset) >= TEXT_BASE)
+               if (re_src->r_offset >= CONFIG_SYS_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;
        } while (re_src++ < re_end);
 
                                *(Elf32_Addr *)(re_src->r_offset - rel_offset) -= rel_offset;
        } while (re_src++ < re_end);
 

diff --git a/arch/m68k/cpu/mcf5227x/start.S b/arch/m68k/cpu/mcf5227x/start.S
index 30428f1..ac71096 100644 (file)
--- a/arch/m68k/cpu/mcf5227x/start.S
+++ b/arch/m68k/cpu/mcf5227x/start.S
@@ -44,8 +44,8 @@
        rte;
 
 #if defined(CONFIG_CF_SBF)
        rte;
 
 #if defined(CONFIG_CF_SBF)

-#define ASM_DRAMINIT   (asm_dram_init - 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_DRAMINIT   (asm_dram_init - CONFIG_SYS_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
 
 .text
 #endif
 
 .text


@@ -138,7 +138,7 @@ vector192_255:
 asm_sbf_img_hdr:
        .long   0x00000000      /* checksum, not yet implemented */
        .long   0x00020000      /* image length */
 asm_sbf_img_hdr:
        .long   0x00000000      /* checksum, not yet implemented */
        .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:
        move.l  #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_CTRL), %d0
 
 asm_dram_init:
        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
 
        /* jump to memory and execute */
        jsr     asm_dspi_rd_status
 
        /* jump to memory and execute */

-       move.l  #(TEXT_BASE + 0x400), %a0
+       move.l  #(CONFIG_SYS_TEXT_BASE + 0x400), %a0

        move.l  %a0, (%a1)
        jmp     (%a0)
 
        move.l  %a0, (%a1)
        jmp     (%a0)
 


@@ -364,7 +364,7 @@ _start:
 
        /* Set vector base register at the beginning of the Flash */
 #if defined(CONFIG_CF_SBF)
 
        /* Set vector base register at the beginning of the Flash */
 #if defined(CONFIG_CF_SBF)

-       move.l  #TEXT_BASE, %d0
+       move.l  #CONFIG_SYS_TEXT_BASE, %d0

        movec   %d0, %VBR
 #else
        move.l  #CONFIG_SYS_FLASH_BASE, %d0
        movec   %d0, %VBR
 #else
        move.l  #CONFIG_SYS_FLASH_BASE, %d0

diff --git a/arch/m68k/cpu/mcf52x2/start.S b/arch/m68k/cpu/mcf52x2/start.S
index 9ef206a..d1f3d83 100644 (file)
--- a/arch/m68k/cpu/mcf52x2/start.S
+++ b/arch/m68k/cpu/mcf52x2/start.S
@@ -57,8 +57,8 @@
 _vectors:
 
 .long  0x00000000              /* Flash offset is 0 until we setup CS0 */
 _vectors:
 
 .long  0x00000000              /* Flash offset is 0 until we setup CS0 */

-#if defined(CONFIG_M5282) && (TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE)
-.long  _start - TEXT_BASE
+#if defined(CONFIG_M5282) && (CONFIG_SYS_TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE)
+.long  _start - CONFIG_SYS_TEXT_BASE

 #else
 .long  _START
 #endif
 #else
 .long  _START
 #endif


@@ -106,7 +106,7 @@ _vectors:
 
 #if defined(CONFIG_SYS_INT_FLASH_BASE) && \
     (defined(CONFIG_M5282) || defined(CONFIG_M5281))
 
 #if defined(CONFIG_SYS_INT_FLASH_BASE) && \
     (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   0xFFFFFFFF /* all sectors protected */
                .long   0x00000000 /* supervisor/User restriction */
                .long   0x55AA55AA,0xAA55AA55 /* CFM Backdoorkey */
                .long   0xFFFFFFFF /* all sectors protected */
                .long   0x00000000 /* supervisor/User restriction */


@@ -150,7 +150,7 @@ _start:
        movec   %d0, %RAMBAR1
 
 #if defined(CONFIG_M5282)
        movec   %d0, %RAMBAR1
 
 #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 */
 
        move.l #(_flashbar_setup-CONFIG_SYS_INT_FLASH_BASE), %a0
        /* Setup code in SRAM to initialize FLASHBAR, if start from internal Flash */
 
        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 */
        move.l  #(CONFIG_SYS_INT_FLASH_BASE + CONFIG_SYS_INT_FLASH_ENABLE), %d0
        movec   %d0, %FLASHBAR
        /* Setup code to initialize FLASHBAR, if start from external Memory */
        move.l  #(CONFIG_SYS_INT_FLASH_BASE + CONFIG_SYS_INT_FLASH_ENABLE), %d0
        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
         */
 #if !defined(CONFIG_MONITOR_IS_IN_RAM)
         * therefore no VBR to set
         */
 #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
 #else
        move.l  #CONFIG_SYS_FLASH_BASE, %d0
        move.l  #CONFIG_SYS_INT_FLASH_BASE, %d0
 #else
        move.l  #CONFIG_SYS_FLASH_BASE, %d0


@@ -297,7 +297,7 @@ clear_bss:
        /* set parameters for board_init_r */
        move.l %a0,-(%sp)               /* dest_addr */
        move.l %d0,-(%sp)               /* gd */
        /* set parameters for board_init_r */
        move.l %a0,-(%sp)               /* dest_addr */
        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)
        halt
 #endif
     defined(CONFIG_SYS_HALT_BEFOR_RAM_JUMP)
        halt
 #endif

diff --git a/arch/m68k/cpu/mcf5445x/start.S b/arch/m68k/cpu/mcf5445x/start.S
index 738e4a7..8b69d1f 100644 (file)
--- a/arch/m68k/cpu/mcf5445x/start.S
+++ b/arch/m68k/cpu/mcf5445x/start.S
@@ -44,8 +44,8 @@
        rte;
 
 #if defined(CONFIG_CF_SBF)
        rte;
 
 #if defined(CONFIG_CF_SBF)

-#define ASM_DRAMINIT   (asm_dram_init - 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_DRAMINIT   (asm_dram_init - CONFIG_SYS_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
 
 .text
 #endif
 
 .text


@@ -143,7 +143,7 @@ vector192_255:
 asm_sbf_img_hdr:
        .long   0x00000000      /* checksum, not yet implemented */
        .long   0x00030000      /* image length */
 asm_sbf_img_hdr:
        .long   0x00000000      /* checksum, not yet implemented */
        .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:
        move.w #0x2700,%sr              /* Mask off Interrupt */
 
 asm_dram_init:
        move.w #0x2700,%sr              /* Mask off Interrupt */


@@ -358,7 +358,7 @@ asm_dspi_rd_loop2:
        jsr     asm_dspi_rd_status
 
        /* jump to memory and execute */
        jsr     asm_dspi_rd_status
 
        /* jump to memory and execute */

-       move.l  #(TEXT_BASE + 0x400), %a0
+       move.l  #(CONFIG_SYS_TEXT_BASE + 0x400), %a0

        jmp     (%a0)
 
 asm_dspi_wr_status:
        jmp     (%a0)
 
 asm_dspi_wr_status:

diff --git a/arch/microblaze/cpu/start.S b/arch/microblaze/cpu/start.S
index 7f60434..98c248f 100644 (file)
--- a/arch/microblaze/cpu/start.S
+++ b/arch/microblaze/cpu/start.S
@@ -69,10 +69,10 @@ _start:
        shi     r7, r0, 0x2
        shi     r6, r0, 0x6
 /*
        shi     r7, r0, 0x2
        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    r5, r0, __text_start
        rsub    r4, r5, r4      /* size = __end - __text_start */
        addi    r4, r0, __end
        addi    r5, r0, __text_start
        rsub    r4, r5, r4      /* size = __end - __text_start */

diff --git a/arch/microblaze/lib/board.c b/arch/microblaze/lib/board.c
index 0ce040e..84267cd 100644 (file)
--- a/arch/microblaze/lib/board.c
+++ b/arch/microblaze/lib/board.c
@@ -122,7 +122,7 @@ void board_init (void)
        puts ("SDRAM :\n");
        printf ("\t\tIcache:%s\n", icache_status() ? "ON" : "OFF");
        printf ("\t\tDcache:%s\n", dcache_status() ? "ON" : "OFF");
        puts ("SDRAM :\n");
        printf ("\t\tIcache:%s\n", icache_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)
        puts ("FLASH: ");
 
 #if defined(CONFIG_CMD_FLASH)
        puts ("FLASH: ");

diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S
index 91096ad..c9df751 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/start.S
+++ b/arch/powerpc/cpu/mpc85xx/start.S
@@ -145,7 +145,7 @@ _start_e500:
        beq     2b
 
        /* Setup interrupt vectors */
        beq     2b
 
        /* Setup interrupt vectors */

-       lis     r1,TEXT_BASE@h
+       lis     r1,CONFIG_SYS_TEXT_BASE@h

        mtspr   IVPR,r1
 
        li      r1,0x0100
        mtspr   IVPR,r1
 
        li      r1,0x0100


@@ -291,25 +291,25 @@ _start_e500:
        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
 
        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
 

-       lis     r8,FSL_BOOKE_MAS2(TEXT_BASE & 0xffc00000, (MAS2_I|MAS2_G))@h
-       ori     r8,r8,FSL_BOOKE_MAS2(TEXT_BASE & 0xffc00000, (MAS2_I|MAS2_G))@l
+       lis     r8,FSL_BOOKE_MAS2(CONFIG_SYS_TEXT_BASE & 0xffc00000, (MAS2_I|MAS2_G))@h
+       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 */
        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
 #else
        /*
 
        /* The 85xx has the default boot window 0xff800000 - 0xffffffff */
        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
 #else
        /*

-        * create a temp mapping in AS=1 to the 1M TEXT_BASE space, the main
-        * image has been relocated to TEXT_BASE on the second stage.
+        * create a temp mapping in AS=1 to the 1M CONFIG_SYS_TEXT_BASE space, the main
+        * 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
        ori     r7,r7,FSL_BOOKE_MAS1(1, 1, 0, 1, BOOKE_PAGESZ_1M)@l
 
         */
        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
 

-       lis     r8,FSL_BOOKE_MAS2(TEXT_BASE, (MAS2_I|MAS2_G))@h
-       ori     r8,r8,FSL_BOOKE_MAS2(TEXT_BASE, (MAS2_I|MAS2_G))@l
+       lis     r8,FSL_BOOKE_MAS2(CONFIG_SYS_TEXT_BASE, (MAS2_I|MAS2_G))@h
+       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
-       ori     r9,r9,FSL_BOOKE_MAS3(TEXT_BASE, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@l
+       lis     r9,FSL_BOOKE_MAS3(CONFIG_SYS_TEXT_BASE, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@h
+       ori     r9,r9,FSL_BOOKE_MAS3(CONFIG_SYS_TEXT_BASE, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@l

 #endif
 
        mtspr   MAS0,r6
 #endif
 
        mtspr   MAS0,r6

diff --git a/arch/powerpc/cpu/mpc86xx/start.S b/arch/powerpc/cpu/mpc86xx/start.S
index 596053f..0d02279 100644 (file)
--- a/arch/powerpc/cpu/mpc86xx/start.S
+++ b/arch/powerpc/cpu/mpc86xx/start.S
@@ -848,8 +848,8 @@ setup_ccsrbar:
        stw     r5, 0(r4) /* Store physical value of CCSR */
        isync
 
        stw     r5, 0(r4) /* Store physical value of CCSR */
        isync
 

-       lis     r5, TEXT_BASE@h
-       ori     r5,r5,TEXT_BASE@l
+       lis     r5, CONFIG_SYS_TEXT_BASE@h
+       ori     r5,r5,CONFIG_SYS_TEXT_BASE@l

        lwz     r5, 0(r5)
        isync
 
        lwz     r5, 0(r5)
        isync
 

diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c
index 529f719..fee8257 100644 (file)
--- a/arch/powerpc/lib/board.c
+++ b/arch/powerpc/lib/board.c
@@ -734,7 +734,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 
 # if defined(CONFIG_OXC) || defined(CONFIG_RMU)
        /* flash mapped at end of memory map */
 
 # if defined(CONFIG_OXC) || defined(CONFIG_RMU)
        /* 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
        bd->bi_flashoffset = monitor_flash_len; /* reserved area for startup monitor  */
 # endif
 # elif CONFIG_SYS_MONITOR_BASE == CONFIG_SYS_FLASH_BASE
        bd->bi_flashoffset = monitor_flash_len; /* reserved area for startup monitor  */
 # endif

diff --git a/arch/sh/config.mk b/arch/sh/config.mk
index 797bf4c..07ba68f 100644 (file)
--- a/arch/sh/config.mk
+++ b/arch/sh/config.mk
@@ -29,6 +29,6 @@ STANDALONE_LOAD_ADDR += -EB
 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_SH -D__SH__
 endif
 
 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

diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c
index c97e20c..a302fc2 100644 (file)
--- a/arch/sh/lib/board.c
+++ b/arch/sh/lib/board.c
@@ -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);
        env_relocate();
        jumptable_init();
                        CONFIG_SYS_MALLOC_LEN, CONFIG_SYS_MALLOC_LEN - 16);
        env_relocate();
        jumptable_init();

diff --git a/arch/sparc/cpu/leon2/Makefile b/arch/sparc/cpu/leon2/Makefile
index 7cc4420..91dc967 100644 (file)
--- a/arch/sparc/cpu/leon2/Makefile
+++ b/arch/sparc/cpu/leon2/Makefile
@@ -44,8 +44,9 @@ $(LIB):       $(OBJS)
 include $(SRCTREE)/rules.mk
 
 $(START): $(START:.o=.S)
 include $(SRCTREE)/rules.mk
 
 $(START): $(START:.o=.S)

-       $(CC) -D__ASSEMBLY__ $(DBGFLAGS) $(OPTFLAGS) -D__KERNEL__ -DTEXT_BASE=$(TEXT_BASE) \
-       -I$(TOPDIR)/include -fno-builtin -ffreestanding -nostdinc -isystem $(gccincdir) -pipe \
+       $(CC) -D__ASSEMBLY__ $(DBGFLAGS) $(OPTFLAGS) -D__KERNEL__ \
+       -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) -I$(TOPDIR)/include \
+       -fno-builtin -ffreestanding -nostdinc -isystem $(gccincdir) -pipe \

        $(PLATFORM_CPPFLAGS) -Wall -Wstrict-prototypes \
        -I$(TOPDIR)/board -c -o $(START) $(START:.o=.S)
 
        $(PLATFORM_CPPFLAGS) -Wall -Wstrict-prototypes \
        -I$(TOPDIR)/board -c -o $(START) $(START:.o=.S)
 

diff --git a/arch/sparc/cpu/leon2/prom.c b/arch/sparc/cpu/leon2/prom.c
index 1a6c7f7..965a2fa 100644 (file)
--- a/arch/sparc/cpu/leon2/prom.c
+++ b/arch/sparc/cpu/leon2/prom.c
@@ -50,9 +50,9 @@ extern int __prom_start;
 #define PROM_SIZE_MASK (PROM_OFFS-1)
 #define __va(x) ( \
        (void *)( ((unsigned long)(x))-PROM_OFFS+ \
 #define PROM_SIZE_MASK (PROM_OFFS-1)
 #define __va(x) ( \
        (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 {
        char *name;
 
 struct property {
        char *name;

diff --git a/arch/sparc/cpu/leon2/start.S b/arch/sparc/cpu/leon2/start.S
index b1f1eb5..dd58262 100644 (file)
--- a/arch/sparc/cpu/leon2/start.S
+++ b/arch/sparc/cpu/leon2/start.S
@@ -455,7 +455,7 @@ _irq_entry:
        WRITE_PAUSE
        mov     %l7, %o0                ! irq level
        set     handler_irq, %o1
        WRITE_PAUSE
        mov     %l7, %o0                ! irq level
        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
        call    %o1
        add     %sp, SF_REGS_SZ, %o1    ! pt_regs ptr
        add     %o1, %o2, %o1
        call    %o1
        add     %sp, SF_REGS_SZ, %o1    ! pt_regs ptr

diff --git a/arch/sparc/cpu/leon3/Makefile b/arch/sparc/cpu/leon3/Makefile
index 182543d..64c67f8 100644 (file)
--- a/arch/sparc/cpu/leon3/Makefile
+++ b/arch/sparc/cpu/leon3/Makefile
@@ -44,8 +44,9 @@ $(LIB):       $(OBJS)
 include $(SRCTREE)/rules.mk
 
 $(START): $(START:.o=.S)
 include $(SRCTREE)/rules.mk
 
 $(START): $(START:.o=.S)

-       $(CC) -D__ASSEMBLY__ $(DBGFLAGS) $(OPTFLAGS) -D__KERNEL__ -DTEXT_BASE=$(TEXT_BASE) \
-       -I$(TOPDIR)/include -fno-builtin -ffreestanding -nostdinc -isystem $(gccincdir) -pipe \
+       $(CC) -D__ASSEMBLY__ $(DBGFLAGS) $(OPTFLAGS) -D__KERNEL__ \
+       -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) -I$(TOPDIR)/include \
+       -fno-builtin -ffreestanding -nostdinc -isystem $(gccincdir) -pipe \

        $(PLATFORM_CPPFLAGS) -Wall -Wstrict-prototypes \
        -I$(TOPDIR)/board -c -o $(START) $(START:.o=.S)
 
        $(PLATFORM_CPPFLAGS) -Wall -Wstrict-prototypes \
        -I$(TOPDIR)/board -c -o $(START) $(START:.o=.S)
 

diff --git a/arch/sparc/cpu/leon3/prom.c b/arch/sparc/cpu/leon3/prom.c
index 18d2fb2..1bd28d4 100644 (file)
--- a/arch/sparc/cpu/leon3/prom.c
+++ b/arch/sparc/cpu/leon3/prom.c
@@ -54,9 +54,9 @@ extern int __prom_start;
 #define PROM_SIZE_MASK (PROM_OFFS-1)
 #define __va(x) ( \
        (void *)( ((unsigned long)(x))-PROM_OFFS+ \
 #define PROM_SIZE_MASK (PROM_OFFS-1)
 #define __va(x) ( \
        (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 {
        char *name;
 
 struct property {
        char *name;

diff --git a/arch/sparc/cpu/leon3/start.S b/arch/sparc/cpu/leon3/start.S
index bd634bd..5c0808a 100644 (file)
--- a/arch/sparc/cpu/leon3/start.S
+++ b/arch/sparc/cpu/leon3/start.S
@@ -369,8 +369,8 @@ snoop_detect:
        sethi   %hi(0x00800000), %o0
        lda     [%g0] 2, %o1
        and     %o0, %o1, %o0
        sethi   %hi(0x00800000), %o0
        lda     [%g0] 2, %o1
        and     %o0, %o1, %o0

-       sethi   %hi(leon3_snooping_avail+CONFIG_SYS_RELOC_MONITOR_BASE-TEXT_BASE), %o1
-       st      %o0, [%lo(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-CONFIG_SYS_TEXT_BASE)+%o1]

 
 /*     call    relocate*/
        nop
 
 /*     call    relocate*/
        nop


@@ -410,7 +410,7 @@ _irq_entry:
        WRITE_PAUSE
        mov     %l7, %o0                ! irq level
        set     handler_irq, %o1
        WRITE_PAUSE
        mov     %l7, %o0                ! irq level
        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
        call    %o1
        add     %sp, SF_REGS_SZ, %o1    ! pt_regs ptr
        add     %o1, %o2, %o1
        call    %o1
        add     %sp, SF_REGS_SZ, %o1    ! pt_regs ptr

diff --git a/arch/sparc/include/asm/asmmacro.h b/arch/sparc/include/asm/asmmacro.h
index aeb87ee..d2aa940 100644 (file)
--- a/arch/sparc/include/asm/asmmacro.h
+++ b/arch/sparc/include/asm/asmmacro.h
@@ -33,8 +33,8 @@
  * c-code can be called.
  */
 #define SAVE_ALL_HEAD \
  * c-code can be called.
  */
 #define SAVE_ALL_HEAD \

-       sethi   %hi(trap_setup+(CONFIG_SYS_RELOC_MONITOR_BASE-TEXT_BASE)), %l4; \
-       jmpl    %l4 + %lo(trap_setup+(CONFIG_SYS_RELOC_MONITOR_BASE-TEXT_BASE)), %l6;
+       sethi   %hi(trap_setup+(CONFIG_SYS_RELOC_MONITOR_BASE-CONFIG_SYS_TEXT_BASE)), %l4; \
+       jmpl    %l4 + %lo(trap_setup+(CONFIG_SYS_RELOC_MONITOR_BASE-CONFIG_SYS_TEXT_BASE)), %l6;

 #define SAVE_ALL \
        SAVE_ALL_HEAD \
        nop;
 #define SAVE_ALL \
        SAVE_ALL_HEAD \
        nop;

diff --git a/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c b/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c
index 1f76dd9..d64ad1b 100644 (file)
--- a/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c
+++ b/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c
@@ -43,7 +43,7 @@ unsigned long display_height;
 int checkboard (void)
 {
        puts ("Board: MCF-EV1 + MCF-EV23 (BuS Elektronik GmbH & Co. KG)\n");
 int checkboard (void)
 {
        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");
 #endif
 
        puts ("       Boot from Internal FLASH\n");
 #endif
 

diff --git a/board/BuS/EB+MCF-EV123/config.mk b/board/BuS/EB+MCF-EV123/config.mk
index f03e396..50185ae 100644 (file)
--- a/board/BuS/EB+MCF-EV123/config.mk
+++ b/board/BuS/EB+MCF-EV123/config.mk
@@ -23,6 +23,6 @@
 #
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/textbase.mk
 #
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/textbase.mk

-ifndef TEXT_BASE
-TEXT_BASE = 0xFE000000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xFE000000

 endif
 endif

diff --git a/board/BuS/EB+MCF-EV123/textbase.mk b/board/BuS/EB+MCF-EV123/textbase.mk
index ecde6ed..b97c034 100644 (file)
--- a/board/BuS/EB+MCF-EV123/textbase.mk
+++ b/board/BuS/EB+MCF-EV123/textbase.mk
@@ -1 +1 @@
-TEXT_BASE = 0xFFE00000
+CONFIG_SYS_TEXT_BASE = 0xFFE00000

diff --git a/board/BuS/eb_cpux9k2/config.mk b/board/BuS/eb_cpux9k2/config.mk
index ff2cfd1..e554a45 100644 (file)
--- a/board/BuS/eb_cpux9k2/config.mk
+++ b/board/BuS/eb_cpux9k2/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x23f00000
+CONFIG_SYS_TEXT_BASE = 0x23f00000

diff --git a/board/LEOX/elpt860/config.mk b/board/LEOX/elpt860/config.mk
index defc360..c9ba3ff 100644 (file)
--- a/board/LEOX/elpt860/config.mk
+++ b/board/LEOX/elpt860/config.mk
@@ -32,5 +32,5 @@
 # ELPT860 board
 #
 
 # ELPT860 board
 #
 

-TEXT_BASE = 0x02000000
-#TEXT_BASE = 0x00FB0000
+CONFIG_SYS_TEXT_BASE = 0x02000000
+#CONFIG_SYS_TEXT_BASE = 0x00FB0000

diff --git a/board/LaCie/edminiv2/config.mk b/board/LaCie/edminiv2/config.mk
index 3dec1aa..d07642f 100644 (file)
--- a/board/LaCie/edminiv2/config.mk
+++ b/board/LaCie/edminiv2/config.mk
@@ -24,4 +24,4 @@
 # MA 02110-1301 USA
 #
 
 # MA 02110-1301 USA
 #
 

-TEXT_BASE = 0x00100000
+CONFIG_SYS_TEXT_BASE = 0x00100000

diff --git a/board/Marvell/db64360/config.mk b/board/Marvell/db64360/config.mk
index 0e42b48..7760505 100644 (file)
--- a/board/Marvell/db64360/config.mk
+++ b/board/Marvell/db64360/config.mk
@@ -25,4 +25,4 @@
 # EVB64360 boards
 #
 
 # EVB64360 boards
 #
 

-TEXT_BASE = 0xfff00000
+CONFIG_SYS_TEXT_BASE = 0xfff00000

diff --git a/board/Marvell/db64460/config.mk b/board/Marvell/db64460/config.mk
index 5a434d9..bcb5062 100644 (file)
--- a/board/Marvell/db64460/config.mk
+++ b/board/Marvell/db64460/config.mk
@@ -25,4 +25,4 @@
 # EVB64460 boards
 #
 
 # EVB64460 boards
 #
 

-TEXT_BASE = 0xfff00000
+CONFIG_SYS_TEXT_BASE = 0xfff00000

diff --git a/board/Marvell/guruplug/config.mk b/board/Marvell/guruplug/config.mk
index caa26b6..12d7737 100644 (file)
--- a/board/Marvell/guruplug/config.mk
+++ b/board/Marvell/guruplug/config.mk
@@ -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

diff --git a/board/Marvell/mv88f6281gtw_ge/config.mk b/board/Marvell/mv88f6281gtw_ge/config.mk
index 2bd9f79..761c2bb 100644 (file)
--- a/board/Marvell/mv88f6281gtw_ge/config.mk
+++ b/board/Marvell/mv88f6281gtw_ge/config.mk
@@ -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
 KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg
 
 # Kirkwood Boot Image configuration file
 KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg

diff --git a/board/Marvell/openrd_base/config.mk b/board/Marvell/openrd_base/config.mk
index 8ae355e..5a49280 100644 (file)
--- a/board/Marvell/openrd_base/config.mk
+++ b/board/Marvell/openrd_base/config.mk
@@ -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
 KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg
 
 # Kirkwood Boot Image configuration file
 KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg

diff --git a/board/Marvell/rd6281a/config.mk b/board/Marvell/rd6281a/config.mk
index 2bd9f79..761c2bb 100644 (file)
--- a/board/Marvell/rd6281a/config.mk
+++ b/board/Marvell/rd6281a/config.mk
@@ -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
 KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg
 
 # Kirkwood Boot Image configuration file
 KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg

diff --git a/board/Marvell/sheevaplug/config.mk b/board/Marvell/sheevaplug/config.mk
index 2bd9f79..761c2bb 100644 (file)
--- a/board/Marvell/sheevaplug/config.mk
+++ b/board/Marvell/sheevaplug/config.mk
@@ -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
 KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg
 
 # Kirkwood Boot Image configuration file
 KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg

diff --git a/board/RPXClassic/config.mk b/board/RPXClassic/config.mk
index ae455e1..77c7308 100644 (file)
--- a/board/RPXClassic/config.mk
+++ b/board/RPXClassic/config.mk
@@ -26,4 +26,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xff000000
+CONFIG_SYS_TEXT_BASE = 0xff000000

diff --git a/board/RPXlite/config.mk b/board/RPXlite/config.mk
index 6536b77..dfc2f05 100644 (file)
--- a/board/RPXlite/config.mk
+++ b/board/RPXlite/config.mk
@@ -25,4 +25,4 @@
 # RPXlite boards
 #
 
 # RPXlite boards
 #
 

-TEXT_BASE = 0xfff00000
+CONFIG_SYS_TEXT_BASE = 0xfff00000

diff --git a/board/RPXlite_dw/config.mk b/board/RPXlite_dw/config.mk
index 7970910..95b6f66 100644 (file)
--- a/board/RPXlite_dw/config.mk
+++ b/board/RPXlite_dw/config.mk
@@ -26,4 +26,4 @@
 # RPXlite dw boards : lite_dw
 #
 
 # RPXlite dw boards : lite_dw
 #
 

-TEXT_BASE = 0xff000000
+CONFIG_SYS_TEXT_BASE = 0xff000000

diff --git a/board/RRvision/config.mk b/board/RRvision/config.mk
index ab1c8d6..a39b230 100644 (file)
--- a/board/RRvision/config.mk
+++ b/board/RRvision/config.mk
@@ -25,4 +25,4 @@
 # RedRock vision boards
 #
 
 # RedRock vision boards
 #
 

-TEXT_BASE = 0x40000000
+CONFIG_SYS_TEXT_BASE = 0x40000000

diff --git a/board/a3000/config.mk b/board/a3000/config.mk
index 798e032..7ab93bc 100644 (file)
--- a/board/a3000/config.mk
+++ b/board/a3000/config.mk
@@ -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)

diff --git a/board/actux1/config.mk b/board/actux1/config.mk
index a0dbe0b..dd1d8d3 100644 (file)
--- a/board/actux1/config.mk
+++ b/board/actux1/config.mk
@@ -1,4 +1,4 @@
-TEXT_BASE = 0x00e00000
+CONFIG_SYS_TEXT_BASE = 0x00e00000

 
 # include NPE ethernet driver
 BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a
 
 # include NPE ethernet driver
 BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a

diff --git a/board/actux2/config.mk b/board/actux2/config.mk
index a0dbe0b..dd1d8d3 100644 (file)
--- a/board/actux2/config.mk
+++ b/board/actux2/config.mk
@@ -1,4 +1,4 @@
-TEXT_BASE = 0x00e00000
+CONFIG_SYS_TEXT_BASE = 0x00e00000

 
 # include NPE ethernet driver
 BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a
 
 # include NPE ethernet driver
 BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a

diff --git a/board/actux3/config.mk b/board/actux3/config.mk
index a0dbe0b..dd1d8d3 100644 (file)
--- a/board/actux3/config.mk
+++ b/board/actux3/config.mk
@@ -1,4 +1,4 @@
-TEXT_BASE = 0x00e00000
+CONFIG_SYS_TEXT_BASE = 0x00e00000

 
 # include NPE ethernet driver
 BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a
 
 # include NPE ethernet driver
 BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a

diff --git a/board/actux4/config.mk b/board/actux4/config.mk
index f2b5fc9..09ae589 100644 (file)
--- a/board/actux4/config.mk
+++ b/board/actux4/config.mk
@@ -1,4 +1,4 @@
-TEXT_BASE = 0x00e00000
+CONFIG_SYS_TEXT_BASE = 0x00e00000

 
 # include NPE ethernet driver
 BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a
 
 # include NPE ethernet driver
 BOARDLIBS = arch/arm/cpu/ixp/npe/libnpe.a

diff --git a/board/adder/config.mk b/board/adder/config.mk
index 4691a69..aa12388 100644 (file)
--- a/board/adder/config.mk
+++ b/board/adder/config.mk
@@ -24,4 +24,4 @@
 #
 # Analogue&Micro Adder boards family
 #
 #
 # Analogue&Micro Adder boards family
 #

-TEXT_BASE = 0xFE000000
+CONFIG_SYS_TEXT_BASE = 0xFE000000

diff --git a/board/afeb9260/config.mk b/board/afeb9260/config.mk
index 9ce161e..2077692 100644 (file)
--- a/board/afeb9260/config.mk
+++ b/board/afeb9260/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x21f00000
+CONFIG_SYS_TEXT_BASE = 0x21f00000

diff --git a/board/alaska/config.mk b/board/alaska/config.mk
index 99d28a5..00d26d2 100644 (file)
--- a/board/alaska/config.mk
+++ b/board/alaska/config.mk
@@ -25,7 +25,8 @@
 # alaska board
 #
 
 # alaska board
 #
 

-TEXT_BASE = 0xfff00000
-# TEXT_BASE = 0x00100000
+CONFIG_SYS_TEXT_BASE = 0xfff00000
+# 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

diff --git a/board/altera/nios2-generic/config.mk b/board/altera/nios2-generic/config.mk
index d500133..95e75af 100644 (file)
--- a/board/altera/nios2-generic/config.mk
+++ b/board/altera/nios2-generic/config.mk
@@ -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 += -I$(TOPDIR)/board/$(VENDOR)/include
 
 PLATFORM_CPPFLAGS += -mno-hw-div -mno-hw-mul
 PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(VENDOR)/include

diff --git a/board/amcc/acadia/config.mk b/board/amcc/acadia/config.mk
index 01db41c..d5c9ae7 100644 (file)
--- a/board/amcc/acadia/config.mk
+++ b/board/amcc/acadia/config.mk
@@ -27,8 +27,8 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
-TEXT_BASE = 0xFFF80000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xFFF80000

 endif
 
 ifeq ($(debug),1)
 endif
 
 ifeq ($(debug),1)

diff --git a/board/amcc/bamboo/config.mk b/board/amcc/bamboo/config.mk
index 72b6bc0..cdf8f11 100644 (file)
--- a/board/amcc/bamboo/config.mk
+++ b/board/amcc/bamboo/config.mk
@@ -23,8 +23,8 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
-TEXT_BASE = 0xFFFA0000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xFFFA0000

 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1

diff --git a/board/amcc/bluestone/config.mk b/board/amcc/bluestone/config.mk
index e2194e4..efb2de4 100644 (file)
--- a/board/amcc/bluestone/config.mk
+++ b/board/amcc/bluestone/config.mk
@@ -25,8 +25,8 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
-TEXT_BASE = 0xFFFA0000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xFFFA0000

 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1

diff --git a/board/amcc/bubinga/config.mk b/board/amcc/bubinga/config.mk
index 1bdf5e4..1646d34 100644 (file)
--- a/board/amcc/bubinga/config.mk
+++ b/board/amcc/bubinga/config.mk
@@ -21,4 +21,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xFFFC0000
+CONFIG_SYS_TEXT_BASE = 0xFFFC0000

diff --git a/board/amcc/canyonlands/config.mk b/board/amcc/canyonlands/config.mk
index 3d6a608..9dd9c4b 100644 (file)
--- a/board/amcc/canyonlands/config.mk
+++ b/board/amcc/canyonlands/config.mk
@@ -26,8 +26,8 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
-TEXT_BASE = 0xFFF80000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xFFF80000

 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1

diff --git a/board/amcc/ebony/config.mk b/board/amcc/ebony/config.mk
index 60d3bf4..0b628cf 100644 (file)
--- a/board/amcc/ebony/config.mk
+++ b/board/amcc/ebony/config.mk
@@ -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
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1

diff --git a/board/amcc/katmai/config.mk b/board/amcc/katmai/config.mk
index ef0cf96..ca86dca 100644 (file)
--- a/board/amcc/katmai/config.mk
+++ b/board/amcc/katmai/config.mk
@@ -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
 

diff --git a/board/amcc/kilauea/config.mk b/board/amcc/kilauea/config.mk
index b3d3f22..17ef0d3 100644 (file)
--- a/board/amcc/kilauea/config.mk
+++ b/board/amcc/kilauea/config.mk
@@ -23,8 +23,8 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
-TEXT_BASE = 0xFFFA0000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xFFFA0000

 endif
 
 ifeq ($(debug),1)
 endif
 
 ifeq ($(debug),1)

diff --git a/board/amcc/luan/config.mk b/board/amcc/luan/config.mk
index 5e4182d..d8790ce 100644 (file)
--- a/board/amcc/luan/config.mk
+++ b/board/amcc/luan/config.mk
@@ -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
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1

diff --git a/board/amcc/makalu/config.mk b/board/amcc/makalu/config.mk
index a46b197..e0ad623 100644 (file)
--- a/board/amcc/makalu/config.mk
+++ b/board/amcc/makalu/config.mk
@@ -21,4 +21,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xFFFA0000
+CONFIG_SYS_TEXT_BASE = 0xFFFA0000

diff --git a/board/amcc/ocotea/config.mk b/board/amcc/ocotea/config.mk
index b62e776..06c519a 100644 (file)
--- a/board/amcc/ocotea/config.mk
+++ b/board/amcc/ocotea/config.mk
@@ -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
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1

diff --git a/board/amcc/redwood/config.mk b/board/amcc/redwood/config.mk
index 381f2b2..0d167b2 100644 (file)
--- a/board/amcc/redwood/config.mk
+++ b/board/amcc/redwood/config.mk
@@ -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
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1

diff --git a/board/amcc/sequoia/config.mk b/board/amcc/sequoia/config.mk
index c8e2dff..5bce055 100644 (file)
--- a/board/amcc/sequoia/config.mk
+++ b/board/amcc/sequoia/config.mk
@@ -26,8 +26,8 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
-TEXT_BASE = 0xFFF80000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xFFF80000

 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1

diff --git a/board/amcc/taihu/config.mk b/board/amcc/taihu/config.mk
index 1bdf5e4..1646d34 100644 (file)
--- a/board/amcc/taihu/config.mk
+++ b/board/amcc/taihu/config.mk
@@ -21,4 +21,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xFFFC0000
+CONFIG_SYS_TEXT_BASE = 0xFFFC0000

diff --git a/board/amcc/taishan/config.mk b/board/amcc/taishan/config.mk
index ee5eb1b..0b22b6e 100644 (file)
--- a/board/amcc/taishan/config.mk
+++ b/board/amcc/taishan/config.mk
@@ -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
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1

diff --git a/board/amcc/walnut/config.mk b/board/amcc/walnut/config.mk
index 1bdf5e4..1646d34 100644 (file)
--- a/board/amcc/walnut/config.mk
+++ b/board/amcc/walnut/config.mk
@@ -21,4 +21,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xFFFC0000
+CONFIG_SYS_TEXT_BASE = 0xFFFC0000

diff --git a/board/amcc/yosemite/config.mk b/board/amcc/yosemite/config.mk
index df5466e..0523aa3 100644 (file)
--- a/board/amcc/yosemite/config.mk
+++ b/board/amcc/yosemite/config.mk
@@ -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
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1

diff --git a/board/amcc/yucca/config.mk b/board/amcc/yucca/config.mk
index 3ce3cc1..179df64 100644 (file)
--- a/board/amcc/yucca/config.mk
+++ b/board/amcc/yucca/config.mk
@@ -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
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1

diff --git a/board/amirix/ap1000/config.mk b/board/amirix/ap1000/config.mk
index 09c6efa..1fdca05 100644 (file)
--- a/board/amirix/ap1000/config.mk
+++ b/board/amirix/ap1000/config.mk
@@ -24,7 +24,7 @@
 # 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
 # run from RAM instead of Flash.
 # 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
 # run from RAM instead of Flash.

-TEXT_BASE = 0x08000000
+CONFIG_SYS_TEXT_BASE = 0x08000000

 
 # Use board specific linker script
 LDSCRIPT := $(SRCTREE)/board/amirix/ap1000/u-boot.lds
 
 # Use board specific linker script
 LDSCRIPT := $(SRCTREE)/board/amirix/ap1000/u-boot.lds

diff --git a/board/apollon/config.mk b/board/apollon/config.mk
index 2b464e7..66005d4 100644 (file)
--- a/board/apollon/config.mk
+++ b/board/apollon/config.mk
@@ -13,13 +13,13 @@
 # Linux-Kernel is expected to be at 8000'8000, entry 8000'8000
 # (mem base + reserved)
 # For use with external or internal boots.
 # Linux-Kernel is expected to be at 8000'8000, entry 8000'8000
 # (mem base + reserved)
 # For use with external or internal boots.

-TEXT_BASE = 0x83e80000
+CONFIG_SYS_TEXT_BASE = 0x83e80000

 
 # Used with full SRAM boot.
 # This is either with a GP system or a signed boot image.
 # easiest, and safest way to go if you can.
 
 # Used with full SRAM boot.
 # This is either with a GP system or a signed boot image.
 # 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
-#TEXT_BASE = 0x08000000
+#CONFIG_SYS_TEXT_BASE = 0x0
+#CONFIG_SYS_TEXT_BASE = 0x08000000

diff --git a/board/apollon/lowlevel_init.S b/board/apollon/lowlevel_init.S
index 64550f6..f066fe4 100644 (file)
--- a/board/apollon/lowlevel_init.S
+++ b/board/apollon/lowlevel_init.S
@@ -46,7 +46,7 @@
 #define SDRAM_BASE_ADDRESS     0x80008000
 
 _TEXT_BASE:
 #define SDRAM_BASE_ADDRESS     0x80008000
 
 _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
 lowlevel_init:
 
 .globl lowlevel_init
 lowlevel_init:

diff --git a/board/armadillo/config.mk b/board/armadillo/config.mk
index 23c432f..ecb8b74 100644 (file)
--- a/board/armadillo/config.mk
+++ b/board/armadillo/config.mk
@@ -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

diff --git a/board/armltd/integrator/config.mk b/board/armltd/integrator/config.mk
index 25b79b3..8b57af1 100644 (file)
--- a/board/armltd/integrator/config.mk
+++ b/board/armltd/integrator/config.mk
@@ -2,4 +2,4 @@
 # image should be loaded at 0x01000000
 #
 
 # image should be loaded at 0x01000000
 #
 

-TEXT_BASE = 0x01000000
+CONFIG_SYS_TEXT_BASE = 0x01000000

diff --git a/board/armltd/versatile/config.mk b/board/armltd/versatile/config.mk
index 25b79b3..8b57af1 100644 (file)
--- a/board/armltd/versatile/config.mk
+++ b/board/armltd/versatile/config.mk
@@ -2,4 +2,4 @@
 # image should be loaded at 0x01000000
 #
 
 # image should be loaded at 0x01000000
 #
 

-TEXT_BASE = 0x01000000
+CONFIG_SYS_TEXT_BASE = 0x01000000

diff --git a/board/assabet/config.mk b/board/assabet/config.mk
index 74cb419..d9866a0 100644 (file)
--- a/board/assabet/config.mk
+++ b/board/assabet/config.mk
@@ -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

diff --git a/board/astro/mcf5373l/config.mk b/board/astro/mcf5373l/config.mk
index 6316a30..ad63dd1 100644 (file)
--- a/board/astro/mcf5373l/config.mk
+++ b/board/astro/mcf5373l/config.mk
@@ -22,6 +22,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = $(CONFIG_TEXT_BASE)
-
-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)

diff --git a/board/atc/config.mk b/board/atc/config.mk
index dd854e7..ff00840 100644 (file)
--- a/board/atc/config.mk
+++ b/board/atc/config.mk
@@ -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)

diff --git a/board/atmel/at91cap9adk/config.mk b/board/atmel/at91cap9adk/config.mk
index e241aee..797da0e 100644 (file)
--- a/board/atmel/at91cap9adk/config.mk
+++ b/board/atmel/at91cap9adk/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x73000000
+CONFIG_SYS_TEXT_BASE = 0x73000000

diff --git a/board/atmel/at91rm9200dk/config.mk b/board/atmel/at91rm9200dk/config.mk
index 9ce161e..2077692 100644 (file)
--- a/board/atmel/at91rm9200dk/config.mk
+++ b/board/atmel/at91rm9200dk/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x21f00000
+CONFIG_SYS_TEXT_BASE = 0x21f00000

diff --git a/board/atmel/at91rm9200ek/config.mk b/board/atmel/at91rm9200ek/config.mk
index 9ce161e..2077692 100644 (file)
--- a/board/atmel/at91rm9200ek/config.mk
+++ b/board/atmel/at91rm9200ek/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x21f00000
+CONFIG_SYS_TEXT_BASE = 0x21f00000

diff --git a/board/atmel/at91sam9260ek/config.mk b/board/atmel/at91sam9260ek/config.mk
index ff2cfd1..e554a45 100644 (file)
--- a/board/atmel/at91sam9260ek/config.mk
+++ b/board/atmel/at91sam9260ek/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x23f00000
+CONFIG_SYS_TEXT_BASE = 0x23f00000

diff --git a/board/atmel/at91sam9261ek/config.mk b/board/atmel/at91sam9261ek/config.mk
index ff2cfd1..e554a45 100644 (file)
--- a/board/atmel/at91sam9261ek/config.mk
+++ b/board/atmel/at91sam9261ek/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x23f00000
+CONFIG_SYS_TEXT_BASE = 0x23f00000

diff --git a/board/atmel/at91sam9263ek/config.mk b/board/atmel/at91sam9263ek/config.mk
index ff2cfd1..e554a45 100644 (file)
--- a/board/atmel/at91sam9263ek/config.mk
+++ b/board/atmel/at91sam9263ek/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x23f00000
+CONFIG_SYS_TEXT_BASE = 0x23f00000

diff --git a/board/atmel/at91sam9m10g45ek/config.mk b/board/atmel/at91sam9m10g45ek/config.mk
index 7fe9d03..9d3c5ae 100644 (file)
--- a/board/atmel/at91sam9m10g45ek/config.mk
+++ b/board/atmel/at91sam9m10g45ek/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x73f00000
+CONFIG_SYS_TEXT_BASE = 0x73f00000

diff --git a/board/atmel/at91sam9rlek/config.mk b/board/atmel/at91sam9rlek/config.mk
index ff2cfd1..e554a45 100644 (file)
--- a/board/atmel/at91sam9rlek/config.mk
+++ b/board/atmel/at91sam9rlek/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x23f00000
+CONFIG_SYS_TEXT_BASE = 0x23f00000

diff --git a/board/atmel/atngw100/config.mk b/board/atmel/atngw100/config.mk
index 9a794e5..ea76d05 100644 (file)
--- a/board/atmel/atngw100/config.mk
+++ b/board/atmel/atngw100/config.mk
@@ -1,3 +1,3 @@
-TEXT_BASE              = 0x00000000
+CONFIG_SYS_TEXT_BASE           = 0x00000000

 PLATFORM_RELFLAGS      += -ffunction-sections -fdata-sections
 PLATFORM_LDFLAGS       += --gc-sections
 PLATFORM_RELFLAGS      += -ffunction-sections -fdata-sections
 PLATFORM_LDFLAGS       += --gc-sections

diff --git a/board/atmel/atstk1000/config.mk b/board/atmel/atstk1000/config.mk
index 40e55fe..8c03b77 100644 (file)
--- a/board/atmel/atstk1000/config.mk
+++ b/board/atmel/atstk1000/config.mk
@@ -1,4 +1,4 @@
 PLATFORM_RELFLAGS      += -ffunction-sections -fdata-sections
 PLATFORM_LDFLAGS       += --gc-sections
 PLATFORM_RELFLAGS      += -ffunction-sections -fdata-sections
 PLATFORM_LDFLAGS       += --gc-sections

-TEXT_BASE              = 0x00000000
+CONFIG_SYS_TEXT_BASE           = 0x00000000

 LDSCRIPT               = $(src)board/atmel/atstk1000/u-boot.lds
 LDSCRIPT               = $(src)board/atmel/atstk1000/u-boot.lds

diff --git a/board/atum8548/config.mk b/board/atum8548/config.mk
index a13f52d..f191e62 100644 (file)
--- a/board/atum8548/config.mk
+++ b/board/atum8548/config.mk
@@ -22,8 +22,8 @@
 
 #
 # atum8548 board
 
 #
 # atum8548 board

-# TEXT_BASE = 0xfff80000
-# TEXT_BASE = 0xfffff000
-ifndef TEXT_BASE
-TEXT_BASE = 0xfff80000
+# CONFIG_SYS_TEXT_BASE = 0xfff80000
+# CONFIG_SYS_TEXT_BASE = 0xfffff000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xfff80000

 endif
 endif

diff --git a/board/barco/config.mk b/board/barco/config.mk
index f950c07..94da3b7 100644 (file)
--- a/board/barco/config.mk
+++ b/board/barco/config.mk
@@ -25,6 +25,6 @@
 # Barco Hydra/SCN boards
 #
 
 # Barco Hydra/SCN 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)

diff --git a/board/bc3450/config.mk b/board/bc3450/config.mk
index 47e9955..162ac52 100644 (file)
--- a/board/bc3450/config.mk
+++ b/board/bc3450/config.mk
@@ -24,18 +24,19 @@
 #
 # BC3450 board:
 #
 #
 # BC3450 board:
 #

-#      Valid values for TEXT_BASE are:
+#      Valid values for CONFIG_SYS_TEXT_BASE are:

 #
 #      0xFC000000   boot low (standard configuration with room for max 64 MByte
 #                   Flash ROM)
 #      0x00100000   boot from RAM (for testing only)
 #
 
 #
 #      0xFC000000   boot low (standard configuration with room for max 64 MByte
 #                   Flash ROM)
 #      0x00100000   boot from RAM (for testing only)
 #
 

-ifndef TEXT_BASE
+ifndef CONFIG_SYS_TEXT_BASE

 ## Standard: boot low
 ## Standard: boot low

-TEXT_BASE = 0xFC000000
+CONFIG_SYS_TEXT_BASE = 0xFC000000

 ## For testing: boot from RAM
 ## For testing: boot from RAM

-# TEXT_BASE = 0x00100000
+# CONFIG_SYS_TEXT_BASE = 0x00100000

 endif
 
 endif
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/bct-brettl2/config.mk b/board/bct-brettl2/config.mk
index dfd9456..0c02d44 100644 (file)
--- a/board/bct-brettl2/config.mk
+++ b/board/bct-brettl2/config.mk
@@ -24,7 +24,7 @@
 #
 
 # This is not actually used for Blackfin boards so do not change it
 #
 
 # This is not actually used for Blackfin boards so do not change it

-#TEXT_BASE = do-not-use-me
+#CONFIG_SYS_TEXT_BASE = do-not-use-me

 
 CONFIG_BFIN_CPU = bf536-0.3
 
 
 CONFIG_BFIN_CPU = bf536-0.3
 

diff --git a/board/bf518f-ezbrd/config.mk b/board/bf518f-ezbrd/config.mk
index 30b92a3..9a54dbf 100644 (file)
--- a/board/bf518f-ezbrd/config.mk
+++ b/board/bf518f-ezbrd/config.mk
@@ -24,7 +24,7 @@
 #
 
 # This is not actually used for Blackfin boards so do not change it
 #
 
 # This is not actually used for Blackfin boards so do not change it

-#TEXT_BASE = do-not-use-me
+#CONFIG_SYS_TEXT_BASE = do-not-use-me

 
 CONFIG_BFIN_CPU = bf518-0.0
 
 
 CONFIG_BFIN_CPU = bf518-0.0
 

diff --git a/board/bf526-ezbrd/config.mk b/board/bf526-ezbrd/config.mk
index aaf4541..46c09ea 100644 (file)
--- a/board/bf526-ezbrd/config.mk
+++ b/board/bf526-ezbrd/config.mk
@@ -24,7 +24,7 @@
 #
 
 # This is not actually used for Blackfin boards so do not change it
 #
 
 # This is not actually used for Blackfin boards so do not change it

-#TEXT_BASE = do-not-use-me
+#CONFIG_SYS_TEXT_BASE = do-not-use-me

 
 CONFIG_BFIN_CPU = bf526-0.0
 
 
 CONFIG_BFIN_CPU = bf526-0.0
 

diff --git a/board/bf527-ad7160-eval/config.mk b/board/bf527-ad7160-eval/config.mk
index 9784810..a6c272a 100644 (file)
--- a/board/bf527-ad7160-eval/config.mk
+++ b/board/bf527-ad7160-eval/config.mk
@@ -24,7 +24,7 @@
 #
 
 # This is not actually used for Blackfin boards so do not change it
 #
 
 # This is not actually used for Blackfin boards so do not change it

-#TEXT_BASE = do-not-use-me
+#CONFIG_SYS_TEXT_BASE = do-not-use-me

 
 CONFIG_BFIN_CPU = bf527-0.2
 
 
 CONFIG_BFIN_CPU = bf527-0.2
 

diff --git a/board/bf527-ezkit/config.mk b/board/bf527-ezkit/config.mk
index 78eebff..790fe99 100644 (file)
--- a/board/bf527-ezkit/config.mk
+++ b/board/bf527-ezkit/config.mk
@@ -24,7 +24,7 @@
 #
 
 # This is not actually used for Blackfin boards so do not change it
 #
 
 # This is not actually used for Blackfin boards so do not change it

-#TEXT_BASE = do-not-use-me
+#CONFIG_SYS_TEXT_BASE = do-not-use-me

 
 CONFIG_BFIN_CPU = bf527-0.0
 
 
 CONFIG_BFIN_CPU = bf527-0.0
 

diff --git a/board/bf527-sdp/config.mk b/board/bf527-sdp/config.mk
index 744e7a5..7cb935a 100644 (file)
--- a/board/bf527-sdp/config.mk
+++ b/board/bf527-sdp/config.mk
@@ -24,7 +24,7 @@
 #
 
 # This is not actually used for Blackfin boards so do not change it
 #
 
 # This is not actually used for Blackfin boards so do not change it

-#TEXT_BASE = do-not-use-me
+#CONFIG_SYS_TEXT_BASE = do-not-use-me

 
 CONFIG_BFIN_CPU = bf527-0.2
 
 
 CONFIG_BFIN_CPU = bf527-0.2
 

diff --git a/board/bf533-ezkit/config.mk b/board/bf533-ezkit/config.mk
index 60ec6b6..a0d1749 100644 (file)
--- a/board/bf533-ezkit/config.mk
+++ b/board/bf533-ezkit/config.mk
@@ -24,7 +24,7 @@
 #
 
 # This is not actually used for Blackfin boards so do not change it
 #
 
 # This is not actually used for Blackfin boards so do not change it

-#TEXT_BASE = do-not-use-me
+#CONFIG_SYS_TEXT_BASE = do-not-use-me

 
 CONFIG_BFIN_CPU = bf533-0.3
 
 
 CONFIG_BFIN_CPU = bf533-0.3
 

diff --git a/board/bf533-stamp/config.mk b/board/bf533-stamp/config.mk
index 60ec6b6..a0d1749 100644 (file)
--- a/board/bf533-stamp/config.mk
+++ b/board/bf533-stamp/config.mk
@@ -24,7 +24,7 @@
 #
 
 # This is not actually used for Blackfin boards so do not change it
 #
 
 # This is not actually used for Blackfin boards so do not change it

-#TEXT_BASE = do-not-use-me
+#CONFIG_SYS_TEXT_BASE = do-not-use-me

 
 CONFIG_BFIN_CPU = bf533-0.3
 
 
 CONFIG_BFIN_CPU = bf533-0.3
 

diff --git a/board/bf537-minotaur/config.mk b/board/bf537-minotaur/config.mk
index 59e9a9c..de02635 100644 (file)
--- a/board/bf537-minotaur/config.mk
+++ b/board/bf537-minotaur/config.mk
@@ -24,7 +24,7 @@
 #
 
 # This is not actually used for Blackfin boards so do not change it
 #
 
 # This is not actually used for Blackfin boards so do not change it

-#TEXT_BASE = do-not-use-me
+#CONFIG_SYS_TEXT_BASE = do-not-use-me

 
 CONFIG_BFIN_CPU = bf537-0.2
 
 
 CONFIG_BFIN_CPU = bf537-0.2
 

diff --git a/board/bf537-pnav/config.mk b/board/bf537-pnav/config.mk
index ce8ef3b..e29d87f 100644 (file)
--- a/board/bf537-pnav/config.mk
+++ b/board/bf537-pnav/config.mk
@@ -24,7 +24,7 @@
 #
 
 # This is not actually used for Blackfin boards so do not change it
 #
 
 # This is not actually used for Blackfin boards so do not change it

-#TEXT_BASE = do-not-use-me
+#CONFIG_SYS_TEXT_BASE = do-not-use-me

 
 CONFIG_BFIN_CPU = bf537-0.2
 
 
 CONFIG_BFIN_CPU = bf537-0.2
 

diff --git a/board/bf537-srv1/config.mk b/board/bf537-srv1/config.mk
index 59e9a9c..de02635 100644 (file)
--- a/board/bf537-srv1/config.mk
+++ b/board/bf537-srv1/config.mk
@@ -24,7 +24,7 @@
 #
 
 # This is not actually used for Blackfin boards so do not change it
 #
 
 # This is not actually used for Blackfin boards so do not change it

-#TEXT_BASE = do-not-use-me
+#CONFIG_SYS_TEXT_BASE = do-not-use-me

 
 CONFIG_BFIN_CPU = bf537-0.2
 
 
 CONFIG_BFIN_CPU = bf537-0.2
 

diff --git a/board/bf537-stamp/config.mk b/board/bf537-stamp/config.mk
index 3bac0ad..6694f06 100644 (file)
--- a/board/bf537-stamp/config.mk
+++ b/board/bf537-stamp/config.mk
@@ -24,7 +24,7 @@
 #
 
 # This is not actually used for Blackfin boards so do not change it
 #
 
 # This is not actually used for Blackfin boards so do not change it

-#TEXT_BASE = do-not-use-me
+#CONFIG_SYS_TEXT_BASE = do-not-use-me

 
 CONFIG_BFIN_CPU = bf537-0.2
 
 
 CONFIG_BFIN_CPU = bf537-0.2
 

diff --git a/board/bf538f-ezkit/config.mk b/board/bf538f-ezkit/config.mk
index 170a2d5..4ab1397 100644 (file)
--- a/board/bf538f-ezkit/config.mk
+++ b/board/bf538f-ezkit/config.mk
@@ -24,7 +24,7 @@
 #
 
 # This is not actually used for Blackfin boards so do not change it
 #
 
 # This is not actually used for Blackfin boards so do not change it

-#TEXT_BASE = do-not-use-me
+#CONFIG_SYS_TEXT_BASE = do-not-use-me

 
 CONFIG_BFIN_CPU = bf538-0.4
 
 
 CONFIG_BFIN_CPU = bf538-0.4
 

diff --git a/board/bf548-ezkit/config.mk b/board/bf548-ezkit/config.mk
index ec3c28e..9aa1761 100644 (file)
--- a/board/bf548-ezkit/config.mk
+++ b/board/bf548-ezkit/config.mk
@@ -24,7 +24,7 @@
 #
 
 # This is not actually used for Blackfin boards so do not change it
 #
 
 # This is not actually used for Blackfin boards so do not change it

-#TEXT_BASE = do-not-use-me
+#CONFIG_SYS_TEXT_BASE = do-not-use-me

 
 CONFIG_BFIN_CPU = bf548-0.0
 
 
 CONFIG_BFIN_CPU = bf548-0.0
 

diff --git a/board/bf561-acvilon/config.mk b/board/bf561-acvilon/config.mk
index 221de65..5c88114 100644 (file)
--- a/board/bf561-acvilon/config.mk
+++ b/board/bf561-acvilon/config.mk
@@ -24,7 +24,7 @@
 #
 
 # This is not actually used for Blackfin boards so do not change it
 #
 
 # This is not actually used for Blackfin boards so do not change it

-#TEXT_BASE = do-not-use-me
+#CONFIG_SYS_TEXT_BASE = do-not-use-me

 
 CONFIG_BFIN_CPU = bf561-0.5
 
 
 CONFIG_BFIN_CPU = bf561-0.5
 

diff --git a/board/bf561-ezkit/config.mk b/board/bf561-ezkit/config.mk
index ff19190..19cdefc 100644 (file)
--- a/board/bf561-ezkit/config.mk
+++ b/board/bf561-ezkit/config.mk
@@ -24,7 +24,7 @@
 #
 
 # This is not actually used for Blackfin boards so do not change it
 #
 
 # This is not actually used for Blackfin boards so do not change it

-#TEXT_BASE = do-not-use-me
+#CONFIG_SYS_TEXT_BASE = do-not-use-me

 
 CONFIG_BFIN_CPU = bf561-0.3
 
 
 CONFIG_BFIN_CPU = bf561-0.3
 

diff --git a/board/blackstamp/config.mk b/board/blackstamp/config.mk
index 5035cb9..0ca3c90 100644 (file)
--- a/board/blackstamp/config.mk
+++ b/board/blackstamp/config.mk
@@ -24,7 +24,7 @@
 #
 
 # This is not actually used for Blackfin boards so do not change it
 #
 
 # This is not actually used for Blackfin boards so do not change it

-#TEXT_BASE = do-not-use-me
+#CONFIG_SYS_TEXT_BASE = do-not-use-me

 
 CONFIG_BFIN_CPU = bf532-0.5
 
 
 CONFIG_BFIN_CPU = bf532-0.5
 

diff --git a/board/blackvme/config.mk b/board/blackvme/config.mk
index 8d0fe39..4d6e0ba 100644 (file)
--- a/board/blackvme/config.mk
+++ b/board/blackvme/config.mk
@@ -24,7 +24,7 @@
 #
 
 # This is not actually used for Blackfin boards so do not change it
 #
 
 # This is not actually used for Blackfin boards so do not change it

-#TEXT_BASE = do-not-use-me
+#CONFIG_SYS_TEXT_BASE = do-not-use-me

 
 CONFIG_BFIN_CPU = bf561-0.5
 
 
 CONFIG_BFIN_CPU = bf561-0.5
 

diff --git a/board/bmw/config.mk b/board/bmw/config.mk
index f991549..4a05c8c 100644 (file)
--- a/board/bmw/config.mk
+++ b/board/bmw/config.mk
@@ -25,8 +25,8 @@
 # CU824 board
 #
 
 # CU824 board
 #
 

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 # NOTE: The flags below affect how the BCM570x driver is compiled
 PLATFORM_CPPFLAGS += -DEMBEDDED -DBIG_ENDIAN_HOST -DINCLUDE_5701_AX_FIX=1\
                     -DDBG=0 -DT3_JUMBO_RCV_RCB_ENTRY_COUNT=256\
 # NOTE: The flags below affect how the BCM570x driver is compiled
 PLATFORM_CPPFLAGS += -DEMBEDDED -DBIG_ENDIAN_HOST -DINCLUDE_5701_AX_FIX=1\
                     -DDBG=0 -DT3_JUMBO_RCV_RCB_ENTRY_COUNT=256\

-                    -DTEXT_BASE=$(TEXT_BASE)
+                    -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)

diff --git a/board/c2mon/config.mk b/board/c2mon/config.mk
index c2d21e2..ab80867 100644 (file)
--- a/board/c2mon/config.mk
+++ b/board/c2mon/config.mk
@@ -25,4 +25,4 @@
 # TTTech C2MON boards
 #
 
 # TTTech C2MON boards
 #
 

-TEXT_BASE = 0x40000000
+CONFIG_SYS_TEXT_BASE = 0x40000000

diff --git a/board/calao/sbc35_a9g20/config.mk b/board/calao/sbc35_a9g20/config.mk
index ff2cfd1..e554a45 100644 (file)
--- a/board/calao/sbc35_a9g20/config.mk
+++ b/board/calao/sbc35_a9g20/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x23f00000
+CONFIG_SYS_TEXT_BASE = 0x23f00000

diff --git a/board/calao/tny_a9260/config.mk b/board/calao/tny_a9260/config.mk
index ff2cfd1..e554a45 100644 (file)
--- a/board/calao/tny_a9260/config.mk
+++ b/board/calao/tny_a9260/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x23f00000
+CONFIG_SYS_TEXT_BASE = 0x23f00000

diff --git a/board/canmb/config.mk b/board/canmb/config.mk
index a163b34..ad367bb 100644 (file)
--- a/board/canmb/config.mk
+++ b/board/canmb/config.mk
@@ -27,13 +27,14 @@
 #
 # CANMB board
 #
 #
 # CANMB board
 #

-# allowed and functional TEXT_BASE values:
+# allowed and functional CONFIG_SYS_TEXT_BASE values:

 #
 #   0xfe000000         low boot at 0x00000100 (default board setting)
 #      0x00100000              RAM load and test
 #
 
 #
 #   0xfe000000         low boot at 0x00000100 (default board setting)
 #      0x00100000              RAM load and test
 #
 

-TEXT_BASE = 0xFE000000
-#TEXT_BASE = 0x00100000
+CONFIG_SYS_TEXT_BASE = 0xFE000000
+#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

diff --git a/board/cerf250/config.mk b/board/cerf250/config.mk
index 1a86cc9..c2d46b2 100644 (file)
--- a/board/cerf250/config.mk
+++ b/board/cerf250/config.mk
@@ -2,4 +2,4 @@
 # Cerf board with PXA250 cpu
 #
 #
 # Cerf board with PXA250 cpu
 #
 #

-TEXT_BASE = 0xa3080000
+CONFIG_SYS_TEXT_BASE = 0xa3080000

diff --git a/board/cm-bf527/config.mk b/board/cm-bf527/config.mk
index 78eebff..790fe99 100644 (file)
--- a/board/cm-bf527/config.mk
+++ b/board/cm-bf527/config.mk
@@ -24,7 +24,7 @@
 #
 
 # This is not actually used for Blackfin boards so do not change it
 #
 
 # This is not actually used for Blackfin boards so do not change it

-#TEXT_BASE = do-not-use-me
+#CONFIG_SYS_TEXT_BASE = do-not-use-me

 
 CONFIG_BFIN_CPU = bf527-0.0
 
 
 CONFIG_BFIN_CPU = bf527-0.0
 

diff --git a/board/cm-bf533/config.mk b/board/cm-bf533/config.mk
index 60ec6b6..a0d1749 100644 (file)
--- a/board/cm-bf533/config.mk
+++ b/board/cm-bf533/config.mk
@@ -24,7 +24,7 @@
 #
 
 # This is not actually used for Blackfin boards so do not change it
 #
 
 # This is not actually used for Blackfin boards so do not change it

-#TEXT_BASE = do-not-use-me
+#CONFIG_SYS_TEXT_BASE = do-not-use-me

 
 CONFIG_BFIN_CPU = bf533-0.3
 
 
 CONFIG_BFIN_CPU = bf533-0.3
 

diff --git a/board/cm-bf537e/config.mk b/board/cm-bf537e/config.mk
index 1281da4..c5d45c7 100644 (file)
--- a/board/cm-bf537e/config.mk
+++ b/board/cm-bf537e/config.mk
@@ -24,7 +24,7 @@
 #
 
 # This is not actually used for Blackfin boards so do not change it
 #
 
 # This is not actually used for Blackfin boards so do not change it

-#TEXT_BASE = do-not-use-me
+#CONFIG_SYS_TEXT_BASE = do-not-use-me

 
 CONFIG_BFIN_CPU = bf537-0.2
 
 
 CONFIG_BFIN_CPU = bf537-0.2
 

diff --git a/board/cm-bf537u/config.mk b/board/cm-bf537u/config.mk
index 1281da4..c5d45c7 100644 (file)
--- a/board/cm-bf537u/config.mk
+++ b/board/cm-bf537u/config.mk
@@ -24,7 +24,7 @@
 #
 
 # This is not actually used for Blackfin boards so do not change it
 #
 
 # This is not actually used for Blackfin boards so do not change it

-#TEXT_BASE = do-not-use-me
+#CONFIG_SYS_TEXT_BASE = do-not-use-me

 
 CONFIG_BFIN_CPU = bf537-0.2
 
 
 CONFIG_BFIN_CPU = bf537-0.2
 

diff --git a/board/cm-bf548/config.mk b/board/cm-bf548/config.mk
index bce60e5..da6aa52 100644 (file)
--- a/board/cm-bf548/config.mk
+++ b/board/cm-bf548/config.mk
@@ -24,7 +24,7 @@
 #
 
 # This is not actually used for Blackfin boards so do not change it
 #
 
 # This is not actually used for Blackfin boards so do not change it

-#TEXT_BASE = do-not-use-me
+#CONFIG_SYS_TEXT_BASE = do-not-use-me

 
 CONFIG_BFIN_CPU = bf548-0.0
 
 
 CONFIG_BFIN_CPU = bf548-0.0
 

diff --git a/board/cm-bf561/config.mk b/board/cm-bf561/config.mk
index ff19190..19cdefc 100644 (file)
--- a/board/cm-bf561/config.mk
+++ b/board/cm-bf561/config.mk
@@ -24,7 +24,7 @@
 #
 
 # This is not actually used for Blackfin boards so do not change it
 #
 
 # This is not actually used for Blackfin boards so do not change it

-#TEXT_BASE = do-not-use-me
+#CONFIG_SYS_TEXT_BASE = do-not-use-me

 
 CONFIG_BFIN_CPU = bf561-0.3
 
 
 CONFIG_BFIN_CPU = bf561-0.3
 

diff --git a/board/cm4008/config.mk b/board/cm4008/config.mk
index 74eaeb0..0d5923b 100644 (file)
--- a/board/cm4008/config.mk
+++ b/board/cm4008/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x00f00000
+CONFIG_SYS_TEXT_BASE = 0x00f00000

diff --git a/board/cm41xx/config.mk b/board/cm41xx/config.mk
index 74eaeb0..0d5923b 100644 (file)
--- a/board/cm41xx/config.mk
+++ b/board/cm41xx/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x00f00000
+CONFIG_SYS_TEXT_BASE = 0x00f00000

diff --git a/board/cm5200/config.mk b/board/cm5200/config.mk
index 7f06139..0b07aba 100644 (file)
--- a/board/cm5200/config.mk
+++ b/board/cm5200/config.mk
@@ -21,6 +21,7 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xfc000000
+CONFIG_SYS_TEXT_BASE = 0xfc000000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/cmc_pu2/config.mk b/board/cmc_pu2/config.mk
index 7116eea..cdb8a5f 100644 (file)
--- a/board/cmc_pu2/config.mk
+++ b/board/cmc_pu2/config.mk
@@ -1,3 +1,3 @@
-TEXT_BASE = 0x20F00000
+CONFIG_SYS_TEXT_BASE = 0x20F00000

 ## For testing: load at 0x20100000 and "go" at 0x201000A4
 ## For testing: load at 0x20100000 and "go" at 0x201000A4

-#TEXT_BASE = 0x20100000
+#CONFIG_SYS_TEXT_BASE = 0x20100000

diff --git a/board/cmi/config.mk b/board/cmi/config.mk
index 564f638..b065545 100644 (file)
--- a/board/cmi/config.mk
+++ b/board/cmi/config.mk
@@ -26,6 +26,7 @@
 #
 
 # Boot from flash at location 0x00000000
 #
 
 # Boot from flash at location 0x00000000

-TEXT_BASE = 0x02000000
+CONFIG_SYS_TEXT_BASE = 0x02000000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)

diff --git a/board/cobra5272/config.mk b/board/cobra5272/config.mk
index ccb2cf7..5b8c608 100644 (file)
--- a/board/cobra5272/config.mk
+++ b/board/cobra5272/config.mk
@@ -22,4 +22,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xffe00000
+CONFIG_SYS_TEXT_BASE = 0xffe00000

diff --git a/board/cogent/README b/board/cogent/README
index 31ca187..4343f73 100644 (file)
--- a/board/cogent/README
+++ b/board/cogent/README
@@ -87,11 +87,11 @@ want the serial console on motherboard serial port A or on one of the
 8xx SMC ports, and set CONFIG_8xx_CONS_{SMC1,SMC2,NONE} accordingly
 (NONE means use Cogent motherboard serial port A).
 
 8xx SMC ports, and set CONFIG_8xx_CONS_{SMC1,SMC2,NONE} accordingly
 (NONE means use Cogent motherboard serial port A).
 

-Then edit the file "cogent/config.mk". Firstly, set TEXT_BASE to be
+Then edit the file "cogent/config.mk". Firstly, set CONFIG_SYS_TEXT_BASE to be

 the base address of the EPROM for the CPU module. This should be the
 same as the value selected for CONFIG_SYS_MONITOR_BASE in
 "include/config_cogent_*.h" (in fact, I have made this automatic via
 the base address of the EPROM for the CPU module. This should be the
 same as the value selected for CONFIG_SYS_MONITOR_BASE in
 "include/config_cogent_*.h" (in fact, I have made this automatic via

-the -DTEXT_BASE=... option in CPPFLAGS).
+the -CONFIG_SYS_TEXT_BASE=... option in CPPFLAGS).

 
 Finally, set the values of the make variables $(CMA_MB) and $(CMA_IOMS).
 
 
 Finally, set the values of the make variables $(CMA_MB) and $(CMA_IOMS).
 

diff --git a/board/cogent/config.mk b/board/cogent/config.mk
index 35a5ed3..0a5f286 100644 (file)
--- a/board/cogent/config.mk
+++ b/board/cogent/config.mk
@@ -26,8 +26,9 @@
 #
 
 # Boot EPROM location
 #
 
 # Boot EPROM location

-TEXT_BASE = 0xfff00000
+CONFIG_SYS_TEXT_BASE = 0xfff00000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)

 
 LDSCRIPT := $(SRCTREE)/board/cogent/u-boot.lds
 
 LDSCRIPT := $(SRCTREE)/board/cogent/u-boot.lds

diff --git a/board/colibri_pxa270/config.mk b/board/colibri_pxa270/config.mk
index 1d650ac..0f10662 100644 (file)
--- a/board/colibri_pxa270/config.mk
+++ b/board/colibri_pxa270/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0xa1000000
+CONFIG_SYS_TEXT_BASE = 0xa1000000

diff --git a/board/cpc45/config.mk b/board/cpc45/config.mk
index bf9d9de..ab79b2c 100644 (file)
--- a/board/cpc45/config.mk
+++ b/board/cpc45/config.mk
@@ -27,10 +27,11 @@
 
 
 ifeq ($(CONFIG_BOOT_ROM),y)
 
 
 ifeq ($(CONFIG_BOOT_ROM),y)

-       TEXT_BASE := 0xFFF00000
+       CONFIG_SYS_TEXT_BASE := 0xFFF00000

        PLATFORM_CPPFLAGS += -DCONFIG_BOOT_ROM
 else
        PLATFORM_CPPFLAGS += -DCONFIG_BOOT_ROM
 else

-       TEXT_BASE := 0xFFF00000
+       CONFIG_SYS_TEXT_BASE := 0xFFF00000

 endif
 
 endif
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)

diff --git a/board/cpu86/config.mk b/board/cpu86/config.mk
index 5fe0ca0..3469e73 100644 (file)
--- a/board/cpu86/config.mk
+++ b/board/cpu86/config.mk
@@ -31,10 +31,11 @@
 #
 
 ifeq ($(CONFIG_BOOT_ROM),y)
 #
 
 ifeq ($(CONFIG_BOOT_ROM),y)

-       TEXT_BASE := 0xFF800000
+       CONFIG_SYS_TEXT_BASE := 0xFF800000

        PLATFORM_CPPFLAGS += -DCONFIG_BOOT_ROM
 else
        PLATFORM_CPPFLAGS += -DCONFIG_BOOT_ROM
 else

-       TEXT_BASE := 0xFF000000
+       CONFIG_SYS_TEXT_BASE := 0xFF000000

 endif
 
 endif
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)

diff --git a/board/cpu87/config.mk b/board/cpu87/config.mk
index 6a694a4..eba3036 100644 (file)
--- a/board/cpu87/config.mk
+++ b/board/cpu87/config.mk
@@ -31,10 +31,11 @@
 #
 
 ifeq ($(CONFIG_BOOT_ROM),y)
 #
 
 ifeq ($(CONFIG_BOOT_ROM),y)

-       TEXT_BASE := 0xFF800000
+       CONFIG_SYS_TEXT_BASE := 0xFF800000

        PLATFORM_CPPFLAGS += -DCONFIG_BOOT_ROM
 else
        PLATFORM_CPPFLAGS += -DCONFIG_BOOT_ROM
 else

-       TEXT_BASE := 0xFF000000
+       CONFIG_SYS_TEXT_BASE := 0xFF000000

 endif
 
 endif
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)

diff --git a/board/cradle/config.mk b/board/cradle/config.mk
index aa40388..6656bdd 100644 (file)
--- a/board/cradle/config.mk
+++ b/board/cradle/config.mk
@@ -1,2 +1,2 @@
-TEXT_BASE = 0xa0f80000
-#TEXT_BASE = 0
+CONFIG_SYS_TEXT_BASE = 0xa0f80000
+#CONFIG_SYS_TEXT_BASE = 0

diff --git a/board/cray/L1/config.mk b/board/cray/L1/config.mk
index b69fe8e..28924f9 100644 (file)
--- a/board/cray/L1/config.mk
+++ b/board/cray/L1/config.mk
@@ -23,4 +23,4 @@
 
 # Note: I make an "image" from U-Boot itself, which prefixes 0x40 bytes of
 # header info, hence start address is thus shifted.
 
 # Note: I make an "image" from U-Boot itself, which prefixes 0x40 bytes of
 # header info, hence start address is thus shifted.

-TEXT_BASE = 0xFFFD0040
+CONFIG_SYS_TEXT_BASE = 0xFFFD0040

diff --git a/board/csb226/config.mk b/board/csb226/config.mk
index 2354392..9e46555 100644 (file)
--- a/board/csb226/config.mk
+++ b/board/csb226/config.mk
@@ -7,9 +7,9 @@
 #
 
 # This is the address where U-Boot lives in flash:
 #
 
 # This is the address where U-Boot lives in flash:

-#TEXT_BASE = 0
+#CONFIG_SYS_TEXT_BASE = 0

 
 # FIXME: armboot does only work correctly when being compiled
 # for the addresses _after_ relocation to RAM!! Otherwhise the
 # .bss segment is assumed in flash...
 
 # FIXME: armboot does only work correctly when being compiled
 # for the addresses _after_ relocation to RAM!! Otherwhise the
 # .bss segment is assumed in flash...

-TEXT_BASE = 0xa1fe0000
+CONFIG_SYS_TEXT_BASE = 0xa1fe0000

diff --git a/board/csb226/lowlevel_init.S b/board/csb226/lowlevel_init.S
index 9892430..55169be 100644 (file)
--- a/board/csb226/lowlevel_init.S
+++ b/board/csb226/lowlevel_init.S
@@ -39,7 +39,7 @@ DRAM_SIZE:  .long   CONFIG_SYS_DRAM_SIZE
    .endm
 
 _TEXT_BASE:
    .endm
 
 _TEXT_BASE:

-       .word   TEXT_BASE
+       .word   CONFIG_SYS_TEXT_BASE

 
 
 /*
 
 
 /*

diff --git a/board/csb272/config.mk b/board/csb272/config.mk
index 4672f08..a47b005 100644 (file)
--- a/board/csb272/config.mk
+++ b/board/csb272/config.mk
@@ -30,7 +30,7 @@
 
 LDFLAGS += $(LINKER_UNDEFS)
 
 
 LDFLAGS += $(LINKER_UNDEFS)
 

-TEXT_BASE := 0xFFFC0000
-#TEXT_BASE := 0x00100000
+CONFIG_SYS_TEXT_BASE := 0xFFFC0000
+#CONFIG_SYS_TEXT_BASE := 0x00100000

 
 PLATFORM_RELFLAGS := $(PLATFORM_RELFLAGS)
 
 PLATFORM_RELFLAGS := $(PLATFORM_RELFLAGS)

diff --git a/board/csb472/config.mk b/board/csb472/config.mk
index 04aefd1..5941632 100644 (file)
--- a/board/csb472/config.mk
+++ b/board/csb472/config.mk
@@ -30,7 +30,7 @@
 
 LDFLAGS += $(LINKER_UNDEFS)
 
 
 LDFLAGS += $(LINKER_UNDEFS)
 

-TEXT_BASE := 0xFFFC0000
-#TEXT_BASE := 0x00100000
+CONFIG_SYS_TEXT_BASE := 0xFFFC0000
+#CONFIG_SYS_TEXT_BASE := 0x00100000

 
 PLATFORM_RELFLAGS := $(PLATFORM_RELFLAGS)
 
 PLATFORM_RELFLAGS := $(PLATFORM_RELFLAGS)

diff --git a/board/csb637/config.mk b/board/csb637/config.mk
index 4c6f631..e2cc8a6 100644 (file)
--- a/board/csb637/config.mk
+++ b/board/csb637/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x23fc0000
+CONFIG_SYS_TEXT_BASE = 0x23fc0000

diff --git a/board/cu824/config.mk b/board/cu824/config.mk
index 18673e1..721dd19 100644 (file)
--- a/board/cu824/config.mk
+++ b/board/cu824/config.mk
@@ -25,6 +25,6 @@
 # CU824 board
 #
 
 # CU824 board
 #
 

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)

diff --git a/board/dave/B2/config.mk b/board/dave/B2/config.mk
index 5216622..f7b686a 100644 (file)
--- a/board/dave/B2/config.mk
+++ b/board/dave/B2/config.mk
@@ -25,6 +25,6 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0x0C100000
+CONFIG_SYS_TEXT_BASE = 0x0C100000

 
 PLATFORM_CPPFLAGS += -Uarm
 
 PLATFORM_CPPFLAGS += -Uarm

diff --git a/board/dave/PPChameleonEVB/config.mk b/board/dave/PPChameleonEVB/config.mk
index 9083aac..d47a232 100644 (file)
--- a/board/dave/PPChameleonEVB/config.mk
+++ b/board/dave/PPChameleonEVB/config.mk
@@ -22,7 +22,7 @@
 #
 
 # Reserve 256 kB for Monitor
 #
 
 # Reserve 256 kB for Monitor

-#TEXT_BASE = 0xFFFC0000
+#CONFIG_SYS_TEXT_BASE = 0xFFFC0000

 
 # Reserve 320 kB for Monitor
 
 # Reserve 320 kB for Monitor

-TEXT_BASE = 0xFFFB0000
+CONFIG_SYS_TEXT_BASE = 0xFFFB0000

diff --git a/board/davedenx/aria/config.mk b/board/davedenx/aria/config.mk
index 838a018..d52b342 100644 (file)
--- a/board/davedenx/aria/config.mk
+++ b/board/davedenx/aria/config.mk
@@ -20,4 +20,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE  =   0xFFF00000
+CONFIG_SYS_TEXT_BASE  =   0xFFF00000

diff --git a/board/davedenx/qong/config.mk b/board/davedenx/qong/config.mk
index 39c1203..ea1c1b0 100644 (file)
--- a/board/davedenx/qong/config.mk
+++ b/board/davedenx/qong/config.mk
@@ -1,3 +1,3 @@
-TEXT_BASE = 0xa0000000
+CONFIG_SYS_TEXT_BASE = 0xa0000000

 
 # PLATFORM_CPPFLAGS += -DDEBUG
 
 # PLATFORM_CPPFLAGS += -DDEBUG

diff --git a/board/davinci/da8xxevm/config.mk b/board/davinci/da8xxevm/config.mk
index 6da29a9..e176f7d 100644 (file)
--- a/board/davinci/da8xxevm/config.mk
+++ b/board/davinci/da8xxevm/config.mk
@@ -40,4 +40,4 @@
 
 
 #Provide at least 16MB spacing between us and the Linux Kernel image
 
 
 #Provide at least 16MB spacing between us and the Linux Kernel image

-TEXT_BASE = 0xC1080000
+CONFIG_SYS_TEXT_BASE = 0xC1080000

diff --git a/board/davinci/dm355evm/config.mk b/board/davinci/dm355evm/config.mk
index c4e6e07..9a06300 100644 (file)
--- a/board/davinci/dm355evm/config.mk
+++ b/board/davinci/dm355evm/config.mk
@@ -8,4 +8,4 @@
 #
 
 #Provide at least 16MB spacing between us and the Linux Kernel image
 #
 
 #Provide at least 16MB spacing between us and the Linux Kernel image

-TEXT_BASE = 0x81080000
+CONFIG_SYS_TEXT_BASE = 0x81080000

diff --git a/board/davinci/dm355leopard/config.mk b/board/davinci/dm355leopard/config.mk
index d67df02..28ff3f3 100644 (file)
--- a/board/davinci/dm355leopard/config.mk
+++ b/board/davinci/dm355leopard/config.mk
@@ -3,4 +3,4 @@
 #
 
 #Provide at least 16MB spacing between us and the Linux Kernel image
 #
 
 #Provide at least 16MB spacing between us and the Linux Kernel image

-TEXT_BASE = 0x81080000
+CONFIG_SYS_TEXT_BASE = 0x81080000

diff --git a/board/davinci/dm365evm/config.mk b/board/davinci/dm365evm/config.mk
index 86472ff..7b1e900 100644 (file)
--- a/board/davinci/dm365evm/config.mk
+++ b/board/davinci/dm365evm/config.mk
@@ -8,4 +8,4 @@
 #
 
 #Provide at least 16MB spacing between us and the Linux Kernel image
 #
 
 #Provide at least 16MB spacing between us and the Linux Kernel image

-TEXT_BASE = 0x81080000
+CONFIG_SYS_TEXT_BASE = 0x81080000

diff --git a/board/davinci/dm6467evm/config.mk b/board/davinci/dm6467evm/config.mk
index ca801c2..3751043 100644 (file)
--- a/board/davinci/dm6467evm/config.mk
+++ b/board/davinci/dm6467evm/config.mk
@@ -1,2 +1,2 @@
 #Provide at least 16MB spacing between us and the Linux Kernel image
 #Provide at least 16MB spacing between us and the Linux Kernel image

-TEXT_BASE = 0x81080000
+CONFIG_SYS_TEXT_BASE = 0x81080000

diff --git a/board/davinci/dvevm/config.mk b/board/davinci/dvevm/config.mk
index c24ced7..ed80707 100644 (file)
--- a/board/davinci/dvevm/config.mk
+++ b/board/davinci/dvevm/config.mk
@@ -36,4 +36,4 @@
 #
 
 #Provide at least 16MB spacing between us and the Linux Kernel image
 #
 
 #Provide at least 16MB spacing between us and the Linux Kernel image

-TEXT_BASE = 0x81080000
+CONFIG_SYS_TEXT_BASE = 0x81080000

diff --git a/board/davinci/schmoogie/config.mk b/board/davinci/schmoogie/config.mk
index c24ced7..ed80707 100644 (file)
--- a/board/davinci/schmoogie/config.mk
+++ b/board/davinci/schmoogie/config.mk
@@ -36,4 +36,4 @@
 #
 
 #Provide at least 16MB spacing between us and the Linux Kernel image
 #
 
 #Provide at least 16MB spacing between us and the Linux Kernel image

-TEXT_BASE = 0x81080000
+CONFIG_SYS_TEXT_BASE = 0x81080000

diff --git a/board/davinci/sffsdr/config.mk b/board/davinci/sffsdr/config.mk
index 31a1c9e..4fe9007 100644 (file)
--- a/board/davinci/sffsdr/config.mk
+++ b/board/davinci/sffsdr/config.mk
@@ -20,4 +20,4 @@
 #
 # we load ourself to 8400'0000 to provide at least 32MB spacing
 # between us and the Integrity kernel image
 #
 # we load ourself to 8400'0000 to provide at least 32MB spacing
 # between us and the Integrity kernel image

-TEXT_BASE = 0x84000000
+CONFIG_SYS_TEXT_BASE = 0x84000000

diff --git a/board/davinci/sonata/config.mk b/board/davinci/sonata/config.mk
index c24ced7..ed80707 100644 (file)
--- a/board/davinci/sonata/config.mk
+++ b/board/davinci/sonata/config.mk
@@ -36,4 +36,4 @@
 #
 
 #Provide at least 16MB spacing between us and the Linux Kernel image
 #
 
 #Provide at least 16MB spacing between us and the Linux Kernel image

-TEXT_BASE = 0x81080000
+CONFIG_SYS_TEXT_BASE = 0x81080000

diff --git a/board/dbau1x00/README b/board/dbau1x00/README
index b37ff36..b1e9494 100644 (file)
--- a/board/dbau1x00/README
+++ b/board/dbau1x00/README
@@ -26,7 +26,7 @@ boot loader delivered with board.
 
 NOTE! When you switch between the two boot flashes, the
 base addresses will be swapped.
 
 NOTE! When you switch between the two boot flashes, the
 base addresses will be swapped.

-Have this in mind when you compile u-boot. TEXT_BASE has
+Have this in mind when you compile u-boot. CONFIG_SYS_TEXT_BASE has

 to match the address where u-boot is located when you
 actually launch.
 
 to match the address where u-boot is located when you
 actually launch.
 

diff --git a/board/dbau1x00/config.mk b/board/dbau1x00/config.mk
index 39eb60a..3516b42 100644 (file)
--- a/board/dbau1x00/config.mk
+++ b/board/dbau1x00/config.mk
@@ -26,7 +26,7 @@
 #
 
 # ROM version
 #
 
 # ROM version

-TEXT_BASE = 0xbfc00000
+CONFIG_SYS_TEXT_BASE = 0xbfc00000

 
 # RAM version
 
 # RAM version

-#TEXT_BASE = 0x80100000
+#CONFIG_SYS_TEXT_BASE = 0x80100000

diff --git a/board/delta/config.mk b/board/delta/config.mk
index 3fe406c..8b24044 100644 (file)
--- a/board/delta/config.mk
+++ b/board/delta/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x83008000
+CONFIG_SYS_TEXT_BASE = 0x83008000

diff --git a/board/digsy_mtc/config.mk b/board/digsy_mtc/config.mk
index e2f14b0..40e557c 100644 (file)
--- a/board/digsy_mtc/config.mk
+++ b/board/digsy_mtc/config.mk
@@ -5,7 +5,7 @@
 #
 # digsyMTC board:
 #
 #
 # digsyMTC board:
 #

-#      Valid values for TEXT_BASE are:
+#      Valid values for CONFIG_SYS_TEXT_BASE are:

 #
 #      0xFFF00000   boot high (standard configuration)
 #      0xFE000000   boot low
 #
 #      0xFFF00000   boot high (standard configuration)
 #      0xFE000000   boot low


@@ -14,11 +14,12 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
+ifndef CONFIG_SYS_TEXT_BASE

 ## Standard: boot high
 ## Standard: boot high

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 ## For testing: boot from RAM
 ## For testing: boot from RAM

-# TEXT_BASE = 0x00100000
+# CONFIG_SYS_TEXT_BASE = 0x00100000

 endif
 
 endif
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/dnp1110/config.mk b/board/dnp1110/config.mk
index 4f6af46..ccf8277 100644 (file)
--- a/board/dnp1110/config.mk
+++ b/board/dnp1110/config.mk
@@ -14,4 +14,4 @@
 # we load ourself to c1f8'0000, the upper 1 MB of the first (only) bank
 #
 
 # we load ourself to c1f8'0000, the upper 1 MB of the first (only) bank
 #
 

-TEXT_BASE = 0xc1f80000
+CONFIG_SYS_TEXT_BASE = 0xc1f80000

diff --git a/board/eNET/config.mk b/board/eNET/config.mk
index 63a58fd..c4242ad 100644 (file)
--- a/board/eNET/config.mk
+++ b/board/eNET/config.mk
@@ -21,7 +21,7 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0x06000000
+CONFIG_SYS_TEXT_BASE = 0x06000000

 CFLAGS_common/dlmalloc.o += -Wa,--no-warn -fno-strict-aliasing
 PLATFORM_RELFLAGS += -fvisibility=hidden
 PLATFORM_CPPFLAGS += -fno-dwarf2-cfi-asm
 CFLAGS_common/dlmalloc.o += -Wa,--no-warn -fno-strict-aliasing
 PLATFORM_RELFLAGS += -fvisibility=hidden
 PLATFORM_CPPFLAGS += -fno-dwarf2-cfi-asm

diff --git a/board/eXalion/config.mk b/board/eXalion/config.mk
index b3f65eb..4a316ce 100644 (file)
--- a/board/eXalion/config.mk
+++ b/board/eXalion/config.mk
@@ -25,7 +25,7 @@
 # Sandpoint boards
 #
 
 # Sandpoint boards
 #
 

-#TEXT_BASE = 0x00090000
-TEXT_BASE = 0xFFF00000
+#CONFIG_SYS_TEXT_BASE = 0x00090000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)

diff --git a/board/earthlcd/favr-32-ezkit/config.mk b/board/earthlcd/favr-32-ezkit/config.mk
index 5c919cd..f8bc88d 100644 (file)
--- a/board/earthlcd/favr-32-ezkit/config.mk
+++ b/board/earthlcd/favr-32-ezkit/config.mk
@@ -1,4 +1,4 @@
 PLATFORM_RELFLAGS      += -ffunction-sections -fdata-sections
 PLATFORM_LDFLAGS       += --gc-sections
 PLATFORM_RELFLAGS      += -ffunction-sections -fdata-sections
 PLATFORM_LDFLAGS       += --gc-sections

-TEXT_BASE              = 0x00000000
+CONFIG_SYS_TEXT_BASE           = 0x00000000

 LDSCRIPT               = $(src)board/earthlcd/favr-32-ezkit/u-boot.lds
 LDSCRIPT               = $(src)board/earthlcd/favr-32-ezkit/u-boot.lds

diff --git a/board/edb93xx/config.mk b/board/edb93xx/config.mk
index b627869..fab59ef 100644 (file)
--- a/board/edb93xx/config.mk
+++ b/board/edb93xx/config.mk
@@ -1,33 +1,33 @@
 LDSCRIPT := $(SRCTREE)/arch/arm/cpu/arm920t/ep93xx/u-boot.lds
 
 ifdef CONFIG_EDB9301
 LDSCRIPT := $(SRCTREE)/arch/arm/cpu/arm920t/ep93xx/u-boot.lds
 
 ifdef CONFIG_EDB9301

-TEXT_BASE = 0x05700000
+CONFIG_SYS_TEXT_BASE = 0x05700000

 endif
 
 ifdef CONFIG_EDB9302
 endif
 
 ifdef CONFIG_EDB9302

-TEXT_BASE = 0x05700000
+CONFIG_SYS_TEXT_BASE = 0x05700000

 endif
 
 ifdef CONFIG_EDB9302A
 endif
 
 ifdef CONFIG_EDB9302A

-TEXT_BASE = 0xc5700000
+CONFIG_SYS_TEXT_BASE = 0xc5700000

 endif
 
 ifdef CONFIG_EDB9307
 endif
 
 ifdef CONFIG_EDB9307

-TEXT_BASE = 0x01f00000
+CONFIG_SYS_TEXT_BASE = 0x01f00000

 endif
 
 ifdef CONFIG_EDB9307A
 endif
 
 ifdef CONFIG_EDB9307A

-TEXT_BASE = 0xc1f00000
+CONFIG_SYS_TEXT_BASE = 0xc1f00000

 endif
 
 ifdef CONFIG_EDB9312
 endif
 
 ifdef CONFIG_EDB9312

-TEXT_BASE = 0x01f00000
+CONFIG_SYS_TEXT_BASE = 0x01f00000

 endif
 
 ifdef CONFIG_EDB9315
 endif
 
 ifdef CONFIG_EDB9315

-TEXT_BASE = 0x01f00000
+CONFIG_SYS_TEXT_BASE = 0x01f00000

 endif
 
 ifdef CONFIG_EDB9315A
 endif
 
 ifdef CONFIG_EDB9315A

-TEXT_BASE = 0xc1f00000
+CONFIG_SYS_TEXT_BASE = 0xc1f00000

 endif
 endif

diff --git a/board/eltec/bab7xx/config.mk b/board/eltec/bab7xx/config.mk
index aa463c5..3c67328 100644 (file)
--- a/board/eltec/bab7xx/config.mk
+++ b/board/eltec/bab7xx/config.mk
@@ -21,6 +21,6 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)

diff --git a/board/eltec/elppc/config.mk b/board/eltec/elppc/config.mk
index aa463c5..3c67328 100644 (file)
--- a/board/eltec/elppc/config.mk
+++ b/board/eltec/elppc/config.mk
@@ -21,6 +21,6 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)

diff --git a/board/eltec/mhpc/config.mk b/board/eltec/mhpc/config.mk
index 03934de..6e28273 100644 (file)
--- a/board/eltec/mhpc/config.mk
+++ b/board/eltec/mhpc/config.mk
@@ -29,5 +29,5 @@
 # MHPC boards
 #
 
 # MHPC boards
 #
 

-TEXT_BASE = 0xfe000000
-/*TEXT_BASE  = 0x00200000 */
+CONFIG_SYS_TEXT_BASE = 0xfe000000
+/*CONFIG_SYS_TEXT_BASE  = 0x00200000 */

diff --git a/board/emk/top5200/config.mk b/board/emk/top5200/config.mk
index 84131fe..586d07e 100644 (file)
--- a/board/emk/top5200/config.mk
+++ b/board/emk/top5200/config.mk
@@ -27,15 +27,16 @@
 #
 # TOP5200 board, on optional MINI5200 and EVAL5200 boards
 #
 #
 # TOP5200 board, on optional MINI5200 and EVAL5200 boards
 #

-# allowed and functional TEXT_BASE values:
+# allowed and functional CONFIG_SYS_TEXT_BASE values:

 #
 #   0xff000000         low boot at 0x00000100 (default board setting)
 #   0xfff00000         high boot at 0xfff00100 (board needs modification)
 #      0x00100000              RAM load and test
 #
 
 #
 #   0xff000000         low boot at 0x00000100 (default board setting)
 #   0xfff00000         high boot at 0xfff00100 (board needs modification)
 #      0x00100000              RAM load and test
 #
 

-TEXT_BASE = 0xff000000
-#TEXT_BASE = 0xfff00000
-#TEXT_BASE = 0x00100000
+CONFIG_SYS_TEXT_BASE = 0xff000000
+#CONFIG_SYS_TEXT_BASE = 0xfff00000
+#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

diff --git a/board/emk/top860/config.mk b/board/emk/top860/config.mk
index 7b940cb..25457e7 100644 (file)
--- a/board/emk/top860/config.mk
+++ b/board/emk/top860/config.mk
@@ -25,4 +25,4 @@
 # TOP860 board
 #
 
 # TOP860 board
 #
 

-TEXT_BASE = 0x80000000
+CONFIG_SYS_TEXT_BASE = 0x80000000

diff --git a/board/ep7312/config.mk b/board/ep7312/config.mk
index 0ae16a2..bdd08b8 100644 (file)
--- a/board/ep7312/config.mk
+++ b/board/ep7312/config.mk
@@ -25,4 +25,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xc0f80000
+CONFIG_SYS_TEXT_BASE = 0xc0f80000

diff --git a/board/ep8248/config.mk b/board/ep8248/config.mk
index eda523b..384e07c 100644 (file)
--- a/board/ep8248/config.mk
+++ b/board/ep8248/config.mk
@@ -27,4 +27,4 @@
 # EP82xx series boards by Embedded Planet
 #
 
 # EP82xx series boards by Embedded Planet
 #
 

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

diff --git a/board/ep8260/config.mk b/board/ep8260/config.mk
index 1225830..a5aef48 100644 (file)
--- a/board/ep8260/config.mk
+++ b/board/ep8260/config.mk
@@ -29,8 +29,9 @@
 # for the "final" configuration, with U-Boot in flash, or the address
 # in RAM where U-Boot is loaded at for debugging.
 #
 # for the "final" configuration, with U-Boot in flash, or the address
 # in RAM where U-Boot is loaded at for debugging.
 #

-#TEXT_BASE = 0x00100000
-#TEXT_BASE = 0xFF000000
-TEXT_BASE = 0xFFF00000
+#CONFIG_SYS_TEXT_BASE = 0x00100000
+#CONFIG_SYS_TEXT_BASE = 0xFF000000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)

diff --git a/board/ep82xxm/config.mk b/board/ep82xxm/config.mk
index da039e2..4b8c259 100644 (file)
--- a/board/ep82xxm/config.mk
+++ b/board/ep82xxm/config.mk
@@ -23,4 +23,4 @@
 
 # EP82xxM series boards by Embedded Planet
 
 
 # EP82xxM series boards by Embedded Planet
 

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

diff --git a/board/ep88x/config.mk b/board/ep88x/config.mk
index 72b326c..0fc941e 100644 (file)
--- a/board/ep88x/config.mk
+++ b/board/ep88x/config.mk
@@ -24,4 +24,4 @@
 #
 # Embedded Planet EP88x boards
 #
 #
 # Embedded Planet EP88x boards
 #

-TEXT_BASE = 0xFC000000
+CONFIG_SYS_TEXT_BASE = 0xFC000000

diff --git a/board/eric/config.mk b/board/eric/config.mk
index dd0b412..bae887f 100644 (file)
--- a/board/eric/config.mk
+++ b/board/eric/config.mk
@@ -25,5 +25,5 @@
 # esd ADCIOP boards
 #
 
 # esd ADCIOP boards
 #
 

-#TEXT_BASE = 0xFFF80000
-TEXT_BASE = 0xFFFC0000
+#CONFIG_SYS_TEXT_BASE = 0xFFF80000
+CONFIG_SYS_TEXT_BASE = 0xFFFC0000

diff --git a/board/esd/adciop/config.mk b/board/esd/adciop/config.mk
index 747f29f..854bfec 100644 (file)
--- a/board/esd/adciop/config.mk
+++ b/board/esd/adciop/config.mk
@@ -26,8 +26,8 @@
 #
 
 # FLASH:
 #
 
 # FLASH:

-#TEXT_BASE = 0xFFFE0000
-TEXT_BASE = 0xFFFD0000
+#CONFIG_SYS_TEXT_BASE = 0xFFFE0000
+CONFIG_SYS_TEXT_BASE = 0xFFFD0000

 
 # SDRAM:
 
 # SDRAM:

-#TEXT_BASE = 0x00FE0000
+#CONFIG_SYS_TEXT_BASE = 0x00FE0000

diff --git a/board/esd/apc405/config.mk b/board/esd/apc405/config.mk
index 11faad2..884565f 100644 (file)
--- a/board/esd/apc405/config.mk
+++ b/board/esd/apc405/config.mk
@@ -25,4 +25,4 @@
 # esd ABG405 boards
 #
 
 # esd ABG405 boards
 #
 

-TEXT_BASE = 0xFFF80000
+CONFIG_SYS_TEXT_BASE = 0xFFF80000

diff --git a/board/esd/ar405/config.mk b/board/esd/ar405/config.mk
index da7c107..a5f29ec 100644 (file)
--- a/board/esd/ar405/config.mk
+++ b/board/esd/ar405/config.mk
@@ -20,4 +20,4 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 #

-TEXT_BASE = 0xFFFA0000
+CONFIG_SYS_TEXT_BASE = 0xFFFA0000

diff --git a/board/esd/ash405/config.mk b/board/esd/ash405/config.mk
index 1d743a9..40e8308 100644 (file)
--- a/board/esd/ash405/config.mk
+++ b/board/esd/ash405/config.mk
@@ -25,4 +25,4 @@
 # esd ASH405 boards
 #
 
 # esd ASH405 boards
 #
 

-TEXT_BASE = 0xFFFC0000
+CONFIG_SYS_TEXT_BASE = 0xFFFC0000

diff --git a/board/esd/canbt/config.mk b/board/esd/canbt/config.mk
index ae855dc..805d67b 100644 (file)
--- a/board/esd/canbt/config.mk
+++ b/board/esd/canbt/config.mk
@@ -20,4 +20,4 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 #

-TEXT_BASE = 0xFFFC0000
+CONFIG_SYS_TEXT_BASE = 0xFFFC0000

diff --git a/board/esd/cms700/config.mk b/board/esd/cms700/config.mk
index 8e48bcd..cdc2eaf 100644 (file)
--- a/board/esd/cms700/config.mk
+++ b/board/esd/cms700/config.mk
@@ -20,4 +20,4 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 #

-TEXT_BASE = 0xFFFC8000
+CONFIG_SYS_TEXT_BASE = 0xFFFC8000

diff --git a/board/esd/cpci2dp/config.mk b/board/esd/cpci2dp/config.mk
index 2da4c9f..188558e 100644 (file)
--- a/board/esd/cpci2dp/config.mk
+++ b/board/esd/cpci2dp/config.mk
@@ -25,4 +25,4 @@
 # esd CPCI2DP board
 #
 
 # esd CPCI2DP board
 #
 

-TEXT_BASE = 0xFFFC0000
+CONFIG_SYS_TEXT_BASE = 0xFFFC0000

diff --git a/board/esd/cpci405/config.mk b/board/esd/cpci405/config.mk
index 1bdf5e4..1646d34 100644 (file)
--- a/board/esd/cpci405/config.mk
+++ b/board/esd/cpci405/config.mk
@@ -21,4 +21,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xFFFC0000
+CONFIG_SYS_TEXT_BASE = 0xFFFC0000

diff --git a/board/esd/cpci5200/config.mk b/board/esd/cpci5200/config.mk
index 170779d..106498d 100644 (file)
--- a/board/esd/cpci5200/config.mk
+++ b/board/esd/cpci5200/config.mk
@@ -24,7 +24,7 @@
 #
 # IceCube board:
 #
 #
 # IceCube board:
 #

-#      Valid values for TEXT_BASE are:
+#      Valid values for CONFIG_SYS_TEXT_BASE are:

 #
 #      0xFFF00000   boot high (standard configuration)
 #      0xFF000000   boot low for 16 MiB boards
 #
 #      0xFFF00000   boot high (standard configuration)
 #      0xFF000000   boot low for 16 MiB boards


@@ -34,11 +34,12 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
+ifndef CONFIG_SYS_TEXT_BASE

 ## Standard: boot high
 ## Standard: boot high

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 ## For testing: boot from RAM
 ## For testing: boot from RAM

-# TEXT_BASE = 0x00100000
+# CONFIG_SYS_TEXT_BASE = 0x00100000

 endif
 
 endif
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/esd/cpci750/config.mk b/board/esd/cpci750/config.mk
index 7795dfa..d17e139 100644 (file)
--- a/board/esd/cpci750/config.mk
+++ b/board/esd/cpci750/config.mk
@@ -25,4 +25,4 @@
 # cpci750 board
 #
 
 # cpci750 board
 #
 

-TEXT_BASE = 0xfff00000
+CONFIG_SYS_TEXT_BASE = 0xfff00000

diff --git a/board/esd/cpciiser4/config.mk b/board/esd/cpciiser4/config.mk
index 58574cb..b044413 100644 (file)
--- a/board/esd/cpciiser4/config.mk
+++ b/board/esd/cpciiser4/config.mk
@@ -25,6 +25,6 @@
 # esd CPCIISER4 boards
 #
 
 # esd CPCIISER4 boards
 #
 

-#TEXT_BASE = 0xFFFE0000
-#TEXT_BASE = 0xFFFD0000
-TEXT_BASE = 0xFFFC0000
+#CONFIG_SYS_TEXT_BASE = 0xFFFE0000
+#CONFIG_SYS_TEXT_BASE = 0xFFFD0000
+CONFIG_SYS_TEXT_BASE = 0xFFFC0000

diff --git a/board/esd/dasa_sim/config.mk b/board/esd/dasa_sim/config.mk
index 4fe3774..67919a9 100644 (file)
--- a/board/esd/dasa_sim/config.mk
+++ b/board/esd/dasa_sim/config.mk
@@ -20,7 +20,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 #

-TEXT_BASE = 0xFFFC0000
+CONFIG_SYS_TEXT_BASE = 0xFFFC0000

 
 # Use board specific linker script
 LDSCRIPT := $(SRCTREE)/board/esd/dasa_sim/u-boot.lds
 
 # Use board specific linker script
 LDSCRIPT := $(SRCTREE)/board/esd/dasa_sim/u-boot.lds

diff --git a/board/esd/dp405/config.mk b/board/esd/dp405/config.mk
index 9b1a8be..69f2e36 100644 (file)
--- a/board/esd/dp405/config.mk
+++ b/board/esd/dp405/config.mk
@@ -21,4 +21,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xFFFD0000
+CONFIG_SYS_TEXT_BASE = 0xFFFD0000

diff --git a/board/esd/du405/config.mk b/board/esd/du405/config.mk
index d091d96..a876bbe 100644 (file)
--- a/board/esd/du405/config.mk
+++ b/board/esd/du405/config.mk
@@ -25,6 +25,6 @@
 # esd CPCIISER4 boards
 #
 
 # esd CPCIISER4 boards
 #
 

-#TEXT_BASE = 0xFFFE0000
-TEXT_BASE = 0xFFFD0000
-#TEXT_BASE = 0xFFFC0000
+#CONFIG_SYS_TEXT_BASE = 0xFFFE0000
+CONFIG_SYS_TEXT_BASE = 0xFFFD0000
+#CONFIG_SYS_TEXT_BASE = 0xFFFC0000

diff --git a/board/esd/du440/config.mk b/board/esd/du440/config.mk
index 91e65ec..2fd5d70 100644 (file)
--- a/board/esd/du440/config.mk
+++ b/board/esd/du440/config.mk
@@ -22,8 +22,8 @@
 #
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 #
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
-TEXT_BASE = 0xFFFA0000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xFFFA0000

 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1

diff --git a/board/esd/hh405/config.mk b/board/esd/hh405/config.mk
index 7129ad5..f26622d 100644 (file)
--- a/board/esd/hh405/config.mk
+++ b/board/esd/hh405/config.mk
@@ -25,7 +25,7 @@
 # esd VOH405 boards
 #
 
 # esd VOH405 boards
 #
 

-#TEXT_BASE = 0xFFF00000
-TEXT_BASE = 0xFFF80000
-#TEXT_BASE = 0xFFFC0000
-#TEXT_BASE = 0x00FC0000
+#CONFIG_SYS_TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF80000
+#CONFIG_SYS_TEXT_BASE = 0xFFFC0000
+#CONFIG_SYS_TEXT_BASE = 0x00FC0000

diff --git a/board/esd/hub405/config.mk b/board/esd/hub405/config.mk
index a6d31aa..0fe7793 100644 (file)
--- a/board/esd/hub405/config.mk
+++ b/board/esd/hub405/config.mk
@@ -25,4 +25,4 @@
 # esd HUB405 boards
 #
 
 # esd HUB405 boards
 #
 

-TEXT_BASE = 0xFFFC0000
+CONFIG_SYS_TEXT_BASE = 0xFFFC0000

diff --git a/board/esd/mecp5123/config.mk b/board/esd/mecp5123/config.mk
index 838a018..d52b342 100644 (file)
--- a/board/esd/mecp5123/config.mk
+++ b/board/esd/mecp5123/config.mk
@@ -20,4 +20,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE  =   0xFFF00000
+CONFIG_SYS_TEXT_BASE  =   0xFFF00000

diff --git a/board/esd/mecp5200/config.mk b/board/esd/mecp5200/config.mk
index 170779d..106498d 100644 (file)
--- a/board/esd/mecp5200/config.mk
+++ b/board/esd/mecp5200/config.mk
@@ -24,7 +24,7 @@
 #
 # IceCube board:
 #
 #
 # IceCube board:
 #

-#      Valid values for TEXT_BASE are:
+#      Valid values for CONFIG_SYS_TEXT_BASE are:

 #
 #      0xFFF00000   boot high (standard configuration)
 #      0xFF000000   boot low for 16 MiB boards
 #
 #      0xFFF00000   boot high (standard configuration)
 #      0xFF000000   boot low for 16 MiB boards


@@ -34,11 +34,12 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
+ifndef CONFIG_SYS_TEXT_BASE

 ## Standard: boot high
 ## Standard: boot high

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 ## For testing: boot from RAM
 ## For testing: boot from RAM

-# TEXT_BASE = 0x00100000
+# CONFIG_SYS_TEXT_BASE = 0x00100000

 endif
 
 endif
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/esd/meesc/config.mk b/board/esd/meesc/config.mk
index 9ce161e..2077692 100644 (file)
--- a/board/esd/meesc/config.mk
+++ b/board/esd/meesc/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x21f00000
+CONFIG_SYS_TEXT_BASE = 0x21f00000

diff --git a/board/esd/ocrtc/config.mk b/board/esd/ocrtc/config.mk
index f123319..64671b3 100644 (file)
--- a/board/esd/ocrtc/config.mk
+++ b/board/esd/ocrtc/config.mk
@@ -25,5 +25,5 @@
 # esd ADCIOP boards
 #
 
 # esd ADCIOP boards
 #
 

-#TEXT_BASE = 0xFFFE0000
-TEXT_BASE = 0xFFFD0000
+#CONFIG_SYS_TEXT_BASE = 0xFFFE0000
+CONFIG_SYS_TEXT_BASE = 0xFFFD0000

diff --git a/board/esd/otc570/config.mk b/board/esd/otc570/config.mk
index ff2cfd1..e554a45 100644 (file)
--- a/board/esd/otc570/config.mk
+++ b/board/esd/otc570/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x23f00000
+CONFIG_SYS_TEXT_BASE = 0x23f00000

diff --git a/board/esd/pci405/config.mk b/board/esd/pci405/config.mk
index 83f07fe..e094e91 100644 (file)
--- a/board/esd/pci405/config.mk
+++ b/board/esd/pci405/config.mk
@@ -25,5 +25,5 @@
 # esd ADCIOP boards
 #
 
 # esd ADCIOP boards
 #
 

-#TEXT_BASE = 0xFFFE0000
-TEXT_BASE = 0xFFFD0000
+#CONFIG_SYS_TEXT_BASE = 0xFFFE0000
+CONFIG_SYS_TEXT_BASE = 0xFFFD0000

diff --git a/board/esd/pf5200/config.mk b/board/esd/pf5200/config.mk
index 170779d..106498d 100644 (file)
--- a/board/esd/pf5200/config.mk
+++ b/board/esd/pf5200/config.mk
@@ -24,7 +24,7 @@
 #
 # IceCube board:
 #
 #
 # IceCube board:
 #

-#      Valid values for TEXT_BASE are:
+#      Valid values for CONFIG_SYS_TEXT_BASE are:

 #
 #      0xFFF00000   boot high (standard configuration)
 #      0xFF000000   boot low for 16 MiB boards
 #
 #      0xFFF00000   boot high (standard configuration)
 #      0xFF000000   boot low for 16 MiB boards


@@ -34,11 +34,12 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
+ifndef CONFIG_SYS_TEXT_BASE

 ## Standard: boot high
 ## Standard: boot high

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 ## For testing: boot from RAM
 ## For testing: boot from RAM

-# TEXT_BASE = 0x00100000
+# CONFIG_SYS_TEXT_BASE = 0x00100000

 endif
 
 endif
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/esd/plu405/config.mk b/board/esd/plu405/config.mk
index 0a4dbaa..a36dd5d 100644 (file)
--- a/board/esd/plu405/config.mk
+++ b/board/esd/plu405/config.mk
@@ -25,4 +25,4 @@
 # esd PLU405 boards
 #
 
 # esd PLU405 boards
 #
 

-TEXT_BASE = 0xFFF80000
+CONFIG_SYS_TEXT_BASE = 0xFFF80000

diff --git a/board/esd/pmc405/config.mk b/board/esd/pmc405/config.mk
index 5a3fc4b..249353e 100644 (file)
--- a/board/esd/pmc405/config.mk
+++ b/board/esd/pmc405/config.mk
@@ -21,4 +21,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xFFF80000
+CONFIG_SYS_TEXT_BASE = 0xFFF80000

diff --git a/board/esd/pmc405de/config.mk b/board/esd/pmc405de/config.mk
index ae855dc..805d67b 100644 (file)
--- a/board/esd/pmc405de/config.mk
+++ b/board/esd/pmc405de/config.mk
@@ -20,4 +20,4 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 #

-TEXT_BASE = 0xFFFC0000
+CONFIG_SYS_TEXT_BASE = 0xFFFC0000

diff --git a/board/esd/pmc440/config.mk b/board/esd/pmc440/config.mk
index 6e9f735..1c75f01 100644 (file)
--- a/board/esd/pmc440/config.mk
+++ b/board/esd/pmc440/config.mk
@@ -22,8 +22,8 @@
 #
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 #
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
-TEXT_BASE = 0xFFF90000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xFFF90000

 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1

diff --git a/board/esd/tasreg/config.mk b/board/esd/tasreg/config.mk
index 69fd8b6..7ee4777 100644 (file)
--- a/board/esd/tasreg/config.mk
+++ b/board/esd/tasreg/config.mk
@@ -22,4 +22,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xffc00000
+CONFIG_SYS_TEXT_BASE = 0xffc00000

diff --git a/board/esd/vme8349/config.mk b/board/esd/vme8349/config.mk
index 1ae26ca..512b82e 100644 (file)
--- a/board/esd/vme8349/config.mk
+++ b/board/esd/vme8349/config.mk
@@ -25,4 +25,4 @@
 # VME8349E
 #
 
 # VME8349E
 #
 

-TEXT_BASE  =   0xFFF00000
+CONFIG_SYS_TEXT_BASE  =   0xFFF00000

diff --git a/board/esd/voh405/config.mk b/board/esd/voh405/config.mk
index 219a4eb..ae2c077 100644 (file)
--- a/board/esd/voh405/config.mk
+++ b/board/esd/voh405/config.mk
@@ -25,4 +25,4 @@
 # esd VOH405 boards
 #
 
 # esd VOH405 boards
 #
 

-TEXT_BASE = 0xFFF80000
+CONFIG_SYS_TEXT_BASE = 0xFFF80000

diff --git a/board/esd/vom405/config.mk b/board/esd/vom405/config.mk
index 8e48bcd..cdc2eaf 100644 (file)
--- a/board/esd/vom405/config.mk
+++ b/board/esd/vom405/config.mk
@@ -20,4 +20,4 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 #

-TEXT_BASE = 0xFFFC8000
+CONFIG_SYS_TEXT_BASE = 0xFFFC8000

diff --git a/board/esd/wuh405/config.mk b/board/esd/wuh405/config.mk
index 1d743a9..40e8308 100644 (file)
--- a/board/esd/wuh405/config.mk
+++ b/board/esd/wuh405/config.mk
@@ -25,4 +25,4 @@
 # esd ASH405 boards
 #
 
 # esd ASH405 boards
 #
 

-TEXT_BASE = 0xFFFC0000
+CONFIG_SYS_TEXT_BASE = 0xFFFC0000

diff --git a/board/espt/config.mk b/board/espt/config.mk
index 006b432..21b51de 100644 (file)
--- a/board/espt/config.mk
+++ b/board/espt/config.mk
@@ -1,9 +1,9 @@
 #
 # board/espt/config.mk
 #
 #
 # board/espt/config.mk
 #

-# TEXT_BASE refers to image _after_ relocation.
+# CONFIG_SYS_TEXT_BASE refers to image _after_ relocation.

 #
 # NOTE: Must match value used in u-boot.lds (in this directory).
 #
 
 #
 # NOTE: Must match value used in u-boot.lds (in this directory).
 #
 

-TEXT_BASE = 0x8FFC0000
+CONFIG_SYS_TEXT_BASE = 0x8FFC0000

diff --git a/board/esteem192e/config.mk b/board/esteem192e/config.mk
index 9d6080b..017dc83 100644 (file)
--- a/board/esteem192e/config.mk
+++ b/board/esteem192e/config.mk
@@ -25,4 +25,4 @@
 # TQM8xxL boards
 #
 
 # TQM8xxL boards
 #
 

-TEXT_BASE = 0x40000000
+CONFIG_SYS_TEXT_BASE = 0x40000000

diff --git a/board/etin/debris/config.mk b/board/etin/debris/config.mk
index 64debf5..68b8fb4 100644 (file)
--- a/board/etin/debris/config.mk
+++ b/board/etin/debris/config.mk
@@ -25,7 +25,7 @@
 # Debris boards
 #
 
 # Debris boards
 #
 

-#TEXT_BASE = 0x00090000
-TEXT_BASE = 0xFFF00000
+#CONFIG_SYS_TEXT_BASE = 0x00090000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)

diff --git a/board/etin/kvme080/config.mk b/board/etin/kvme080/config.mk
index 45abdc0..f2c116a 100644 (file)
--- a/board/etin/kvme080/config.mk
+++ b/board/etin/kvme080/config.mk
@@ -25,6 +25,6 @@
 # KVME080 board
 #
 
 # KVME080 board
 #
 

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)

diff --git a/board/etx094/config.mk b/board/etx094/config.mk
index 655c2db..08f0c7a 100644 (file)
--- a/board/etx094/config.mk
+++ b/board/etx094/config.mk
@@ -25,4 +25,4 @@
 # ETX_094 Boards
 #
 
 # ETX_094 Boards
 #
 

-TEXT_BASE = 0x40000000
+CONFIG_SYS_TEXT_BASE = 0x40000000

diff --git a/board/eukrea/cpu9260/config.mk b/board/eukrea/cpu9260/config.mk
index 9ce161e..2077692 100644 (file)
--- a/board/eukrea/cpu9260/config.mk
+++ b/board/eukrea/cpu9260/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x21f00000
+CONFIG_SYS_TEXT_BASE = 0x21f00000

diff --git a/board/eukrea/cpuat91/config.mk b/board/eukrea/cpuat91/config.mk
index ef8dda0..463f46b 100644 (file)
--- a/board/eukrea/cpuat91/config.mk
+++ b/board/eukrea/cpuat91/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x21F00000
+CONFIG_SYS_TEXT_BASE = 0x21F00000

diff --git a/board/evb4510/config.mk b/board/evb4510/config.mk
index 4d1a019..140c989 100644 (file)
--- a/board/evb4510/config.mk
+++ b/board/evb4510/config.mk
@@ -24,4 +24,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0x007d0000
+CONFIG_SYS_TEXT_BASE = 0x007d0000

diff --git a/board/evb64260/config.mk b/board/evb64260/config.mk
index 0646a3e..f45b5b1 100644 (file)
--- a/board/evb64260/config.mk
+++ b/board/evb64260/config.mk
@@ -25,4 +25,4 @@
 # EVB64260 boards
 #
 
 # EVB64260 boards
 #
 

-TEXT_BASE = 0xfff00000
+CONFIG_SYS_TEXT_BASE = 0xfff00000

diff --git a/board/fads/config.mk b/board/fads/config.mk
index 6106090..1df3c5f 100644 (file)
--- a/board/fads/config.mk
+++ b/board/fads/config.mk
@@ -28,7 +28,7 @@
 # MPC885ADS boards
 #
 
 # MPC885ADS boards
 #
 

-TEXT_BASE = 0xFE000000
+CONFIG_SYS_TEXT_BASE = 0xFE000000

 PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/fads
 HOSTCFLAGS += -I$(TOPDIR)/board/fads
 HOST_ENVIRO_CFLAGS += -I$(TOPDIR)/board/fads
 PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/fads
 HOSTCFLAGS += -I$(TOPDIR)/board/fads
 HOST_ENVIRO_CFLAGS += -I$(TOPDIR)/board/fads

diff --git a/board/fads/fads.h b/board/fads/fads.h
index 4ab4b26..aa94d47 100644 (file)
--- a/board/fads/fads.h
+++ b/board/fads/fads.h
@@ -205,7 +205,7 @@
  */
 #define        CONFIG_SYS_BOOTMAPSZ            (8 << 20)       /* Initial Memory map for Linux */
 
  */
 #define        CONFIG_SYS_BOOTMAPSZ            (8 << 20)       /* Initial Memory map for Linux */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define        CONFIG_SYS_MONITOR_LEN          (256 << 10)     /* Reserve 256 KB for monitor   */
 
 #ifdef CONFIG_BZIP2
 #define        CONFIG_SYS_MONITOR_LEN          (256 << 10)     /* Reserve 256 KB for monitor   */
 
 #ifdef CONFIG_BZIP2

diff --git a/board/faraday/a320evb/config.mk b/board/faraday/a320evb/config.mk
index aa25b98..b751d0d 100644 (file)
--- a/board/faraday/a320evb/config.mk
+++ b/board/faraday/a320evb/config.mk
@@ -32,4 +32,4 @@
 #
 # download area is 1200'0000
 
 #
 # download area is 1200'0000
 

-TEXT_BASE = 0x13f80000
+CONFIG_SYS_TEXT_BASE = 0x13f80000

diff --git a/board/flagadm/config.mk b/board/flagadm/config.mk
index 9c72c79..1980687 100644 (file)
--- a/board/flagadm/config.mk
+++ b/board/flagadm/config.mk
@@ -25,4 +25,4 @@
 # TQM8xxL boards
 #
 
 # TQM8xxL boards
 #
 

-TEXT_BASE = 0x40000000
+CONFIG_SYS_TEXT_BASE = 0x40000000

diff --git a/board/freescale/corenet_ds/config.mk b/board/freescale/corenet_ds/config.mk
index 72db24e..70b2b98 100644 (file)
--- a/board/freescale/corenet_ds/config.mk
+++ b/board/freescale/corenet_ds/config.mk
@@ -23,8 +23,8 @@
 #
 # P4080DS board
 #
 #
 # P4080DS board
 #

-ifndef TEXT_BASE
-TEXT_BASE = 0xeff80000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xeff80000

 endif
 
 RESET_VECTOR_ADDRESS = 0xeffffffc
 endif
 
 RESET_VECTOR_ADDRESS = 0xeffffffc

diff --git a/board/freescale/m5208evbe/config.mk b/board/freescale/m5208evbe/config.mk
index ce014ed..21dece4 100644 (file)
--- a/board/freescale/m5208evbe/config.mk
+++ b/board/freescale/m5208evbe/config.mk
@@ -22,4 +22,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0
+CONFIG_SYS_TEXT_BASE = 0

diff --git a/board/freescale/m52277evb/config.mk b/board/freescale/m52277evb/config.mk
index b42fcc9..4ed60f2 100644 (file)
--- a/board/freescale/m52277evb/config.mk
+++ b/board/freescale/m52277evb/config.mk
@@ -24,4 +24,4 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)

diff --git a/board/freescale/m5235evb/config.mk b/board/freescale/m5235evb/config.mk
index ada38dd..2a4381a 100644 (file)
--- a/board/freescale/m5235evb/config.mk
+++ b/board/freescale/m5235evb/config.mk
@@ -22,7 +22,7 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-/*TEXT_BASE = 0xFFC00000*/
+/*CONFIG_SYS_TEXT_BASE = 0xFFC00000*/

 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE)
\ No newline at end of file
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)

diff --git a/board/freescale/m5249evb/config.mk b/board/freescale/m5249evb/config.mk
index ccb2cf7..5b8c608 100644 (file)
--- a/board/freescale/m5249evb/config.mk
+++ b/board/freescale/m5249evb/config.mk
@@ -22,4 +22,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xffe00000
+CONFIG_SYS_TEXT_BASE = 0xffe00000

diff --git a/board/freescale/m5253demo/config.mk b/board/freescale/m5253demo/config.mk
index fa66b75..93fce15 100644 (file)
--- a/board/freescale/m5253demo/config.mk
+++ b/board/freescale/m5253demo/config.mk
@@ -22,4 +22,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xFF800000
+CONFIG_SYS_TEXT_BASE = 0xFF800000

diff --git a/board/freescale/m5253evbe/config.mk b/board/freescale/m5253evbe/config.mk
index ccb2cf7..5b8c608 100644 (file)
--- a/board/freescale/m5253evbe/config.mk
+++ b/board/freescale/m5253evbe/config.mk
@@ -22,4 +22,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xffe00000
+CONFIG_SYS_TEXT_BASE = 0xffe00000

diff --git a/board/freescale/m5271evb/config.mk b/board/freescale/m5271evb/config.mk
index 9a7af7c..cf6d375 100644 (file)
--- a/board/freescale/m5271evb/config.mk
+++ b/board/freescale/m5271evb/config.mk
@@ -22,4 +22,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xffe00000
+CONFIG_SYS_TEXT_BASE = 0xffe00000

diff --git a/board/freescale/m5272c3/config.mk b/board/freescale/m5272c3/config.mk
index ccb2cf7..5b8c608 100644 (file)
--- a/board/freescale/m5272c3/config.mk
+++ b/board/freescale/m5272c3/config.mk
@@ -22,4 +22,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xffe00000
+CONFIG_SYS_TEXT_BASE = 0xffe00000

diff --git a/board/freescale/m5275evb/config.mk b/board/freescale/m5275evb/config.mk
index ccb2cf7..5b8c608 100644 (file)
--- a/board/freescale/m5275evb/config.mk
+++ b/board/freescale/m5275evb/config.mk
@@ -22,4 +22,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xffe00000
+CONFIG_SYS_TEXT_BASE = 0xffe00000

diff --git a/board/freescale/m5282evb/config.mk b/board/freescale/m5282evb/config.mk
index 0aa2361..882f93a 100644 (file)
--- a/board/freescale/m5282evb/config.mk
+++ b/board/freescale/m5282evb/config.mk
@@ -22,4 +22,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xFFE00000
+CONFIG_SYS_TEXT_BASE = 0xFFE00000

diff --git a/board/freescale/m53017evb/config.mk b/board/freescale/m53017evb/config.mk
index ce014ed..21dece4 100644 (file)
--- a/board/freescale/m53017evb/config.mk
+++ b/board/freescale/m53017evb/config.mk
@@ -22,4 +22,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0
+CONFIG_SYS_TEXT_BASE = 0

diff --git a/board/freescale/m5329evb/config.mk b/board/freescale/m5329evb/config.mk
index ce014ed..21dece4 100644 (file)
--- a/board/freescale/m5329evb/config.mk
+++ b/board/freescale/m5329evb/config.mk
@@ -22,4 +22,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0
+CONFIG_SYS_TEXT_BASE = 0

diff --git a/board/freescale/m5373evb/config.mk b/board/freescale/m5373evb/config.mk
index ce014ed..21dece4 100644 (file)
--- a/board/freescale/m5373evb/config.mk
+++ b/board/freescale/m5373evb/config.mk
@@ -22,4 +22,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0
+CONFIG_SYS_TEXT_BASE = 0

diff --git a/board/freescale/m54451evb/config.mk b/board/freescale/m54451evb/config.mk
index b42fcc9..4ed60f2 100644 (file)
--- a/board/freescale/m54451evb/config.mk
+++ b/board/freescale/m54451evb/config.mk
@@ -24,4 +24,4 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)

diff --git a/board/freescale/m54455evb/config.mk b/board/freescale/m54455evb/config.mk
index b42fcc9..4ed60f2 100644 (file)
--- a/board/freescale/m54455evb/config.mk
+++ b/board/freescale/m54455evb/config.mk
@@ -24,4 +24,4 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)

diff --git a/board/freescale/m547xevb/config.mk b/board/freescale/m547xevb/config.mk
index fa66b75..93fce15 100644 (file)
--- a/board/freescale/m547xevb/config.mk
+++ b/board/freescale/m547xevb/config.mk
@@ -22,4 +22,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xFF800000
+CONFIG_SYS_TEXT_BASE = 0xFF800000

diff --git a/board/freescale/m548xevb/config.mk b/board/freescale/m548xevb/config.mk
index fa66b75..93fce15 100644 (file)
--- a/board/freescale/m548xevb/config.mk
+++ b/board/freescale/m548xevb/config.mk
@@ -22,4 +22,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xFF800000
+CONFIG_SYS_TEXT_BASE = 0xFF800000

diff --git a/board/freescale/mpc5121ads/config.mk b/board/freescale/mpc5121ads/config.mk
index 14998f4..788de52 100644 (file)
--- a/board/freescale/mpc5121ads/config.mk
+++ b/board/freescale/mpc5121ads/config.mk
@@ -20,4 +20,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE  =   0xFFF00000
+CONFIG_SYS_TEXT_BASE  =   0xFFF00000

diff --git a/board/freescale/mpc7448hpc2/config.mk b/board/freescale/mpc7448hpc2/config.mk
index 2e58858..8ae134a 100644 (file)
--- a/board/freescale/mpc7448hpc2/config.mk
+++ b/board/freescale/mpc7448hpc2/config.mk
@@ -21,8 +21,9 @@
 #
 
 # Flash address
 #
 
 # Flash address

-TEXT_BASE = 0xFF000000
+CONFIG_SYS_TEXT_BASE = 0xFF000000

 # RAM address
 # RAM address

-#TEXT_BASE = 0x00400000
+#CONFIG_SYS_TEXT_BASE = 0x00400000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -maltivec -mabi=altivec -msoft-float
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -maltivec -mabi=altivec -msoft-float

diff --git a/board/freescale/mpc8260ads/config.mk b/board/freescale/mpc8260ads/config.mk
index e99e181..569ef31 100644 (file)
--- a/board/freescale/mpc8260ads/config.mk
+++ b/board/freescale/mpc8260ads/config.mk
@@ -31,7 +31,7 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
+ifndef CONFIG_SYS_TEXT_BASE

 ## Standard: boot high
 ## Standard: boot high

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 endif
 endif

diff --git a/board/freescale/mpc8266ads/config.mk b/board/freescale/mpc8266ads/config.mk
index ecc2a7d..248e9b2 100644 (file)
--- a/board/freescale/mpc8266ads/config.mk
+++ b/board/freescale/mpc8266ads/config.mk
@@ -27,6 +27,7 @@
 # mpc8260ads board
 #
 
 # mpc8260ads board
 #
 

-TEXT_BASE = 0xfe000000
+CONFIG_SYS_TEXT_BASE = 0xfe000000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/freescale/mpc8308rdb/config.mk b/board/freescale/mpc8308rdb/config.mk
index f768264..613083d 100644 (file)
--- a/board/freescale/mpc8308rdb/config.mk
+++ b/board/freescale/mpc8308rdb/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0xFE000000
+CONFIG_SYS_TEXT_BASE = 0xFE000000

diff --git a/board/freescale/mpc8313erdb/config.mk b/board/freescale/mpc8313erdb/config.mk
index fd72a14..bd0d215 100644 (file)
--- a/board/freescale/mpc8313erdb/config.mk
+++ b/board/freescale/mpc8313erdb/config.mk
@@ -2,6 +2,6 @@ ifndef NAND_SPL
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 endif
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 endif
 

-ifndef TEXT_BASE
-TEXT_BASE = 0xFE000000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xFE000000

 endif
 endif

diff --git a/board/freescale/mpc8315erdb/config.mk b/board/freescale/mpc8315erdb/config.mk
index b601601..5a9212f 100644 (file)
--- a/board/freescale/mpc8315erdb/config.mk
+++ b/board/freescale/mpc8315erdb/config.mk
@@ -1,9 +1,9 @@
 ifndef NAND_SPL
 ifeq ($(CONFIG_NAND), y)
 ifndef NAND_SPL
 ifeq ($(CONFIG_NAND), y)

-TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)
+CONFIG_SYS_TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)

 endif
 endif
 
 endif
 endif
 

-ifndef TEXT_BASE
-TEXT_BASE = 0xFE000000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xFE000000

 endif
 endif

diff --git a/board/freescale/mpc8323erdb/config.mk b/board/freescale/mpc8323erdb/config.mk
index fe0d37d..fa5324b 100644 (file)
--- a/board/freescale/mpc8323erdb/config.mk
+++ b/board/freescale/mpc8323erdb/config.mk
@@ -25,4 +25,4 @@
 # MPC8323ERDB
 #
 
 # MPC8323ERDB
 #
 

-TEXT_BASE = 0xFE000000
+CONFIG_SYS_TEXT_BASE = 0xFE000000

diff --git a/board/freescale/mpc832xemds/config.mk b/board/freescale/mpc832xemds/config.mk
index 6c3eca7..3ba2046 100644 (file)
--- a/board/freescale/mpc832xemds/config.mk
+++ b/board/freescale/mpc832xemds/config.mk
@@ -25,4 +25,4 @@
 # MPC832XEMDS
 #
 
 # MPC832XEMDS
 #
 

-TEXT_BASE = 0xFE000000
+CONFIG_SYS_TEXT_BASE = 0xFE000000

diff --git a/board/freescale/mpc8349emds/config.mk b/board/freescale/mpc8349emds/config.mk
index edf64d1..678cd5d 100644 (file)
--- a/board/freescale/mpc8349emds/config.mk
+++ b/board/freescale/mpc8349emds/config.mk
@@ -25,4 +25,4 @@
 # MPC8349EMDS
 #
 
 # MPC8349EMDS
 #
 

-TEXT_BASE  =   0xFE000000
+CONFIG_SYS_TEXT_BASE  =   0xFE000000

diff --git a/board/freescale/mpc8349itx/config.mk b/board/freescale/mpc8349itx/config.mk
index 61b6a90..6b44e11 100644 (file)
--- a/board/freescale/mpc8349itx/config.mk
+++ b/board/freescale/mpc8349itx/config.mk
@@ -26,6 +26,6 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
-TEXT_BASE  =   0xFEF00000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE  =   0xFEF00000

 endif
 endif

diff --git a/board/freescale/mpc8360emds/config.mk b/board/freescale/mpc8360emds/config.mk
index 9ace886..6c8605b 100644 (file)
--- a/board/freescale/mpc8360emds/config.mk
+++ b/board/freescale/mpc8360emds/config.mk
@@ -25,4 +25,4 @@
 # MPC8360EMDS
 #
 
 # MPC8360EMDS
 #
 

-TEXT_BASE = 0xFE000000
+CONFIG_SYS_TEXT_BASE = 0xFE000000

diff --git a/board/freescale/mpc8360erdk/config.mk b/board/freescale/mpc8360erdk/config.mk
index 87dd746..ae7f3df 100644 (file)
--- a/board/freescale/mpc8360erdk/config.mk
+++ b/board/freescale/mpc8360erdk/config.mk
@@ -25,4 +25,4 @@
 # MPC8360ERDK
 #
 
 # MPC8360ERDK
 #
 

-TEXT_BASE = 0xFF800000
+CONFIG_SYS_TEXT_BASE = 0xFF800000

diff --git a/board/freescale/mpc837xemds/config.mk b/board/freescale/mpc837xemds/config.mk
index 63c5fc3..a132778 100644 (file)
--- a/board/freescale/mpc837xemds/config.mk
+++ b/board/freescale/mpc837xemds/config.mk
@@ -25,4 +25,4 @@
 # MPC837xEMDS
 #
 
 # MPC837xEMDS
 #
 

-TEXT_BASE = 0xFE000000
+CONFIG_SYS_TEXT_BASE = 0xFE000000

diff --git a/board/freescale/mpc837xerdb/config.mk b/board/freescale/mpc837xerdb/config.mk
index 5675f81..593083c 100644 (file)
--- a/board/freescale/mpc837xerdb/config.mk
+++ b/board/freescale/mpc837xerdb/config.mk
@@ -25,4 +25,4 @@
 # MPC837xERDB
 #
 
 # MPC837xERDB
 #
 

-TEXT_BASE = 0xFE000000
+CONFIG_SYS_TEXT_BASE = 0xFE000000

diff --git a/board/freescale/mpc8536ds/config.mk b/board/freescale/mpc8536ds/config.mk
index ac15ff3..7acedcb 100644 (file)
--- a/board/freescale/mpc8536ds/config.mk
+++ b/board/freescale/mpc8536ds/config.mk
@@ -25,23 +25,23 @@
 #
 ifndef NAND_SPL
 ifeq ($(CONFIG_NAND), y)
 #
 ifndef NAND_SPL
 ifeq ($(CONFIG_NAND), y)

-TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)
+CONFIG_SYS_TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)

 LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
 endif
 endif
 
 ifeq ($(CONFIG_SDCARD), y)
 LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
 endif
 endif
 
 ifeq ($(CONFIG_SDCARD), y)

-TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)
+CONFIG_SYS_TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)

 RESET_VECTOR_ADDRESS = 0xf8fffffc
 endif
 
 ifeq ($(CONFIG_SPIFLASH), y)
 RESET_VECTOR_ADDRESS = 0xf8fffffc
 endif
 
 ifeq ($(CONFIG_SPIFLASH), y)

-TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)
+CONFIG_SYS_TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)

 RESET_VECTOR_ADDRESS = 0xf8fffffc
 endif
 
 RESET_VECTOR_ADDRESS = 0xf8fffffc
 endif
 

-ifndef TEXT_BASE
-TEXT_BASE = 0xeff80000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xeff80000

 endif
 
 ifndef RESET_VECTOR_ADDRESS
 endif
 
 ifndef RESET_VECTOR_ADDRESS

diff --git a/board/freescale/mpc8540ads/config.mk b/board/freescale/mpc8540ads/config.mk
index 7ae5e61..3a9030f 100644 (file)
--- a/board/freescale/mpc8540ads/config.mk
+++ b/board/freescale/mpc8540ads/config.mk
@@ -26,4 +26,4 @@
 # default CCARBAR is at 0xff700000
 # assume U-Boot is less than 0.5MB
 #
 # default CCARBAR is at 0xff700000
 # assume U-Boot is less than 0.5MB
 #

-TEXT_BASE = 0xfff80000
+CONFIG_SYS_TEXT_BASE = 0xfff80000

diff --git a/board/freescale/mpc8541cds/config.mk b/board/freescale/mpc8541cds/config.mk
index e7a0b34..4b6bf67 100644 (file)
--- a/board/freescale/mpc8541cds/config.mk
+++ b/board/freescale/mpc8541cds/config.mk
@@ -23,4 +23,4 @@
 #
 # mpc8541cds board
 #
 #
 # mpc8541cds board
 #

-TEXT_BASE = 0xfff80000
+CONFIG_SYS_TEXT_BASE = 0xfff80000

diff --git a/board/freescale/mpc8544ds/config.mk b/board/freescale/mpc8544ds/config.mk
index a09dac1..bd85cf7 100644 (file)
--- a/board/freescale/mpc8544ds/config.mk
+++ b/board/freescale/mpc8544ds/config.mk
@@ -23,6 +23,6 @@
 #
 # mpc8544ds board
 #
 #
 # mpc8544ds board
 #

-ifndef TEXT_BASE
-TEXT_BASE = 0xfff80000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xfff80000

 endif
 endif

diff --git a/board/freescale/mpc8548cds/config.mk b/board/freescale/mpc8548cds/config.mk
index 81c8737..bbd0c6a 100644 (file)
--- a/board/freescale/mpc8548cds/config.mk
+++ b/board/freescale/mpc8548cds/config.mk
@@ -23,6 +23,6 @@
 #
 # mpc8548cds board
 #
 #
 # mpc8548cds board
 #

-ifndef TEXT_BASE
-TEXT_BASE = 0xfff80000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xfff80000

 endif
 endif

diff --git a/board/freescale/mpc8555cds/config.mk b/board/freescale/mpc8555cds/config.mk
index 798be39..8f62e5a 100644 (file)
--- a/board/freescale/mpc8555cds/config.mk
+++ b/board/freescale/mpc8555cds/config.mk
@@ -23,4 +23,4 @@
 #
 # mpc8555cds board
 #
 #
 # mpc8555cds board
 #

-TEXT_BASE = 0xfff80000
+CONFIG_SYS_TEXT_BASE = 0xfff80000

diff --git a/board/freescale/mpc8560ads/config.mk b/board/freescale/mpc8560ads/config.mk
index 37dc7a1..6ccdcda 100644 (file)
--- a/board/freescale/mpc8560ads/config.mk
+++ b/board/freescale/mpc8560ads/config.mk
@@ -26,4 +26,4 @@
 # default CCARBAR is at 0xff700000
 # assume U-Boot is less than 0.5MB
 #
 # default CCARBAR is at 0xff700000
 # assume U-Boot is less than 0.5MB
 #

-TEXT_BASE = 0xfff80000
+CONFIG_SYS_TEXT_BASE = 0xfff80000

diff --git a/board/freescale/mpc8568mds/config.mk b/board/freescale/mpc8568mds/config.mk
index ed4b101..65de864 100644 (file)
--- a/board/freescale/mpc8568mds/config.mk
+++ b/board/freescale/mpc8568mds/config.mk
@@ -23,4 +23,4 @@
 #
 # mpc8568mds board
 #
 #
 # mpc8568mds board
 #

-TEXT_BASE = 0xfff80000
+CONFIG_SYS_TEXT_BASE = 0xfff80000

diff --git a/board/freescale/mpc8569mds/config.mk b/board/freescale/mpc8569mds/config.mk
index 4f7e18d..9adc606 100644 (file)
--- a/board/freescale/mpc8569mds/config.mk
+++ b/board/freescale/mpc8569mds/config.mk
@@ -25,11 +25,11 @@
 #
 ifndef NAND_SPL
 ifeq ($(CONFIG_NAND), y)
 #
 ifndef NAND_SPL
 ifeq ($(CONFIG_NAND), y)

-TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)
+CONFIG_SYS_TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)

 LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
 endif
 endif
 
 LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
 endif
 endif
 

-ifndef TEXT_BASE
-TEXT_BASE = 0xfff80000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xfff80000

 endif
 endif

diff --git a/board/freescale/mpc8572ds/config.mk b/board/freescale/mpc8572ds/config.mk
index 67394c9..ac31b94 100644 (file)
--- a/board/freescale/mpc8572ds/config.mk
+++ b/board/freescale/mpc8572ds/config.mk
@@ -23,8 +23,8 @@
 #
 # mpc8572ds board
 #
 #
 # mpc8572ds board
 #

-ifndef TEXT_BASE
-TEXT_BASE = 0xeff80000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xeff80000

 endif
 
 RESET_VECTOR_ADDRESS = 0xeffffffc
 endif
 
 RESET_VECTOR_ADDRESS = 0xeffffffc

diff --git a/board/freescale/mpc8610hpcd/config.mk b/board/freescale/mpc8610hpcd/config.mk
index 798f60a..61356ac 100644 (file)
--- a/board/freescale/mpc8610hpcd/config.mk
+++ b/board/freescale/mpc8610hpcd/config.mk
@@ -19,4 +19,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xfff00000
+CONFIG_SYS_TEXT_BASE = 0xfff00000

diff --git a/board/freescale/mpc8641hpcn/config.mk b/board/freescale/mpc8641hpcn/config.mk
index 3315d25..23d36b1 100644 (file)
--- a/board/freescale/mpc8641hpcn/config.mk
+++ b/board/freescale/mpc8641hpcn/config.mk
@@ -25,4 +25,4 @@
 # default CCSRBAR is at 0xff700000
 # assume U-Boot is less than 0.5MB
 #
 # default CCSRBAR is at 0xff700000
 # assume U-Boot is less than 0.5MB
 #

-TEXT_BASE = 0xeff00000
+CONFIG_SYS_TEXT_BASE = 0xeff00000

diff --git a/board/freescale/mx31ads/config.mk b/board/freescale/mx31ads/config.mk
index 7ec0fe2..2303f30 100644 (file)
--- a/board/freescale/mx31ads/config.mk
+++ b/board/freescale/mx31ads/config.mk
@@ -1,3 +1,3 @@
-TEXT_BASE = 0x87f00000
+CONFIG_SYS_TEXT_BASE = 0x87f00000

 
 LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds
 
 LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds

diff --git a/board/freescale/mx31pdk/config.mk b/board/freescale/mx31pdk/config.mk
index dcaa09f..de2c642 100644 (file)
--- a/board/freescale/mx31pdk/config.mk
+++ b/board/freescale/mx31pdk/config.mk
@@ -1,5 +1,5 @@
 ifdef CONFIG_NAND_SPL
 ifdef CONFIG_NAND_SPL

-TEXT_BASE = 0x87ec0000
+CONFIG_SYS_TEXT_BASE = 0x87ec0000

 else
 else

-TEXT_BASE = 0x87f00000
+CONFIG_SYS_TEXT_BASE = 0x87f00000

 endif
 endif

diff --git a/board/freescale/mx51evk/config.mk b/board/freescale/mx51evk/config.mk
index dd4a2c2..716fca9 100644 (file)
--- a/board/freescale/mx51evk/config.mk
+++ b/board/freescale/mx51evk/config.mk
@@ -21,6 +21,6 @@
 #
 
 LDSCRIPT = $(CPUDIR)/$(SOC)/u-boot.lds
 #
 
 LDSCRIPT = $(CPUDIR)/$(SOC)/u-boot.lds

-TEXT_BASE = 0x97800000
+CONFIG_SYS_TEXT_BASE = 0x97800000

 IMX_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/imximage.cfg
 ALL += $(obj)u-boot.imx
 IMX_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/imximage.cfg
 ALL += $(obj)u-boot.imx

diff --git a/board/freescale/p1022ds/config.mk b/board/freescale/p1022ds/config.mk
index 4581d20..5ad81e0 100644 (file)
--- a/board/freescale/p1022ds/config.mk
+++ b/board/freescale/p1022ds/config.mk
@@ -7,8 +7,8 @@
 # any later version.
 #
 
 # any later version.
 #
 

-ifndef TEXT_BASE
-TEXT_BASE = 0xeff80000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xeff80000

 endif
 
 RESET_VECTOR_ADDRESS = 0xeffffffc
 endif
 
 RESET_VECTOR_ADDRESS = 0xeffffffc

diff --git a/board/freescale/p1_p2_rdb/config.mk b/board/freescale/p1_p2_rdb/config.mk
index 2d306bb..18da010 100644 (file)
--- a/board/freescale/p1_p2_rdb/config.mk
+++ b/board/freescale/p1_p2_rdb/config.mk
@@ -26,23 +26,23 @@
 
 ifndef NAND_SPL
 ifeq ($(CONFIG_NAND), y)
 
 ifndef NAND_SPL
 ifeq ($(CONFIG_NAND), y)

-TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)
+CONFIG_SYS_TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)

 LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
 endif
 endif
 
 ifeq ($(CONFIG_SDCARD), y)
 LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
 endif
 endif
 
 ifeq ($(CONFIG_SDCARD), y)

-TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)
+CONFIG_SYS_TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)

 RESET_VECTOR_ADDRESS = 0xf8fffffc
 endif
 
 ifeq ($(CONFIG_SPIFLASH), y)
 RESET_VECTOR_ADDRESS = 0xf8fffffc
 endif
 
 ifeq ($(CONFIG_SPIFLASH), y)

-TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)
+CONFIG_SYS_TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)

 RESET_VECTOR_ADDRESS = 0xf8fffffc
 endif
 
 RESET_VECTOR_ADDRESS = 0xf8fffffc
 endif
 

-ifndef TEXT_BASE
-TEXT_BASE = 0xeff80000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xeff80000

 endif
 
 ifndef RESET_VECTOR_ADDRESS
 endif
 
 ifndef RESET_VECTOR_ADDRESS

diff --git a/board/freescale/p2020ds/config.mk b/board/freescale/p2020ds/config.mk
index 4fcd69c..4268c19 100644 (file)
--- a/board/freescale/p2020ds/config.mk
+++ b/board/freescale/p2020ds/config.mk
@@ -23,8 +23,8 @@
 #
 # p2020ds board
 #
 #
 # p2020ds board
 #

-ifndef TEXT_BASE
-TEXT_BASE = 0xeff80000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xeff80000

 endif
 
 RESET_VECTOR_ADDRESS = 0xeffffffc
 endif
 
 RESET_VECTOR_ADDRESS = 0xeffffffc

diff --git a/board/funkwerk/vovpn-gw/config.mk b/board/funkwerk/vovpn-gw/config.mk
index e59b483..5adb691 100644 (file)
--- a/board/funkwerk/vovpn-gw/config.mk
+++ b/board/funkwerk/vovpn-gw/config.mk
@@ -18,4 +18,4 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 

-TEXT_BASE = 0xfff00000
+CONFIG_SYS_TEXT_BASE = 0xfff00000

diff --git a/board/g2000/config.mk b/board/g2000/config.mk
index 25b2105..c5f8c6e 100644 (file)
--- a/board/g2000/config.mk
+++ b/board/g2000/config.mk
@@ -25,5 +25,5 @@
 # esd PLU405 boards
 #
 
 # esd PLU405 boards
 #
 

-TEXT_BASE = 0xFFFC0000
-#TEXT_BASE = 0x00FC0000
+CONFIG_SYS_TEXT_BASE = 0xFFFC0000
+#CONFIG_SYS_TEXT_BASE = 0x00FC0000

diff --git a/board/gaisler/gr_cpci_ax2000/config.mk b/board/gaisler/gr_cpci_ax2000/config.mk
index 6c4d56b..e8df9a3 100644 (file)
--- a/board/gaisler/gr_cpci_ax2000/config.mk
+++ b/board/gaisler/gr_cpci_ax2000/config.mk
@@ -26,12 +26,13 @@
 #
 
 # U-BOOT IN FLASH
 #
 
 # U-BOOT IN FLASH

-TEXT_BASE = 0x00000000
+CONFIG_SYS_TEXT_BASE = 0x00000000

 
 # U-BOOT IN RAM or SDRAM with -nosram flag set when starting GRMON
 
 # U-BOOT IN RAM or SDRAM with -nosram flag set when starting GRMON

-#TEXT_BASE = 0x40000000
+#CONFIG_SYS_TEXT_BASE = 0x40000000

 
 # U-BOOT IN SDRAM
 
 # U-BOOT IN SDRAM

-#TEXT_BASE = 0x60000000
+#CONFIG_SYS_TEXT_BASE = 0x60000000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/gaisler/gr_ep2s60/config.mk b/board/gaisler/gr_ep2s60/config.mk
index 2ee0957..ce82469 100644 (file)
--- a/board/gaisler/gr_ep2s60/config.mk
+++ b/board/gaisler/gr_ep2s60/config.mk
@@ -27,9 +27,10 @@
 #
 
 # U-BOOT IN FLASH
 #
 
 # U-BOOT IN FLASH

-TEXT_BASE = 0x00000000
+CONFIG_SYS_TEXT_BASE = 0x00000000

 
 # U-BOOT IN SDRAM
 
 # U-BOOT IN SDRAM

-#TEXT_BASE = 0x40000000
+#CONFIG_SYS_TEXT_BASE = 0x40000000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/gaisler/gr_xc3s_1500/config.mk b/board/gaisler/gr_xc3s_1500/config.mk
index 35cbc1b..c60ef7b 100644 (file)
--- a/board/gaisler/gr_xc3s_1500/config.mk
+++ b/board/gaisler/gr_xc3s_1500/config.mk
@@ -26,9 +26,10 @@
 #
 
 # U-BOOT IN FLASH
 #
 
 # U-BOOT IN FLASH

-TEXT_BASE = 0x00000000
+CONFIG_SYS_TEXT_BASE = 0x00000000

 
 # U-BOOT IN RAM
 
 # U-BOOT IN RAM

-#TEXT_BASE = 0x40000000
+#CONFIG_SYS_TEXT_BASE = 0x40000000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/gaisler/grsim/config.mk b/board/gaisler/grsim/config.mk
index 81cd415..c2e8268 100644 (file)
--- a/board/gaisler/grsim/config.mk
+++ b/board/gaisler/grsim/config.mk
@@ -26,9 +26,10 @@
 #
 
 # U-BOOT IN FLASH
 #
 
 # U-BOOT IN FLASH

-TEXT_BASE = 0x00000000
+CONFIG_SYS_TEXT_BASE = 0x00000000

 
 # U-BOOT IN RAM
 
 # U-BOOT IN RAM

-#TEXT_BASE = 0x40000000
+#CONFIG_SYS_TEXT_BASE = 0x40000000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/gaisler/grsim_leon2/config.mk b/board/gaisler/grsim_leon2/config.mk
index 65eba1b..4d88691 100644 (file)
--- a/board/gaisler/grsim_leon2/config.mk
+++ b/board/gaisler/grsim_leon2/config.mk
@@ -26,9 +26,10 @@
 #
 
 # RUN U-BOOT FROM PROM
 #
 
 # RUN U-BOOT FROM PROM

-TEXT_BASE = 0x00000000
+CONFIG_SYS_TEXT_BASE = 0x00000000

 
 # RUN U-BOOT FROM RAM
 
 # RUN U-BOOT FROM RAM

-#TEXT_BASE = 0x40000000
+#CONFIG_SYS_TEXT_BASE = 0x40000000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/galaxy5200/config.mk b/board/galaxy5200/config.mk
index c6398b2..c46e51a 100644 (file)
--- a/board/galaxy5200/config.mk
+++ b/board/galaxy5200/config.mk
@@ -24,7 +24,7 @@
 #
 # galaxy5200 board:
 #
 #
 # galaxy5200 board:
 #

-#      Valid values for TEXT_BASE are:
+#      Valid values for CONFIG_SYS_TEXT_BASE are:

 #
 #      0xFFF00000   boot high (standard configuration)
 #      0xFE000000   boot low
 #
 #      0xFFF00000   boot high (standard configuration)
 #      0xFE000000   boot low


@@ -34,12 +34,13 @@
 sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp
 
 ifdef CONFIG_galaxy5200_LOWBOOT
 sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp
 
 ifdef CONFIG_galaxy5200_LOWBOOT

-TEXT_BASE = 0xFE000000
+CONFIG_SYS_TEXT_BASE = 0xFE000000

 endif
 
 endif
 

-ifndef TEXT_BASE
+ifndef CONFIG_SYS_TEXT_BASE

 ## Standard: boot high
 ## Standard: boot high

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 endif
 
 endif
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/gcplus/config.mk b/board/gcplus/config.mk
index 57326b8..a9bd3ff 100644 (file)
--- a/board/gcplus/config.mk
+++ b/board/gcplus/config.mk
@@ -10,4 +10,4 @@
 # bootp;tftp;bootm, repeat, etc.,.
 #
 
 # bootp;tftp;bootm, repeat, etc.,.
 #
 

-TEXT_BASE = 0xc8f00000
+CONFIG_SYS_TEXT_BASE = 0xc8f00000

diff --git a/board/gdsys/dlvision/config.mk b/board/gdsys/dlvision/config.mk
index 1bdf5e4..1646d34 100644 (file)
--- a/board/gdsys/dlvision/config.mk
+++ b/board/gdsys/dlvision/config.mk
@@ -21,4 +21,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xFFFC0000
+CONFIG_SYS_TEXT_BASE = 0xFFFC0000

diff --git a/board/gdsys/gdppc440etx/config.mk b/board/gdsys/gdppc440etx/config.mk
index 045f3e9..1e01ec5 100644 (file)
--- a/board/gdsys/gdppc440etx/config.mk
+++ b/board/gdsys/gdppc440etx/config.mk
@@ -25,12 +25,12 @@
 # G&D 440EP/GR ETX-Module
 #
 
 # G&D 440EP/GR ETX-Module
 #
 

-#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
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1

diff --git a/board/gdsys/intip/config.mk b/board/gdsys/intip/config.mk
index 56e397d..75aee0d 100644 (file)
--- a/board/gdsys/intip/config.mk
+++ b/board/gdsys/intip/config.mk
@@ -26,8 +26,8 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
-TEXT_BASE = 0xFFFA0000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xFFFA0000

 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1

diff --git a/board/gdsys/neo/config.mk b/board/gdsys/neo/config.mk
index 1bdf5e4..1646d34 100644 (file)
--- a/board/gdsys/neo/config.mk
+++ b/board/gdsys/neo/config.mk
@@ -21,4 +21,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xFFFC0000
+CONFIG_SYS_TEXT_BASE = 0xFFFC0000

diff --git a/board/gen860t/config.mk b/board/gen860t/config.mk
index 7acd904..b788092 100644 (file)
--- a/board/gen860t/config.mk
+++ b/board/gen860t/config.mk
@@ -25,4 +25,4 @@
 # FLASH base address for GEN860T board
 #
 
 # FLASH base address for GEN860T board
 #
 

-TEXT_BASE = 0x40000000
+CONFIG_SYS_TEXT_BASE = 0x40000000

diff --git a/board/genietv/config.mk b/board/genietv/config.mk
index 69ab21f..72b0ec0 100644 (file)
--- a/board/genietv/config.mk
+++ b/board/genietv/config.mk
@@ -21,5 +21,5 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0x00000000
+CONFIG_SYS_TEXT_BASE = 0x00000000

 OBJCFLAGS = --set-section-flags=.ppcenv=contents,alloc,load,data
 OBJCFLAGS = --set-section-flags=.ppcenv=contents,alloc,load,data

diff --git a/board/gth2/config.mk b/board/gth2/config.mk
index 2bc1338..c905049 100644 (file)
--- a/board/gth2/config.mk
+++ b/board/gth2/config.mk
@@ -26,16 +26,16 @@
 #
 
 ifeq ($(TBASE),0)
 #
 
 ifeq ($(TBASE),0)

-TEXT_BASE = 0
+CONFIG_SYS_TEXT_BASE = 0

 else
 ifeq ($(TBASE),1)
 else
 ifeq ($(TBASE),1)

-TEXT_BASE = 0xbfc10070
+CONFIG_SYS_TEXT_BASE = 0xbfc10070

 else
 ifeq ($(TBASE),2)
 else
 ifeq ($(TBASE),2)

-TEXT_BASE = 0xbfc30070
+CONFIG_SYS_TEXT_BASE = 0xbfc30070

 else
 ## Only to make ordinary make work
 else
 ## Only to make ordinary make work

-TEXT_BASE = 0x90000000
+CONFIG_SYS_TEXT_BASE = 0x90000000

 endif
 endif
 endif
 endif
 endif
 endif

diff --git a/board/gw8260/config.mk b/board/gw8260/config.mk
index ca0540d..ad3c2d7 100644 (file)
--- a/board/gw8260/config.mk
+++ b/board/gw8260/config.mk
@@ -29,6 +29,7 @@
 # MBX8xx boards
 #
 
 # MBX8xx boards
 #
 

-TEXT_BASE = 0x40000000
+CONFIG_SYS_TEXT_BASE = 0x40000000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/hermes/config.mk b/board/hermes/config.mk
index 008165f..b77f5bf 100644 (file)
--- a/board/hermes/config.mk
+++ b/board/hermes/config.mk
@@ -25,4 +25,4 @@
 # Multidata HERMES-PRO ISDN Routers
 #
 
 # Multidata HERMES-PRO ISDN Routers
 #
 

-TEXT_BASE = 0xFE000000
+CONFIG_SYS_TEXT_BASE = 0xFE000000

diff --git a/board/hidden_dragon/config.mk b/board/hidden_dragon/config.mk
index 5c36d05..96b6262 100644 (file)
--- a/board/hidden_dragon/config.mk
+++ b/board/hidden_dragon/config.mk
@@ -25,6 +25,6 @@
 # Hidden Dragon boards
 #
 
 # Hidden Dragon 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)

diff --git a/board/hymod/config.mk b/board/hymod/config.mk
index 2df321f..af44829 100644 (file)
--- a/board/hymod/config.mk
+++ b/board/hymod/config.mk
@@ -25,7 +25,7 @@
 # HYMOD boards
 #
 
 # HYMOD boards
 #
 

-TEXT_BASE = 0x40000000
+CONFIG_SYS_TEXT_BASE = 0x40000000

 
 PLATFORM_CPPFLAGS += -I$(TOPDIR)
 
 
 PLATFORM_CPPFLAGS += -I$(TOPDIR)
 

diff --git a/board/ibf-dsp561/config.mk b/board/ibf-dsp561/config.mk
index 1fec4d0..80b527c 100644 (file)
--- a/board/ibf-dsp561/config.mk
+++ b/board/ibf-dsp561/config.mk
@@ -24,7 +24,7 @@
 #
 
 # This is not actually used for Blackfin boards so do not change it
 #
 
 # This is not actually used for Blackfin boards so do not change it

-#TEXT_BASE = do-not-use-me
+#CONFIG_SYS_TEXT_BASE = do-not-use-me

 
 CONFIG_BFIN_CPU = bf561-0.5
 
 
 CONFIG_BFIN_CPU = bf561-0.5
 

diff --git a/board/icecube/config.mk b/board/icecube/config.mk
index 170779d..106498d 100644 (file)
--- a/board/icecube/config.mk
+++ b/board/icecube/config.mk
@@ -24,7 +24,7 @@
 #
 # IceCube board:
 #
 #
 # IceCube board:
 #

-#      Valid values for TEXT_BASE are:
+#      Valid values for CONFIG_SYS_TEXT_BASE are:

 #
 #      0xFFF00000   boot high (standard configuration)
 #      0xFF000000   boot low for 16 MiB boards
 #
 #      0xFFF00000   boot high (standard configuration)
 #      0xFF000000   boot low for 16 MiB boards


@@ -34,11 +34,12 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
+ifndef CONFIG_SYS_TEXT_BASE

 ## Standard: boot high
 ## Standard: boot high

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 ## For testing: boot from RAM
 ## For testing: boot from RAM

-# TEXT_BASE = 0x00100000
+# CONFIG_SYS_TEXT_BASE = 0x00100000

 endif
 
 endif
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/icu862/config.mk b/board/icu862/config.mk
index 315e70d..ed8e9de 100644 (file)
--- a/board/icu862/config.mk
+++ b/board/icu862/config.mk
@@ -25,5 +25,5 @@
 # ICU862 boards
 #
 
 # ICU862 boards
 #
 

-TEXT_BASE = 0x40F00000
+CONFIG_SYS_TEXT_BASE = 0x40F00000

 OBJCFLAGS =    --set-section-flags=.ppcenv=contents,alloc,load,data
 OBJCFLAGS =    --set-section-flags=.ppcenv=contents,alloc,load,data

diff --git a/board/idmr/config.mk b/board/idmr/config.mk
index f7c2258..95b0f9e 100644 (file)
--- a/board/idmr/config.mk
+++ b/board/idmr/config.mk
@@ -22,4 +22,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xff800000
+CONFIG_SYS_TEXT_BASE = 0xff800000

diff --git a/board/ids8247/config.mk b/board/ids8247/config.mk
index 2a7f3dd..1aee97c 100644 (file)
--- a/board/ids8247/config.mk
+++ b/board/ids8247/config.mk
@@ -29,6 +29,7 @@
 # for the "final" configuration, with U-Boot in flash, or the address
 # in RAM where U-Boot is loaded at for debugging.
 #
 # for the "final" configuration, with U-Boot in flash, or the address
 # in RAM where U-Boot is loaded at for debugging.
 #

-TEXT_BASE = 0xfff00000
+CONFIG_SYS_TEXT_BASE = 0xfff00000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)

diff --git a/board/impa7/config.mk b/board/impa7/config.mk
index 417d6a8..15e7f04 100644 (file)
--- a/board/impa7/config.mk
+++ b/board/impa7/config.mk
@@ -25,4 +25,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xc1780000
+CONFIG_SYS_TEXT_BASE = 0xc1780000

diff --git a/board/imx31_phycore/config.mk b/board/imx31_phycore/config.mk
index d34dc02..0131edf 100644 (file)
--- a/board/imx31_phycore/config.mk
+++ b/board/imx31_phycore/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x87f00000
+CONFIG_SYS_TEXT_BASE = 0x87f00000

diff --git a/board/incaip/config.mk b/board/incaip/config.mk
index 0cecc01..7ef5a66 100644 (file)
--- a/board/incaip/config.mk
+++ b/board/incaip/config.mk
@@ -26,7 +26,7 @@
 #
 
 # ROM version
 #
 
 # ROM version

-TEXT_BASE = 0xB0000000
+CONFIG_SYS_TEXT_BASE = 0xB0000000

 
 # RAM version
 
 # RAM version

-#TEXT_BASE = 0x80100000
+#CONFIG_SYS_TEXT_BASE = 0x80100000

diff --git a/board/inka4x0/config.mk b/board/inka4x0/config.mk
index 9f6fb3b..145496f 100644 (file)
--- a/board/inka4x0/config.mk
+++ b/board/inka4x0/config.mk
@@ -24,19 +24,20 @@
 #
 # INKA 4X0 board:
 #
 #
 # INKA 4X0 board:
 #

-#      Valid values for TEXT_BASE are:
+#      Valid values for CONFIG_SYS_TEXT_BASE are:

 #
 #      0xFFE00000   boot low
 #
 #      0x00100000   boot from RAM (for testing only)
 #
 
 #
 #      0xFFE00000   boot low
 #
 #      0x00100000   boot from RAM (for testing only)
 #
 

-ifndef TEXT_BASE
+ifndef CONFIG_SYS_TEXT_BASE

 ## Standard: boot low
 ## Standard: boot low

-TEXT_BASE = 0xFFE00000
+CONFIG_SYS_TEXT_BASE = 0xFFE00000

 ## For testing: boot from RAM
 ## For testing: boot from RAM

-#TEXT_BASE = 0x00100000
+#CONFIG_SYS_TEXT_BASE = 0x00100000

 endif
 
 endif
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

 LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds
 LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds

diff --git a/board/innokom/config.mk b/board/innokom/config.mk
index 2354392..9e46555 100644 (file)
--- a/board/innokom/config.mk
+++ b/board/innokom/config.mk
@@ -7,9 +7,9 @@
 #
 
 # This is the address where U-Boot lives in flash:
 #
 
 # This is the address where U-Boot lives in flash:

-#TEXT_BASE = 0
+#CONFIG_SYS_TEXT_BASE = 0

 
 # FIXME: armboot does only work correctly when being compiled
 # for the addresses _after_ relocation to RAM!! Otherwhise the
 # .bss segment is assumed in flash...
 
 # FIXME: armboot does only work correctly when being compiled
 # for the addresses _after_ relocation to RAM!! Otherwhise the
 # .bss segment is assumed in flash...

-TEXT_BASE = 0xa1fe0000
+CONFIG_SYS_TEXT_BASE = 0xa1fe0000

diff --git a/board/innokom/lowlevel_init.S b/board/innokom/lowlevel_init.S
index 9892430..55169be 100644 (file)
--- a/board/innokom/lowlevel_init.S
+++ b/board/innokom/lowlevel_init.S
@@ -39,7 +39,7 @@ DRAM_SIZE:  .long   CONFIG_SYS_DRAM_SIZE
    .endm
 
 _TEXT_BASE:
    .endm
 
 _TEXT_BASE:

-       .word   TEXT_BASE
+       .word   CONFIG_SYS_TEXT_BASE

 
 
 /*
 
 
 /*

diff --git a/board/ip04/config.mk b/board/ip04/config.mk
index 683101b..fc818fb 100644 (file)
--- a/board/ip04/config.mk
+++ b/board/ip04/config.mk
@@ -24,7 +24,7 @@
 #
 
 # This is not actually used for Blackfin boards so do not change it
 #
 
 # This is not actually used for Blackfin boards so do not change it

-#TEXT_BASE = do-not-use-me
+#CONFIG_SYS_TEXT_BASE = do-not-use-me

 
 CONFIG_BFIN_CPU = bf532-0.5
 
 
 CONFIG_BFIN_CPU = bf532-0.5
 

diff --git a/board/ip860/config.mk b/board/ip860/config.mk
index ea3b873..f5184a9 100644 (file)
--- a/board/ip860/config.mk
+++ b/board/ip860/config.mk
@@ -25,4 +25,4 @@
 # MicroSys IP860 VMEBus Systems
 #
 
 # MicroSys IP860 VMEBus Systems
 #
 

-TEXT_BASE = 0x10000000
+CONFIG_SYS_TEXT_BASE = 0x10000000

diff --git a/board/ipek01/config.mk b/board/ipek01/config.mk
index c8ecb29..4937019 100644 (file)
--- a/board/ipek01/config.mk
+++ b/board/ipek01/config.mk
@@ -25,6 +25,7 @@
 # IPEK01 board
 #
 
 # IPEK01 board
 #
 

-TEXT_BASE = 0xfc000000
+CONFIG_SYS_TEXT_BASE = 0xfc000000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/iphase4539/config.mk b/board/iphase4539/config.mk
index 632c1d2..23cb835 100644 (file)
--- a/board/iphase4539/config.mk
+++ b/board/iphase4539/config.mk
@@ -24,6 +24,7 @@
 # iphase4539 board
 #
 
 # iphase4539 board
 #
 

-TEXT_BASE = 0xffb00000
+CONFIG_SYS_TEXT_BASE = 0xffb00000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/ispan/config.mk b/board/ispan/config.mk
index 4600dbb..c7fb397 100644 (file)
--- a/board/ispan/config.mk
+++ b/board/ispan/config.mk
@@ -24,6 +24,6 @@
 #
 # Interphase iSPAN Communications Controllers
 #
 #
 # Interphase iSPAN Communications Controllers
 #

-#TEXT_BASE = 0xFF800000
-#TEXT_BASE = 0xFFBA0000
-TEXT_BASE = 0xFE7A0000
+#CONFIG_SYS_TEXT_BASE = 0xFF800000
+#CONFIG_SYS_TEXT_BASE = 0xFFBA0000
+CONFIG_SYS_TEXT_BASE = 0xFE7A0000

diff --git a/board/ivm/config.mk b/board/ivm/config.mk
index 37e7185..be913a8 100644 (file)
--- a/board/ivm/config.mk
+++ b/board/ivm/config.mk
@@ -26,4 +26,4 @@
 # IVM boards
 #
 
 # IVM boards
 #
 

-TEXT_BASE = 0xFF000000
+CONFIG_SYS_TEXT_BASE = 0xFF000000

diff --git a/board/ixdp425/config.mk b/board/ixdp425/config.mk
index ecff8d7..509c894 100644 (file)
--- a/board/ixdp425/config.mk
+++ b/board/ixdp425/config.mk
@@ -1,2 +1,2 @@
 #
 #

-TEXT_BASE = 0x00f80000
+CONFIG_SYS_TEXT_BASE = 0x00f80000

diff --git a/board/jse/config.mk b/board/jse/config.mk
index 03ec085..30ad1c2 100644 (file)
--- a/board/jse/config.mk
+++ b/board/jse/config.mk
@@ -21,4 +21,4 @@
 # Picture Elements, Inc. JSE boards
 #
 
 # Picture Elements, Inc. JSE boards
 #
 

-TEXT_BASE = 0xFFF80000
+CONFIG_SYS_TEXT_BASE = 0xFFF80000

diff --git a/board/jupiter/config.mk b/board/jupiter/config.mk
index 5f4da96..d876436 100644 (file)
--- a/board/jupiter/config.mk
+++ b/board/jupiter/config.mk
@@ -24,18 +24,20 @@
 #
 # Jupiter board:
 #
 #
 # Jupiter board:
 #

-#      Valid values for TEXT_BASE are:
+#      Valid values for CONFIG_SYS_TEXT_BASE are:

 #
 #      0xFFF00000   boot high (standard configuration)
 #      0x00100000   boot from RAM (for testing only)
 #
 
 #
 #      0xFFF00000   boot high (standard configuration)
 #      0x00100000   boot from RAM (for testing only)
 #
 

-ifndef TEXT_BASE
+ifndef CONFIG_SYS_TEXT_BASE

 ## Standard: boot high
 ## Standard: boot high

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 ## For testing: boot from RAM
 ## For testing: boot from RAM

-# TEXT_BASE = 0x00100000
+# CONFIG_SYS_TEXT_BASE = 0x00100000

 endif
 
 endif
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
-#PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -DDEBUG -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board
+#PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+#      -DDEBUG -I$(TOPDIR)/board

diff --git a/board/karo/tx25/config.mk b/board/karo/tx25/config.mk
index 51ca1ab..4283c3e 100644 (file)
--- a/board/karo/tx25/config.mk
+++ b/board/karo/tx25/config.mk
@@ -1,5 +1,5 @@
 ifdef CONFIG_NAND_SPL
 ifdef CONFIG_NAND_SPL

-TEXT_BASE = 0x810c0000
+CONFIG_SYS_TEXT_BASE = 0x810c0000

 else
 else

-TEXT_BASE = 0x81fc0000
+CONFIG_SYS_TEXT_BASE = 0x81fc0000

 endif
 endif

diff --git a/board/kb9202/config.mk b/board/kb9202/config.mk
index 9ce161e..2077692 100644 (file)
--- a/board/kb9202/config.mk
+++ b/board/kb9202/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x21f00000
+CONFIG_SYS_TEXT_BASE = 0x21f00000

diff --git a/board/keymile/km8xx/config.mk b/board/keymile/km8xx/config.mk
index 8625cea..5f5dc2d 100644 (file)
--- a/board/keymile/km8xx/config.mk
+++ b/board/keymile/km8xx/config.mk
@@ -25,4 +25,4 @@
 # mgsvud boards
 #
 
 # mgsvud boards
 #
 

-TEXT_BASE = 0xf0000000
+CONFIG_SYS_TEXT_BASE = 0xf0000000

diff --git a/board/keymile/km_arm/config.mk b/board/keymile/km_arm/config.mk
index b9e81b2..df4828c 100644 (file)
--- a/board/keymile/km_arm/config.mk
+++ b/board/keymile/km_arm/config.mk
@@ -22,7 +22,7 @@
 # MA 02110-1301 USA
 #
 
 # MA 02110-1301 USA
 #
 

-TEXT_BASE = 0x004000000
+CONFIG_SYS_TEXT_BASE = 0x004000000

 
 # Kirkwood Boot Image configuration file
 KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg
 
 # Kirkwood Boot Image configuration file
 KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg

diff --git a/board/keymile/kmeter1/config.mk b/board/keymile/kmeter1/config.mk
index 20f298b..a3b92c8 100644 (file)
--- a/board/keymile/kmeter1/config.mk
+++ b/board/keymile/kmeter1/config.mk
@@ -21,4 +21,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xF0000000
+CONFIG_SYS_TEXT_BASE = 0xF0000000

diff --git a/board/keymile/mgcoge/config.mk b/board/keymile/mgcoge/config.mk
index 143bc9f..c91358a 100644 (file)
--- a/board/keymile/mgcoge/config.mk
+++ b/board/keymile/mgcoge/config.mk
@@ -21,4 +21,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xFE000000
+CONFIG_SYS_TEXT_BASE = 0xFE000000

diff --git a/board/korat/config.mk b/board/korat/config.mk
index 73180db..828b22d 100644 (file)
--- a/board/korat/config.mk
+++ b/board/korat/config.mk
@@ -40,8 +40,8 @@ endif
 
 ifeq ($(perm),1)
 PLATFORM_CPPFLAGS += -DCONFIG_KORAT_PERMANENT
 
 ifeq ($(perm),1)
 PLATFORM_CPPFLAGS += -DCONFIG_KORAT_PERMANENT

-TEXT_BASE = 0xFFFA0000
+CONFIG_SYS_TEXT_BASE = 0xFFFA0000

 else
 else

-TEXT_BASE = 0xF7F60000
+CONFIG_SYS_TEXT_BASE = 0xF7F60000

 LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-F7FC.lds
 endif
 LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-F7FC.lds
 endif

diff --git a/board/kup/kup4k/config.mk b/board/kup/kup4k/config.mk
index 22e30b2..8d2419f 100644 (file)
--- a/board/kup/kup4k/config.mk
+++ b/board/kup/kup4k/config.mk
@@ -25,4 +25,4 @@
 # KUP4K board
 #
 
 # KUP4K board
 #
 

-TEXT_BASE = 0x40000000
+CONFIG_SYS_TEXT_BASE = 0x40000000

diff --git a/board/kup/kup4x/config.mk b/board/kup/kup4x/config.mk
index 61d4e09..a705f53 100644 (file)
--- a/board/kup/kup4x/config.mk
+++ b/board/kup/kup4x/config.mk
@@ -25,4 +25,4 @@
 # KUP4X board
 #
 
 # KUP4X board
 #
 

-TEXT_BASE = 0x40000000
+CONFIG_SYS_TEXT_BASE = 0x40000000

diff --git a/board/lantec/config.mk b/board/lantec/config.mk
index 05ea3b9..1914609 100644 (file)
--- a/board/lantec/config.mk
+++ b/board/lantec/config.mk
@@ -25,4 +25,4 @@
 # Lantec board (based on TQM8xxL config).
 #
 
 # Lantec board (based on TQM8xxL config).
 #
 

-TEXT_BASE = 0x40000000
+CONFIG_SYS_TEXT_BASE = 0x40000000

diff --git a/board/lart/config.mk b/board/lart/config.mk
index 3033c4f..b6b5e4d 100644 (file)
--- a/board/lart/config.mk
+++ b/board/lart/config.mk
@@ -20,4 +20,4 @@
 #
 
 
 #
 
 

-TEXT_BASE = 0xc1780000
+CONFIG_SYS_TEXT_BASE = 0xc1780000

diff --git a/board/linkstation/config.mk b/board/linkstation/config.mk
index d048290..e43a736 100644 (file)
--- a/board/linkstation/config.mk
+++ b/board/linkstation/config.mk
@@ -23,7 +23,7 @@
 
 # LinkStation/LinkStation-HG:
 #
 
 # LinkStation/LinkStation-HG:
 #

-#       Valid values for TEXT_BASE are:
+#       Valid values for CONFIG_SYS_TEXT_BASE are:

 #
 #      Standard configuration - all models
 #       0xFFF00000   boot from flash
 #
 #      Standard configuration - all models
 #       0xFFF00000   boot from flash


@@ -37,14 +37,14 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
+ifndef CONFIG_SYS_TEXT_BASE

 # For flash image - all models
 # For flash image - all models

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 # For RAM image
 # HLAN and LAN
 # For RAM image
 # HLAN and LAN

-#TEXT_BASE = 0x03F00000
+#CONFIG_SYS_TEXT_BASE = 0x03F00000

 # HGLAN and HGTL
 # HGLAN and HGTL

-#TEXT_BASE = 0x07F00000
+#CONFIG_SYS_TEXT_BASE = 0x07F00000

 endif
 
 endif
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)

diff --git a/board/logicpd/am3517evm/config.mk b/board/logicpd/am3517evm/config.mk
index f7a35ce..102d32b 100644 (file)
--- a/board/logicpd/am3517evm/config.mk
+++ b/board/logicpd/am3517evm/config.mk
@@ -27,4 +27,4 @@
 # (mem base + reserved)
 
 # For use with external or internal boots.
 # (mem base + reserved)
 
 # For use with external or internal boots.

-TEXT_BASE = 0x80e80000
+CONFIG_SYS_TEXT_BASE = 0x80e80000

diff --git a/board/logicpd/imx27lite/config.mk b/board/logicpd/imx27lite/config.mk
index 2f9c4e6..7f22154 100644 (file)
--- a/board/logicpd/imx27lite/config.mk
+++ b/board/logicpd/imx27lite/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0xc0000000
+CONFIG_SYS_TEXT_BASE = 0xc0000000

diff --git a/board/logicpd/imx31_litekit/config.mk b/board/logicpd/imx31_litekit/config.mk
index d34dc02..0131edf 100644 (file)
--- a/board/logicpd/imx31_litekit/config.mk
+++ b/board/logicpd/imx31_litekit/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x87f00000
+CONFIG_SYS_TEXT_BASE = 0x87f00000

diff --git a/board/logicpd/zoom1/config.mk b/board/logicpd/zoom1/config.mk
index 7347497..39a94dc 100644 (file)
--- a/board/logicpd/zoom1/config.mk
+++ b/board/logicpd/zoom1/config.mk
@@ -30,4 +30,4 @@
 # (mem base + reserved)
 
 # For use with external or internal boots.
 # (mem base + reserved)
 
 # For use with external or internal boots.

-TEXT_BASE = 0x80e80000
+CONFIG_SYS_TEXT_BASE = 0x80e80000

diff --git a/board/logicpd/zoom2/config.mk b/board/logicpd/zoom2/config.mk
index 33f394b..8a8adc7 100644 (file)
--- a/board/logicpd/zoom2/config.mk
+++ b/board/logicpd/zoom2/config.mk
@@ -30,4 +30,4 @@
 # (mem base + reserved)
 
 # For use with external or internal boots.
 # (mem base + reserved)
 
 # For use with external or internal boots.

-TEXT_BASE = 0x80e80000
+CONFIG_SYS_TEXT_BASE = 0x80e80000

diff --git a/board/lpc2292sodimm/config.mk b/board/lpc2292sodimm/config.mk
index b28f418..4891792 100644 (file)
--- a/board/lpc2292sodimm/config.mk
+++ b/board/lpc2292sodimm/config.mk
@@ -26,5 +26,5 @@
 #
 
 #address where u-boot will be relocated
 #
 
 #address where u-boot will be relocated

-#TEXT_BASE = 0x0
-TEXT_BASE = 0x81500000
+#CONFIG_SYS_TEXT_BASE = 0x0
+CONFIG_SYS_TEXT_BASE = 0x81500000

diff --git a/board/lpc2292sodimm/lowlevel_init.S b/board/lpc2292sodimm/lowlevel_init.S
index 4e8eb89..f579a1a 100644 (file)
--- a/board/lpc2292sodimm/lowlevel_init.S
+++ b/board/lpc2292sodimm/lowlevel_init.S
@@ -29,7 +29,7 @@
 #define BCFG1_VALUE    0x10001C61
 
 _TEXT_BASE:
 #define BCFG1_VALUE    0x10001C61
 
 _TEXT_BASE:

-       .word   TEXT_BASE
+       .word   CONFIG_SYS_TEXT_BASE

 MEMMAP_ADR:
        .word   MEMMAP
 BCFG0_ADR:
 MEMMAP_ADR:
        .word   MEMMAP
 BCFG0_ADR:

diff --git a/board/lpd7a40x/config.mk b/board/lpd7a40x/config.mk
index bc03874..003e707 100644 (file)
--- a/board/lpd7a40x/config.mk
+++ b/board/lpd7a40x/config.mk
@@ -34,5 +34,5 @@
 # download area is 0xc0f00000
 #
 
 # download area is 0xc0f00000
 #
 

-TEXT_BASE = 0xc1fc0000
-#TEXT_BASE = 0x00000000
+CONFIG_SYS_TEXT_BASE = 0xc1fc0000
+#CONFIG_SYS_TEXT_BASE = 0x00000000

diff --git a/board/lpd7a40x/lowlevel_init.S b/board/lpd7a40x/lowlevel_init.S
index 780b931..de34fc6 100644 (file)
--- a/board/lpd7a40x/lowlevel_init.S
+++ b/board/lpd7a40x/lowlevel_init.S
@@ -129,7 +129,7 @@
 #define DO_MEM_READ    2
 
 _TEXT_BASE:
 #define DO_MEM_READ    2
 
 _TEXT_BASE:

-       .word   TEXT_BASE
+       .word   CONFIG_SYS_TEXT_BASE

 
 .globl lowlevel_init
 lowlevel_init:
 
 .globl lowlevel_init
 lowlevel_init:

diff --git a/board/lubbock/config.mk b/board/lubbock/config.mk
index 55c8b27..f30f695 100644 (file)
--- a/board/lubbock/config.mk
+++ b/board/lubbock/config.mk
@@ -1,3 +1,3 @@
-#TEXT_BASE = 0xa1700000
-TEXT_BASE = 0xa3080000
-#TEXT_BASE = 0
+#CONFIG_SYS_TEXT_BASE = 0xa1700000
+CONFIG_SYS_TEXT_BASE = 0xa3080000
+#CONFIG_SYS_TEXT_BASE = 0

diff --git a/board/lwmon/config.mk b/board/lwmon/config.mk
index dfa952a..de48fd7 100644 (file)
--- a/board/lwmon/config.mk
+++ b/board/lwmon/config.mk
@@ -26,5 +26,5 @@
 # LWE Monitorcontroller Litronic LCD IV boards
 #
 
 # LWE Monitorcontroller Litronic LCD IV boards
 #
 

-TEXT_BASE = 0x40000000
-#TEXT_BASE = 0x41000000
+CONFIG_SYS_TEXT_BASE = 0x40000000
+#CONFIG_SYS_TEXT_BASE = 0x41000000

diff --git a/board/lwmon5/config.mk b/board/lwmon5/config.mk
index 3c6d041..3679d90 100644 (file)
--- a/board/lwmon5/config.mk
+++ b/board/lwmon5/config.mk
@@ -24,8 +24,8 @@
 # lwmon5 (440EPx)
 #
 
 # lwmon5 (440EPx)
 #
 

-ifndef TEXT_BASE
-TEXT_BASE = 0xFFF80000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xFFF80000

 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1

diff --git a/board/m501sk/config.mk b/board/m501sk/config.mk
index 9ce161e..2077692 100644 (file)
--- a/board/m501sk/config.mk
+++ b/board/m501sk/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x21f00000
+CONFIG_SYS_TEXT_BASE = 0x21f00000

diff --git a/board/manroland/hmi1001/config.mk b/board/manroland/hmi1001/config.mk
index 8ccf33e..b5a7125 100644 (file)
--- a/board/manroland/hmi1001/config.mk
+++ b/board/manroland/hmi1001/config.mk
@@ -24,19 +24,20 @@
 #
 # INKA 4X0 board:
 #
 #
 # INKA 4X0 board:
 #

-#      Valid values for TEXT_BASE are:
+#      Valid values for CONFIG_SYS_TEXT_BASE are:

 #
 #      0xFFE00000   boot high
 #
 #      0x00100000   boot from RAM (for testing only)
 #
 
 #
 #      0xFFE00000   boot high
 #
 #      0x00100000   boot from RAM (for testing only)
 #
 

-ifndef TEXT_BASE
+ifndef CONFIG_SYS_TEXT_BASE

 ## Standard: boot high
 ## Standard: boot high

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 ## For testing: boot from RAM
 ## For testing: boot from RAM

-#TEXT_BASE = 0x00100000
+#CONFIG_SYS_TEXT_BASE = 0x00100000

 endif
 
 endif
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

 LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds
 LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds

diff --git a/board/manroland/mucmc52/config.mk b/board/manroland/mucmc52/config.mk
index 6850728..cb2218f 100644 (file)
--- a/board/manroland/mucmc52/config.mk
+++ b/board/manroland/mucmc52/config.mk
@@ -27,19 +27,20 @@
 #
 # MUCMC52 board:
 #
 #
 # MUCMC52 board:
 #

-#      Valid values for TEXT_BASE are:
+#      Valid values for CONFIG_SYS_TEXT_BASE are:

 #
 #      0xFFE00000   boot high
 #
 #      0x00100000   boot from RAM (for testing only)
 #
 
 #
 #      0xFFE00000   boot high
 #
 #      0x00100000   boot from RAM (for testing only)
 #
 

-ifndef TEXT_BASE
+ifndef CONFIG_SYS_TEXT_BASE

 ## Standard: boot high
 ## Standard: boot high

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 ## For testing: boot from RAM
 ## For testing: boot from RAM

-#TEXT_BASE = 0x00100000
+#CONFIG_SYS_TEXT_BASE = 0x00100000

 endif
 
 endif
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

 LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc5xxx/u-boot.lds
 LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc5xxx/u-boot.lds

diff --git a/board/manroland/uc100/config.mk b/board/manroland/uc100/config.mk
index a65a8ba..4308eed 100644 (file)
--- a/board/manroland/uc100/config.mk
+++ b/board/manroland/uc100/config.mk
@@ -25,5 +25,5 @@
 # UC100 boards
 #
 
 # UC100 boards
 #
 

-#TEXT_BASE = 0x40000000
-TEXT_BASE = 0x40700000
+#CONFIG_SYS_TEXT_BASE = 0x40000000
+CONFIG_SYS_TEXT_BASE = 0x40700000

diff --git a/board/manroland/uc101/config.mk b/board/manroland/uc101/config.mk
index 8ccf33e..b5a7125 100644 (file)
--- a/board/manroland/uc101/config.mk
+++ b/board/manroland/uc101/config.mk
@@ -24,19 +24,20 @@
 #
 # INKA 4X0 board:
 #
 #
 # INKA 4X0 board:
 #

-#      Valid values for TEXT_BASE are:
+#      Valid values for CONFIG_SYS_TEXT_BASE are:

 #
 #      0xFFE00000   boot high
 #
 #      0x00100000   boot from RAM (for testing only)
 #
 
 #
 #      0xFFE00000   boot high
 #
 #      0x00100000   boot from RAM (for testing only)
 #
 

-ifndef TEXT_BASE
+ifndef CONFIG_SYS_TEXT_BASE

 ## Standard: boot high
 ## Standard: boot high

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 ## For testing: boot from RAM
 ## For testing: boot from RAM

-#TEXT_BASE = 0x00100000
+#CONFIG_SYS_TEXT_BASE = 0x00100000

 endif
 
 endif
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

 LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds
 LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds

diff --git a/board/matrix_vision/mvbc_p/config.mk b/board/matrix_vision/mvbc_p/config.mk
index c2c09f4..6677b3a 100644 (file)
--- a/board/matrix_vision/mvbc_p/config.mk
+++ b/board/matrix_vision/mvbc_p/config.mk
@@ -23,8 +23,9 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
-TEXT_BASE = 0xFF800000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xFF800000

 endif
 
 endif
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/matrix_vision/mvblm7/config.mk b/board/matrix_vision/mvblm7/config.mk
index d48fc31..7339635 100644 (file)
--- a/board/matrix_vision/mvblm7/config.mk
+++ b/board/matrix_vision/mvblm7/config.mk
@@ -22,4 +22,4 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-TEXT_BASE  = 0xFFF00000
+CONFIG_SYS_TEXT_BASE  = 0xFFF00000

diff --git a/board/matrix_vision/mvsmr/config.mk b/board/matrix_vision/mvsmr/config.mk
index b1da812..3886fe1 100644 (file)
--- a/board/matrix_vision/mvsmr/config.mk
+++ b/board/matrix_vision/mvsmr/config.mk
@@ -23,9 +23,10 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
-TEXT_BASE = 0xFF800000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xFF800000

 endif
 
 endif
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

 LDSCRIPT := $(SRCTREE)/board/matrix_vision/mvsmr/u-boot.lds
 LDSCRIPT := $(SRCTREE)/board/matrix_vision/mvsmr/u-boot.lds

diff --git a/board/mbx8xx/config.mk b/board/mbx8xx/config.mk
index d5e8ed2..e984ecd 100644 (file)
--- a/board/mbx8xx/config.mk
+++ b/board/mbx8xx/config.mk
@@ -29,5 +29,5 @@
 # MBX8xx boards
 #
 
 # MBX8xx boards
 #
 

-TEXT_BASE = 0xfe000000
-/*TEXT_BASE  = 0x00200000 */
+CONFIG_SYS_TEXT_BASE = 0xfe000000
+/*CONFIG_SYS_TEXT_BASE  = 0x00200000 */

diff --git a/board/mcc200/config.mk b/board/mcc200/config.mk
index d0f9289..c5d50aa 100644 (file)
--- a/board/mcc200/config.mk
+++ b/board/mcc200/config.mk
@@ -24,7 +24,7 @@
 #
 # MCC200, PRS200 boards:
 #
 #
 # MCC200, PRS200 boards:
 #

-#      Valid values for TEXT_BASE are:
+#      Valid values for CONFIG_SYS_TEXT_BASE are:

 #
 #      0xFC000000   boot low (standard configuration)
 #      0xFFF00000   boot high
 #
 #      0xFC000000   boot low (standard configuration)
 #      0xFFF00000   boot high


@@ -33,13 +33,14 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
+ifndef CONFIG_SYS_TEXT_BASE

 ## Standard: boot low
 ## Standard: boot low

-TEXT_BASE = 0xFC000000
+CONFIG_SYS_TEXT_BASE = 0xFC000000

 ## Boot high
 ## Boot high

-# TEXT_BASE = 0xFFF00000
+# CONFIG_SYS_TEXT_BASE = 0xFFF00000

 ## For testing: boot from RAM
 ## For testing: boot from RAM

-# TEXT_BASE = 0x00100000
+# CONFIG_SYS_TEXT_BASE = 0x00100000

 endif
 
 endif
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/micronas/vct/config.mk b/board/micronas/vct/config.mk
index 2a71dad..ae7c58f 100644 (file)
--- a/board/micronas/vct/config.mk
+++ b/board/micronas/vct/config.mk
@@ -26,6 +26,6 @@
 
 sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
-TEXT_BASE = 0x87000000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0x87000000

 endif
 endif

diff --git a/board/mimc/mimc200/config.mk b/board/mimc/mimc200/config.mk
index 9a794e5..ea76d05 100644 (file)
--- a/board/mimc/mimc200/config.mk
+++ b/board/mimc/mimc200/config.mk
@@ -1,3 +1,3 @@
-TEXT_BASE              = 0x00000000
+CONFIG_SYS_TEXT_BASE           = 0x00000000

 PLATFORM_RELFLAGS      += -ffunction-sections -fdata-sections
 PLATFORM_LDFLAGS       += --gc-sections
 PLATFORM_RELFLAGS      += -ffunction-sections -fdata-sections
 PLATFORM_LDFLAGS       += --gc-sections

diff --git a/board/miromico/hammerhead/config.mk b/board/miromico/hammerhead/config.mk
index 9a794e5..ea76d05 100644 (file)
--- a/board/miromico/hammerhead/config.mk
+++ b/board/miromico/hammerhead/config.mk
@@ -1,3 +1,3 @@
-TEXT_BASE              = 0x00000000
+CONFIG_SYS_TEXT_BASE           = 0x00000000

 PLATFORM_RELFLAGS      += -ffunction-sections -fdata-sections
 PLATFORM_LDFLAGS       += --gc-sections
 PLATFORM_RELFLAGS      += -ffunction-sections -fdata-sections
 PLATFORM_LDFLAGS       += --gc-sections

diff --git a/board/ml2/config.mk b/board/ml2/config.mk
index 5e0bdae..77e81e2 100644 (file)
--- a/board/ml2/config.mk
+++ b/board/ml2/config.mk
@@ -25,8 +25,8 @@
 # esd ADCIOP boards
 #
 
 # esd ADCIOP boards
 #
 

-#TEXT_BASE = 0xFFFE0000
-TEXT_BASE = 0x18000000
+#CONFIG_SYS_TEXT_BASE = 0xFFFE0000
+CONFIG_SYS_TEXT_BASE = 0x18000000

 
 # Use board specific linker script
 LDSCRIPT := $(SRCTREE)/board/ml2/u-boot.lds
 
 # Use board specific linker script
 LDSCRIPT := $(SRCTREE)/board/ml2/u-boot.lds

diff --git a/board/modnet50/config.mk b/board/modnet50/config.mk
index 49d4836..4e4d305 100644 (file)
--- a/board/modnet50/config.mk
+++ b/board/modnet50/config.mk
@@ -25,5 +25,5 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0x00f00000
+CONFIG_SYS_TEXT_BASE = 0x00f00000

 #CROSS_COMPILE = arm-elf-
 #CROSS_COMPILE = arm-elf-

diff --git a/board/modnet50/lowlevel_init.S b/board/modnet50/lowlevel_init.S
index c98c155..52ef2a8 100644 (file)
--- a/board/modnet50/lowlevel_init.S
+++ b/board/modnet50/lowlevel_init.S
@@ -55,7 +55,7 @@
 lowlevel_init:
 
 #if defined(CONFIG_MODNET50)
 lowlevel_init:
 
 #if defined(CONFIG_MODNET50)

-       ldr     pc, =(_jump_to_high + NETARM_MMAP_CS0_BASE - TEXT_BASE)
+       ldr     pc, =(_jump_to_high + NETARM_MMAP_CS0_BASE - CONFIG_SYS_TEXT_BASE)

 
 _jump_to_high:
        /*
 
 _jump_to_high:
        /*

diff --git a/board/mosaixtech/icon/config.mk b/board/mosaixtech/icon/config.mk
index b2748ce..1797b9a 100644 (file)
--- a/board/mosaixtech/icon/config.mk
+++ b/board/mosaixtech/icon/config.mk
@@ -21,7 +21,7 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xFFFA0000
+CONFIG_SYS_TEXT_BASE = 0xFFFA0000

 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 

diff --git a/board/motionpro/config.mk b/board/motionpro/config.mk
index e7934d2..c41b3db 100644 (file)
--- a/board/motionpro/config.mk
+++ b/board/motionpro/config.mk
@@ -25,6 +25,7 @@
 # Promess Motion-PRO
 #
 
 # Promess Motion-PRO
 #
 

-TEXT_BASE = 0xfff00000
+CONFIG_SYS_TEXT_BASE = 0xfff00000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/mousse/config.mk b/board/mousse/config.mk
index 933e6b3..c9dc87c 100644 (file)
--- a/board/mousse/config.mk
+++ b/board/mousse/config.mk
@@ -24,7 +24,7 @@
 #
 # MOUSSE boards
 #
 #
 # MOUSSE boards
 #

-TEXT_BASE = 0xFFF00000
-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE)
+CONFIG_SYS_TEXT_BASE = 0xFFF00000
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)

 
 LDSCRIPT := $(SRCTREE)/board/mousse/u-boot.lds
 
 LDSCRIPT := $(SRCTREE)/board/mousse/u-boot.lds

diff --git a/board/mp2usb/config.mk b/board/mp2usb/config.mk
index e299bfd..948e4ff 100644 (file)
--- a/board/mp2usb/config.mk
+++ b/board/mp2usb/config.mk
@@ -1,3 +1,3 @@
-TEXT_BASE = 0x27F00000
+CONFIG_SYS_TEXT_BASE = 0x27F00000

 ## For testing: load at 0x20100000 and "go" at 0x201000A4
 ## For testing: load at 0x20100000 and "go" at 0x201000A4

-#TEXT_BASE = 0x20100000
+#CONFIG_SYS_TEXT_BASE = 0x20100000

diff --git a/board/mpc8308_p1m/config.mk b/board/mpc8308_p1m/config.mk
index 183d3e8..b3f0ab9 100644 (file)
--- a/board/mpc8308_p1m/config.mk
+++ b/board/mpc8308_p1m/config.mk
@@ -1,3 +1,3 @@
-ifndef TEXT_BASE
-TEXT_BASE = 0xFC000000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xFC000000

 endif
 endif

diff --git a/board/mpc8540eval/config.mk b/board/mpc8540eval/config.mk
index 20b8681..1ef7ee1 100644 (file)
--- a/board/mpc8540eval/config.mk
+++ b/board/mpc8540eval/config.mk
@@ -25,5 +25,5 @@
 # default CCARBAR is at 0xff700000
 # assume U-Boot is less than 0.5MB
 #
 # default CCARBAR is at 0xff700000
 # assume U-Boot is less than 0.5MB
 #

-#TEXT_BASE = 0x1000000
-TEXT_BASE = 0xfff80000
+#CONFIG_SYS_TEXT_BASE = 0x1000000
+CONFIG_SYS_TEXT_BASE = 0xfff80000

diff --git a/board/mpl/mip405/config.mk b/board/mpl/mip405/config.mk
index 0f8d153..8fe11e5 100644 (file)
--- a/board/mpl/mip405/config.mk
+++ b/board/mpl/mip405/config.mk
@@ -25,5 +25,5 @@
 # esd ADCIOP boards
 #
 
 # esd ADCIOP boards
 #
 

-#TEXT_BASE = 0xFFFE0000
-TEXT_BASE = 0xFFF80000
+#CONFIG_SYS_TEXT_BASE = 0xFFFE0000
+CONFIG_SYS_TEXT_BASE = 0xFFF80000

diff --git a/board/mpl/pati/config.mk b/board/mpl/pati/config.mk
index b8a0985..ba2e42b 100644 (file)
--- a/board/mpl/pati/config.mk
+++ b/board/mpl/pati/config.mk
@@ -26,6 +26,7 @@
 #
 
 # Boot from flash at location 0x00000000
 #
 
 # Boot from flash at location 0x00000000

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)

diff --git a/board/mpl/pip405/config.mk b/board/mpl/pip405/config.mk
index 0f8d153..8fe11e5 100644 (file)
--- a/board/mpl/pip405/config.mk
+++ b/board/mpl/pip405/config.mk
@@ -25,5 +25,5 @@
 # esd ADCIOP boards
 #
 
 # esd ADCIOP boards
 #
 

-#TEXT_BASE = 0xFFFE0000
-TEXT_BASE = 0xFFF80000
+#CONFIG_SYS_TEXT_BASE = 0xFFFE0000
+CONFIG_SYS_TEXT_BASE = 0xFFF80000

diff --git a/board/mpl/vcma9/config.mk b/board/mpl/vcma9/config.mk
index 1fa09c9..e345913 100644 (file)
--- a/board/mpl/vcma9/config.mk
+++ b/board/mpl/vcma9/config.mk
@@ -20,5 +20,5 @@
 #
 
 
 #
 
 

-#TEXT_BASE = 0x30F80000
-TEXT_BASE = 0x33F80000
+#CONFIG_SYS_TEXT_BASE = 0x30F80000
+CONFIG_SYS_TEXT_BASE = 0x33F80000

diff --git a/board/mpl/vcma9/lowlevel_init.S b/board/mpl/vcma9/lowlevel_init.S
index e3af073..062e868 100644 (file)
--- a/board/mpl/vcma9/lowlevel_init.S
+++ b/board/mpl/vcma9/lowlevel_init.S
@@ -128,7 +128,7 @@
 /**************************************/
 
 _TEXT_BASE:
 /**************************************/
 
 _TEXT_BASE:

-       .word   TEXT_BASE
+       .word   CONFIG_SYS_TEXT_BASE

 
 .globl lowlevel_init
 lowlevel_init:
 
 .globl lowlevel_init
 lowlevel_init:

diff --git a/board/mpr2/config.mk b/board/mpr2/config.mk
index 6d41d97..4a4bca1 100644 (file)
--- a/board/mpr2/config.mk
+++ b/board/mpr2/config.mk
@@ -29,9 +29,9 @@
 # MA 02111-1307 USA
 
 #
 # MA 02111-1307 USA
 
 #

-# TEXT_BASE refers to image _after_ relocation.
+# CONFIG_SYS_TEXT_BASE refers to image _after_ relocation.

 #
 # NOTE: Must match value used in u-boot.lds (in this directory).
 #
 
 #
 # NOTE: Must match value used in u-boot.lds (in this directory).
 #
 

-TEXT_BASE = 0x8FFC0000
+CONFIG_SYS_TEXT_BASE = 0x8FFC0000

diff --git a/board/ms7720se/config.mk b/board/ms7720se/config.mk
index cad8d3a..d2944a6 100644 (file)
--- a/board/ms7720se/config.mk
+++ b/board/ms7720se/config.mk
@@ -26,9 +26,9 @@
 # MA 02111-1307 USA
 
 #
 # MA 02111-1307 USA
 
 #

-# TEXT_BASE refers to image _after_ relocation.
+# CONFIG_SYS_TEXT_BASE refers to image _after_ relocation.

 #
 # NOTE: Must match value used in u-boot.lds (in this directory).
 #
 
 #
 # NOTE: Must match value used in u-boot.lds (in this directory).
 #
 

-TEXT_BASE = 0x8FFC0000
+CONFIG_SYS_TEXT_BASE = 0x8FFC0000

diff --git a/board/ms7722se/config.mk b/board/ms7722se/config.mk
index 4797d6f..3f1606b 100644 (file)
--- a/board/ms7722se/config.mk
+++ b/board/ms7722se/config.mk
@@ -23,9 +23,9 @@
 # MA 02111-1307 USA
 
 #
 # MA 02111-1307 USA
 
 #

-# TEXT_BASE refers to image _after_ relocation.
+# CONFIG_SYS_TEXT_BASE refers to image _after_ relocation.

 #
 # NOTE: Must match value used in u-boot.lds (in this directory).
 #
 
 #
 # NOTE: Must match value used in u-boot.lds (in this directory).
 #
 

-TEXT_BASE = 0x8FFC0000
+CONFIG_SYS_TEXT_BASE = 0x8FFC0000

diff --git a/board/ms7750se/config.mk b/board/ms7750se/config.mk
index 1eed580..ba4d155 100644 (file)
--- a/board/ms7750se/config.mk
+++ b/board/ms7750se/config.mk
@@ -20,4 +20,4 @@
 #
 # NOTE: Must match value used in u-boot.lds (in this directory).
 #
 #
 # NOTE: Must match value used in u-boot.lds (in this directory).
 #

-TEXT_BASE = 0x8FFC0000
+CONFIG_SYS_TEXT_BASE = 0x8FFC0000

diff --git a/board/muas3001/config.mk b/board/muas3001/config.mk
index cdd0ec9..857435e 100644 (file)
--- a/board/muas3001/config.mk
+++ b/board/muas3001/config.mk
@@ -21,4 +21,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xFF000000
+CONFIG_SYS_TEXT_BASE = 0xFF000000

diff --git a/board/munices/config.mk b/board/munices/config.mk
index 1b573bc..9dcc241 100644 (file)
--- a/board/munices/config.mk
+++ b/board/munices/config.mk
@@ -24,15 +24,16 @@
 #
 # MUNICes board:
 #
 #
 # MUNICes board:
 #

-#      Valid values for TEXT_BASE are:
+#      Valid values for CONFIG_SYS_TEXT_BASE are:

 #
 #      0xFFF00000   boot high (standard configuration)
 #
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 #
 #      0xFFF00000   boot high (standard configuration)
 #
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
-TEXT_BASE = 0xFFF00000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 endif
 
 endif
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/musenki/config.mk b/board/musenki/config.mk
index 18673e1..721dd19 100644 (file)
--- a/board/musenki/config.mk
+++ b/board/musenki/config.mk
@@ -25,6 +25,6 @@
 # CU824 board
 #
 
 # CU824 board
 #
 

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)

diff --git a/board/mvblue/config.mk b/board/mvblue/config.mk
index 6e0ce4e..5db48c2 100644 (file)
--- a/board/mvblue/config.mk
+++ b/board/mvblue/config.mk
@@ -21,6 +21,6 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)

diff --git a/board/mx1ads/config.mk b/board/mx1ads/config.mk
index f6ac40d..2bc5b15 100644 (file)
--- a/board/mx1ads/config.mk
+++ b/board/mx1ads/config.mk
@@ -22,4 +22,4 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 

-TEXT_BASE = 0x08400000
+CONFIG_SYS_TEXT_BASE = 0x08400000

diff --git a/board/mx1ads/lowlevel_init.S b/board/mx1ads/lowlevel_init.S
index 6967fb2..a7400b3 100644 (file)
--- a/board/mx1ads/lowlevel_init.S
+++ b/board/mx1ads/lowlevel_init.S
@@ -31,7 +31,7 @@
 
 
 _TEXT_BASE:
 
 
 _TEXT_BASE:

-       .word   TEXT_BASE
+       .word   CONFIG_SYS_TEXT_BASE

 
 .globl lowlevel_init
 lowlevel_init:
 
 .globl lowlevel_init
 lowlevel_init:

diff --git a/board/mx1fs2/config.mk b/board/mx1fs2/config.mk
index 59ab542..eb4d046 100644 (file)
--- a/board/mx1fs2/config.mk
+++ b/board/mx1fs2/config.mk
@@ -1,10 +1,10 @@
 #
 # This config file is used for compilation of IMX sources
 #
 #
 # This config file is used for compilation of IMX sources
 #

-# You might change location of U-Boot in memory by setting right TEXT_BASE.
+# You might change location of U-Boot in memory by setting right CONFIG_SYS_TEXT_BASE.

 # This allows for example having one copy located at the end of ram and stored
 # in flash device and later on while developing use other location to test
 # the code in RAM device only.
 #
 
 # This allows for example having one copy located at the end of ram and stored
 # in flash device and later on while developing use other location to test
 # the code in RAM device only.
 #
 

-TEXT_BASE = 0x08f00000
+CONFIG_SYS_TEXT_BASE = 0x08f00000

diff --git a/board/nc650/config.mk b/board/nc650/config.mk
index 9d9b892..3b457c2 100644 (file)
--- a/board/nc650/config.mk
+++ b/board/nc650/config.mk
@@ -26,4 +26,4 @@
 # NC650 board
 #
 
 # NC650 board
 #
 

-TEXT_BASE = 0x40700000
+CONFIG_SYS_TEXT_BASE = 0x40700000

diff --git a/board/netphone/config.mk b/board/netphone/config.mk
index 8497ebc..65a27fd 100644 (file)
--- a/board/netphone/config.mk
+++ b/board/netphone/config.mk
@@ -25,4 +25,4 @@
 # netVia Boards
 #
 
 # netVia Boards
 #
 

-TEXT_BASE = 0x40000000
+CONFIG_SYS_TEXT_BASE = 0x40000000

diff --git a/board/netstal/hcu4/config.mk b/board/netstal/hcu4/config.mk
index 580f18c..73ed7be 100644 (file)
--- a/board/netstal/hcu4/config.mk
+++ b/board/netstal/hcu4/config.mk
@@ -21,7 +21,7 @@
 # Netstal Maschinen AG: HCU4 boards
 #
 
 # Netstal Maschinen AG: HCU4 boards
 #
 

-TEXT_BASE = 0xFFFB0000
+CONFIG_SYS_TEXT_BASE = 0xFFFB0000

 
 ifeq ($(debug),1)
 PLATFORM_CPPFLAGS += -DDEBUG -g
 
 ifeq ($(debug),1)
 PLATFORM_CPPFLAGS += -DDEBUG -g

diff --git a/board/netstal/hcu5/config.mk b/board/netstal/hcu5/config.mk
index 51ddb76..a768544 100644 (file)
--- a/board/netstal/hcu5/config.mk
+++ b/board/netstal/hcu5/config.mk
@@ -21,7 +21,7 @@
 # Netstal Maschinen AG: HCU5 boards
 #
 
 # Netstal Maschinen AG: HCU5 boards
 #
 

-TEXT_BASE = 0xFFFB0000
+CONFIG_SYS_TEXT_BASE = 0xFFFB0000

 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 

diff --git a/board/netstal/mcu25/config.mk b/board/netstal/mcu25/config.mk
index f0f2ea1..b4a59d6 100644 (file)
--- a/board/netstal/mcu25/config.mk
+++ b/board/netstal/mcu25/config.mk
@@ -20,7 +20,7 @@
 #
 # Netstal Maschinen AG: MCU25 board
 #
 #
 # Netstal Maschinen AG: MCU25 board
 #

-TEXT_BASE = 0xFFFB0000
+CONFIG_SYS_TEXT_BASE = 0xFFFB0000

 
 ifeq ($(debug),1)
 PLATFORM_CPPFLAGS += -DDEBUG -g
 
 ifeq ($(debug),1)
 PLATFORM_CPPFLAGS += -DDEBUG -g

diff --git a/board/netstar/config.mk b/board/netstar/config.mk
index 8b73e97..9e1446e 100644 (file)
--- a/board/netstar/config.mk
+++ b/board/netstar/config.mk
@@ -3,9 +3,9 @@
 # entry 1000'8000 (mem base + reserved)
 #
 # We load ourself to internal RAM at 2001'2000
 # entry 1000'8000 (mem base + reserved)
 #
 # We load ourself to internal RAM at 2001'2000

-# Check map file when changing TEXT_BASE.
+# Check map file when changing CONFIG_SYS_TEXT_BASE.

 # Everything has fit into 192kB internal SRAM!
 #
 
 # Everything has fit into 192kB internal SRAM!
 #
 

-# XXX TEXT_BASE = 0x20012000
-TEXT_BASE = 0x13FC0000
+# XXX CONFIG_SYS_TEXT_BASE = 0x20012000
+CONFIG_SYS_TEXT_BASE = 0x13FC0000

diff --git a/board/netstar/setup.S b/board/netstar/setup.S
index 3c2d467..72e1811 100644 (file)
--- a/board/netstar/setup.S
+++ b/board/netstar/setup.S
@@ -27,7 +27,7 @@
 #include <version.h>
 
 _TEXT_BASE:
 #include <version.h>
 
 _TEXT_BASE:

-       .word   TEXT_BASE       /* SDRAM load addr from config.mk */
+       .word   CONFIG_SYS_TEXT_BASE    /* SDRAM load addr from config.mk */

 
 OMAP5910_LPG1_BASE:            .word 0xfffbd000
 OMAP5910_TIPB_SWITCHES_BASE:   .word 0xfffbc800
 
 OMAP5910_LPG1_BASE:            .word 0xfffbd000
 OMAP5910_TIPB_SWITCHES_BASE:   .word 0xfffbc800

diff --git a/board/netta/config.mk b/board/netta/config.mk
index 8497ebc..65a27fd 100644 (file)
--- a/board/netta/config.mk
+++ b/board/netta/config.mk
@@ -25,4 +25,4 @@
 # netVia Boards
 #
 
 # netVia Boards
 #
 

-TEXT_BASE = 0x40000000
+CONFIG_SYS_TEXT_BASE = 0x40000000

diff --git a/board/netta2/config.mk b/board/netta2/config.mk
index 8497ebc..65a27fd 100644 (file)
--- a/board/netta2/config.mk
+++ b/board/netta2/config.mk
@@ -25,4 +25,4 @@
 # netVia Boards
 #
 
 # netVia Boards
 #
 

-TEXT_BASE = 0x40000000
+CONFIG_SYS_TEXT_BASE = 0x40000000

diff --git a/board/netvia/config.mk b/board/netvia/config.mk
index 9dddaad..5b3600f 100644 (file)
--- a/board/netvia/config.mk
+++ b/board/netvia/config.mk
@@ -25,4 +25,4 @@
 # netVia Boards
 #
 
 # netVia Boards
 #
 

-TEXT_BASE = 0x40000000
+CONFIG_SYS_TEXT_BASE = 0x40000000

diff --git a/board/ns9750dev/config.mk b/board/ns9750dev/config.mk
index 6a22cee..e5d8702 100644 (file)
--- a/board/ns9750dev/config.mk
+++ b/board/ns9750dev/config.mk
@@ -13,4 +13,4 @@
 #
 
 
 #
 
 

-TEXT_BASE = 0x00780000
+CONFIG_SYS_TEXT_BASE = 0x00780000

diff --git a/board/ns9750dev/lowlevel_init.S b/board/ns9750dev/lowlevel_init.S
index 3a09786..ba5ff81 100644 (file)
--- a/board/ns9750dev/lowlevel_init.S
+++ b/board/ns9750dev/lowlevel_init.S
@@ -68,7 +68,7 @@
 .endm
 
 _TEXT_BASE:
 .endm
 
 _TEXT_BASE:

-       .word   TEXT_BASE       @ sdram load addr from config.mk
+       .word   CONFIG_SYS_TEXT_BASE    @ sdram load addr from config.mk

 _PHYS_FLASH:
        .word   PHYS_FLASH_1    @ real flash address (without mirroring)
 _CAS_LATENCY:
 _PHYS_FLASH:
        .word   PHYS_FLASH_1    @ real flash address (without mirroring)
 _CAS_LATENCY:

diff --git a/board/nx823/config.mk b/board/nx823/config.mk
index 3b3ea1e..1913b2e 100644 (file)
--- a/board/nx823/config.mk
+++ b/board/nx823/config.mk
@@ -25,4 +25,4 @@
 # Nexus boards
 #
 
 # Nexus boards
 #
 

-TEXT_BASE = 0x40000000
+CONFIG_SYS_TEXT_BASE = 0x40000000

diff --git a/board/o2dnt/config.mk b/board/o2dnt/config.mk
index b873376..a0dafed 100644 (file)
--- a/board/o2dnt/config.mk
+++ b/board/o2dnt/config.mk
@@ -22,6 +22,7 @@
 #
 
 # boot low for 16 MiB boards
 #
 
 # boot low for 16 MiB boards

-TEXT_BASE = 0xFF000000
+CONFIG_SYS_TEXT_BASE = 0xFF000000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/overo/config.mk b/board/overo/config.mk
index 59b651f..e7c471c 100644 (file)
--- a/board/overo/config.mk
+++ b/board/overo/config.mk
@@ -25,5 +25,4 @@
 # Linux-Kernel is expected to be at 8000'8000, entry 8000'8000
 # (mem base + reserved)
 
 # Linux-Kernel is expected to be at 8000'8000, entry 8000'8000
 # (mem base + reserved)
 

-# For use with external or internal boots.
-TEXT_BASE = 0x80008000
+CONFIG_SYS_TEXT_BASE = 0x80008000

diff --git a/board/oxc/config.mk b/board/oxc/config.mk
index 7a5bcfc..9a6a7f4 100644 (file)
--- a/board/oxc/config.mk
+++ b/board/oxc/config.mk
@@ -25,7 +25,7 @@
 # OXC boards
 #
 
 # OXC boards
 #
 

-#TEXT_BASE = 0x00090000
-TEXT_BASE = 0xFFF00000
+#CONFIG_SYS_TEXT_BASE = 0x00090000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)

diff --git a/board/pandora/config.mk b/board/pandora/config.mk
index 6b1f69a..0fab80c 100644 (file)
--- a/board/pandora/config.mk
+++ b/board/pandora/config.mk
@@ -30,4 +30,4 @@
 # (mem base + reserved)
 
 # For use with external or internal boots.
 # (mem base + reserved)
 
 # For use with external or internal boots.

-TEXT_BASE = 0x80e80000
+CONFIG_SYS_TEXT_BASE = 0x80e80000

diff --git a/board/pb1x00/README b/board/pb1x00/README
index b37ff36..b1e9494 100644 (file)
--- a/board/pb1x00/README
+++ b/board/pb1x00/README
@@ -26,7 +26,7 @@ boot loader delivered with board.
 
 NOTE! When you switch between the two boot flashes, the
 base addresses will be swapped.
 
 NOTE! When you switch between the two boot flashes, the
 base addresses will be swapped.

-Have this in mind when you compile u-boot. TEXT_BASE has
+Have this in mind when you compile u-boot. CONFIG_SYS_TEXT_BASE has

 to match the address where u-boot is located when you
 actually launch.
 
 to match the address where u-boot is located when you
 actually launch.
 

diff --git a/board/pb1x00/config.mk b/board/pb1x00/config.mk
index 396a045..6f3dc08 100644 (file)
--- a/board/pb1x00/config.mk
+++ b/board/pb1x00/config.mk
@@ -26,7 +26,7 @@
 #
 
 # ROM version
 #
 
 # ROM version

-#TEXT_BASE = 0xbfc00000
+#CONFIG_SYS_TEXT_BASE = 0xbfc00000

 
 # SDRAM version
 
 # SDRAM version

-TEXT_BASE = 0x83800000
+CONFIG_SYS_TEXT_BASE = 0x83800000

diff --git a/board/pcippc2/config.mk b/board/pcippc2/config.mk
index 92d37c9..07c910d 100644 (file)
--- a/board/pcippc2/config.mk
+++ b/board/pcippc2/config.mk
@@ -25,6 +25,6 @@
 # PCIPPC-2 boards
 #
 
 # PCIPPC-2 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)

diff --git a/board/pcs440ep/config.mk b/board/pcs440ep/config.mk
index 0844e98..4dedfaa 100644 (file)
--- a/board/pcs440ep/config.mk
+++ b/board/pcs440ep/config.mk
@@ -28,12 +28,12 @@
 # Check the U-Boot Image with a SHA1 checksum
 ALL += $(obj)u-boot.sha1
 
 # Check the U-Boot Image with a SHA1 checksum
 ALL += $(obj)u-boot.sha1
 

-#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 = 0xFFFA0000
+CONFIG_SYS_TEXT_BASE = 0xFFFA0000

 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1

diff --git a/board/pdm360ng/config.mk b/board/pdm360ng/config.mk
index c3b07dd..a1f2b5a 100644 (file)
--- a/board/pdm360ng/config.mk
+++ b/board/pdm360ng/config.mk
@@ -21,4 +21,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xF0000000
+CONFIG_SYS_TEXT_BASE = 0xF0000000

diff --git a/board/phytec/pcm030/config.mk b/board/phytec/pcm030/config.mk
index 92fecc6..73bb0c1 100644 (file)
--- a/board/phytec/pcm030/config.mk
+++ b/board/phytec/pcm030/config.mk
@@ -24,7 +24,7 @@
 #
 # phyCORE-MPC5200B tiny board:
 #
 #
 # phyCORE-MPC5200B tiny board:
 #

-#      Valid values for TEXT_BASE are:
+#      Valid values for CONFIG_SYS_TEXT_BASE are:

 #
 #      0xFFF00000   boot high (standard configuration)
 #      0xFF000000   boot low
 #
 #      0xFFF00000   boot high (standard configuration)
 #      0xFF000000   boot low


@@ -33,9 +33,10 @@
 
 sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
+ifndef CONFIG_SYS_TEXT_BASE

 ## Standard: boot high
 ## Standard: boot high

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 endif
 
 endif
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/pleb2/config.mk b/board/pleb2/config.mk
index 6958a63..079f58e 100644 (file)
--- a/board/pleb2/config.mk
+++ b/board/pleb2/config.mk
@@ -1,3 +1,3 @@
-TEXT_BASE =  0xa1F80000
-#TEXT_BASE = 0xa3080000
-#TEXT_BASE = 0
+CONFIG_SYS_TEXT_BASE =  0xa1F80000
+#CONFIG_SYS_TEXT_BASE = 0xa3080000
+#CONFIG_SYS_TEXT_BASE = 0

diff --git a/board/pm520/config.mk b/board/pm520/config.mk
index ad689f3..55cf027 100644 (file)
--- a/board/pm520/config.mk
+++ b/board/pm520/config.mk
@@ -25,7 +25,8 @@
 # PM520 board
 #
 
 # PM520 board
 #
 

-TEXT_BASE = 0xfff00000
-# TEXT_BASE = 0x00100000
+CONFIG_SYS_TEXT_BASE = 0xfff00000
+# 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

diff --git a/board/pm826/config.mk b/board/pm826/config.mk
index 48ac299..d1c7c70 100644 (file)
--- a/board/pm826/config.mk
+++ b/board/pm826/config.mk
@@ -28,10 +28,11 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
+ifndef CONFIG_SYS_TEXT_BASE

 ## Standard: boot 64-bit flash
 ## Standard: boot 64-bit flash

-TEXT_BASE = 0xFF000000
+CONFIG_SYS_TEXT_BASE = 0xFF000000

 
 endif
 
 
 endif
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)

diff --git a/board/pm828/config.mk b/board/pm828/config.mk
index 6288431..66b6dcb 100644 (file)
--- a/board/pm828/config.mk
+++ b/board/pm828/config.mk
@@ -28,10 +28,11 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
+ifndef CONFIG_SYS_TEXT_BASE

 ## Standard: boot 64-bit flash
 ## Standard: boot 64-bit flash

-TEXT_BASE = 0x40000000
+CONFIG_SYS_TEXT_BASE = 0x40000000

 
 endif
 
 
 endif
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)

diff --git a/board/pm854/config.mk b/board/pm854/config.mk
index 0b28f4e..92e6276 100644 (file)
--- a/board/pm854/config.mk
+++ b/board/pm854/config.mk
@@ -26,4 +26,4 @@
 # default CCARBAR is at 0xff700000
 # assume U-Boot is less than 0.5MB
 #
 # default CCARBAR is at 0xff700000
 # assume U-Boot is less than 0.5MB
 #

-TEXT_BASE = 0xfff80000
+CONFIG_SYS_TEXT_BASE = 0xfff80000

diff --git a/board/pm856/config.mk b/board/pm856/config.mk
index 8229305..25adde5 100644 (file)
--- a/board/pm856/config.mk
+++ b/board/pm856/config.mk
@@ -26,4 +26,4 @@
 # default CCARBAR is at 0xff700000
 # assume U-Boot is less than 0.5MB
 #
 # default CCARBAR is at 0xff700000
 # assume U-Boot is less than 0.5MB
 #

-TEXT_BASE = 0xfff80000
+CONFIG_SYS_TEXT_BASE = 0xfff80000

diff --git a/board/pn62/config.mk b/board/pn62/config.mk
index a2b6f05..637deea 100644 (file)
--- a/board/pn62/config.mk
+++ b/board/pn62/config.mk
@@ -25,6 +25,6 @@
 # PN62 boards
 #
 
 # PN62 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)

diff --git a/board/ppmc7xx/config.mk b/board/ppmc7xx/config.mk
index b5b46dc..7b65ed7 100644 (file)
--- a/board/ppmc7xx/config.mk
+++ b/board/ppmc7xx/config.mk
@@ -23,6 +23,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 TEXT_END  = 0xFFF40000
 TEXT_END  = 0xFFF40000

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)

diff --git a/board/ppmc8260/config.mk b/board/ppmc8260/config.mk
index d06fcea..537c2d8 100644 (file)
--- a/board/ppmc8260/config.mk
+++ b/board/ppmc8260/config.mk
@@ -29,6 +29,7 @@
 # MBX8xx boards
 #
 
 # MBX8xx boards
 #
 

-TEXT_BASE = 0xfe000000
+CONFIG_SYS_TEXT_BASE = 0xfe000000

 TEXT_END  = 0xfe080000
 TEXT_END  = 0xfe080000

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/prodrive/alpr/config.mk b/board/prodrive/alpr/config.mk
index b62e776..06c519a 100644 (file)
--- a/board/prodrive/alpr/config.mk
+++ b/board/prodrive/alpr/config.mk
@@ -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
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1

diff --git a/board/prodrive/p3mx/config.mk b/board/prodrive/p3mx/config.mk
index 35bf1c1..475438b 100644 (file)
--- a/board/prodrive/p3mx/config.mk
+++ b/board/prodrive/p3mx/config.mk
@@ -25,4 +25,4 @@
 # p3mx boards (P3M750 & P3M7448)
 #
 
 # p3mx boards (P3M750 & P3M7448)
 #
 

-TEXT_BASE = 0xfff00000
+CONFIG_SYS_TEXT_BASE = 0xfff00000

diff --git a/board/prodrive/p3p440/config.mk b/board/prodrive/p3p440/config.mk
index 60d3bf4..0b628cf 100644 (file)
--- a/board/prodrive/p3p440/config.mk
+++ b/board/prodrive/p3p440/config.mk
@@ -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
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1

diff --git a/board/prodrive/pdnb3/config.mk b/board/prodrive/pdnb3/config.mk
index 51dee86..817541f 100644 (file)
--- a/board/prodrive/pdnb3/config.mk
+++ b/board/prodrive/pdnb3/config.mk
@@ -1,2 +1,2 @@
 #
 #

-TEXT_BASE = 0x01f00000
+CONFIG_SYS_TEXT_BASE = 0x01f00000

diff --git a/board/psyent/pci5441/config.mk b/board/psyent/pci5441/config.mk
index d72bcee..863a4cb 100644 (file)
--- a/board/psyent/pci5441/config.mk
+++ b/board/psyent/pci5441/config.mk
@@ -21,7 +21,7 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0x018e0000
+CONFIG_SYS_TEXT_BASE = 0x018e0000

 
 PLATFORM_CPPFLAGS += -mno-hw-div -mno-hw-mul
 PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(VENDOR)/include
 
 PLATFORM_CPPFLAGS += -mno-hw-div -mno-hw-mul
 PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(VENDOR)/include

diff --git a/board/psyent/pk1c20/config.mk b/board/psyent/pk1c20/config.mk
index d65780d..3913a24 100644 (file)
--- a/board/psyent/pk1c20/config.mk
+++ b/board/psyent/pk1c20/config.mk
@@ -21,7 +21,7 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0x01fc0000
+CONFIG_SYS_TEXT_BASE = 0x01fc0000

 
 PLATFORM_CPPFLAGS += -mno-hw-div -mno-hw-mul
 PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(VENDOR)/include
 
 PLATFORM_CPPFLAGS += -mno-hw-div -mno-hw-mul
 PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(VENDOR)/include

diff --git a/board/purple/config.mk b/board/purple/config.mk
index ea478ed..404c3fb 100644 (file)
--- a/board/purple/config.mk
+++ b/board/purple/config.mk
@@ -26,7 +26,7 @@
 #
 
 # ROM version
 #
 
 # ROM version

-TEXT_BASE = 0xB0000000
+CONFIG_SYS_TEXT_BASE = 0xB0000000

 
 # RAM version
 
 # RAM version

-#TEXT_BASE = 0x80100000
+#CONFIG_SYS_TEXT_BASE = 0x80100000

diff --git a/board/purple/purple.c b/board/purple/purple.c
index 54bef65..4e9e700 100644 (file)
--- a/board/purple/purple.c
+++ b/board/purple/purple.c
@@ -222,10 +222,10 @@ static void programLoad(void)
        FUNCPTR absEntry;
        ulong *src,*dst;
 
        FUNCPTR absEntry;
        ulong *src,*dst;
 

-       src = (ulong *)(TEXT_BASE + 0x428);
+       src = (ulong *)(CONFIG_SYS_TEXT_BASE + 0x428);

        dst = (ulong *)0xbf0081d0;
 
        dst = (ulong *)0xbf0081d0;
 

-       absEntry = (FUNCPTR)(TEXT_BASE + 0x400);
+       absEntry = (FUNCPTR)(CONFIG_SYS_TEXT_BASE + 0x400);

        absEntry(src,dst,0x6);
 
        src = (ulong *)((ulong)copydwords & 0xfffffff8);
        absEntry(src,dst,0x6);
 
        src = (ulong *)((ulong)copydwords & 0xfffffff8);

diff --git a/board/pxa255_idp/config.mk b/board/pxa255_idp/config.mk
index 55c8b27..f30f695 100644 (file)
--- a/board/pxa255_idp/config.mk
+++ b/board/pxa255_idp/config.mk
@@ -1,3 +1,3 @@
-#TEXT_BASE = 0xa1700000
-TEXT_BASE = 0xa3080000
-#TEXT_BASE = 0
+#CONFIG_SYS_TEXT_BASE = 0xa1700000
+CONFIG_SYS_TEXT_BASE = 0xa3080000
+#CONFIG_SYS_TEXT_BASE = 0

diff --git a/board/qemu-mips/config.mk b/board/qemu-mips/config.mk
index 4d4078a..27cd34a 100644 (file)
--- a/board/qemu-mips/config.mk
+++ b/board/qemu-mips/config.mk
@@ -4,7 +4,7 @@
 #
 
 # ROM version
 #
 
 # ROM version

-TEXT_BASE = 0xbfc00000
+CONFIG_SYS_TEXT_BASE = 0xbfc00000

 
 # RAM version
 
 # RAM version

-#TEXT_BASE = 0x80001000
+#CONFIG_SYS_TEXT_BASE = 0x80001000

diff --git a/board/quad100hd/config.mk b/board/quad100hd/config.mk
index 1bdf5e4..1646d34 100644 (file)
--- a/board/quad100hd/config.mk
+++ b/board/quad100hd/config.mk
@@ -21,4 +21,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xFFFC0000
+CONFIG_SYS_TEXT_BASE = 0xFFFC0000

diff --git a/board/quantum/config.mk b/board/quantum/config.mk
index 7cb374e..b583a70 100644 (file)
--- a/board/quantum/config.mk
+++ b/board/quantum/config.mk
@@ -25,4 +25,4 @@
 # RMU boards
 #
 
 # RMU boards
 #
 

-TEXT_BASE = 0xfff00000
+CONFIG_SYS_TEXT_BASE = 0xfff00000

diff --git a/board/r360mpi/config.mk b/board/r360mpi/config.mk
index 9d6080b..017dc83 100644 (file)
--- a/board/r360mpi/config.mk
+++ b/board/r360mpi/config.mk
@@ -25,4 +25,4 @@
 # TQM8xxL boards
 #
 
 # TQM8xxL boards
 #
 

-TEXT_BASE = 0x40000000
+CONFIG_SYS_TEXT_BASE = 0x40000000

diff --git a/board/rattler/config.mk b/board/rattler/config.mk
index 5fca8c7..7a83dba 100644 (file)
--- a/board/rattler/config.mk
+++ b/board/rattler/config.mk
@@ -27,4 +27,4 @@
 # Rattler series boards by Analogue & Micro
 #
 
 # Rattler series boards by Analogue & Micro
 #
 

-TEXT_BASE = 0xFE000000
+CONFIG_SYS_TEXT_BASE = 0xFE000000

diff --git a/board/rbc823/config.mk b/board/rbc823/config.mk
index 199ea3c..05be776 100644 (file)
--- a/board/rbc823/config.mk
+++ b/board/rbc823/config.mk
@@ -25,4 +25,4 @@
 # RBC823 boards
 #
 
 # RBC823 boards
 #
 

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

diff --git a/board/renesas/MigoR/config.mk b/board/renesas/MigoR/config.mk
index 2c5085a..ffe954c 100644 (file)
--- a/board/renesas/MigoR/config.mk
+++ b/board/renesas/MigoR/config.mk
@@ -23,9 +23,9 @@
 # MA 02111-1307 USA
 
 #
 # MA 02111-1307 USA
 
 #

-# TEXT_BASE refers to image _after_ relocation.
+# CONFIG_SYS_TEXT_BASE refers to image _after_ relocation.

 #
 # NOTE: Must match value used in u-boot.lds (in this directory).
 #
 
 #
 # NOTE: Must match value used in u-boot.lds (in this directory).
 #
 

-TEXT_BASE = 0x8FFC0000
+CONFIG_SYS_TEXT_BASE = 0x8FFC0000

diff --git a/board/renesas/ap325rxa/config.mk b/board/renesas/ap325rxa/config.mk
index b52a5e5..f572afd 100644 (file)
--- a/board/renesas/ap325rxa/config.mk
+++ b/board/renesas/ap325rxa/config.mk
@@ -18,9 +18,9 @@
 # MA 02111-1307 USA
 
 #
 # MA 02111-1307 USA
 
 #

-# TEXT_BASE refers to image _after_ relocation.
+# CONFIG_SYS_TEXT_BASE refers to image _after_ relocation.

 #
 # NOTE: Must match value used in u-boot.lds (in this directory).
 #
 
 #
 # NOTE: Must match value used in u-boot.lds (in this directory).
 #
 

-TEXT_BASE = 0x8FFC0000
+CONFIG_SYS_TEXT_BASE = 0x8FFC0000

diff --git a/board/renesas/r2dplus/config.mk b/board/renesas/r2dplus/config.mk
index 1ec7dcc..55163b9 100644 (file)
--- a/board/renesas/r2dplus/config.mk
+++ b/board/renesas/r2dplus/config.mk
@@ -20,4 +20,4 @@
 #
 # NOTE: Must match value used in u-boot.lds (in this directory).
 #
 #
 # NOTE: Must match value used in u-boot.lds (in this directory).
 #

-TEXT_BASE = 0x0FFC0000
+CONFIG_SYS_TEXT_BASE = 0x0FFC0000

diff --git a/board/renesas/r7780mp/config.mk b/board/renesas/r7780mp/config.mk
index 6a045a1..70ee3fd 100644 (file)
--- a/board/renesas/r7780mp/config.mk
+++ b/board/renesas/r7780mp/config.mk
@@ -19,9 +19,9 @@
 # MA 02111-1307 USA
 
 #
 # MA 02111-1307 USA
 
 #

-# TEXT_BASE refers to image _after_ relocation.
+# CONFIG_SYS_TEXT_BASE refers to image _after_ relocation.

 #
 # NOTE: Must match value used in u-boot.lds (in this directory).
 #
 
 #
 # NOTE: Must match value used in u-boot.lds (in this directory).
 #
 

-TEXT_BASE = 0x0FFC0000
+CONFIG_SYS_TEXT_BASE = 0x0FFC0000

diff --git a/board/renesas/rsk7203/config.mk b/board/renesas/rsk7203/config.mk
index 61aa51f..5b533f6 100644 (file)
--- a/board/renesas/rsk7203/config.mk
+++ b/board/renesas/rsk7203/config.mk
@@ -20,9 +20,9 @@
 # MA 02111-1307 USA
 
 #
 # MA 02111-1307 USA
 
 #

-# TEXT_BASE refers to image _after_ relocation.
+# CONFIG_SYS_TEXT_BASE refers to image _after_ relocation.

 #
 # NOTE: Must match value used in u-boot.lds (in this directory).
 #
 
 #
 # NOTE: Must match value used in u-boot.lds (in this directory).
 #
 

-TEXT_BASE = 0x0C7C0000
+CONFIG_SYS_TEXT_BASE = 0x0C7C0000

diff --git a/board/renesas/sh7763rdp/config.mk b/board/renesas/sh7763rdp/config.mk
index c52dbfd..54c1a5b 100644 (file)
--- a/board/renesas/sh7763rdp/config.mk
+++ b/board/renesas/sh7763rdp/config.mk
@@ -1,11 +1,11 @@
 #
 # board/sh7763rdp/config.mk
 #
 #
 # board/sh7763rdp/config.mk
 #

-# TEXT_BASE refers to image _after_ relocation.
+# CONFIG_SYS_TEXT_BASE refers to image _after_ relocation.

 #
 # NOTE: Must match value used in u-boot.lds (in this directory).
 #
 
 #
 # NOTE: Must match value used in u-boot.lds (in this directory).
 #
 

-TEXT_BASE = 0x8FFC0000
+CONFIG_SYS_TEXT_BASE = 0x8FFC0000

 
 # PLATFORM_CPPFLAGS += -DCONFIG_MULTIBOOT
 
 # PLATFORM_CPPFLAGS += -DCONFIG_MULTIBOOT

diff --git a/board/renesas/sh7785lcr/config.mk b/board/renesas/sh7785lcr/config.mk
index 66d35cb..1a9038c 100644 (file)
--- a/board/renesas/sh7785lcr/config.mk
+++ b/board/renesas/sh7785lcr/config.mk
@@ -18,12 +18,12 @@
 # MA 02111-1307 USA
 
 #
 # MA 02111-1307 USA
 
 #

-# TEXT_BASE refers to image _after_ relocation.
+# CONFIG_SYS_TEXT_BASE refers to image _after_ relocation.

 #
 # NOTE: Must match value used in u-boot.lds (in this directory).
 #
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 #
 # NOTE: Must match value used in u-boot.lds (in this directory).
 #
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
-TEXT_BASE = 0x0ff80000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0x0ff80000

 endif
 endif

diff --git a/board/rmu/config.mk b/board/rmu/config.mk
index 7cb374e..b583a70 100644 (file)
--- a/board/rmu/config.mk
+++ b/board/rmu/config.mk
@@ -25,4 +25,4 @@
 # RMU boards
 #
 
 # RMU boards
 #
 

-TEXT_BASE = 0xfff00000
+CONFIG_SYS_TEXT_BASE = 0xfff00000

diff --git a/board/ronetix/pm9261/config.mk b/board/ronetix/pm9261/config.mk
index 7185419..975522a 100644 (file)
--- a/board/ronetix/pm9261/config.mk
+++ b/board/ronetix/pm9261/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x23f00000
\ No newline at end of file
+CONFIG_SYS_TEXT_BASE = 0x23f00000
\ No newline at end of file

diff --git a/board/ronetix/pm9263/config.mk b/board/ronetix/pm9263/config.mk
index ff2cfd1..e554a45 100644 (file)
--- a/board/ronetix/pm9263/config.mk
+++ b/board/ronetix/pm9263/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x23f00000
+CONFIG_SYS_TEXT_BASE = 0x23f00000

diff --git a/board/ronetix/pm9g45/config.mk b/board/ronetix/pm9g45/config.mk
index 7fe9d03..9d3c5ae 100644 (file)
--- a/board/ronetix/pm9g45/config.mk
+++ b/board/ronetix/pm9g45/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x73f00000
+CONFIG_SYS_TEXT_BASE = 0x73f00000

diff --git a/board/rpxsuper/config.mk b/board/rpxsuper/config.mk
index 4b8c5d3..705a5ac 100644 (file)
--- a/board/rpxsuper/config.mk
+++ b/board/rpxsuper/config.mk
@@ -29,6 +29,7 @@
 # MBX8xx boards
 #
 
 # MBX8xx boards
 #
 

-TEXT_BASE = 0x80F00000
+CONFIG_SYS_TEXT_BASE = 0x80F00000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/rsdproto/config.mk b/board/rsdproto/config.mk
index 35c3d8c..f52d545 100644 (file)
--- a/board/rsdproto/config.mk
+++ b/board/rsdproto/config.mk
@@ -29,7 +29,7 @@
 # MBX8xx boards
 #
 
 # MBX8xx boards
 #
 

-TEXT_BASE = 0xff000000
-/*TEXT_BASE  = 0x00200000 */
+CONFIG_SYS_TEXT_BASE = 0xff000000
+/*CONFIG_SYS_TEXT_BASE  = 0x00200000 */

 
 LDSCRIPT := $(SRCTREE)/board/rsdproto/u-boot.lds
 
 LDSCRIPT := $(SRCTREE)/board/rsdproto/u-boot.lds

diff --git a/board/sacsng/config.mk b/board/sacsng/config.mk
index 220b218..c33543d 100644 (file)
--- a/board/sacsng/config.mk
+++ b/board/sacsng/config.mk
@@ -29,6 +29,7 @@
 # 82xx boards
 #
 
 # 82xx boards
 #
 

-TEXT_BASE = 0x40000000
+CONFIG_SYS_TEXT_BASE = 0x40000000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/samsung/goni/config.mk b/board/samsung/goni/config.mk
index 0e9dd45..e4581ca 100644 (file)
--- a/board/samsung/goni/config.mk
+++ b/board/samsung/goni/config.mk
@@ -31,4 +31,4 @@
 # 0x30000000 to 0x35000000 (80MiB)
 # 0x40000000 to 0x50000000 (256MiB)
 #
 # 0x30000000 to 0x35000000 (80MiB)
 # 0x40000000 to 0x50000000 (256MiB)
 #

-TEXT_BASE = 0x34800000
+CONFIG_SYS_TEXT_BASE = 0x34800000

diff --git a/board/samsung/goni/lowlevel_init.S b/board/samsung/goni/lowlevel_init.S
index 62737ab..30a5835 100644 (file)
--- a/board/samsung/goni/lowlevel_init.S
+++ b/board/samsung/goni/lowlevel_init.S
@@ -39,7 +39,7 @@
  */
 
 _TEXT_BASE:
  */
 
 _TEXT_BASE:

-       .word   TEXT_BASE
+       .word   CONFIG_SYS_TEXT_BASE

 
        .globl lowlevel_init
 lowlevel_init:
 
        .globl lowlevel_init
 lowlevel_init:

diff --git a/board/samsung/smdk2400/config.mk b/board/samsung/smdk2400/config.mk
index 4e019e3..4c27dc3 100644 (file)
--- a/board/samsung/smdk2400/config.mk
+++ b/board/samsung/smdk2400/config.mk
@@ -22,4 +22,4 @@
 #
 
 
 #
 
 

-TEXT_BASE = 0x0CF80000
+CONFIG_SYS_TEXT_BASE = 0x0CF80000

diff --git a/board/samsung/smdk2400/lowlevel_init.S b/board/samsung/smdk2400/lowlevel_init.S
index 9c808c0..c275c07 100644 (file)
--- a/board/samsung/smdk2400/lowlevel_init.S
+++ b/board/samsung/smdk2400/lowlevel_init.S
@@ -123,7 +123,7 @@
 
 
 _TEXT_BASE:
 
 
 _TEXT_BASE:

-       .word   TEXT_BASE
+       .word   CONFIG_SYS_TEXT_BASE

 
 .globl lowlevel_init
 lowlevel_init:
 
 .globl lowlevel_init
 lowlevel_init:

diff --git a/board/samsung/smdk2410/config.mk b/board/samsung/smdk2410/config.mk
index 3642b0a..c8d1b1f 100644 (file)
--- a/board/samsung/smdk2410/config.mk
+++ b/board/samsung/smdk2410/config.mk
@@ -22,4 +22,4 @@
 #
 
 
 #
 
 

-TEXT_BASE = 0x33F80000
+CONFIG_SYS_TEXT_BASE = 0x33F80000

diff --git a/board/samsung/smdk2410/lowlevel_init.S b/board/samsung/smdk2410/lowlevel_init.S
index ab6afdd..a2bf570 100644 (file)
--- a/board/samsung/smdk2410/lowlevel_init.S
+++ b/board/samsung/smdk2410/lowlevel_init.S
@@ -127,7 +127,7 @@
 /**************************************/
 
 _TEXT_BASE:
 /**************************************/
 
 _TEXT_BASE:

-       .word   TEXT_BASE
+       .word   CONFIG_SYS_TEXT_BASE

 
 .globl lowlevel_init
 lowlevel_init:
 
 .globl lowlevel_init
 lowlevel_init:

diff --git a/board/samsung/smdk6400/config.mk b/board/samsung/smdk6400/config.mk
index 4ab1d7e..90cbcf2 100644 (file)
--- a/board/samsung/smdk6400/config.mk
+++ b/board/samsung/smdk6400/config.mk
@@ -24,9 +24,9 @@
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 ifndef CONFIG_NAND_SPL
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 ifndef CONFIG_NAND_SPL

-TEXT_BASE = $(RAM_TEXT)
+CONFIG_SYS_TEXT_BASE = $(RAM_TEXT)

 else
 else

-TEXT_BASE = 0
+CONFIG_SYS_TEXT_BASE = 0

 endif
 
 LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot-nand.lds
 endif
 
 LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot-nand.lds

diff --git a/board/samsung/smdk6400/lowlevel_init.S b/board/samsung/smdk6400/lowlevel_init.S
index 30d8878..f7ce176 100644 (file)
--- a/board/samsung/smdk6400/lowlevel_init.S
+++ b/board/samsung/smdk6400/lowlevel_init.S
@@ -45,7 +45,7 @@
 #endif
 
 _TEXT_BASE:
 #endif
 
 _TEXT_BASE:

-       .word   TEXT_BASE
+       .word   CONFIG_SYS_TEXT_BASE

 
        .globl lowlevel_init
 lowlevel_init:
 
        .globl lowlevel_init
 lowlevel_init:

diff --git a/board/samsung/smdkc100/config.mk b/board/samsung/smdkc100/config.mk
index ebab420..3a08bb1 100644 (file)
--- a/board/samsung/smdkc100/config.mk
+++ b/board/samsung/smdkc100/config.mk
@@ -13,4 +13,4 @@
 # 0x30000000 to 0x35000000 (80MiB)
 # 0x40000000 to 0x48000000 (128MiB)
 #
 # 0x30000000 to 0x35000000 (80MiB)
 # 0x40000000 to 0x48000000 (128MiB)
 #

-TEXT_BASE = 0x34800000
+CONFIG_SYS_TEXT_BASE = 0x34800000

diff --git a/board/samsung/smdkc100/lowlevel_init.S b/board/samsung/smdkc100/lowlevel_init.S
index 30d0d06..6d18835 100644 (file)
--- a/board/samsung/smdkc100/lowlevel_init.S
+++ b/board/samsung/smdkc100/lowlevel_init.S
@@ -34,7 +34,7 @@
  */
 
 _TEXT_BASE:
  */
 
 _TEXT_BASE:

-       .word   TEXT_BASE
+       .word   CONFIG_SYS_TEXT_BASE

 
        .globl lowlevel_init
 lowlevel_init:
 
        .globl lowlevel_init
 lowlevel_init:

diff --git a/board/sandburst/karef/config.mk b/board/sandburst/karef/config.mk
index f2f94c5..46f5b24 100644 (file)
--- a/board/sandburst/karef/config.mk
+++ b/board/sandburst/karef/config.mk
@@ -27,9 +27,9 @@
 #
 
 ifeq ($(ramsym),1)
 #
 
 ifeq ($(ramsym),1)

-TEXT_BASE = 0x07FD0000
+CONFIG_SYS_TEXT_BASE = 0x07FD0000

 else
 else

-TEXT_BASE = 0xFFF80000
+CONFIG_SYS_TEXT_BASE = 0xFFF80000

 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1

diff --git a/board/sandburst/metrobox/config.mk b/board/sandburst/metrobox/config.mk
index 565e826..93bcdec 100644 (file)
--- a/board/sandburst/metrobox/config.mk
+++ b/board/sandburst/metrobox/config.mk
@@ -22,9 +22,9 @@
 #
 
 ifeq ($(ramsym),1)
 #
 
 ifeq ($(ramsym),1)

-TEXT_BASE = 0x07FD0000
+CONFIG_SYS_TEXT_BASE = 0x07FD0000

 else
 else

-TEXT_BASE = 0xFFF80000
+CONFIG_SYS_TEXT_BASE = 0xFFF80000

 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1

diff --git a/board/sandpoint/config.mk b/board/sandpoint/config.mk
index b3f65eb..4a316ce 100644 (file)
--- a/board/sandpoint/config.mk
+++ b/board/sandpoint/config.mk
@@ -25,7 +25,7 @@
 # Sandpoint boards
 #
 
 # Sandpoint boards
 #
 

-#TEXT_BASE = 0x00090000
-TEXT_BASE = 0xFFF00000
+#CONFIG_SYS_TEXT_BASE = 0x00090000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)

diff --git a/board/sbc2410x/config.mk b/board/sbc2410x/config.mk
index dc59d08..bc01a2d 100644 (file)
--- a/board/sbc2410x/config.mk
+++ b/board/sbc2410x/config.mk
@@ -20,4 +20,4 @@
 #
 # download area is 3300'0000
 
 #
 # download area is 3300'0000
 

-TEXT_BASE = 0x33F80000
+CONFIG_SYS_TEXT_BASE = 0x33F80000

diff --git a/board/sbc2410x/lowlevel_init.S b/board/sbc2410x/lowlevel_init.S
index 3df63cd..3de9166 100644 (file)
--- a/board/sbc2410x/lowlevel_init.S
+++ b/board/sbc2410x/lowlevel_init.S
@@ -123,7 +123,7 @@
 /**************************************/
 
 _TEXT_BASE:
 /**************************************/
 
 _TEXT_BASE:

-       .word   TEXT_BASE
+       .word   CONFIG_SYS_TEXT_BASE

 
 .globl lowlevel_init
 lowlevel_init:
 
 .globl lowlevel_init
 lowlevel_init:

diff --git a/board/sbc405/config.mk b/board/sbc405/config.mk
index bd57217..77bb9e4 100644 (file)
--- a/board/sbc405/config.mk
+++ b/board/sbc405/config.mk
@@ -25,4 +25,4 @@
 # Wind River sbc405 boards
 #
 
 # Wind River sbc405 boards
 #
 

-TEXT_BASE = 0xFFFC0000
+CONFIG_SYS_TEXT_BASE = 0xFFFC0000

diff --git a/board/sbc8240/config.mk b/board/sbc8240/config.mk
index 1e97960..84f4d5e 100644 (file)
--- a/board/sbc8240/config.mk
+++ b/board/sbc8240/config.mk
@@ -25,6 +25,6 @@
 # sbc8240 board
 #
 
 # sbc8240 board
 #
 

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)

diff --git a/board/sbc8260/config.mk b/board/sbc8260/config.mk
index 1f18260..b8b2a7a 100644 (file)
--- a/board/sbc8260/config.mk
+++ b/board/sbc8260/config.mk
@@ -29,6 +29,7 @@
 # MBX8xx boards
 #
 
 # MBX8xx boards
 #
 

-TEXT_BASE = 0x40000000
+CONFIG_SYS_TEXT_BASE = 0x40000000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/sbc8349/config.mk b/board/sbc8349/config.mk
index eacb27e..0a1e003 100644 (file)
--- a/board/sbc8349/config.mk
+++ b/board/sbc8349/config.mk
@@ -24,4 +24,4 @@
 # SBC8349E
 #
 
 # SBC8349E
 #
 

-TEXT_BASE  =   0xFF800000
+CONFIG_SYS_TEXT_BASE  =   0xFF800000

diff --git a/board/sbc8548/config.mk b/board/sbc8548/config.mk
index b2013d6..df6f92c 100644 (file)
--- a/board/sbc8548/config.mk
+++ b/board/sbc8548/config.mk
@@ -23,6 +23,6 @@
 #
 # sbc8548 board
 #
 #
 # sbc8548 board
 #

-ifndef TEXT_BASE
-TEXT_BASE = 0xfffa0000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xfffa0000

 endif
 endif

diff --git a/board/sbc8560/config.mk b/board/sbc8560/config.mk
index 995dada..4530192 100644 (file)
--- a/board/sbc8560/config.mk
+++ b/board/sbc8560/config.mk
@@ -27,4 +27,4 @@
 # default CCARBAR is at 0xff700000
 # assume U-Boot is less than 256K
 #
 # default CCARBAR is at 0xff700000
 # assume U-Boot is less than 256K
 #

-TEXT_BASE = 0xfffc0000
+CONFIG_SYS_TEXT_BASE = 0xfffc0000

diff --git a/board/sbc8641d/config.mk b/board/sbc8641d/config.mk
index d1456b9..37a777a 100644 (file)
--- a/board/sbc8641d/config.mk
+++ b/board/sbc8641d/config.mk
@@ -24,4 +24,4 @@
 # sbc8641 board
 # default CCSRBAR is at 0xff700000
 #
 # sbc8641 board
 # default CCSRBAR is at 0xff700000
 #

-TEXT_BASE = 0xfff00000
+CONFIG_SYS_TEXT_BASE = 0xfff00000

diff --git a/board/sc3/config.mk b/board/sc3/config.mk
index a46b197..e0ad623 100644 (file)
--- a/board/sc3/config.mk
+++ b/board/sc3/config.mk
@@ -21,4 +21,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xFFFA0000
+CONFIG_SYS_TEXT_BASE = 0xFFFA0000

diff --git a/board/scb9328/config.mk b/board/scb9328/config.mk
index 8d1d79a..7c5e067 100644 (file)
--- a/board/scb9328/config.mk
+++ b/board/scb9328/config.mk
@@ -1,10 +1,10 @@
 #
 # This config file is used for compilation of scb93328 sources
 #
 #
 # This config file is used for compilation of scb93328 sources
 #

-# You might change location of U-Boot in memory by setting right TEXT_BASE.
+# You might change location of U-Boot in memory by setting right CONFIG_SYS_TEXT_BASE.

 # This allows for example having one copy located at the end of ram and stored
 # in flash device and later on while developing use other location to test
 # the code in RAM device only.
 #
 
 # This allows for example having one copy located at the end of ram and stored
 # in flash device and later on while developing use other location to test
 # the code in RAM device only.
 #
 

-TEXT_BASE = 0x08f00000
+CONFIG_SYS_TEXT_BASE = 0x08f00000

diff --git a/board/shannon/config.mk b/board/shannon/config.mk
index ca45733..6afa2d3 100644 (file)
--- a/board/shannon/config.mk
+++ b/board/shannon/config.mk
@@ -20,4 +20,4 @@
 #
 
 
 #
 
 

-TEXT_BASE = 0xd8380000
+CONFIG_SYS_TEXT_BASE = 0xd8380000

diff --git a/board/sheldon/simpc8313/config.mk b/board/sheldon/simpc8313/config.mk
index ce1c0d8..7a8aa42 100644 (file)
--- a/board/sheldon/simpc8313/config.mk
+++ b/board/sheldon/simpc8313/config.mk
@@ -2,8 +2,8 @@ ifndef NAND_SPL
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 endif
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 endif
 

-ifndef TEXT_BASE
-TEXT_BASE = 0x00100000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0x00100000

 endif
 
 ifdef CONFIG_NAND_LP
 endif
 
 ifdef CONFIG_NAND_LP

diff --git a/board/siemens/IAD210/config.mk b/board/siemens/IAD210/config.mk
index c30abcb..2204f8d 100644 (file)
--- a/board/siemens/IAD210/config.mk
+++ b/board/siemens/IAD210/config.mk
@@ -29,5 +29,5 @@
 # iad210 boards
 #
 
 # iad210 boards
 #
 

-TEXT_BASE = 0x08000000
-/*TEXT_BASE  = 0x00200000 */
+CONFIG_SYS_TEXT_BASE = 0x08000000
+/*CONFIG_SYS_TEXT_BASE  = 0x00200000 */

diff --git a/board/siemens/SCM/config.mk b/board/siemens/SCM/config.mk
index 5d0898b..50446d3 100644 (file)
--- a/board/siemens/SCM/config.mk
+++ b/board/siemens/SCM/config.mk
@@ -29,6 +29,7 @@
 # for the "final" configuration, with U-Boot in flash, or the address
 # in RAM where U-Boot is loaded at for debugging.
 #
 # for the "final" configuration, with U-Boot in flash, or the address
 # in RAM where U-Boot is loaded at for debugging.
 #

-TEXT_BASE = 0x40000000
+CONFIG_SYS_TEXT_BASE = 0x40000000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)

diff --git a/board/siemens/SMN42/config.mk b/board/siemens/SMN42/config.mk
index b28f418..4891792 100644 (file)
--- a/board/siemens/SMN42/config.mk
+++ b/board/siemens/SMN42/config.mk
@@ -26,5 +26,5 @@
 #
 
 #address where u-boot will be relocated
 #
 
 #address where u-boot will be relocated

-#TEXT_BASE = 0x0
-TEXT_BASE = 0x81500000
+#CONFIG_SYS_TEXT_BASE = 0x0
+CONFIG_SYS_TEXT_BASE = 0x81500000

diff --git a/board/siemens/SMN42/lowlevel_init.S b/board/siemens/SMN42/lowlevel_init.S
index f13d9b9..44e209b 100644 (file)
--- a/board/siemens/SMN42/lowlevel_init.S
+++ b/board/siemens/SMN42/lowlevel_init.S
@@ -38,7 +38,7 @@
 #define   IO0_VALUE   0x4000C
 
 _TEXT_BASE:
 #define   IO0_VALUE   0x4000C
 
 _TEXT_BASE:

-       .word   TEXT_BASE
+       .word   CONFIG_SYS_TEXT_BASE

 MEMMAP_ADR:
        .word   MEMMAP
 BCFG0_ADR:
 MEMMAP_ADR:
        .word   MEMMAP
 BCFG0_ADR:

diff --git a/board/sixnet/config.mk b/board/sixnet/config.mk
index 0cd8f44..830f963 100644 (file)
--- a/board/sixnet/config.mk
+++ b/board/sixnet/config.mk
@@ -25,4 +25,4 @@
 # SIXNET boards
 #
 
 # SIXNET boards
 #
 

-TEXT_BASE = 0xF8000000
+CONFIG_SYS_TEXT_BASE = 0xF8000000

diff --git a/board/snmc/qs850/config.mk b/board/snmc/qs850/config.mk
index 905f692..30e3f25 100644 (file)
--- a/board/snmc/qs850/config.mk
+++ b/board/snmc/qs850/config.mk
@@ -26,4 +26,4 @@
 # Start address of Bootloader in Flash
 #
 
 # Start address of Bootloader in Flash
 #
 

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

diff --git a/board/snmc/qs860t/config.mk b/board/snmc/qs860t/config.mk
index f6ab260..96e497a 100644 (file)
--- a/board/snmc/qs860t/config.mk
+++ b/board/snmc/qs860t/config.mk
@@ -26,4 +26,4 @@
 # Start address of 512K Socketed Flash
 #
 
 # Start address of 512K Socketed Flash
 #
 

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

diff --git a/board/socrates/config.mk b/board/socrates/config.mk
index 7ea37b5..96f1ff3 100644 (file)
--- a/board/socrates/config.mk
+++ b/board/socrates/config.mk
@@ -26,4 +26,4 @@
 # socrates board
 # default CCARBAR is at 0xff700000
 #
 # socrates board
 # default CCARBAR is at 0xff700000
 #

-TEXT_BASE = 0xfff80000
+CONFIG_SYS_TEXT_BASE = 0xfff80000

diff --git a/board/sorcery/config.mk b/board/sorcery/config.mk
index 25de0b5..b159c65 100644 (file)
--- a/board/sorcery/config.mk
+++ b/board/sorcery/config.mk
@@ -25,5 +25,6 @@
 # sorcery board
 #
 
 # sorcery board
 #
 

-TEXT_BASE = 0xfff00000
-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+CONFIG_SYS_TEXT_BASE = 0xfff00000
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/spc1920/config.mk b/board/spc1920/config.mk
index 8dacc17..61e6fba 100644 (file)
--- a/board/spc1920/config.mk
+++ b/board/spc1920/config.mk
@@ -28,8 +28,8 @@
 # MPC885ADS boards
 #
 
 # MPC885ADS boards
 #
 

-#TEXT_BASE = 0xFE000000
-TEXT_BASE = 0xFFF00000
+#CONFIG_SYS_TEXT_BASE = 0xFE000000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/spc1920
 HOSTCFLAGS += -I$(TOPDIR)/board/spc1920
 HOST_ENVIRO_CFLAGS += -I$(TOPDIR)/board/spc1920
 PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/spc1920
 HOSTCFLAGS += -I$(TOPDIR)/board/spc1920
 HOST_ENVIRO_CFLAGS += -I$(TOPDIR)/board/spc1920

diff --git a/board/spd8xx/config.mk b/board/spd8xx/config.mk
index e1e0192..b6d5a19 100644 (file)
--- a/board/spd8xx/config.mk
+++ b/board/spd8xx/config.mk
@@ -26,4 +26,4 @@
 # SPD823TS boards
 #
 
 # SPD823TS boards
 #
 

-TEXT_BASE = 0xFF000000
+CONFIG_SYS_TEXT_BASE = 0xFF000000

diff --git a/board/spear/spear300/config.mk b/board/spear/spear300/config.mk
index 35646f2..11da2c3 100644 (file)
--- a/board/spear/spear300/config.mk
+++ b/board/spear/spear300/config.mk
@@ -23,7 +23,7 @@
 
 #########################################################################
 
 
 #########################################################################
 

-TEXT_BASE = 0x00700000
+CONFIG_SYS_TEXT_BASE = 0x00700000

 
 ALL += $(obj)u-boot.img
 
 
 ALL += $(obj)u-boot.img
 

diff --git a/board/spear/spear310/config.mk b/board/spear/spear310/config.mk
index cba8436..2b59c39 100644 (file)
--- a/board/spear/spear310/config.mk
+++ b/board/spear/spear310/config.mk
@@ -23,7 +23,7 @@
 
 #########################################################################
 
 
 #########################################################################
 

-TEXT_BASE = 0x00700000
+CONFIG_SYS_TEXT_BASE = 0x00700000

 
 ALL += $(obj)u-boot.img
 
 
 ALL += $(obj)u-boot.img
 

diff --git a/board/spear/spear320/config.mk b/board/spear/spear320/config.mk
index cba8436..2b59c39 100644 (file)
--- a/board/spear/spear320/config.mk
+++ b/board/spear/spear320/config.mk
@@ -23,7 +23,7 @@
 
 #########################################################################
 
 
 #########################################################################
 

-TEXT_BASE = 0x00700000
+CONFIG_SYS_TEXT_BASE = 0x00700000

 
 ALL += $(obj)u-boot.img
 
 
 ALL += $(obj)u-boot.img
 

diff --git a/board/spear/spear600/config.mk b/board/spear/spear600/config.mk
index 35646f2..11da2c3 100644 (file)
--- a/board/spear/spear600/config.mk
+++ b/board/spear/spear600/config.mk
@@ -23,7 +23,7 @@
 
 #########################################################################
 
 
 #########################################################################
 

-TEXT_BASE = 0x00700000
+CONFIG_SYS_TEXT_BASE = 0x00700000

 
 ALL += $(obj)u-boot.img
 
 
 ALL += $(obj)u-boot.img
 

diff --git a/board/st/nhk8815/config.mk b/board/st/nhk8815/config.mk
index 590393b..1789717 100644 (file)
--- a/board/st/nhk8815/config.mk
+++ b/board/st/nhk8815/config.mk
@@ -23,4 +23,4 @@
 # image should be loaded at 0x01000000
 #
 
 # image should be loaded at 0x01000000
 #
 

-TEXT_BASE = 0x03F80000
+CONFIG_SYS_TEXT_BASE = 0x03F80000

diff --git a/board/stx/stxgp3/config.mk b/board/stx/stxgp3/config.mk
index 47e44aa..4921ddc 100644 (file)
--- a/board/stx/stxgp3/config.mk
+++ b/board/stx/stxgp3/config.mk
@@ -26,4 +26,4 @@
 # default CCARBAR is at 0xff700000
 # assume U-Boot is less than 0.5MB
 #
 # default CCARBAR is at 0xff700000
 # assume U-Boot is less than 0.5MB
 #

-TEXT_BASE = 0xfff80000
+CONFIG_SYS_TEXT_BASE = 0xfff80000

diff --git a/board/stx/stxssa/config.mk b/board/stx/stxssa/config.mk
index 57fe5d6..b69ff6a 100644 (file)
--- a/board/stx/stxssa/config.mk
+++ b/board/stx/stxssa/config.mk
@@ -27,4 +27,4 @@
 # U-Boot is less than 256K, so push
 # it further up into the flash
 #
 # U-Boot is less than 256K, so push
 # it further up into the flash
 #

-TEXT_BASE = 0xFFFC0000
+CONFIG_SYS_TEXT_BASE = 0xFFFC0000

diff --git a/board/stx/stxxtc/config.mk b/board/stx/stxxtc/config.mk
index f5dc034..d7c8b02 100644 (file)
--- a/board/stx/stxxtc/config.mk
+++ b/board/stx/stxxtc/config.mk
@@ -25,4 +25,4 @@
 # STx XTc
 #
 
 # STx XTc
 #
 

-TEXT_BASE = 0x40F00000
+CONFIG_SYS_TEXT_BASE = 0x40F00000

diff --git a/board/svm_sc8xx/config.mk b/board/svm_sc8xx/config.mk
index 4bec9cb..11e2c26 100644 (file)
--- a/board/svm_sc8xx/config.mk
+++ b/board/svm_sc8xx/config.mk
@@ -21,4 +21,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0x40000000
+CONFIG_SYS_TEXT_BASE = 0x40000000

diff --git a/board/sx1/config.mk b/board/sx1/config.mk
index 4902e82..441bea2 100644 (file)
--- a/board/sx1/config.mk
+++ b/board/sx1/config.mk
@@ -16,4 +16,4 @@
 #
 #
 
 #
 #
 

-TEXT_BASE = 0x11080000
+CONFIG_SYS_TEXT_BASE = 0x11080000

diff --git a/board/sx1/lowlevel_init.S b/board/sx1/lowlevel_init.S
index bdf812e..c1a811a 100644 (file)
--- a/board/sx1/lowlevel_init.S
+++ b/board/sx1/lowlevel_init.S
@@ -37,7 +37,7 @@
 
 
 _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
 lowlevel_init:
 
 .globl lowlevel_init
 lowlevel_init:

diff --git a/board/syteco/jadecpu/config.mk b/board/syteco/jadecpu/config.mk
index 91994b0..617603d 100644 (file)
--- a/board/syteco/jadecpu/config.mk
+++ b/board/syteco/jadecpu/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x10000000
+CONFIG_SYS_TEXT_BASE = 0x10000000

diff --git a/board/t3corp/config.mk b/board/t3corp/config.mk
index 616aa19..640389e 100644 (file)
--- a/board/t3corp/config.mk
+++ b/board/t3corp/config.mk
@@ -24,8 +24,8 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
-TEXT_BASE = 0xFFFA0000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xFFFA0000

 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1

diff --git a/board/tb0229/config.mk b/board/tb0229/config.mk
index 9a50850..017511d 100644 (file)
--- a/board/tb0229/config.mk
+++ b/board/tb0229/config.mk
@@ -24,7 +24,7 @@
 #
 
 # ROM version
 #
 
 # ROM version

-TEXT_BASE = 0xBFC00000
+CONFIG_SYS_TEXT_BASE = 0xBFC00000

 
 # RAM version
 
 # RAM version

-#TEXT_BASE = 0x80400000
+#CONFIG_SYS_TEXT_BASE = 0x80400000

diff --git a/board/tcm-bf518/config.mk b/board/tcm-bf518/config.mk
index 30b92a3..9a54dbf 100644 (file)
--- a/board/tcm-bf518/config.mk
+++ b/board/tcm-bf518/config.mk
@@ -24,7 +24,7 @@
 #
 
 # This is not actually used for Blackfin boards so do not change it
 #
 
 # This is not actually used for Blackfin boards so do not change it

-#TEXT_BASE = do-not-use-me
+#CONFIG_SYS_TEXT_BASE = do-not-use-me

 
 CONFIG_BFIN_CPU = bf518-0.0
 
 
 CONFIG_BFIN_CPU = bf518-0.0
 

diff --git a/board/tcm-bf537/config.mk b/board/tcm-bf537/config.mk
index 1281da4..c5d45c7 100644 (file)
--- a/board/tcm-bf537/config.mk
+++ b/board/tcm-bf537/config.mk
@@ -24,7 +24,7 @@
 #
 
 # This is not actually used for Blackfin boards so do not change it
 #
 
 # This is not actually used for Blackfin boards so do not change it

-#TEXT_BASE = do-not-use-me
+#CONFIG_SYS_TEXT_BASE = do-not-use-me

 
 CONFIG_BFIN_CPU = bf537-0.2
 
 
 CONFIG_BFIN_CPU = bf537-0.2
 

diff --git a/board/ti/beagle/config.mk b/board/ti/beagle/config.mk
index 6fb10e3..cf055db 100644 (file)
--- a/board/ti/beagle/config.mk
+++ b/board/ti/beagle/config.mk
@@ -30,4 +30,4 @@
 # (mem base + reserved)
 
 # For use with external or internal boots.
 # (mem base + reserved)
 
 # For use with external or internal boots.

-TEXT_BASE = 0x80008000
+CONFIG_SYS_TEXT_BASE = 0x80008000

diff --git a/board/ti/evm/config.mk b/board/ti/evm/config.mk
index 4d873eb..b92d3b0 100644 (file)
--- a/board/ti/evm/config.mk
+++ b/board/ti/evm/config.mk
@@ -30,4 +30,4 @@
 # (mem base + reserved)
 
 # For use with external or internal boots.
 # (mem base + reserved)
 
 # For use with external or internal boots.

-TEXT_BASE = 0x80e80000
+CONFIG_SYS_TEXT_BASE = 0x80e80000

diff --git a/board/ti/omap1510inn/config.mk b/board/ti/omap1510inn/config.mk
index 9cd7424..67fe0bd 100644 (file)
--- a/board/ti/omap1510inn/config.mk
+++ b/board/ti/omap1510inn/config.mk
@@ -22,4 +22,4 @@
 #
 
 
 #
 
 

-TEXT_BASE = 0x11080000
+CONFIG_SYS_TEXT_BASE = 0x11080000

diff --git a/board/ti/omap1510inn/lowlevel_init.S b/board/ti/omap1510inn/lowlevel_init.S
index 1c68e5b..0e01841 100644 (file)
--- a/board/ti/omap1510inn/lowlevel_init.S
+++ b/board/ti/omap1510inn/lowlevel_init.S
@@ -37,7 +37,7 @@
 
 
 _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
 lowlevel_init:
 
 .globl lowlevel_init
 lowlevel_init:

diff --git a/board/ti/omap1610inn/config.mk b/board/ti/omap1610inn/config.mk
index 1c5b7b5..ee0aa0a 100644 (file)
--- a/board/ti/omap1610inn/config.mk
+++ b/board/ti/omap1610inn/config.mk
@@ -23,4 +23,4 @@
 #
 
 
 #
 
 

-TEXT_BASE = 0x11080000
+CONFIG_SYS_TEXT_BASE = 0x11080000

diff --git a/board/ti/omap1610inn/lowlevel_init.S b/board/ti/omap1610inn/lowlevel_init.S
index e4ed9f3..b376ba5 100644 (file)
--- a/board/ti/omap1610inn/lowlevel_init.S
+++ b/board/ti/omap1610inn/lowlevel_init.S
@@ -35,7 +35,7 @@
 
 
 _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
 lowlevel_init:
 
 .globl lowlevel_init
 lowlevel_init:

diff --git a/board/ti/omap2420h4/config.mk b/board/ti/omap2420h4/config.mk
index 3edcde0..ca5ebdf 100644 (file)
--- a/board/ti/omap2420h4/config.mk
+++ b/board/ti/omap2420h4/config.mk
@@ -14,15 +14,15 @@
 # (mem base + reserved)
 
 # For use with external or internal boots.
 # (mem base + reserved)
 
 # For use with external or internal boots.

-TEXT_BASE = 0x80e80000
+CONFIG_SYS_TEXT_BASE = 0x80e80000

 
 # Used with full SRAM boot.
 # This is either with a GP system or a signed boot image.
 # easiest, and safest way to go if you can.
 
 # Used with full SRAM boot.
 # This is either with a GP system or a signed boot image.
 # 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
-#TEXT_BASE = 0x08000000
-#TEXT_BASE = 0x04000000
+#CONFIG_SYS_TEXT_BASE = 0x0
+#CONFIG_SYS_TEXT_BASE = 0x08000000
+#CONFIG_SYS_TEXT_BASE = 0x04000000

diff --git a/board/ti/omap2420h4/lowlevel_init.S b/board/ti/omap2420h4/lowlevel_init.S
index 9752fc4..731c552 100644 (file)
--- a/board/ti/omap2420h4/lowlevel_init.S
+++ b/board/ti/omap2420h4/lowlevel_init.S
@@ -31,7 +31,7 @@
 #include <asm/arch/clocks.h>
 
 _TEXT_BASE:
 #include <asm/arch/clocks.h>
 
 _TEXT_BASE:

-       .word   TEXT_BASE       /* sdram load addr from config.mk */
+       .word   CONFIG_SYS_TEXT_BASE    /* sdram load addr from config.mk */

 
 /**************************************************************************
  * cpy_clk_code: relocates clock code into SRAM where its safer to execute
 
 /**************************************************************************
  * cpy_clk_code: relocates clock code into SRAM where its safer to execute

diff --git a/board/ti/omap5912osk/config.mk b/board/ti/omap5912osk/config.mk
index 5362a4f..0ed7d8a 100644 (file)
--- a/board/ti/omap5912osk/config.mk
+++ b/board/ti/omap5912osk/config.mk
@@ -27,4 +27,4 @@
 #
 
 
 #
 
 

-TEXT_BASE = 0x11080000
+CONFIG_SYS_TEXT_BASE = 0x11080000

diff --git a/board/ti/omap5912osk/lowlevel_init.S b/board/ti/omap5912osk/lowlevel_init.S
index 7bfdb26..e60161e 100644 (file)
--- a/board/ti/omap5912osk/lowlevel_init.S
+++ b/board/ti/omap5912osk/lowlevel_init.S
@@ -36,7 +36,7 @@
 
 
 _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
 lowlevel_init:
 
 .globl lowlevel_init
 lowlevel_init:

diff --git a/board/ti/omap730p2/config.mk b/board/ti/omap730p2/config.mk
index 6940320..8618820 100644 (file)
--- a/board/ti/omap730p2/config.mk
+++ b/board/ti/omap730p2/config.mk
@@ -22,4 +22,4 @@
 #
 #
 
 #
 #
 

-TEXT_BASE = 0x11080000
+CONFIG_SYS_TEXT_BASE = 0x11080000

diff --git a/board/ti/omap730p2/lowlevel_init.S b/board/ti/omap730p2/lowlevel_init.S
index d4e97a5..6c574f1 100644 (file)
--- a/board/ti/omap730p2/lowlevel_init.S
+++ b/board/ti/omap730p2/lowlevel_init.S
@@ -41,7 +41,7 @@
 #endif
 
 _TEXT_BASE:
 #endif
 
 _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
 lowlevel_init:
 
 .globl lowlevel_init
 lowlevel_init:

diff --git a/board/ti/panda/config.mk b/board/ti/panda/config.mk
index 7176c14..33901a7 100644 (file)
--- a/board/ti/panda/config.mk
+++ b/board/ti/panda/config.mk
@@ -27,4 +27,5 @@
 # 8000'0000 - 9fff'ffff (512 MB)
 # Linux-Kernel is expected to be at 8000'8000, entry 8000'8000
 # (mem base + reserved)
 # 8000'0000 - 9fff'ffff (512 MB)
 # Linux-Kernel is expected to be at 8000'8000, entry 8000'8000
 # (mem base + reserved)

-TEXT_BASE = 0x80e80000
+
+CONFIG_SYS_TEXT_BASE = 0x80e80000

diff --git a/board/ti/sdp3430/config.mk b/board/ti/sdp3430/config.mk
index 18e4761..2ca03dd 100644 (file)
--- a/board/ti/sdp3430/config.mk
+++ b/board/ti/sdp3430/config.mk
@@ -30,4 +30,4 @@
 # (mem base + reserved)
 
 # For use with external or internal boots.
 # (mem base + reserved)
 
 # For use with external or internal boots.

-TEXT_BASE = 0x80e80000
+CONFIG_SYS_TEXT_BASE = 0x80e80000

diff --git a/board/ti/sdp4430/config.mk b/board/ti/sdp4430/config.mk
index 7bb9473..33901a7 100644 (file)
--- a/board/ti/sdp4430/config.mk
+++ b/board/ti/sdp4430/config.mk
@@ -28,4 +28,4 @@
 # Linux-Kernel is expected to be at 8000'8000, entry 8000'8000
 # (mem base + reserved)
 
 # Linux-Kernel is expected to be at 8000'8000, entry 8000'8000
 # (mem base + reserved)
 

-TEXT_BASE = 0x80e80000
+CONFIG_SYS_TEXT_BASE = 0x80e80000

diff --git a/board/ti/tnetv107xevm/config.mk b/board/ti/tnetv107xevm/config.mk
index d24d49a..79b8304 100644 (file)
--- a/board/ti/tnetv107xevm/config.mk
+++ b/board/ti/tnetv107xevm/config.mk
@@ -17,4 +17,4 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 

-TEXT_BASE = 0x83FC0000
+CONFIG_SYS_TEXT_BASE = 0x83FC0000

diff --git a/board/timll/devkit8000/config.mk b/board/timll/devkit8000/config.mk
index 6bfcef7..cb2cf8f 100644 (file)
--- a/board/timll/devkit8000/config.mk
+++ b/board/timll/devkit8000/config.mk
@@ -32,4 +32,4 @@
 # (mem base + reserved)
 
 # For use with external or internal boots.
 # (mem base + reserved)
 
 # For use with external or internal boots.

-TEXT_BASE = 0x80e80000
+CONFIG_SYS_TEXT_BASE = 0x80e80000

diff --git a/board/total5200/config.mk b/board/total5200/config.mk
index e7ac93d..2863a44 100644 (file)
--- a/board/total5200/config.mk
+++ b/board/total5200/config.mk
@@ -24,7 +24,7 @@
 #
 # Total5200 board:
 #
 #
 # Total5200 board:
 #

-#      Valid values for TEXT_BASE are:
+#      Valid values for CONFIG_SYS_TEXT_BASE are:

 #
 #      0xFFF00000   boot high (standard configuration)
 #      0xFE000000   boot low
 #
 #      0xFFF00000   boot high (standard configuration)
 #      0xFE000000   boot low


@@ -33,11 +33,12 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
+ifndef CONFIG_SYS_TEXT_BASE

 ## Standard: boot high
 ## Standard: boot high

-TEXT_BASE = 0xFFF00000
+CONFIG_SYS_TEXT_BASE = 0xFFF00000

 ## For testing: boot from RAM
 ## For testing: boot from RAM

-# TEXT_BASE = 0x00100000
+# CONFIG_SYS_TEXT_BASE = 0x00100000

 endif
 
 endif
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/tqc/tqm5200/config.mk b/board/tqc/tqm5200/config.mk
index d72dfe7..d9522ad 100644 (file)
--- a/board/tqc/tqm5200/config.mk
+++ b/board/tqc/tqm5200/config.mk
@@ -24,7 +24,7 @@
 #
 # TQM5200 board:
 #
 #
 # TQM5200 board:
 #

-#      Valid values for TEXT_BASE are:
+#      Valid values for CONFIG_SYS_TEXT_BASE are:

 #
 #      0xFC000000   boot low (standard configuration with room for max 64 MByte
 #                   Flash ROM)
 #
 #      0xFC000000   boot low (standard configuration with room for max 64 MByte
 #                   Flash ROM)


@@ -34,13 +34,14 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
+ifndef CONFIG_SYS_TEXT_BASE

 ## Standard: boot low
 ## Standard: boot low

-TEXT_BASE = 0xFC000000
+CONFIG_SYS_TEXT_BASE = 0xFC000000

 ## For a backup copy of U-Boot at the end of flash: boot high
 ## For a backup copy of U-Boot at the end of flash: boot high

-# TEXT_BASE = 0xFFF00000
+# CONFIG_SYS_TEXT_BASE = 0xFFF00000

 ## For testing: boot from RAM
 ## For testing: boot from RAM

-# TEXT_BASE = 0x00100000
+# CONFIG_SYS_TEXT_BASE = 0x00100000

 endif
 
 endif
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/tqc/tqm8260/config.mk b/board/tqc/tqm8260/config.mk
index 3ecfc48..b8de2f1 100644 (file)
--- a/board/tqc/tqm8260/config.mk
+++ b/board/tqc/tqm8260/config.mk
@@ -29,6 +29,7 @@
 # for the "final" configuration, with U-Boot in flash, or the address
 # in RAM where U-Boot is loaded at for debugging.
 #
 # for the "final" configuration, with U-Boot in flash, or the address
 # in RAM where U-Boot is loaded at for debugging.
 #

-TEXT_BASE = 0x40000000
+CONFIG_SYS_TEXT_BASE = 0x40000000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)

diff --git a/board/tqc/tqm8272/config.mk b/board/tqc/tqm8272/config.mk
index 05c5f0c..0ea1342 100644 (file)
--- a/board/tqc/tqm8272/config.mk
+++ b/board/tqc/tqm8272/config.mk
@@ -29,6 +29,7 @@
 # for the "final" configuration, with U-Boot in flash, or the address
 # in RAM where U-Boot is loaded at for debugging.
 #
 # for the "final" configuration, with U-Boot in flash, or the address
 # in RAM where U-Boot is loaded at for debugging.
 #

-TEXT_BASE = 0x40000000
+CONFIG_SYS_TEXT_BASE = 0x40000000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)

diff --git a/board/tqc/tqm834x/config.mk b/board/tqc/tqm834x/config.mk
index f172c4e..868fc86 100644 (file)
--- a/board/tqc/tqm834x/config.mk
+++ b/board/tqc/tqm834x/config.mk
@@ -20,4 +20,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE   =   0x80000000
+CONFIG_SYS_TEXT_BASE   =   0x80000000

diff --git a/board/tqc/tqm85xx/config.mk b/board/tqc/tqm85xx/config.mk
index 37b7b23..7d62544 100644 (file)
--- a/board/tqc/tqm85xx/config.mk
+++ b/board/tqc/tqm85xx/config.mk
@@ -25,7 +25,7 @@
 # tqm85xx board
 #
 ifeq ($(CONFIG_TQM8548_BE),y)
 # tqm85xx board
 #
 ifeq ($(CONFIG_TQM8548_BE),y)

-TEXT_BASE = 0xfff80000
+CONFIG_SYS_TEXT_BASE = 0xfff80000

 else
 else

-TEXT_BASE = 0xfffc0000
+CONFIG_SYS_TEXT_BASE = 0xfffc0000

 endif
 endif

diff --git a/board/tqc/tqm8xx/config.mk b/board/tqc/tqm8xx/config.mk
index 9d6080b..017dc83 100644 (file)
--- a/board/tqc/tqm8xx/config.mk
+++ b/board/tqc/tqm8xx/config.mk
@@ -25,4 +25,4 @@
 # TQM8xxL boards
 #
 
 # TQM8xxL boards
 #
 

-TEXT_BASE = 0x40000000
+CONFIG_SYS_TEXT_BASE = 0x40000000

diff --git a/board/trab/config.mk b/board/trab/config.mk
index 88f3beb..a349b8c 100644 (file)
--- a/board/trab/config.mk
+++ b/board/trab/config.mk
@@ -21,8 +21,8 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-ifndef TEXT_BASE
-TEXT_BASE = 0x0DF40000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0x0DF40000

 endif
 
 LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds
 endif
 
 LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds

diff --git a/board/trab/lowlevel_init.S b/board/trab/lowlevel_init.S
index 9a00944..3cef414 100644 (file)
--- a/board/trab/lowlevel_init.S
+++ b/board/trab/lowlevel_init.S
@@ -138,7 +138,7 @@
 
 
 _TEXT_BASE:
 
 
 _TEXT_BASE:

-       .word   TEXT_BASE
+       .word   CONFIG_SYS_TEXT_BASE

 
 .globl lowlevel_init
 lowlevel_init:
 
 .globl lowlevel_init
 lowlevel_init:

diff --git a/board/trizepsiv/config.mk b/board/trizepsiv/config.mk
index 4486f6b..f04eb74 100644 (file)
--- a/board/trizepsiv/config.mk
+++ b/board/trizepsiv/config.mk
@@ -1,3 +1,3 @@
-TEXT_BASE =0xa1f00000
+CONFIG_SYS_TEXT_BASE =0xa1f00000

 # 0xa1700000
 # 0xa1700000

-#TEXT_BASE = 0
+#CONFIG_SYS_TEXT_BASE = 0

diff --git a/board/utx8245/config.mk b/board/utx8245/config.mk
index a33faa7..a3d30a7 100644 (file)
--- a/board/utx8245/config.mk
+++ b/board/utx8245/config.mk
@@ -29,5 +29,5 @@
 #
 # UTX8245 boards
 #
 #
 # UTX8245 boards
 #

-TEXT_BASE = 0xFFF00000
-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE)
+CONFIG_SYS_TEXT_BASE = 0xFFF00000
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)

diff --git a/board/v37/config.mk b/board/v37/config.mk
index 50cac97..06801a6 100644 (file)
--- a/board/v37/config.mk
+++ b/board/v37/config.mk
@@ -24,4 +24,4 @@
 #
 # Marel V37 boards
 #
 #
 # Marel V37 boards
 #

-TEXT_BASE = 0x40000000
+CONFIG_SYS_TEXT_BASE = 0x40000000

diff --git a/board/v38b/config.mk b/board/v38b/config.mk
index bc55fc7..985c6ba 100644 (file)
--- a/board/v38b/config.mk
+++ b/board/v38b/config.mk
@@ -27,6 +27,7 @@
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 

-TEXT_BASE = 0xFF000000
+CONFIG_SYS_TEXT_BASE = 0xFF000000

 
 

-PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+       -I$(TOPDIR)/board

diff --git a/board/ve8313/config.mk b/board/ve8313/config.mk
index 02dd33e..33686aa 100644 (file)
--- a/board/ve8313/config.mk
+++ b/board/ve8313/config.mk
@@ -2,6 +2,6 @@ ifndef NAND_SPL
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 endif
 
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 endif
 

-ifndef TEXT_BASE
-TEXT_BASE = 0xfe000000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xfe000000

 endif
 endif

diff --git a/board/voiceblue/config.mk b/board/voiceblue/config.mk
index 2cfc56a..412b57d 100644 (file)
--- a/board/voiceblue/config.mk
+++ b/board/voiceblue/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x13FD0000
+CONFIG_SYS_TEXT_BASE = 0x13FD0000

diff --git a/board/voiceblue/setup.S b/board/voiceblue/setup.S
index cc50e8c..6dddd6b 100644 (file)
--- a/board/voiceblue/setup.S
+++ b/board/voiceblue/setup.S
@@ -26,7 +26,7 @@
 #include <version.h>
 
 _TEXT_BASE:
 #include <version.h>
 
 _TEXT_BASE:

-       .word   TEXT_BASE       /* SDRAM load addr from config.mk */
+       .word   CONFIG_SYS_TEXT_BASE    /* SDRAM load addr from config.mk */

 
 OMAP5910_LPG1_BASE:            .word 0xfffbd000
 OMAP5910_TIPB_SWITCHES_BASE:   .word 0xfffbc800
 
 OMAP5910_LPG1_BASE:            .word 0xfffbd000
 OMAP5910_TIPB_SWITCHES_BASE:   .word 0xfffbc800

diff --git a/board/vpac270/config.mk b/board/vpac270/config.mk
index 1d650ac..0f10662 100644 (file)
--- a/board/vpac270/config.mk
+++ b/board/vpac270/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0xa1000000
+CONFIG_SYS_TEXT_BASE = 0xa1000000

diff --git a/board/w7o/config.mk b/board/w7o/config.mk
index bc341ca..d9a53dd 100644 (file)
--- a/board/w7o/config.mk
+++ b/board/w7o/config.mk
@@ -25,7 +25,7 @@
 # Wave 7 Optics boards
 #
 
 # Wave 7 Optics boards
 #
 

-#TEXT_BASE = 0xFFF80000
-TEXT_BASE = 0xFFFC0000
+#CONFIG_SYS_TEXT_BASE = 0xFFF80000
+CONFIG_SYS_TEXT_BASE = 0xFFFC0000

 
 #PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARD)
 
 #PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARD)

diff --git a/board/wepep250/config.mk b/board/wepep250/config.mk
index 8701581..60cbc24 100644 (file)
--- a/board/wepep250/config.mk
+++ b/board/wepep250/config.mk
@@ -1,11 +1,11 @@
 #
 # This is config used for compilation of WEP EP250 sources
 #
 #
 # This is config used for compilation of WEP EP250 sources
 #

-# You might change location of U-Boot in memory by setting right TEXT_BASE.
+# You might change location of U-Boot in memory by setting right CONFIG_SYS_TEXT_BASE.

 # This allows for example having one copy located at the end of ram and stored
 # in flash device and later on while developing use other location to test
 # the code in RAM device only.
 #
 
 # This allows for example having one copy located at the end of ram and stored
 # in flash device and later on while developing use other location to test
 # the code in RAM device only.
 #
 

-TEXT_BASE = 0xa1fe0000
-#TEXT_BASE = 0xa1001000
+CONFIG_SYS_TEXT_BASE = 0xa1fe0000
+#CONFIG_SYS_TEXT_BASE = 0xa1001000

diff --git a/board/westel/amx860/config.mk b/board/westel/amx860/config.mk
index d0ee4a2..4957433 100644 (file)
--- a/board/westel/amx860/config.mk
+++ b/board/westel/amx860/config.mk
@@ -21,6 +21,6 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-#TEXT_BASE = 0xFE000000
-TEXT_BASE = 0x40000000
+#CONFIG_SYS_TEXT_BASE = 0xFE000000
+CONFIG_SYS_TEXT_BASE = 0x40000000

 OBJCFLAGS =    --set-section-flags=.ppcenv=contents,alloc,load,data
 OBJCFLAGS =    --set-section-flags=.ppcenv=contents,alloc,load,data

diff --git a/board/xaeniax/config.mk b/board/xaeniax/config.mk
index 45079a0..c639752 100644 (file)
--- a/board/xaeniax/config.mk
+++ b/board/xaeniax/config.mk
@@ -1,2 +1,2 @@
-TEXT_BASE = 0xa3FB0000
-#TEXT_BASE = 0
+CONFIG_SYS_TEXT_BASE = 0xa3FB0000
+#CONFIG_SYS_TEXT_BASE = 0

diff --git a/board/xes/xpedite1000/config.mk b/board/xes/xpedite1000/config.mk
index 33dfbf1..5da8707 100644 (file)
--- a/board/xes/xpedite1000/config.mk
+++ b/board/xes/xpedite1000/config.mk
@@ -26,9 +26,9 @@
 #
 
 ifeq ($(ramsym),1)
 #
 
 ifeq ($(ramsym),1)

-TEXT_BASE = 0x07FD0000
+CONFIG_SYS_TEXT_BASE = 0x07FD0000

 else
 else

-TEXT_BASE = 0xFFF80000
+CONFIG_SYS_TEXT_BASE = 0xFFF80000

 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1

diff --git a/board/xes/xpedite5170/config.mk b/board/xes/xpedite5170/config.mk
index 1abae97..5b99220 100644 (file)
--- a/board/xes/xpedite5170/config.mk
+++ b/board/xes/xpedite5170/config.mk
@@ -24,4 +24,4 @@
 #
 # XPedite5170
 #
 #
 # XPedite5170
 #

-TEXT_BASE = 0xfff00000
+CONFIG_SYS_TEXT_BASE = 0xfff00000

diff --git a/board/xes/xpedite5200/config.mk b/board/xes/xpedite5200/config.mk
index 0761579..a6bd6d2 100644 (file)
--- a/board/xes/xpedite5200/config.mk
+++ b/board/xes/xpedite5200/config.mk
@@ -24,6 +24,6 @@
 #
 # xpedite5200 board
 #
 #
 # xpedite5200 board
 #

-ifndef TEXT_BASE
-TEXT_BASE = 0xfff80000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xfff80000

 endif
 endif

diff --git a/board/xes/xpedite5370/config.mk b/board/xes/xpedite5370/config.mk
index 995def8..aa8c5e0 100644 (file)
--- a/board/xes/xpedite5370/config.mk
+++ b/board/xes/xpedite5370/config.mk
@@ -24,6 +24,6 @@
 #
 # xpedite5370 board
 #
 #
 # xpedite5370 board
 #

-ifndef TEXT_BASE
-TEXT_BASE = 0xfff80000
+ifndef CONFIG_SYS_TEXT_BASE
+CONFIG_SYS_TEXT_BASE = 0xfff80000

 endif
 endif

diff --git a/board/xilinx/microblaze-generic/config.mk b/board/xilinx/microblaze-generic/config.mk
index c75daaf..f8d7e26 100644 (file)
--- a/board/xilinx/microblaze-generic/config.mk
+++ b/board/xilinx/microblaze-generic/config.mk
@@ -25,7 +25,7 @@
 # Version: Xilinx EDK 6.3 EDK_Gmm.12.3
 #
 
 # Version: Xilinx EDK 6.3 EDK_Gmm.12.3
 #
 

-TEXT_BASE = 0x29000000
+CONFIG_SYS_TEXT_BASE = 0x29000000

 
 PLATFORM_CPPFLAGS += -mno-xl-soft-mul
 PLATFORM_CPPFLAGS += -mno-xl-soft-div
 
 PLATFORM_CPPFLAGS += -mno-xl-soft-mul
 PLATFORM_CPPFLAGS += -mno-xl-soft-div

diff --git a/board/xilinx/ppc405-generic/u-boot-ram.lds b/board/xilinx/ppc405-generic/u-boot-ram.lds
index 2543c9b..a7539fd 100644 (file)
--- a/board/xilinx/ppc405-generic/u-boot-ram.lds
+++ b/board/xilinx/ppc405-generic/u-boot-ram.lds
@@ -124,7 +124,7 @@ SECTIONS
    *(COMMON)
   }
 
    *(COMMON)
   }
 

-  ppcenv_assert = ASSERT(. < 0xFFFFB000, ".bss section too big, overlaps .ppcenv section. Please update your configuration: CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_LEN and TEXT_BASE may need to be modified.");
+  ppcenv_assert = ASSERT(. < 0xFFFFB000, ".bss section too big, overlaps .ppcenv section. Please update your configuration: CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_LEN and CONFIG_SYS_TEXT_BASE may need to be modified.");

 
   _end = . ;
   PROVIDE (end = .);
 
   _end = . ;
   PROVIDE (end = .);

diff --git a/board/xilinx/ppc405-generic/u-boot-rom.lds b/board/xilinx/ppc405-generic/u-boot-rom.lds
index 65d0e4d..074f3c2 100644 (file)
--- a/board/xilinx/ppc405-generic/u-boot-rom.lds
+++ b/board/xilinx/ppc405-generic/u-boot-rom.lds
@@ -134,7 +134,7 @@ SECTIONS
    *(COMMON)
   }
 
    *(COMMON)
   }
 

-  ppcenv_assert = ASSERT(. < 0xFFFFB000, ".bss section too big, overlaps .ppcenv section. Please update your configuration: CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_LEN and TEXT_BASE may need to be modified.");
+  ppcenv_assert = ASSERT(. < 0xFFFFB000, ".bss section too big, overlaps .ppcenv section. Please update your configuration: CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_LEN and CONFIG_SYS_TEXT_BASE may need to be modified.");

 
   _end = . ;
   PROVIDE (end = .);
 
   _end = . ;
   PROVIDE (end = .);

diff --git a/board/xilinx/ppc440-generic/u-boot-ram.lds b/board/xilinx/ppc440-generic/u-boot-ram.lds
index 94f6faf..203f062 100644 (file)
--- a/board/xilinx/ppc440-generic/u-boot-ram.lds
+++ b/board/xilinx/ppc440-generic/u-boot-ram.lds
@@ -125,7 +125,7 @@ SECTIONS
    . = ALIGN(4);
   }
 
    . = ALIGN(4);
   }
 

-  ppcenv_assert = ASSERT(. < 0xFFFFB000, ".bss section too big, overlaps .ppcenv section. Please update your confguration: CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_LEN and TEXT_BASE may need to be modified.");
+  ppcenv_assert = ASSERT(. < 0xFFFFB000, ".bss section too big, overlaps .ppcenv section. Please update your confguration: CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_LEN and CONFIG_SYS_TEXT_BASE may need to be modified.");

 
   _end = . ;
   PROVIDE (end = .);
 
   _end = . ;
   PROVIDE (end = .);

diff --git a/board/xilinx/ppc440-generic/u-boot-rom.lds b/board/xilinx/ppc440-generic/u-boot-rom.lds
index b8f8bed..b67617d 100644 (file)
--- a/board/xilinx/ppc440-generic/u-boot-rom.lds
+++ b/board/xilinx/ppc440-generic/u-boot-rom.lds
@@ -135,7 +135,7 @@ SECTIONS
    . = ALIGN(4);
   }
 
    . = ALIGN(4);
   }
 

-  ppcenv_assert = ASSERT(. < 0xFFFFB000, ".bss section too big, overlaps .ppcenv section. Please update your confguration: CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_LEN and TEXT_BASE may need to be modified.");
+  ppcenv_assert = ASSERT(. < 0xFFFFB000, ".bss section too big, overlaps .ppcenv section. Please update your confguration: CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_LEN and CONFIG_SYS_TEXT_BASE may need to be modified.");

 
   _end = . ;
   PROVIDE (end = .);
 
   _end = . ;
   PROVIDE (end = .);

diff --git a/board/xm250/config.mk b/board/xm250/config.mk
index 8ce0c48..a3fa0e5 100644 (file)
--- a/board/xm250/config.mk
+++ b/board/xm250/config.mk
@@ -27,9 +27,9 @@
 
 
 # This is the address where U-Boot lives in flash:
 
 
 # This is the address where U-Boot lives in flash:

-#TEXT_BASE = 0
+#CONFIG_SYS_TEXT_BASE = 0

 
 # FIXME: armboot does only work correctly when being compiled
 # for the addresses _after_ relocation to RAM!! Otherwhise the
 # .bss segment is assumed in flash...
 
 # FIXME: armboot does only work correctly when being compiled
 # for the addresses _after_ relocation to RAM!! Otherwhise the
 # .bss segment is assumed in flash...

-TEXT_BASE = 0xA3F80000
+CONFIG_SYS_TEXT_BASE = 0xA3F80000

diff --git a/board/xsengine/config.mk b/board/xsengine/config.mk
index 148c519..821bb3b 100644 (file)
--- a/board/xsengine/config.mk
+++ b/board/xsengine/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0xA3F80000
+CONFIG_SYS_TEXT_BASE = 0xA3F80000

diff --git a/board/zeus/config.mk b/board/zeus/config.mk
index 1bdf5e4..1646d34 100644 (file)
--- a/board/zeus/config.mk
+++ b/board/zeus/config.mk
@@ -21,4 +21,4 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-TEXT_BASE = 0xFFFC0000
+CONFIG_SYS_TEXT_BASE = 0xFFFC0000

diff --git a/board/zipitz2/config.mk b/board/zipitz2/config.mk
index 1d650ac..0f10662 100644 (file)
--- a/board/zipitz2/config.mk
+++ b/board/zipitz2/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0xa1000000
+CONFIG_SYS_TEXT_BASE = 0xa1000000

diff --git a/board/zpc1900/config.mk b/board/zpc1900/config.mk
index 3e53b2b..1bb0806 100644 (file)
--- a/board/zpc1900/config.mk
+++ b/board/zpc1900/config.mk
@@ -27,4 +27,4 @@
 # ZPC.1900 board
 #
 
 # ZPC.1900 board
 #
 

-TEXT_BASE = 0xFE000000
+CONFIG_SYS_TEXT_BASE = 0xFE000000

diff --git a/board/zylonite/config.mk b/board/zylonite/config.mk
index 09b0f71..954f46e 100644 (file)
--- a/board/zylonite/config.mk
+++ b/board/zylonite/config.mk
@@ -1,4 +1,4 @@
-#TEXT_BASE = 0x0
-#TEXT_BASE = 0xa1700000
-#TEXT_BASE = 0xa3080000
-TEXT_BASE = 0xa3008000
+#CONFIG_SYS_TEXT_BASE = 0x0
+#CONFIG_SYS_TEXT_BASE = 0xa1700000
+#CONFIG_SYS_TEXT_BASE = 0xa3080000
+CONFIG_SYS_TEXT_BASE = 0xa3008000

diff --git a/config.mk b/config.mk
index eb95093..ce8e5f2 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -166,8 +166,8 @@ gccincdir := $(shell $(CC) -print-file-name=include)
 
 CPPFLAGS := $(DBGFLAGS) $(OPTFLAGS) $(RELFLAGS)                \
        -D__KERNEL__
 
 CPPFLAGS := $(DBGFLAGS) $(OPTFLAGS) $(RELFLAGS)                \
        -D__KERNEL__

-ifneq ($(TEXT_BASE),)
-CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE)
+ifneq ($(CONFIG_SYS_TEXT_BASE),)
+CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)

 endif
 
 ifneq ($(RESET_VECTOR_ADDRESS),)
 endif
 
 ifneq ($(RESET_VECTOR_ADDRESS),)


@@ -205,8 +205,8 @@ endif
 AFLAGS := $(AFLAGS_DEBUG) -D__ASSEMBLY__ $(CPPFLAGS)
 
 LDFLAGS += -Bstatic -T $(obj)u-boot.lds $(PLATFORM_LDFLAGS)
 AFLAGS := $(AFLAGS_DEBUG) -D__ASSEMBLY__ $(CPPFLAGS)
 
 LDFLAGS += -Bstatic -T $(obj)u-boot.lds $(PLATFORM_LDFLAGS)

-ifneq ($(TEXT_BASE),)
-LDFLAGS += -Ttext $(TEXT_BASE)
+ifneq ($(CONFIG_SYS_TEXT_BASE),)
+LDFLAGS += -Ttext $(CONFIG_SYS_TEXT_BASE)

 endif
 
 # Location of a usable BFD library, where we define "usable" as
 endif
 
 # Location of a usable BFD library, where we define "usable" as


@@ -236,7 +236,7 @@ endif
 
 export HOSTCC HOSTCFLAGS HOSTLDFLAGS PEDCFLAGS HOSTSTRIP CROSS_COMPILE \
        AS LD CC CPP AR NM STRIP OBJCOPY OBJDUMP MAKE
 
 export HOSTCC HOSTCFLAGS HOSTLDFLAGS PEDCFLAGS HOSTSTRIP CROSS_COMPILE \
        AS LD CC CPP AR NM STRIP OBJCOPY OBJDUMP MAKE

-export TEXT_BASE PLATFORM_CPPFLAGS PLATFORM_RELFLAGS CPPFLAGS CFLAGS AFLAGS
+export CONFIG_SYS_TEXT_BASE PLATFORM_CPPFLAGS PLATFORM_RELFLAGS CPPFLAGS CFLAGS AFLAGS

 
 #########################################################################
 
 
 #########################################################################
 

diff --git a/doc/README.ARM-memory-map b/doc/README.ARM-memory-map
index e2c4e16..1b120ac 100644 (file)
--- a/doc/README.ARM-memory-map
+++ b/doc/README.ARM-memory-map
@@ -9,8 +9,8 @@ To: Wolfgang Denk <wd@denx.de>
 >
 >How are they (should they be) set in your memory map above?
 
 >
 >How are they (should they be) set in your memory map above?
 

-_armboot_start contains the value of TEXT_BASE (0xA07E0000); it seems
-TEXT_BASE and _armboot_start are both used for the same purpose in
+_armboot_start contains the value of CONFIG_SYS_TEXT_BASE (0xA07E0000); it seems
+CONFIG_SYS_TEXT_BASE and _armboot_start are both used for the same purpose in

 different parts of the (ARM) code.
 Furthermore, the startup code (cpu/<arm>/start.S) internally uses
 another variable (_TEXT_BASE) with the same content as _armboot_start.
 different parts of the (ARM) code.
 Furthermore, the startup code (cpu/<arm>/start.S) internally uses
 another variable (_TEXT_BASE) with the same content as _armboot_start.

diff --git a/doc/README.COBRA5272 b/doc/README.COBRA5272
index 2d3f706..ae0f148 100644 (file)
--- a/doc/README.COBRA5272
+++ b/doc/README.COBRA5272
@@ -89,9 +89,9 @@ please first check:
        => u-boot as single bootloader starting from flash
 
 
        => u-boot as single bootloader starting from flash
 
 

-       in board/cobra5272/config.mk TEXT_BASE should be
+       in board/cobra5272/config.mk CONFIG_SYS_TEXT_BASE should be

 
 

-               TEXT_BASE = 0xffe00000
+               CONFIG_SYS_TEXT_BASE = 0xffe00000

 
        => linking address for u-boot as single bootloader stored in flash
 
 
        => linking address for u-boot as single bootloader stored in flash
 


@@ -128,9 +128,9 @@ please modify the settings:
        => u-boot as RAM version, chainloaded by another bootloader or using bdm cable
 
 
        => u-boot as RAM version, chainloaded by another bootloader or using bdm cable
 
 

-       in board/cobra5272/config.mk TEXT_BASE should be
+       in board/cobra5272/config.mk CONFIG_SYS_TEXT_BASE should be

 
 

-               TEXT_BASE = 0x00020000
+               CONFIG_SYS_TEXT_BASE = 0x00020000

 
        => target linking address for RAM
 
 
        => target linking address for RAM
 

diff --git a/doc/README.arm-relocation b/doc/README.arm-relocation
index e3ed60e..4ab3c7c 100644 (file)
--- a/doc/README.arm-relocation
+++ b/doc/README.arm-relocation
@@ -44,7 +44,7 @@ CONFIG_SYS_ARM_WITHOUT_RELOC defined!!!
 -------------------------------------------------------------------------------------
 
 For boards which boot from nand_spl, it is possible to save a copy
 -------------------------------------------------------------------------------------
 
 For boards which boot from nand_spl, it is possible to save a copy

-if TEXT_BASE == relocation address! This prevents that uboot code
+if CONFIG_SYS_TEXT_BASE == relocation address! This prevents that uboot code

 is copied again in relocate_code().
 
 example for the tx25 board:
 is copied again in relocate_code().
 
 example for the tx25 board:


@@ -61,7 +61,7 @@ e) there it copy u-boot to CONFIG_SYS_NAND_U_BOOT_DST and
 f) u-boot code steps through board_init_f() and calculates
    the relocation address and copy itself to it
 
 f) u-boot code steps through board_init_f() and calculates
    the relocation address and copy itself to it
 

-If TEXT_BASE == relocation address, the copying of u-boot
+If CONFIG_SYS_TEXT_BASE == relocation address, the copying of u-boot

 in f) could be saved.
 
 -------------------------------------------------------------------------------------
 in f) could be saved.
 
 -------------------------------------------------------------------------------------


@@ -71,10 +71,10 @@ ToDo:
 - fill in bd_t infos (check)
 - adapt all boards
 
 - fill in bd_t infos (check)
 - adapt all boards
 

-- maybe adapt TEXT_BASE (this must be checked from board maintainers)
+- maybe adapt CONFIG_SYS_TEXT_BASE (this must be checked from board maintainers)

   This *must* be done for boards, which boot from NOR flash
 
   This *must* be done for boards, which boot from NOR flash
 

-  on other boards if TEXT_BASE = relocation baseaddr, this saves
+  on other boards if CONFIG_SYS_TEXT_BASE = relocation baseaddr, this saves

   one copying from u-boot code.
 
 - new function dram_init_banksize() is actual board specific. Maybe
   one copying from u-boot code.
 
 - new function dram_init_banksize() is actual board specific. Maybe


@@ -88,13 +88,13 @@ Relocation with NAND_SPL (example for the tx25):
   and start with code execution on this address.
 
 - The First page contains u-boot code from u-boot:nand_spl/nand_boot_fsl_nfc.c
   and start with code execution on this address.
 
 - The First page contains u-boot code from u-boot:nand_spl/nand_boot_fsl_nfc.c

-  which inits the dram, cpu registers, reloacte itself to TEXT_BASE  and loads
+  which inits the dram, cpu registers, reloacte itself to CONFIG_SYS_TEXT_BASE  and loads

   the "real" u-boot to CONFIG_SYS_NAND_U_BOOT_DST and starts execution
   @CONFIG_SYS_NAND_U_BOOT_START
 
 - This u-boot does no ram int, nor cpu register setup. Just looks
   where it have to relocate and relocate itself to this address.
   the "real" u-boot to CONFIG_SYS_NAND_U_BOOT_DST and starts execution
   @CONFIG_SYS_NAND_U_BOOT_START
 
 - This u-boot does no ram int, nor cpu register setup. Just looks
   where it have to relocate and relocate itself to this address.

-  If relocate address = TEXT_BASE(not the same, as the TEXT_BASE
+  If relocate address = CONFIG_SYS_TEXT_BASE(not the same, as the TEXT_BASE

   from the nand_spl code), no need to copy, just go on with bss clear
   and jump to board_init_r.
 
   from the nand_spl code), no need to copy, just go on with bss clear
   and jump to board_init_r.
 

diff --git a/doc/README.m68k b/doc/README.m68k
index a00ab69..3766b33 100644 (file)
--- a/doc/README.m68k
+++ b/doc/README.m68k
@@ -72,7 +72,7 @@ For the preloader, please see
 http://mailman.uclinux.org/pipermail/uclinux-dev/2003-December/023384.html
 
 U-boot is configured to run at 0x20000 at default. This can be configured by
 http://mailman.uclinux.org/pipermail/uclinux-dev/2003-December/023384.html
 
 U-boot is configured to run at 0x20000 at default. This can be configured by

-change TEXT_BASE in board/m5282evb/config.mk and CONFIG_SYS_MONITOR_BASE in
+change CONFIG_SYS_TEXT_BASE in board/m5282evb/config.mk and CONFIG_SYS_MONITOR_BASE in

 include/configs/M5282EVB.h.
 
 3.2 BuS EB+MCF-EV123
 include/configs/M5282EVB.h.
 
 3.2 BuS EB+MCF-EV123


@@ -96,7 +96,7 @@ CONFIG_MONITOR_IS_IN_RAM must be defined. If it is defined the
 initial vector table and basic processor initialization will not
 be compiled in. The start address of u-boot must be adjusted in
 the boards config header file (CONFIG_SYS_MONITOR_BASE) and Makefile
 initial vector table and basic processor initialization will not
 be compiled in. The start address of u-boot must be adjusted in
 the boards config header file (CONFIG_SYS_MONITOR_BASE) and Makefile

-(TEXT_BASE) to the load address.
+(CONFIG_SYS_TEXT_BASE) to the load address.

 
 4.1 MCF5272 specific Options/Settings
 -------------------------------------
 
 4.1 MCF5272 specific Options/Settings
 -------------------------------------

diff --git a/doc/README.phytec.pcm030 b/doc/README.phytec.pcm030
index 29b7637..05faab6 100644 (file)
--- a/doc/README.phytec.pcm030
+++ b/doc/README.phytec.pcm030
@@ -5,11 +5,11 @@ pcm030_RAMBOOT_config \
 pcm030_LOWBOOT_config: unconfig
        @ >include/config.h
        @[ -z "$(findstring LOWBOOT_,$@)" ] || \
 pcm030_LOWBOOT_config: unconfig
        @ >include/config.h
        @[ -z "$(findstring LOWBOOT_,$@)" ] || \

-               { echo "TEXT_BASE = 0xFF000000" >board/phytec/pcm030/config.tmp ; \
+               { echo "CONFIG_SYS_TEXT_BASE = 0xFF000000"      >board/phytec/pcm030/config.tmp ; \

                  echo "... with LOWBOOT configuration" ; \
                }
        @[ -z "$(findstring RAMBOOT_,$@)" ] || \
                  echo "... with LOWBOOT configuration" ; \
                }
        @[ -z "$(findstring RAMBOOT_,$@)" ] || \

-              { echo "TEXT_BASE = 0x00100000" >board/phycore_mpc5200b_tiny/\
+              { echo "CONFIG_SYS_TEXT_BASE = 0x00100000" >board/phycore_mpc5200b_tiny/\

                        config.tmp ; \
                 echo "... with RAMBOOT configuration" ; \
                 echo "... remember to make sure that MBAR is already \
                        config.tmp ; \
                 echo "... with RAMBOOT configuration" ; \
                 echo "... remember to make sure that MBAR is already \

diff --git a/include/configs/A3000.h b/include/configs/A3000.h
index 6d8870c..0532a75 100644 (file)
--- a/include/configs/A3000.h
+++ b/include/configs/A3000.h
@@ -135,7 +135,7 @@
 
 #define CONFIG_SYS_EUMB_ADDR       0xFC000000
 
 
 #define CONFIG_SYS_EUMB_ADDR       0xFC000000
 

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN     (256 << 10) /* Reserve 256 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN      (128 << 10) /* Reserve 128 kB for malloc()  */
 
 #define CONFIG_SYS_MONITOR_LEN     (256 << 10) /* Reserve 256 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN      (128 << 10) /* Reserve 128 kB for malloc()  */
 


@@ -170,7 +170,7 @@
  * Definitions for initial stack pointer and data area
  */
 
  * Definitions for initial stack pointer and data area
  */
 

-/* #define CONFIG_SYS_MONITOR_BASE        TEXT_BASE */
+/* #define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE */

 /*#define CONFIG_SYS_GBL_DATA_SIZE    256*/
 #define CONFIG_SYS_GBL_DATA_SIZE      128
 #define CONFIG_SYS_INIT_RAM_ADDR     0x40000000
 /*#define CONFIG_SYS_GBL_DATA_SIZE    256*/
 #define CONFIG_SYS_GBL_DATA_SIZE      128
 #define CONFIG_SYS_INIT_RAM_ADDR     0x40000000

diff --git a/include/configs/AP1000.h b/include/configs/AP1000.h
index e707075..875cb14 100644 (file)
--- a/include/configs/AP1000.h
+++ b/include/configs/AP1000.h
@@ -141,7 +141,7 @@
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          0x20000000
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          0x20000000

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (192 * 1024)    /* Reserve 196 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024)    /* Reserve 128 kB for malloc()  */
 
 #define CONFIG_SYS_MONITOR_LEN         (192 * 1024)    /* Reserve 196 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024)    /* Reserve 128 kB for malloc()  */
 

diff --git a/include/configs/AR405.h b/include/configs/AR405.h
index 568ce15..d3c60f2 100644 (file)
--- a/include/configs/AR405.h
+++ b/include/configs/AR405.h
@@ -182,8 +182,8 @@
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_MONITOR_BASE
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_MONITOR_BASE

-#define CONFIG_SYS_MONITOR_BASE                TEXT_BASE
-#define CONFIG_SYS_MONITOR_LEN         (~(TEXT_BASE) + 1)
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_MONITOR_LEN         (~(CONFIG_SYS_TEXT_BASE) + 1)

 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024)    /* Reserve 128 kB for malloc()  */
 
 /*
 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024)    /* Reserve 128 kB for malloc()  */
 
 /*

diff --git a/include/configs/ATUM8548.h b/include/configs/ATUM8548.h
index 58f0c1f..388234c 100644 (file)
--- a/include/configs/ATUM8548.h
+++ b/include/configs/ATUM8548.h
@@ -173,7 +173,7 @@
 #define CONFIG_SYS_FLASH_WRITE_TOUT    8000    /* Flash Write Timeout (ms) */
 
 
 #define CONFIG_SYS_FLASH_WRITE_TOUT    8000    /* Flash Write Timeout (ms) */
 
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 #define CONFIG_FLASH_CFI_DRIVER    1
 #define CONFIG_SYS_FLASH_CFI           1
 
 #define CONFIG_FLASH_CFI_DRIVER    1
 #define CONFIG_SYS_FLASH_CFI           1

diff --git a/include/configs/Adder.h b/include/configs/Adder.h
index e4d30a1..7371a9c 100644 (file)
--- a/include/configs/Adder.h
+++ b/include/configs/Adder.h
@@ -130,7 +130,7 @@
  */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)       /* Initial Memory map for Linux */
 
  */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)       /* Initial Memory map for Linux */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 KB for Monitor   */
 #ifdef CONFIG_BZIP2
 #define CONFIG_SYS_MALLOC_LEN          (2500 << 10)    /* Reserve ~2.5 MB for malloc() */
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 KB for Monitor   */
 #ifdef CONFIG_BZIP2
 #define CONFIG_SYS_MALLOC_LEN          (2500 << 10)    /* Reserve ~2.5 MB for malloc() */

diff --git a/include/configs/Alaska8220.h b/include/configs/Alaska8220.h
index 85b68be..d9c27ef 100644 (file)
--- a/include/configs/Alaska8220.h
+++ b/include/configs/Alaska8220.h
@@ -253,7 +253,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif

diff --git a/include/configs/BC3450.h b/include/configs/BC3450.h
index 44befe9..f6246fa 100644 (file)
--- a/include/configs/BC3450.h
+++ b/include/configs/BC3450.h
@@ -207,7 +207,7 @@
 
 #define CONFIG_TIMESTAMP               /* display image timestamps */
 
 
 #define CONFIG_TIMESTAMP               /* display image timestamps */
 

-#if (TEXT_BASE == 0xFC000000)          /* Boot low */
+#if (CONFIG_SYS_TEXT_BASE == 0xFC000000)               /* Boot low */

 #   define CONFIG_SYS_LOWBOOT          1
 #endif
 
 #   define CONFIG_SYS_LOWBOOT          1
 #endif
 


@@ -324,7 +324,7 @@
 /*
  * Flash configuration
  */
 /*
  * Flash configuration
  */

-#define CONFIG_SYS_FLASH_BASE          TEXT_BASE /* 0xFC000000 */
+#define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_TEXT_BASE /* 0xFC000000 */

 
 /* use CFI flash driver if no module variant is spezified */
 #define CONFIG_SYS_FLASH_CFI           1       /* Flash is CFI conformant */
 
 /* use CFI flash driver if no module variant is spezified */
 #define CONFIG_SYS_FLASH_CFI           1       /* Flash is CFI conformant */


@@ -386,7 +386,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif

diff --git a/include/configs/BMW.h b/include/configs/BMW.h
index 98f6396..6e7f012 100644 (file)
--- a/include/configs/BMW.h
+++ b/include/configs/BMW.h
@@ -124,7 +124,7 @@
 
 #define CONFIG_SYS_EUMB_ADDR       0xFC000000
 
 
 #define CONFIG_SYS_EUMB_ADDR       0xFC000000
 

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 
 #define CONFIG_SYS_MONITOR_LEN     (256 << 10) /* Reserve 256 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN      (2048 << 10) /* Reserve 2MB for malloc()    */
 
 #define CONFIG_SYS_MONITOR_LEN     (256 << 10) /* Reserve 256 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN      (2048 << 10) /* Reserve 2MB for malloc()    */

diff --git a/include/configs/CANBT.h b/include/configs/CANBT.h
index ad075b8..c7854ab 100644 (file)
--- a/include/configs/CANBT.h
+++ b/include/configs/CANBT.h
@@ -127,8 +127,8 @@
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_MONITOR_BASE
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_MONITOR_BASE

-#define CONFIG_SYS_MONITOR_BASE                TEXT_BASE
-#define CONFIG_SYS_MONITOR_LEN         (~(TEXT_BASE) + 1)
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_MONITOR_LEN         (~(CONFIG_SYS_TEXT_BASE) + 1)

 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024)    /* Reserve 128 kB for malloc()  */
 
 /*
 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024)    /* Reserve 128 kB for malloc()  */
 
 /*

diff --git a/include/configs/CMS700.h b/include/configs/CMS700.h
index 9c57acb..099e30d 100644 (file)
--- a/include/configs/CMS700.h
+++ b/include/configs/CMS700.h
@@ -207,8 +207,8 @@
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_MONITOR_BASE
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_MONITOR_BASE

-#define CONFIG_SYS_MONITOR_BASE                TEXT_BASE
-#define CONFIG_SYS_MONITOR_LEN         (~(TEXT_BASE) + 1)
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_MONITOR_LEN         (~(CONFIG_SYS_TEXT_BASE) + 1)

 #define CONFIG_SYS_MALLOC_LEN          (256 * 1024)
 
 #if (CONFIG_SYS_MONITOR_BASE < FLASH_BASE0_PRELIM)
 #define CONFIG_SYS_MALLOC_LEN          (256 * 1024)
 
 #if (CONFIG_SYS_MONITOR_BASE < FLASH_BASE0_PRELIM)

diff --git a/include/configs/CPC45.h b/include/configs/CPC45.h
index 6451263..8ba3c7d 100644 (file)
--- a/include/configs/CPC45.h
+++ b/include/configs/CPC45.h
@@ -126,7 +126,7 @@
 
 #define CONFIG_SYS_EUMB_ADDR           0xFCE00000
 
 
 #define CONFIG_SYS_EUMB_ADDR           0xFCE00000
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN          (128 << 10)     /* Reserve 128 kB for malloc()  */
 
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN          (128 << 10)     /* Reserve 128 kB for malloc()  */

diff --git a/include/configs/CPCI405.h b/include/configs/CPCI405.h
index da57b04..e006621 100644 (file)
--- a/include/configs/CPCI405.h
+++ b/include/configs/CPCI405.h
@@ -204,9 +204,9 @@
  * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
  * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000

-#define CONFIG_SYS_FLASH_BASE          TEXT_BASE
-#define CONFIG_SYS_MONITOR_BASE                TEXT_BASE
-#define CONFIG_SYS_MONITOR_LEN         (~(TEXT_BASE) + 1)
+#define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_MONITOR_LEN         (~(CONFIG_SYS_TEXT_BASE) + 1)

 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024)    /* Reserve 128 kB for malloc()  */
 
 /*
 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024)    /* Reserve 128 kB for malloc()  */
 
 /*

diff --git a/include/configs/CPU86.h b/include/configs/CPU86.h
index 6d76d9f..0927f2c 100644 (file)
--- a/include/configs/CPU86.h
+++ b/include/configs/CPU86.h
@@ -304,7 +304,7 @@
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_SDRAM_MAX_SIZE      0x08000000      /* max. 128 MB          */
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_SDRAM_MAX_SIZE      0x08000000      /* max. 128 MB          */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor */
 #define CONFIG_SYS_MALLOC_LEN          (128 << 10)     /* Reserve 128 kB for malloc()*/
 
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor */
 #define CONFIG_SYS_MALLOC_LEN          (128 << 10)     /* Reserve 128 kB for malloc()*/
 

diff --git a/include/configs/CPU87.h b/include/configs/CPU87.h
index 83b010c..c50ff99 100644 (file)
--- a/include/configs/CPU87.h
+++ b/include/configs/CPU87.h
@@ -319,7 +319,7 @@
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_SDRAM_MAX_SIZE      0x08000000      /* max. 128 MB          */
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_SDRAM_MAX_SIZE      0x08000000      /* max. 128 MB          */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor */
 #define CONFIG_SYS_MALLOC_LEN          (128 << 10)     /* Reserve 128 kB for malloc()*/
 
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor */
 #define CONFIG_SYS_MALLOC_LEN          (128 << 10)     /* Reserve 128 kB for malloc()*/
 

diff --git a/include/configs/CRAYL1.h b/include/configs/CRAYL1.h
index f6cd760..da0a576 100644 (file)
--- a/include/configs/CRAYL1.h
+++ b/include/configs/CRAYL1.h
@@ -159,7 +159,7 @@
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          0xFFC00000
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          0xFFC00000

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 
 
 #define CONFIG_SYS_MONITOR_LEN         (192 * 1024)    /* Reserve 192 kB for Monitor   */
 
 
 #define CONFIG_SYS_MONITOR_LEN         (192 * 1024)    /* Reserve 192 kB for Monitor   */

diff --git a/include/configs/CU824.h b/include/configs/CU824.h
index 4a3f2bc..e093120 100644 (file)
--- a/include/configs/CU824.h
+++ b/include/configs/CU824.h
@@ -114,7 +114,7 @@
 
 #define CONFIG_SYS_EUMB_ADDR       0xFCE00000
 
 
 #define CONFIG_SYS_EUMB_ADDR       0xFCE00000
 

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 
 #define CONFIG_SYS_MONITOR_LEN     (256 << 10) /* Reserve 256 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN      (128 << 10) /* Reserve 128 kB for malloc()  */
 
 #define CONFIG_SYS_MONITOR_LEN     (256 << 10) /* Reserve 256 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN      (128 << 10) /* Reserve 128 kB for malloc()  */

diff --git a/include/configs/DP405.h b/include/configs/DP405.h
index 5311dfb..f86305e 100644 (file)
--- a/include/configs/DP405.h
+++ b/include/configs/DP405.h
@@ -157,8 +157,8 @@
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_MONITOR_BASE
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_MONITOR_BASE

-#define CONFIG_SYS_MONITOR_BASE                TEXT_BASE
-#define CONFIG_SYS_MONITOR_LEN         (~(TEXT_BASE) + 1)
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_MONITOR_LEN         (~(CONFIG_SYS_TEXT_BASE) + 1)

 #define CONFIG_SYS_MALLOC_LEN          (256 * 1024)
 
 #if (CONFIG_SYS_MONITOR_BASE < FLASH_BASE0_PRELIM)
 #define CONFIG_SYS_MALLOC_LEN          (256 * 1024)
 
 #if (CONFIG_SYS_MONITOR_BASE < FLASH_BASE0_PRELIM)

diff --git a/include/configs/DU440.h b/include/configs/DU440.h
index 9c34994..c36185d 100644 (file)
--- a/include/configs/DU440.h
+++ b/include/configs/DU440.h
@@ -51,7 +51,7 @@
 #define CONFIG_SYS_BOOT_BASE_ADDR      0xf0000000
 #define CONFIG_SYS_SDRAM_BASE          0x00000000      /* _must_ be 0          */
 #define CONFIG_SYS_FLASH_BASE          0xfc000000      /* start of FLASH       */
 #define CONFIG_SYS_BOOT_BASE_ADDR      0xf0000000
 #define CONFIG_SYS_SDRAM_BASE          0x00000000      /* _must_ be 0          */
 #define CONFIG_SYS_FLASH_BASE          0xfc000000      /* start of FLASH       */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_NAND0_ADDR          0xd0000000      /* NAND Flash           */
 #define CONFIG_SYS_NAND1_ADDR          0xd0100000      /* NAND Flash           */
 #define CONFIG_SYS_OCM_BASE            0xe0010000      /* ocm                  */
 #define CONFIG_SYS_NAND0_ADDR          0xd0000000      /* NAND Flash           */
 #define CONFIG_SYS_NAND1_ADDR          0xd0100000      /* NAND Flash           */
 #define CONFIG_SYS_OCM_BASE            0xe0010000      /* ocm                  */

diff --git a/include/configs/EB+MCF-EV123.h b/include/configs/EB+MCF-EV123.h
index 880cb4e..af57fb9 100644 (file)
--- a/include/configs/EB+MCF-EV123.h
+++ b/include/configs/EB+MCF-EV123.h
@@ -173,10 +173,10 @@
 
 /* If M5282 port is fully implemented the monitor base will be behind
  * the vector table. */
 
 /* If M5282 port is fully implemented the monitor base will be behind
  * the vector table. */

-#if (TEXT_BASE !=  CONFIG_SYS_INT_FLASH_BASE)
-#define CONFIG_SYS_MONITOR_BASE        (TEXT_BASE + 0x400)
+#if (CONFIG_SYS_TEXT_BASE !=  CONFIG_SYS_INT_FLASH_BASE)
+#define CONFIG_SYS_MONITOR_BASE        (CONFIG_SYS_TEXT_BASE + 0x400)

 #else
 #else

-#define CONFIG_SYS_MONITOR_BASE        (TEXT_BASE + 0x418) /* 24 Byte for CFM-Config */
+#define CONFIG_SYS_MONITOR_BASE        (CONFIG_SYS_TEXT_BASE + 0x418) /* 24 Byte for CFM-Config */

 #endif
 
 #define CONFIG_SYS_MONITOR_LEN         0x20000
 #endif
 
 #define CONFIG_SYS_MONITOR_LEN         0x20000

diff --git a/include/configs/EP88x.h b/include/configs/EP88x.h
index e1c6096..aa5de9b 100644 (file)
--- a/include/configs/EP88x.h
+++ b/include/configs/EP88x.h
@@ -125,7 +125,7 @@
  */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)       /* Initial Memory map for Linux */
 
  */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)       /* Initial Memory map for Linux */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 KB for Monitor   */
 #ifdef CONFIG_BZIP2
 #define CONFIG_SYS_MALLOC_LEN          (4096 << 10)    /* Reserve ~4 MB for malloc()   */
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 KB for Monitor   */
 #ifdef CONFIG_BZIP2
 #define CONFIG_SYS_MALLOC_LEN          (4096 << 10)    /* Reserve ~4 MB for malloc()   */

diff --git a/include/configs/EXBITGEN.h b/include/configs/EXBITGEN.h
index 4d08243..880a7a8 100644 (file)
--- a/include/configs/EXBITGEN.h
+++ b/include/configs/EXBITGEN.h
@@ -165,7 +165,7 @@
 #define CONFIG_SYS_FLASH1_SIZE         0x02000000
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_FLASH0_BASE
 #define CONFIG_SYS_FLASH_SIZE          CONFIG_SYS_FLASH0_SIZE
 #define CONFIG_SYS_FLASH1_SIZE         0x02000000
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_FLASH0_BASE
 #define CONFIG_SYS_FLASH_SIZE          CONFIG_SYS_FLASH0_SIZE

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (192 * 1024)    /* Reserve 196 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024)    /* Reserve 128 kB for malloc()  */
 
 #define CONFIG_SYS_MONITOR_LEN         (192 * 1024)    /* Reserve 196 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024)    /* Reserve 128 kB for malloc()  */
 

diff --git a/include/configs/HH405.h b/include/configs/HH405.h
index 0db9298..8991db4 100644 (file)
--- a/include/configs/HH405.h
+++ b/include/configs/HH405.h
@@ -311,7 +311,7 @@
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          0xFFF80000
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          0xFFF80000

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (512 * 1024)    /* Reserve 512 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN          (4 << 20)       /* Reserve 4 MB for malloc()    */
 
 #define CONFIG_SYS_MONITOR_LEN         (512 * 1024)    /* Reserve 512 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN          (4 << 20)       /* Reserve 4 MB for malloc()    */
 

diff --git a/include/configs/HIDDEN_DRAGON.h b/include/configs/HIDDEN_DRAGON.h
index 251fe67..359187a 100644 (file)
--- a/include/configs/HIDDEN_DRAGON.h
+++ b/include/configs/HIDDEN_DRAGON.h
@@ -131,7 +131,7 @@
 #else
 #undef CONFIG_SYS_RAMBOOT
 #define CONFIG_SYS_MONITOR_LEN         0x00030000
 #else
 #undef CONFIG_SYS_RAMBOOT
 #define CONFIG_SYS_MONITOR_LEN         0x00030000

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 
 #define CONFIG_SYS_GBL_DATA_SIZE       128
 
 
 #define CONFIG_SYS_GBL_DATA_SIZE       128
 

diff --git a/include/configs/ICU862.h b/include/configs/ICU862.h
index 917135e..f286449 100644 (file)
--- a/include/configs/ICU862.h
+++ b/include/configs/ICU862.h
@@ -210,7 +210,7 @@
 #else
 #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */
 #endif
 #else
 #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */
 #endif

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define        CONFIG_SYS_MALLOC_LEN           (256 << 10)     /* Reserve 256 kB for malloc()  */
 
 /*
 #define        CONFIG_SYS_MALLOC_LEN           (256 << 10)     /* Reserve 256 kB for malloc()  */
 
 /*

diff --git a/include/configs/IDS8247.h b/include/configs/IDS8247.h
index 4e73941..52a57a9 100644 (file)
--- a/include/configs/IDS8247.h
+++ b/include/configs/IDS8247.h
@@ -229,7 +229,7 @@
 #define CONFIG_SYS_FLASH_BANKS_LIST    { 0xFF800000 }
 #define CONFIG_SYS_MAX_FLASH_BANKS     1       /* max number of memory banks         */
 /* What should the base address of the main FLASH be and how big is
 #define CONFIG_SYS_FLASH_BANKS_LIST    { 0xFF800000 }
 #define CONFIG_SYS_MAX_FLASH_BANKS     1       /* max number of memory banks         */
 /* What should the base address of the main FLASH be and how big is

- * it (in MBytes)? This must contain TEXT_BASE from board/ids8247/config.mk
+ * it (in MBytes)? This must contain CONFIG_SYS_TEXT_BASE from board/ids8247/config.mk

  * The main FLASH is whichever is connected to *CS0.
  */
 #define CONFIG_SYS_FLASH0_BASE 0xFFF00000
  * The main FLASH is whichever is connected to *CS0.
  */
 #define CONFIG_SYS_FLASH0_BASE 0xFFF00000


@@ -305,7 +305,7 @@
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_FLASH0_BASE
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_FLASH0_BASE

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor */
 #define CONFIG_SYS_MALLOC_LEN          (128 << 10)     /* Reserve 128 kB for malloc()*/
 
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor */
 #define CONFIG_SYS_MALLOC_LEN          (128 << 10)     /* Reserve 128 kB for malloc()*/
 

diff --git a/include/configs/IPHASE4539.h b/include/configs/IPHASE4539.h
index 3cb6cf7..9d19e37 100644 (file)
--- a/include/configs/IPHASE4539.h
+++ b/include/configs/IPHASE4539.h
@@ -193,7 +193,7 @@
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          0xFF800000
 
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          0xFF800000
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor  */
 #define CONFIG_SYS_MALLOC_LEN          (128 << 10)     /* Reserve 128 kB for malloc() */
 
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor  */
 #define CONFIG_SYS_MALLOC_LEN          (128 << 10)     /* Reserve 128 kB for malloc() */
 

diff --git a/include/configs/ISPAN.h b/include/configs/ISPAN.h
index c0b1d86..3ea7e5d 100644 (file)
--- a/include/configs/ISPAN.h
+++ b/include/configs/ISPAN.h
@@ -171,7 +171,7 @@
  */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)       /* Initial Memory map for Linux */
 
  */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)       /* Initial Memory map for Linux */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (192 << 10)     /* Reserve 192 kB for Monitor   */
 #ifdef CONFIG_BZIP2
 #define CONFIG_SYS_MALLOC_LEN          (4096 << 10)    /* Reserve 4 MB for malloc()    */
 #define CONFIG_SYS_MONITOR_LEN         (192 << 10)     /* Reserve 192 kB for Monitor   */
 #ifdef CONFIG_BZIP2
 #define CONFIG_SYS_MALLOC_LEN          (4096 << 10)    /* Reserve 4 MB for malloc()    */

diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h
index 3961100..b62945e 100644 (file)
--- a/include/configs/IceCube.h
+++ b/include/configs/IceCube.h
@@ -122,11 +122,11 @@
 #endif
 
 
 #endif
 
 

-#if (TEXT_BASE == 0xFF000000)          /* Boot low with 16 MB Flash */
+#if (CONFIG_SYS_TEXT_BASE == 0xFF000000)               /* Boot low with 16 MB Flash */

 #   define CONFIG_SYS_LOWBOOT          1
 #   define CONFIG_SYS_LOWBOOT16        1
 #endif
 #   define CONFIG_SYS_LOWBOOT          1
 #   define CONFIG_SYS_LOWBOOT16        1
 #endif

-#if (TEXT_BASE == 0xFF800000)          /* Boot low with  8 MB Flash */
+#if (CONFIG_SYS_TEXT_BASE == 0xFF800000)               /* Boot low with  8 MB Flash */

 #if defined(CONFIG_LITE5200B)
 #   error CONFIG_SYS_LOWBOOT08 is incompatible with the Lite5200B
 #else
 #if defined(CONFIG_LITE5200B)
 #   error CONFIG_SYS_LOWBOOT08 is incompatible with the Lite5200B
 #else


@@ -274,7 +274,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif

diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index 6c6b5d6..887bd63 100644 (file)
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -232,7 +232,7 @@
 #define CONFIG_SYS_MEMTEST_END         ((CONFIG_SYS_SDRAM_SIZE - 3) << 20)
 
 #ifdef CONFIG_CF_SBF
 #define CONFIG_SYS_MEMTEST_END         ((CONFIG_SYS_SDRAM_SIZE - 3) << 20)
 
 #ifdef CONFIG_CF_SBF

-#      define CONFIG_SYS_MONITOR_BASE  (TEXT_BASE + 0x400)
+#      define CONFIG_SYS_MONITOR_BASE  (CONFIG_SYS_TEXT_BASE + 0x400)

 #else
 #      define CONFIG_SYS_MONITOR_BASE  (CONFIG_SYS_FLASH_BASE + 0x400)
 #endif
 #else
 #      define CONFIG_SYS_MONITOR_BASE  (CONFIG_SYS_FLASH_BASE + 0x400)
 #endif

diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index 6e0aa14..46f60bf 100644 (file)
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -172,10 +172,10 @@
 
 /* If M5282 port is fully implemented the monitor base will be behind
  * the vector table. */
 
 /* If M5282 port is fully implemented the monitor base will be behind
  * the vector table. */

-#if (TEXT_BASE != CONFIG_SYS_INT_FLASH_BASE)
+#if (CONFIG_SYS_TEXT_BASE != CONFIG_SYS_INT_FLASH_BASE)

 #define CONFIG_SYS_MONITOR_BASE        (CONFIG_SYS_FLASH_BASE + 0x400)
 #else
 #define CONFIG_SYS_MONITOR_BASE        (CONFIG_SYS_FLASH_BASE + 0x400)
 #else

-#define CONFIG_SYS_MONITOR_BASE        (TEXT_BASE + 0x418)     /* 24 Byte for CFM-Config */
+#define CONFIG_SYS_MONITOR_BASE        (CONFIG_SYS_TEXT_BASE + 0x418)  /* 24 Byte for CFM-Config */

 #endif
 
 #define CONFIG_SYS_MONITOR_LEN         0x20000
 #endif
 
 #define CONFIG_SYS_MONITOR_LEN         0x20000

diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index a80d330..1ff80ee 100644 (file)
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -245,7 +245,7 @@
 #define CONFIG_SYS_MEMTEST_END         ((CONFIG_SYS_SDRAM_SIZE - 3) << 20)
 
 #ifdef CONFIG_CF_SBF
 #define CONFIG_SYS_MEMTEST_END         ((CONFIG_SYS_SDRAM_SIZE - 3) << 20)
 
 #ifdef CONFIG_CF_SBF

-#      define CONFIG_SYS_MONITOR_BASE  (TEXT_BASE + 0x400)
+#      define CONFIG_SYS_MONITOR_BASE  (CONFIG_SYS_TEXT_BASE + 0x400)

 #else
 #      define CONFIG_SYS_MONITOR_BASE  (CONFIG_SYS_FLASH_BASE + 0x400)
 #endif
 #else
 #      define CONFIG_SYS_MONITOR_BASE  (CONFIG_SYS_FLASH_BASE + 0x400)
 #endif

diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index 5b4bba8..1cdc373 100644 (file)
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -305,7 +305,7 @@
 #define CONFIG_SYS_MEMTEST_END         ((CONFIG_SYS_SDRAM_SIZE - 3) << 20)
 
 #ifdef CONFIG_CF_SBF
 #define CONFIG_SYS_MEMTEST_END         ((CONFIG_SYS_SDRAM_SIZE - 3) << 20)
 
 #ifdef CONFIG_CF_SBF

-#      define CONFIG_SYS_MONITOR_BASE  (TEXT_BASE + 0x400)
+#      define CONFIG_SYS_MONITOR_BASE  (CONFIG_SYS_TEXT_BASE + 0x400)

 #else
 #      define CONFIG_SYS_MONITOR_BASE  (CONFIG_SYS_FLASH_BASE + 0x400)
 #endif
 #else
 #      define CONFIG_SYS_MONITOR_BASE  (CONFIG_SYS_FLASH_BASE + 0x400)
 #endif

diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h
index ffd37fd..cb406ae 100644 (file)
--- a/include/configs/MPC8260ADS.h
+++ b/include/configs/MPC8260ADS.h
@@ -53,7 +53,7 @@
 /*
  * Figure out if we are booting low via flash HRCW or high via the BCSR.
  */
 /*
  * Figure out if we are booting low via flash HRCW or high via the BCSR.
  */

-#if (TEXT_BASE != 0xFFF00000)          /* Boot low (flash HRCW) */
+#if (CONFIG_SYS_TEXT_BASE != 0xFFF00000)               /* Boot low (flash HRCW) */

 #   define CONFIG_SYS_LOWBOOT          1
 #endif
 
 #   define CONFIG_SYS_LOWBOOT          1
 #endif
 


@@ -376,7 +376,7 @@
 #define BOOTFLAG_COLD  0x01    /* Normal Power-On: Boot from FLASH  */
 #define BOOTFLAG_WARM  0x02    /* Software reboot           */
 
 #define BOOTFLAG_COLD  0x01    /* Normal Power-On: Boot from FLASH  */
 #define BOOTFLAG_WARM  0x02    /* Software reboot           */
 

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT
 #endif


@@ -537,11 +537,11 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "netdev=" MK_STR(CONFIG_NETDEV) "\0"                            \
        "tftpflash=tftpboot $loadaddr $uboot; "                         \
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "netdev=" MK_STR(CONFIG_NETDEV) "\0"                            \
        "tftpflash=tftpboot $loadaddr $uboot; "                         \

-               "protect off " MK_STR(TEXT_BASE) " +$filesize; "        \
-               "erase " MK_STR(TEXT_BASE) " +$filesize; "              \
-               "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; "      \
-               "protect on " MK_STR(TEXT_BASE) " +$filesize; "         \
-               "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0"     \
+               "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "     \
+               "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "           \
+               "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; "   \
+               "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "              \
+               "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0"  \

        "fdtaddr=400000\0"                                              \
        "console=ttyCPM0\0"                                             \
        "setbootargs=setenv bootargs "                                  \
        "fdtaddr=400000\0"                                              \
        "console=ttyCPM0\0"                                             \
        "setbootargs=setenv bootargs "                                  \

diff --git a/include/configs/MPC8266ADS.h b/include/configs/MPC8266ADS.h
index 55d77f8..376ff3e 100644 (file)
--- a/include/configs/MPC8266ADS.h
+++ b/include/configs/MPC8266ADS.h
@@ -33,7 +33,7 @@
 /* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !!                                                                !!
    !!  This configuration requires JP3 to be in position 1-2 to work  !!
 /* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !!                                                                !!
    !!  This configuration requires JP3 to be in position 1-2 to work  !!

-   !!  To make it work for the default, the TEXT_BASE define in              !!
+   !!  To make it work for the default, the CONFIG_SYS_TEXT_BASE define in           !!

    !!  board/mpc8266ads/config.mk must be changed from 0xfe000000 to  !!
    !!  0xfff00000                                                    !!
    !!  The CONFIG_SYS_HRCW_MASTER define below must also be changed to match !!
    !!  board/mpc8266ads/config.mk must be changed from 0xfe000000 to  !!
    !!  0xfff00000                                                    !!
    !!  The CONFIG_SYS_HRCW_MASTER define below must also be changed to match !!


@@ -422,7 +422,7 @@
 #define BOOTFLAG_COLD  0x01    /* Normal Power-On: Boot from FLASH  */
 #define BOOTFLAG_WARM  0x02    /* Software reboot           */
 
 #define BOOTFLAG_COLD  0x01    /* Normal Power-On: Boot from FLASH  */
 #define BOOTFLAG_WARM  0x02    /* Software reboot           */
 

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT
 #endif

diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h
index 1314271..b717c1b 100644 (file)
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@@ -200,7 +200,7 @@
 /*
  * The reserved memory
  */
 /*
  * The reserved memory
  */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE /* start of monitor */

 
 #define CONFIG_SYS_MONITOR_LEN (384 * 1024) /* Reserve 384 kB for Mon */
 #define CONFIG_SYS_MALLOC_LEN  (512 * 1024) /* Reserved for malloc */
 
 #define CONFIG_SYS_MONITOR_LEN (384 * 1024) /* Reserve 384 kB for Mon */
 #define CONFIG_SYS_MALLOC_LEN  (512 * 1024) /* Reserved for malloc */

diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index 3fdd1b0..18af028 100644 (file)
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -196,7 +196,7 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) && !defined(CONFIG_NAND_SPL)
 #define CONFIG_SYS_RAMBOOT
 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) && !defined(CONFIG_NAND_SPL)
 #define CONFIG_SYS_RAMBOOT


@@ -609,11 +609,11 @@
        "ethprime=TSEC1\0"                                              \
        "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                          \
        "tftpflash=tftpboot $loadaddr $uboot; "                         \
        "ethprime=TSEC1\0"                                              \
        "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                          \
        "tftpflash=tftpboot $loadaddr $uboot; "                         \

-               "protect off " MK_STR(TEXT_BASE) " +$filesize; "        \
-               "erase " MK_STR(TEXT_BASE) " +$filesize; "              \
-               "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; "      \
-               "protect on " MK_STR(TEXT_BASE) " +$filesize; "         \
-               "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0"     \
+               "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "     \
+               "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "           \
+               "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; "   \
+               "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "              \
+               "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0"  \

        "fdtaddr=780000\0"                                              \
        "fdtfile=" MK_STR(CONFIG_FDTFILE) "\0"                          \
        "console=ttyS0\0"                                               \
        "fdtaddr=780000\0"                                              \
        "fdtfile=" MK_STR(CONFIG_FDTFILE) "\0"                          \
        "console=ttyS0\0"                                               \

diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index a9466ea..b0f5cbd 100644 (file)
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -177,7 +177,7 @@
 /*
  * The reserved memory
  */
 /*
  * The reserved memory
  */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE /* start of monitor */

 
 #define CONFIG_SYS_MONITOR_LEN         (384 * 1024) /* Reserve 384 kB for Mon */
 #define CONFIG_SYS_MALLOC_LEN          (512 * 1024) /* Reserved for malloc */
 
 #define CONFIG_SYS_MONITOR_LEN         (384 * 1024) /* Reserve 384 kB for Mon */
 #define CONFIG_SYS_MALLOC_LEN          (512 * 1024) /* Reserved for malloc */

diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index 0719fce..f81ca8c 100644 (file)
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -146,7 +146,7 @@
 /*
  * The reserved memory
  */
 /*
  * The reserved memory
  */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT


@@ -551,11 +551,11 @@
        "netdev=" MK_STR(CONFIG_NETDEV) "\0"                            \
        "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                          \
        "tftpflash=tftp $loadaddr $uboot;"                              \
        "netdev=" MK_STR(CONFIG_NETDEV) "\0"                            \
        "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                          \
        "tftpflash=tftp $loadaddr $uboot;"                              \

-               "protect off " MK_STR(TEXT_BASE) " +$filesize; "        \
-               "erase " MK_STR(TEXT_BASE) " +$filesize; "              \
-               "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; "      \
-               "protect on " MK_STR(TEXT_BASE) " +$filesize; "         \
-               "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0"     \
+               "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "     \
+               "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "           \
+               "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; "   \
+               "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "              \
+               "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0"  \

        "fdtaddr=780000\0"                                              \
        "fdtfile=" MK_STR(CONFIG_FDTFILE) "\0"                          \
        "ramdiskaddr=1000000\0"                                         \
        "fdtaddr=780000\0"                                              \
        "fdtfile=" MK_STR(CONFIG_FDTFILE) "\0"                          \
        "ramdiskaddr=1000000\0"                                         \

diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index bed62bd..f57290a 100644 (file)
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -135,7 +135,7 @@
 /*
  * The reserved memory
  */
 /*
  * The reserved memory
  */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT

diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 55e9de0..8e508b6 100644 (file)
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -172,7 +172,7 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT

diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index 117f745..3659d88 100644 (file)
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -56,7 +56,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 

-#if (TEXT_BASE == 0xFE000000)
+#if (CONFIG_SYS_TEXT_BASE == 0xFE000000)

 #define CONFIG_SYS_LOWBOOT
 #endif
 
 #define CONFIG_SYS_LOWBOOT
 #endif
 


@@ -292,7 +292,7 @@ boards, we say we have two, but don't display a message if we find only one. */
 /*
  * U-Boot memory configuration
  */
 /*
  * U-Boot memory configuration
  */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT


@@ -716,11 +716,11 @@ boards, we say we have two, but don't display a message if we find only one. */
        "netdev=" MK_STR(CONFIG_NETDEV) "\0"                            \
        "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                          \
        "tftpflash=tftpboot $loadaddr $uboot; "                         \
        "netdev=" MK_STR(CONFIG_NETDEV) "\0"                            \
        "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                          \
        "tftpflash=tftpboot $loadaddr $uboot; "                         \

-               "protect off " MK_STR(TEXT_BASE) " +$filesize; "        \
-               "erase " MK_STR(TEXT_BASE) " +$filesize; "              \
-               "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; "      \
-               "protect on " MK_STR(TEXT_BASE) " +$filesize; "         \
-               "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0"     \
+               "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "     \
+               "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "           \
+               "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; "   \
+               "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "              \
+               "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0"  \

        "fdtaddr=780000\0"                                              \
        "fdtfile=" MK_STR(CONFIG_FDTFILE) "\0"
 
        "fdtaddr=780000\0"                                              \
        "fdtfile=" MK_STR(CONFIG_FDTFILE) "\0"
 

diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h
index d7381aa..5449d0f 100644 (file)
--- a/include/configs/MPC8360EMDS.h
+++ b/include/configs/MPC8360EMDS.h
@@ -161,7 +161,7 @@
  * The reserved memory
  */
 
  * The reserved memory
  */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE /* start of monitor */

 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT

diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h
index fc53ecc..680e329 100644 (file)
--- a/include/configs/MPC8360ERDK.h
+++ b/include/configs/MPC8360ERDK.h
@@ -153,7 +153,7 @@
 /*
  * The reserved memory
  */
 /*
  * The reserved memory
  */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE /* start of monitor */

 #define CONFIG_SYS_FLASH_BASE          0xFF800000 /* FLASH base address */
 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_FLASH_BASE          0xFF800000 /* FLASH base address */
 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)

diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index 8546ebc..45b22a5 100644 (file)
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -196,7 +196,7 @@
 /*
  * The reserved memory
  */
 /*
  * The reserved memory
  */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE /* start of monitor */

 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 20c2304..d69d25e 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -220,7 +220,7 @@
 /*
  * The reserved memory
  */
 /*
  * The reserved memory
  */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE /* start of monitor */

 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT


@@ -667,11 +667,11 @@
        "netdev=" MK_STR(CONFIG_NETDEV) "\0"                            \
        "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                          \
        "tftpflash=tftp $loadaddr $uboot;"                              \
        "netdev=" MK_STR(CONFIG_NETDEV) "\0"                            \
        "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                          \
        "tftpflash=tftp $loadaddr $uboot;"                              \

-               "protect off " MK_STR(TEXT_BASE) " +$filesize; "        \
-               "erase " MK_STR(TEXT_BASE) " +$filesize; "              \
-               "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; "      \
-               "protect on " MK_STR(TEXT_BASE) " +$filesize; "         \
-               "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0"     \
+               "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "     \
+               "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "           \
+               "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; "   \
+               "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "              \
+               "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0"  \

        "fdtaddr=780000\0"                                              \
        "fdtfile=" MK_STR(CONFIG_FDTFILE) "\0"                          \
        "ramdiskaddr=1000000\0"                                         \
        "fdtaddr=780000\0"                                              \
        "fdtfile=" MK_STR(CONFIG_FDTFILE) "\0"                          \
        "ramdiskaddr=1000000\0"                                         \

diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 8960963..8ef24e6 100644 (file)
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -229,7 +229,7 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 #if defined(CONFIG_SYS_SPL) || defined(CONFIG_RAMBOOT_NAND) \
        || defined(CONFIG_RAMBOOT_SDCARD) || defined(CONFIG_RAMBOOT_SPIFLASH)
 
 #if defined(CONFIG_SYS_SPL) || defined(CONFIG_RAMBOOT_NAND) \
        || defined(CONFIG_RAMBOOT_SDCARD) || defined(CONFIG_RAMBOOT_SPIFLASH)


@@ -759,11 +759,11 @@
  "netdev=eth0\0"                                               \
  "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                                \
  "tftpflash=tftpboot $loadaddr $uboot; "                       \
  "netdev=eth0\0"                                               \
  "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                                \
  "tftpflash=tftpboot $loadaddr $uboot; "                       \

-       "protect off " MK_STR(TEXT_BASE) " +$filesize; "        \
-       "erase " MK_STR(TEXT_BASE) " +$filesize; "              \
-       "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; "      \
-       "protect on " MK_STR(TEXT_BASE) " +$filesize; "         \
-       "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0"     \
+       "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "     \
+       "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "           \
+       "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; "   \
+       "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "              \
+       "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0"  \

  "consoledev=ttyS0\0"                          \
  "ramdiskaddr=2000000\0"                       \
  "ramdiskfile=8536ds/ramdisk.uboot\0"          \
  "consoledev=ttyS0\0"                          \
  "ramdiskaddr=2000000\0"                       \
  "ramdiskfile=8536ds/ramdisk.uboot\0"          \

diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index c133895..84db2fb 100644 (file)
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -137,7 +137,7 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT

diff --git a/include/configs/MPC8540EVAL.h b/include/configs/MPC8540EVAL.h
index 75227a6..66fea85 100644 (file)
--- a/include/configs/MPC8540EVAL.h
+++ b/include/configs/MPC8540EVAL.h
@@ -107,7 +107,7 @@
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Timeout for Flash Write (in ms)*/
 #define CONFIG_SYS_FLASH_CFI           1
 
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Timeout for Flash Write (in ms)*/
 #define CONFIG_SYS_FLASH_CFI           1
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT

diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h
index c3167e9..3594269 100644 (file)
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -145,7 +145,7 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_FLASH_CFI
 
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_FLASH_CFI

diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 1804582..3af7f6d 100644 (file)
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -154,7 +154,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500             /* Flash Write Timeout (ms) */
 #define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */
 
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500             /* Flash Write Timeout (ms) */
 #define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_FLASH_CFI
 
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_FLASH_CFI


@@ -498,11 +498,11 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
  "netdev=eth0\0"                                               \
  "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                                \
  "tftpflash=tftpboot $loadaddr $uboot; "                       \
  "netdev=eth0\0"                                               \
  "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                                \
  "tftpflash=tftpboot $loadaddr $uboot; "                       \

-       "protect off " MK_STR(TEXT_BASE) " +$filesize; "        \
-       "erase " MK_STR(TEXT_BASE) " +$filesize; "              \
-       "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; "      \
-       "protect on " MK_STR(TEXT_BASE) " +$filesize; "         \
-       "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0"     \
+       "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "     \
+       "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "           \
+       "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; "   \
+       "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "              \
+       "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0"  \

  "consoledev=ttyS0\0"                          \
  "ramdiskaddr=2000000\0"                       \
  "ramdiskfile=8544ds/ramdisk.uboot\0"          \
  "consoledev=ttyS0\0"                          \
  "ramdiskaddr=2000000\0"                       \
  "ramdiskfile=8544ds/ramdisk.uboot\0"          \

diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index e1e4acf..cda3936 100644 (file)
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -157,7 +157,7 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_FLASH_CFI
 
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_FLASH_CFI


@@ -542,11 +542,11 @@ extern unsigned long get_clock_freq(void);
  "netdev=eth0\0"                                               \
  "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                                \
  "tftpflash=tftpboot $loadaddr $uboot; "                       \
  "netdev=eth0\0"                                               \
  "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                                \
  "tftpflash=tftpboot $loadaddr $uboot; "                       \

-       "protect off " MK_STR(TEXT_BASE) " +$filesize; "        \
-       "erase " MK_STR(TEXT_BASE) " +$filesize; "              \
-       "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; "      \
-       "protect on " MK_STR(TEXT_BASE) " +$filesize; "         \
-       "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0"     \
+       "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "     \
+       "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "           \
+       "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; "   \
+       "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "              \
+       "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0"  \

  "consoledev=ttyS1\0"                          \
  "ramdiskaddr=2000000\0"                       \
  "ramdiskfile=ramdisk.uboot\0"                 \
  "consoledev=ttyS1\0"                          \
  "ramdiskaddr=2000000\0"                       \
  "ramdiskfile=ramdisk.uboot\0"                 \

diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index b0dd175..b22f4d0 100644 (file)
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -143,7 +143,7 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_FLASH_CFI
 
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_FLASH_CFI

diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index 31740fd..cdb6663 100644 (file)
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -134,7 +134,7 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT

diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index a98ecde..3a405d4 100644 (file)
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -154,7 +154,7 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500             /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500             /* Flash Write Timeout (ms) */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_FLASH_CFI
 
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_FLASH_CFI

diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index 75c4801..d09b2f7 100644 (file)
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -190,7 +190,7 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 #if defined(CONFIG_SYS_SPL) || defined(CONFIG_RAMBOOT_NAND)
 #define CONFIG_SYS_RAMBOOT
 
 #if defined(CONFIG_SYS_SPL) || defined(CONFIG_RAMBOOT_NAND)
 #define CONFIG_SYS_RAMBOOT

diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index d720fe9..9601029 100644 (file)
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -189,7 +189,7 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000           /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500             /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000           /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500             /* Flash Write Timeout (ms) */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_FLASH_CFI
 
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_FLASH_CFI


@@ -654,11 +654,11 @@
  "netdev=eth0\0"                                               \
  "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                                \
  "tftpflash=tftpboot $loadaddr $uboot; "                       \
  "netdev=eth0\0"                                               \
  "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                                \
  "tftpflash=tftpboot $loadaddr $uboot; "                       \

-       "protect off " MK_STR(TEXT_BASE) " +$filesize; "        \
-       "erase " MK_STR(TEXT_BASE) " +$filesize; "              \
-       "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; "      \
-       "protect on " MK_STR(TEXT_BASE) " +$filesize; "         \
-       "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0"     \
+       "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "     \
+       "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "           \
+       "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; "   \
+       "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "              \
+       "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0"  \

  "consoledev=ttyS0\0"                          \
  "ramdiskaddr=2000000\0"                       \
  "ramdiskfile=8572ds/ramdisk.uboot\0"          \
  "consoledev=ttyS0\0"                          \
  "ramdiskaddr=2000000\0"                       \
  "ramdiskfile=8572ds/ramdisk.uboot\0"          \

diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 2b7b8b5..004b764 100644 (file)
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -185,7 +185,7 @@
 #undef CONFIG_SYS_FLASH_CHECKSUM
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 #undef CONFIG_SYS_FLASH_CHECKSUM
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 #define CONFIG_SYS_MONITOR_BASE_EARLY   0xfff00000     /* early monitor loc */
 
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_MONITOR_BASE_EARLY   0xfff00000     /* early monitor loc */
 
 #define CONFIG_FLASH_CFI_DRIVER


@@ -424,7 +424,7 @@
 /* Map the last 1M of flash where we're running from reset */
 #define CONFIG_SYS_DBAT6L_EARLY        (CONFIG_SYS_MONITOR_BASE_EARLY | BATL_PP_RW \
                                 | BATL_CACHEINHIBIT | BATL_GUARDEDSTORAGE)
 /* Map the last 1M of flash where we're running from reset */
 #define CONFIG_SYS_DBAT6L_EARLY        (CONFIG_SYS_MONITOR_BASE_EARLY | BATL_PP_RW \
                                 | BATL_CACHEINHIBIT | BATL_GUARDEDSTORAGE)

-#define CONFIG_SYS_DBAT6U_EARLY        (TEXT_BASE | BATU_BL_1M | BATU_VS | BATU_VP)
+#define CONFIG_SYS_DBAT6U_EARLY        (CONFIG_SYS_TEXT_BASE | BATU_BL_1M | BATU_VS | BATU_VP)

 #define CONFIG_SYS_IBAT6L_EARLY        (CONFIG_SYS_MONITOR_BASE_EARLY | BATL_PP_RW \
                                 | BATL_MEMCOHERENCE)
 #define CONFIG_SYS_IBAT6U_EARLY        CONFIG_SYS_DBAT6U_EARLY
 #define CONFIG_SYS_IBAT6L_EARLY        (CONFIG_SYS_MONITOR_BASE_EARLY | BATL_PP_RW \
                                 | BATL_MEMCOHERENCE)
 #define CONFIG_SYS_IBAT6U_EARLY        CONFIG_SYS_DBAT6U_EARLY


@@ -606,11 +606,11 @@
  "netdev=eth0\0"                                               \
  "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                                \
  "tftpflash=tftpboot $loadaddr $uboot; "                       \
  "netdev=eth0\0"                                               \
  "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                                \
  "tftpflash=tftpboot $loadaddr $uboot; "                       \

-       "protect off " MK_STR(TEXT_BASE) " +$filesize; "        \
-       "erase " MK_STR(TEXT_BASE) " +$filesize; "              \
-       "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; "      \
-       "protect on " MK_STR(TEXT_BASE) " +$filesize; " \
-       "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0"     \
+       "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "     \
+       "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "           \
+       "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; "   \
+       "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "      \
+       "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0"  \

  "consoledev=ttyS0\0"                                          \
  "ramdiskaddr=2000000\0"                                       \
  "ramdiskfile=8610hpcd/ramdisk.uboot\0"                                \
  "consoledev=ttyS0\0"                                          \
  "ramdiskaddr=2000000\0"                                       \
  "ramdiskfile=8610hpcd/ramdisk.uboot\0"                                \

diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index d92b12d..a46ec28 100644 (file)
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -239,7 +239,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #undef CONFIG_SYS_FLASH_CHECKSUM
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 #undef CONFIG_SYS_FLASH_CHECKSUM
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */

-#define CONFIG_SYS_MONITOR_BASE                TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE    /* start of monitor */

 #define CONFIG_SYS_MONITOR_BASE_EARLY   0xfff00000     /* early monitor loc */
 
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_MONITOR_BASE_EARLY   0xfff00000     /* early monitor loc */
 
 #define CONFIG_FLASH_CFI_DRIVER


@@ -587,7 +587,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 /* Map the last 1M of flash where we're running from reset */
 #define CONFIG_SYS_DBAT6L_EARLY        (CONFIG_SYS_MONITOR_BASE_EARLY | BATL_PP_RW \
                                 | BATL_CACHEINHIBIT | BATL_GUARDEDSTORAGE)
 /* Map the last 1M of flash where we're running from reset */
 #define CONFIG_SYS_DBAT6L_EARLY        (CONFIG_SYS_MONITOR_BASE_EARLY | BATL_PP_RW \
                                 | BATL_CACHEINHIBIT | BATL_GUARDEDSTORAGE)

-#define CONFIG_SYS_DBAT6U_EARLY        (TEXT_BASE | BATU_BL_1M | BATU_VS | BATU_VP)
+#define CONFIG_SYS_DBAT6U_EARLY        (CONFIG_SYS_TEXT_BASE | BATU_BL_1M | BATU_VS | BATU_VP)

 #define CONFIG_SYS_IBAT6L_EARLY        (CONFIG_SYS_MONITOR_BASE_EARLY | BATL_PP_RW \
                                 | BATL_MEMCOHERENCE)
 #define CONFIG_SYS_IBAT6U_EARLY        CONFIG_SYS_DBAT6U_EARLY
 #define CONFIG_SYS_IBAT6L_EARLY        (CONFIG_SYS_MONITOR_BASE_EARLY | BATL_PP_RW \
                                 | BATL_MEMCOHERENCE)
 #define CONFIG_SYS_IBAT6U_EARLY        CONFIG_SYS_DBAT6U_EARLY


@@ -728,11 +728,11 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
        "netdev=eth0\0"                                                 \
        "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                          \
        "tftpflash=tftpboot $loadaddr $uboot; "                         \
        "netdev=eth0\0"                                                 \
        "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                          \
        "tftpflash=tftpboot $loadaddr $uboot; "                         \

-               "protect off " MK_STR(TEXT_BASE) " +$filesize; "        \
-               "erase " MK_STR(TEXT_BASE) " +$filesize; "              \
-               "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; "      \
-               "protect on " MK_STR(TEXT_BASE) " +$filesize; "         \
-               "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0"     \
+               "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "     \
+               "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "           \
+               "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; "   \
+               "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "              \
+               "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0"  \

        "consoledev=ttyS0\0"                                            \
        "ramdiskaddr=2000000\0"                                         \
        "ramdiskfile=your.ramdisk.u-boot\0"                             \
        "consoledev=ttyS0\0"                                            \
        "ramdiskaddr=2000000\0"                                         \
        "ramdiskfile=your.ramdisk.u-boot\0"                             \

diff --git a/include/configs/MUSENKI.h b/include/configs/MUSENKI.h
index ec9e1ec..c0c716d 100644 (file)
--- a/include/configs/MUSENKI.h
+++ b/include/configs/MUSENKI.h
@@ -118,7 +118,7 @@
 
 #define CONFIG_SYS_EUMB_ADDR       0xFC000000
 
 
 #define CONFIG_SYS_EUMB_ADDR       0xFC000000
 

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN     (256 << 10) /* Reserve 256 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN      (128 << 10) /* Reserve 128 kB for malloc()  */
 
 #define CONFIG_SYS_MONITOR_LEN     (256 << 10) /* Reserve 256 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN      (128 << 10) /* Reserve 128 kB for malloc()  */
 


@@ -153,7 +153,7 @@
  * Definitions for initial stack pointer and data area
  */
 
  * Definitions for initial stack pointer and data area
  */
 

-/* #define CONFIG_SYS_MONITOR_BASE        TEXT_BASE */
+/* #define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE */

 /*#define CONFIG_SYS_GBL_DATA_SIZE    256*/
 #define CONFIG_SYS_GBL_DATA_SIZE      128
 #define CONFIG_SYS_INIT_RAM_ADDR     0x40000000
 /*#define CONFIG_SYS_GBL_DATA_SIZE    256*/
 #define CONFIG_SYS_GBL_DATA_SIZE      128
 #define CONFIG_SYS_INIT_RAM_ADDR     0x40000000

diff --git a/include/configs/MVBC_P.h b/include/configs/MVBC_P.h
index 8f6b16b..05603be 100644 (file)
--- a/include/configs/MVBC_P.h
+++ b/include/configs/MVBC_P.h
@@ -211,7 +211,7 @@
 #define CONFIG_SYS_MAX_FLASH_SECT      256
 
 #define CONFIG_SYS_LOWBOOT
 #define CONFIG_SYS_MAX_FLASH_SECT      256
 
 #define CONFIG_SYS_LOWBOOT

-#define CONFIG_SYS_FLASH_BASE          TEXT_BASE
+#define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_FLASH_SIZE          0x00800000
 
 /*
 #define CONFIG_SYS_FLASH_SIZE          0x00800000
 
 /*


@@ -240,7 +240,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT             1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT             1
 #endif

diff --git a/include/configs/MVBLM7.h b/include/configs/MVBLM7.h
index 25d8077..1cfdef5 100644 (file)
--- a/include/configs/MVBLM7.h
+++ b/include/configs/MVBLM7.h
@@ -116,7 +116,7 @@
 /*
  * U-Boot memory configuration
  */
 /*
  * U-Boot memory configuration
  */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #undef CONFIG_SYS_RAMBOOT
 
 #define CONFIG_SYS_INIT_RAM_LOCK
 #undef CONFIG_SYS_RAMBOOT
 
 #define CONFIG_SYS_INIT_RAM_LOCK

diff --git a/include/configs/MVBLUE.h b/include/configs/MVBLUE.h
index 669816c..cff3304 100644 (file)
--- a/include/configs/MVBLUE.h
+++ b/include/configs/MVBLUE.h
@@ -172,7 +172,7 @@
 #define CONFIG_SYS_SDRAM_BASE      0x00000000
 
 #define CONFIG_SYS_FLASH_BASE      0xFFF00000
 #define CONFIG_SYS_SDRAM_BASE      0x00000000
 
 #define CONFIG_SYS_FLASH_BASE      0xFFF00000

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 
 #define CONFIG_SYS_RESET_ADDRESS   0xFFF00100
 #define CONFIG_SYS_EUMB_ADDR       0xFC000000
 
 #define CONFIG_SYS_RESET_ADDRESS   0xFFF00100
 #define CONFIG_SYS_EUMB_ADDR       0xFC000000

diff --git a/include/configs/MVSMR.h b/include/configs/MVSMR.h
index 000c4c6..074e555 100644 (file)
--- a/include/configs/MVSMR.h
+++ b/include/configs/MVSMR.h
@@ -177,7 +177,7 @@
 #define CONFIG_SYS_MAX_FLASH_SECT      256
 
 #define CONFIG_SYS_LOWBOOT
 #define CONFIG_SYS_MAX_FLASH_SECT      256
 
 #define CONFIG_SYS_LOWBOOT

-#define CONFIG_SYS_FLASH_BASE          TEXT_BASE
+#define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_FLASH_SIZE          0x00800000
 
 /*
 #define CONFIG_SYS_FLASH_SIZE          0x00800000
 
 /*


@@ -210,7 +210,7 @@
                                                CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
                                                CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT             1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT             1
 #endif

diff --git a/include/configs/NC650.h b/include/configs/NC650.h
index 6343cfe..b0a42d6 100644 (file)
--- a/include/configs/NC650.h
+++ b/include/configs/NC650.h
@@ -213,7 +213,7 @@
 #define CONFIG_SYS_RESET_ADDRESS       0xFFF00100
 
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor */
 #define CONFIG_SYS_RESET_ADDRESS       0xFFF00100
 
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define        CONFIG_SYS_MALLOC_LEN           (256 << 10)     /* Reserve 256 kB for malloc()  */
 
 /*
 #define        CONFIG_SYS_MALLOC_LEN           (256 << 10)     /* Reserve 256 kB for malloc()  */
 
 /*

diff --git a/include/configs/OXC.h b/include/configs/OXC.h
index 74c51f4..7f4babe 100644 (file)
--- a/include/configs/OXC.h
+++ b/include/configs/OXC.h
@@ -136,7 +136,7 @@
 
 #define CONFIG_SYS_RESET_ADDRESS       0xFFF00100
 
 
 #define CONFIG_SYS_RESET_ADDRESS       0xFFF00100
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         0x00030000
 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_PRELIMBASE)
 #define CONFIG_SYS_MONITOR_LEN         0x00030000
 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_PRELIMBASE)

diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index da826fc..f3c2883 100644 (file)
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -125,7 +125,7 @@
 #define CONFIG_SYS_MAX_FLASH_BANKS     2
 #define CONFIG_SYS_MAX_FLASH_SECT      1024
 
 #define CONFIG_SYS_MAX_FLASH_BANKS     2
 #define CONFIG_SYS_MAX_FLASH_SECT      1024
 

-#define CONFIG_SYS_MONITOR_BASE                TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_FLASH_CFI
 
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_FLASH_CFI


@@ -432,11 +432,11 @@
        "netdev=eth0\0"                                                 \
        "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                          \
        "tftpflash=tftpboot $loadaddr $uboot; "                         \
        "netdev=eth0\0"                                                 \
        "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                          \
        "tftpflash=tftpboot $loadaddr $uboot; "                         \

-               "protect off " MK_STR(TEXT_BASE) " +$filesize; "        \
-               "erase " MK_STR(TEXT_BASE) " +$filesize; "              \
-               "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; "      \
-               "protect on " MK_STR(TEXT_BASE) " +$filesize; "         \
-               "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0"     \
+               "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "     \
+               "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "           \
+               "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; "   \
+               "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "              \
+               "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0"  \

        "consoledev=ttyS0\0"                                            \
        "ramdiskaddr=2000000\0"                                         \
        "ramdiskfile=uramdisk\0"                                        \
        "consoledev=ttyS0\0"                                            \
        "ramdiskaddr=2000000\0"                                         \
        "ramdiskfile=uramdisk\0"                                        \

diff --git a/include/configs/P1_P2_RDB.h b/include/configs/P1_P2_RDB.h
index f97660c..0b0822d 100644 (file)
--- a/include/configs/P1_P2_RDB.h
+++ b/include/configs/P1_P2_RDB.h
@@ -188,7 +188,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 #if defined(CONFIG_SYS_SPL) || defined(CONFIG_RAMBOOT_NAND) \
        || defined(CONFIG_RAMBOOT_SDCARD) || defined(CONFIG_RAMBOOT_SPIFLASH)
 
 #if defined(CONFIG_SYS_SPL) || defined(CONFIG_RAMBOOT_NAND) \
        || defined(CONFIG_RAMBOOT_SDCARD) || defined(CONFIG_RAMBOOT_SPIFLASH)


@@ -579,11 +579,11 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
        "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                          \
        "loadaddr=1000000\0"                    \
        "tftpflash=tftpboot $loadaddr $uboot; "                 \
        "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                          \
        "loadaddr=1000000\0"                    \
        "tftpflash=tftpboot $loadaddr $uboot; "                 \

-               "protect off " MK_STR(TEXT_BASE) " +$filesize; "        \
-               "erase " MK_STR(TEXT_BASE) " +$filesize; "              \
-               "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; "      \
-               "protect on " MK_STR(TEXT_BASE) " +$filesize; "         \
-               "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0"     \
+               "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "     \
+               "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "           \
+               "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; "   \
+               "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "              \
+               "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0"  \

        "consoledev=ttyS0\0"                            \
        "ramdiskaddr=2000000\0"                 \
        "ramdiskfile=rootfs.ext2.gz.uboot\0"            \
        "consoledev=ttyS0\0"                            \
        "ramdiskaddr=2000000\0"                 \
        "ramdiskfile=rootfs.ext2.gz.uboot\0"            \

diff --git a/include/configs/P2020DS.h b/include/configs/P2020DS.h
index d94c308..27e8d8e 100644 (file)
--- a/include/configs/P2020DS.h
+++ b/include/configs/P2020DS.h
@@ -224,7 +224,7 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000           /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500             /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000           /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500             /* Flash Write Timeout (ms) */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_FLASH_CFI
 
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_FLASH_CFI


@@ -659,11 +659,11 @@
  "netdev=eth0\0"                                               \
  "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                                \
  "tftpflash=tftpboot $loadaddr $uboot; "                       \
  "netdev=eth0\0"                                               \
  "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                                \
  "tftpflash=tftpboot $loadaddr $uboot; "                       \

-       "protect off " MK_STR(TEXT_BASE) " +$filesize; "        \
-       "erase " MK_STR(TEXT_BASE) " +$filesize; "              \
-       "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; "      \
-       "protect on " MK_STR(TEXT_BASE) " +$filesize; "         \
-       "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0"     \
+       "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "     \
+       "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "           \
+       "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; "   \
+       "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "              \
+       "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0"  \

  "consoledev=ttyS0\0"                          \
  "ramdiskaddr=2000000\0"                       \
  "ramdiskfile=p2020ds/ramdisk.uboot\0"         \
  "consoledev=ttyS0\0"                          \
  "ramdiskaddr=2000000\0"                       \
  "ramdiskfile=p2020ds/ramdisk.uboot\0"         \

diff --git a/include/configs/P3G4.h b/include/configs/P3G4.h
index 890170d..6aa214a 100644 (file)
--- a/include/configs/P3G4.h
+++ b/include/configs/P3G4.h
@@ -198,7 +198,7 @@
 #define CONFIG_SYS_FLASH_BASE          0xff000000
 #define CONFIG_SYS_RESET_ADDRESS       0xfff00100
 #define        CONFIG_SYS_MONITOR_LEN          (256 << 10)     /* Reserve 256 kB for Monitor */
 #define CONFIG_SYS_FLASH_BASE          0xff000000
 #define CONFIG_SYS_RESET_ADDRESS       0xfff00100
 #define        CONFIG_SYS_MONITOR_LEN          (256 << 10)     /* Reserve 256 kB for Monitor */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define        CONFIG_SYS_MALLOC_LEN           (256 << 10)     /* Reserve 256 kB for malloc */
 
 /* areas to map different things with the GT in physical space */
 #define        CONFIG_SYS_MALLOC_LEN           (256 << 10)     /* Reserve 256 kB for malloc */
 
 /* areas to map different things with the GT in physical space */

diff --git a/include/configs/PATI.h b/include/configs/PATI.h
index 88e9528..8d67ee7 100644 (file)
--- a/include/configs/PATI.h
+++ b/include/configs/PATI.h
@@ -144,7 +144,7 @@
 #define PLD_CONFIG_BASE                0x04001000      /* PLD  (CS3) */
 
 #define        CONFIG_SYS_MONITOR_BASE 0xFFF00000
 #define PLD_CONFIG_BASE                0x04001000      /* PLD  (CS3) */
 
 #define        CONFIG_SYS_MONITOR_BASE 0xFFF00000

-/* CONFIG_SYS_FLASH_BASE       */ /* TEXT_BASE is defined in the board config.mk file. */
+/* CONFIG_SYS_FLASH_BASE       */ /* CONFIG_SYS_TEXT_BASE is defined in the board config.mk file.      */

                                                /* This adress is given to the linker with -Ttext to    */
                                                /* locate the text section at this adress.              */
 #define        CONFIG_SYS_MONITOR_LEN          (256 << 10)     /* Reserve 192 kB for Monitor                           */
                                                /* This adress is given to the linker with -Ttext to    */
                                                /* locate the text section at this adress.              */
 #define        CONFIG_SYS_MONITOR_LEN          (256 << 10)     /* Reserve 192 kB for Monitor                           */

diff --git a/include/configs/PCI5441.h b/include/configs/PCI5441.h
index c60a9f7..3e7e74b 100644 (file)
--- a/include/configs/PCI5441.h
+++ b/include/configs/PCI5441.h
@@ -63,7 +63,7 @@
 #define CONFIG_SYS_GBL_DATA_SIZE       128             /* Global data size rsvd*/
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 128*1024)
 
 #define CONFIG_SYS_GBL_DATA_SIZE       128             /* Global data size rsvd*/
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 128*1024)
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MALLOC_BASE         (CONFIG_SYS_MONITOR_BASE - CONFIG_SYS_MALLOC_LEN)
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_MALLOC_BASE - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP             CONFIG_SYS_GBL_DATA_OFFSET
 #define CONFIG_SYS_MALLOC_BASE         (CONFIG_SYS_MONITOR_BASE - CONFIG_SYS_MALLOC_LEN)
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_MALLOC_BASE - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP             CONFIG_SYS_GBL_DATA_OFFSET

diff --git a/include/configs/PCIPPC2.h b/include/configs/PCIPPC2.h
index c30ac78..7587ecc 100644 (file)
--- a/include/configs/PCIPPC2.h
+++ b/include/configs/PCIPPC2.h
@@ -117,7 +117,7 @@
 
 #define CONFIG_SYS_RESET_ADDRESS   0xFFF00100
 
 
 #define CONFIG_SYS_RESET_ADDRESS   0xFFF00100
 

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 
 #define CONFIG_SYS_MONITOR_LEN     (256 << 10) /* Reserve 256 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN      (128 << 10) /* Reserve 128 kB for malloc()  */
 
 #define CONFIG_SYS_MONITOR_LEN     (256 << 10) /* Reserve 256 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN      (128 << 10) /* Reserve 128 kB for malloc()  */

diff --git a/include/configs/PCIPPC6.h b/include/configs/PCIPPC6.h
index bc67480..447321a 100644 (file)
--- a/include/configs/PCIPPC6.h
+++ b/include/configs/PCIPPC6.h
@@ -119,7 +119,7 @@
 
 #define CONFIG_SYS_RESET_ADDRESS   0xFFF00100
 
 
 #define CONFIG_SYS_RESET_ADDRESS   0xFFF00100
 

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 
 #define CONFIG_SYS_MONITOR_LEN     (256 << 10) /* Reserve 256 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN      (128 << 10) /* Reserve 128 kB for malloc()  */
 
 #define CONFIG_SYS_MONITOR_LEN     (256 << 10) /* Reserve 256 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN      (128 << 10) /* Reserve 128 kB for malloc()  */

diff --git a/include/configs/PK1C20.h b/include/configs/PK1C20.h
index 874c20b..8e8c049 100644 (file)
--- a/include/configs/PK1C20.h
+++ b/include/configs/PK1C20.h
@@ -65,7 +65,7 @@
 #define CONFIG_SYS_GBL_DATA_SIZE       128             /* Global data size rsvd*/
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 128*1024)
 
 #define CONFIG_SYS_GBL_DATA_SIZE       128             /* Global data size rsvd*/
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 128*1024)
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MALLOC_BASE         (CONFIG_SYS_MONITOR_BASE - CONFIG_SYS_MALLOC_LEN)
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_MALLOC_BASE - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP             CONFIG_SYS_GBL_DATA_OFFSET
 #define CONFIG_SYS_MALLOC_BASE         (CONFIG_SYS_MONITOR_BASE - CONFIG_SYS_MALLOC_LEN)
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_MALLOC_BASE - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP             CONFIG_SYS_GBL_DATA_OFFSET

diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h
index 928ed8e..c7a0172 100644 (file)
--- a/include/configs/PLU405.h
+++ b/include/configs/PLU405.h
@@ -268,8 +268,8 @@
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_MONITOR_BASE
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_MONITOR_BASE

-#define CONFIG_SYS_MONITOR_BASE                TEXT_BASE
-#define CONFIG_SYS_MONITOR_LEN         (~(TEXT_BASE) + 1)
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_MONITOR_LEN         (~(CONFIG_SYS_TEXT_BASE) + 1)

 #define CONFIG_SYS_MALLOC_LEN          (1024 << 10)
 
 /*
 #define CONFIG_SYS_MALLOC_LEN          (1024 << 10)
 
 /*

diff --git a/include/configs/PM520.h b/include/configs/PM520.h
index 22de207..957bf22 100644 (file)
--- a/include/configs/PM520.h
+++ b/include/configs/PM520.h
@@ -241,7 +241,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif

diff --git a/include/configs/PM826.h b/include/configs/PM826.h
index 636bd26..6d24c26 100644 (file)
--- a/include/configs/PM826.h
+++ b/include/configs/PM826.h
@@ -304,7 +304,7 @@
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_FLASH0_BASE
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_FLASH0_BASE

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor */
 #define CONFIG_SYS_MALLOC_LEN          (128 << 10)     /* Reserve 128 kB for malloc()*/
 
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor */
 #define CONFIG_SYS_MALLOC_LEN          (128 << 10)     /* Reserve 128 kB for malloc()*/
 

diff --git a/include/configs/PM828.h b/include/configs/PM828.h
index 9d620af..509c8b4 100644 (file)
--- a/include/configs/PM828.h
+++ b/include/configs/PM828.h
@@ -298,7 +298,7 @@
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_FLASH0_BASE
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_FLASH0_BASE

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor */
 #define CONFIG_SYS_MALLOC_LEN          (128 << 10)     /* Reserve 128 kB for malloc()*/
 
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor */
 #define CONFIG_SYS_MALLOC_LEN          (128 << 10)     /* Reserve 128 kB for malloc()*/
 

diff --git a/include/configs/PM854.h b/include/configs/PM854.h
index cf8a8cf..1179a90 100644 (file)
--- a/include/configs/PM854.h
+++ b/include/configs/PM854.h
@@ -137,7 +137,7 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 
 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)

diff --git a/include/configs/PM856.h b/include/configs/PM856.h
index 0bd28fc..1934e3f 100644 (file)
--- a/include/configs/PM856.h
+++ b/include/configs/PM856.h
@@ -139,7 +139,7 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT

diff --git a/include/configs/PMC405.h b/include/configs/PMC405.h
index c420efe..eb1a166 100644 (file)
--- a/include/configs/PMC405.h
+++ b/include/configs/PMC405.h
@@ -195,8 +195,8 @@
  * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
  * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000

-#define CONFIG_SYS_MONITOR_BASE                TEXT_BASE
-#define CONFIG_SYS_MONITOR_LEN         (~(TEXT_BASE) + 1)
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_MONITOR_LEN         (~(CONFIG_SYS_TEXT_BASE) + 1)

 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024) /* 128 kB for malloc() */
 
 #define CONFIG_PRAM                    0 /* use pram variable to overwrite */
 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024) /* 128 kB for malloc() */
 
 #define CONFIG_PRAM                    0 /* use pram variable to overwrite */

diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h
index 5b1048e..9cefaa1 100644 (file)
--- a/include/configs/PMC405DE.h
+++ b/include/configs/PMC405DE.h
@@ -205,8 +205,8 @@
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          0xfe000000
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          0xfe000000

-#define CONFIG_SYS_MONITOR_BASE                TEXT_BASE
-#define CONFIG_SYS_MONITOR_LEN         (~(TEXT_BASE) + 1)
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_MONITOR_LEN         (~(CONFIG_SYS_TEXT_BASE) + 1)

 #define CONFIG_SYS_MALLOC_LEN          (256 * 1024)
 
 /*
 #define CONFIG_SYS_MALLOC_LEN          (256 * 1024)
 
 /*

diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index bf2247d..4d3c022 100644 (file)
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -53,7 +53,7 @@
  * Base addresses -- Note these are effective addresses where the
  * actual resources get mapped (not physical addresses)
  *----------------------------------------------------------------------*/
  * Base addresses -- Note these are effective addresses where the
  * actual resources get mapped (not physical addresses)
  *----------------------------------------------------------------------*/

-#define CONFIG_SYS_MONITOR_LEN         (~(TEXT_BASE) + 1)
+#define CONFIG_SYS_MONITOR_LEN         (~(CONFIG_SYS_TEXT_BASE) + 1)

 #define CONFIG_SYS_MALLOC_LEN          (1024 * 1024)   /* Reserve 256 kB for malloc()  */
 
 #define CONFIG_PRAM            0       /* use pram variable to overwrite */
 #define CONFIG_SYS_MALLOC_LEN          (1024 * 1024)   /* Reserve 256 kB for malloc()  */
 
 #define CONFIG_PRAM            0       /* use pram variable to overwrite */


@@ -61,7 +61,7 @@
 #define CONFIG_SYS_BOOT_BASE_ADDR      0xf0000000
 #define CONFIG_SYS_SDRAM_BASE          0x00000000      /* _must_ be 0          */
 #define CONFIG_SYS_FLASH_BASE          0xfc000000      /* start of FLASH       */
 #define CONFIG_SYS_BOOT_BASE_ADDR      0xf0000000
 #define CONFIG_SYS_SDRAM_BASE          0x00000000      /* _must_ be 0          */
 #define CONFIG_SYS_FLASH_BASE          0xfc000000      /* start of FLASH       */

-#define CONFIG_SYS_MONITOR_BASE                TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_NAND_ADDR           0xd0000000      /* NAND Flash           */
 #define CONFIG_SYS_OCM_BASE            0xe0010000      /* ocm                  */
 #define CONFIG_SYS_OCM_DATA_ADDR       CONFIG_SYS_OCM_BASE
 #define CONFIG_SYS_NAND_ADDR           0xd0000000      /* NAND Flash           */
 #define CONFIG_SYS_OCM_BASE            0xe0010000      /* ocm                  */
 #define CONFIG_SYS_OCM_DATA_ADDR       CONFIG_SYS_OCM_BASE

diff --git a/include/configs/PN62.h b/include/configs/PN62.h
index 562c5c3..ed026dd 100644 (file)
--- a/include/configs/PN62.h
+++ b/include/configs/PN62.h
@@ -148,7 +148,7 @@
 
 #undef CONFIG_SYS_RAMBOOT
 #define CONFIG_SYS_MONITOR_LEN         0x00030000
 
 #undef CONFIG_SYS_RAMBOOT
 #define CONFIG_SYS_MONITOR_LEN         0x00030000

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 
 /*#define CONFIG_SYS_GBL_DATA_SIZE    256*/
 #define CONFIG_SYS_GBL_DATA_SIZE       128
 
 /*#define CONFIG_SYS_GBL_DATA_SIZE    256*/
 #define CONFIG_SYS_GBL_DATA_SIZE       128

diff --git a/include/configs/RPXlite.h b/include/configs/RPXlite.h
index dd9134d..c9dd104 100644 (file)
--- a/include/configs/RPXlite.h
+++ b/include/configs/RPXlite.h
@@ -129,7 +129,7 @@
  */
 #define        CONFIG_SYS_SDRAM_BASE           0x00000000
 #define CONFIG_SYS_FLASH_BASE          0xFFC00000
  */
 #define        CONFIG_SYS_SDRAM_BASE           0x00000000
 #define CONFIG_SYS_FLASH_BASE          0xFFC00000

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define        CONFIG_SYS_MONITOR_LEN          (256 << 10)     /* Reserve 256 kB for Monitor   */
 #ifdef CONFIG_BZIP2
 #define CONFIG_SYS_MALLOC_LEN          (4096 << 10)    /* Reserve ~4 MB for malloc()   */
 #define        CONFIG_SYS_MONITOR_LEN          (256 << 10)     /* Reserve 256 kB for Monitor   */
 #ifdef CONFIG_BZIP2
 #define CONFIG_SYS_MALLOC_LEN          (4096 << 10)    /* Reserve ~4 MB for malloc()   */

diff --git a/include/configs/RPXsuper.h b/include/configs/RPXsuper.h
index da962f3..ec891e4 100644 (file)
--- a/include/configs/RPXsuper.h
+++ b/include/configs/RPXsuper.h
@@ -34,7 +34,7 @@
 #undef CONFIG_SYS_SBC_BOOT_LOW
 
 /* What should the base address of the main FLASH be and how big is
 #undef CONFIG_SYS_SBC_BOOT_LOW
 
 /* What should the base address of the main FLASH be and how big is

- * it (in MBytes)? This must contain TEXT_BASE from board/sbc8260/config.mk
+ * it (in MBytes)? This must contain CONFIG_SYS_TEXT_BASE from board/sbc8260/config.mk

  * The main FLASH is whichever is connected to *CS0. U-Boot expects
  * this to be the SIMM.
  */
  * The main FLASH is whichever is connected to *CS0. U-Boot expects
  * this to be the SIMM.
  */

diff --git a/include/configs/Rattler.h b/include/configs/Rattler.h
index e630afe..587b42e 100644 (file)
--- a/include/configs/Rattler.h
+++ b/include/configs/Rattler.h
@@ -220,7 +220,7 @@
 */
 #endif /* CONFIG_CMD_JFFS2 */
 
 */
 #endif /* CONFIG_CMD_JFFS2 */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 #endif

diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h
index 688f8a2..b753f26 100644 (file)
--- a/include/configs/SBC8540.h
+++ b/include/configs/SBC8540.h
@@ -324,7 +324,7 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT    200000          /* Timeout for Flash Erase (in ms)      */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    50000           /* Timeout for Flash Write (in ms)      */
 
 #define CONFIG_SYS_FLASH_ERASE_TOUT    200000          /* Timeout for Flash Erase (in ms)      */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    50000           /* Timeout for Flash Write (in ms)      */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor     */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor     */

 
 #if 0
 /* XXX This doesn't work and I don't want to fix it */
 
 #if 0
 /* XXX This doesn't work and I don't want to fix it */

diff --git a/include/configs/SCM.h b/include/configs/SCM.h
index c6fb074..a114f6c 100644 (file)
--- a/include/configs/SCM.h
+++ b/include/configs/SCM.h
@@ -247,7 +247,7 @@
 
 
 /* What should the base address of the main FLASH be and how big is
 
 
 /* What should the base address of the main FLASH be and how big is

- * it (in MBytes)? This must contain TEXT_BASE from board/tqm8260/config.mk
+ * it (in MBytes)? This must contain CONFIG_SYS_TEXT_BASE from board/tqm8260/config.mk

  * The main FLASH is whichever is connected to *CS0.
  */
 #define CONFIG_SYS_FLASH0_BASE 0x40000000
  * The main FLASH is whichever is connected to *CS0.
  */
 #define CONFIG_SYS_FLASH0_BASE 0x40000000


@@ -338,7 +338,7 @@
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_FLASH0_BASE
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_FLASH0_BASE

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor */
 #define CONFIG_SYS_MALLOC_LEN          (128 << 10)     /* Reserve 128 kB for malloc()*/
 
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor */
 #define CONFIG_SYS_MALLOC_LEN          (128 << 10)     /* Reserve 128 kB for malloc()*/
 

diff --git a/include/configs/SIMPC8313.h b/include/configs/SIMPC8313.h
index 9c8c318..6c57f95 100644 (file)
--- a/include/configs/SIMPC8313.h
+++ b/include/configs/SIMPC8313.h
@@ -91,7 +91,7 @@
  */
 #define CONFIG_SYS_NO_FLASH
 
  */
 #define CONFIG_SYS_NO_FLASH
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 #if !defined(CONFIG_NAND_SPL)
 #define CONFIG_SYS_RAMBOOT
 
 #if !defined(CONFIG_NAND_SPL)
 #define CONFIG_SYS_RAMBOOT


@@ -511,11 +511,11 @@
        "ethprime=TSEC1\0"                                              \
        "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                          \
        "tftpflash=tftpboot $loadaddr $uboot; "                         \
        "ethprime=TSEC1\0"                                              \
        "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                          \
        "tftpflash=tftpboot $loadaddr $uboot; "                         \

-               "protect off " MK_STR(TEXT_BASE) " +$filesize; "        \
-               "erase " MK_STR(TEXT_BASE) " +$filesize; "              \
-               "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; "      \
-               "protect on " MK_STR(TEXT_BASE) " +$filesize; "         \
-               "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0"     \
+               "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "     \
+               "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "           \
+               "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; "   \
+               "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "              \
+               "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0"  \

        "fdtaddr=ae0000\0"                                              \
        "fdtfile=" MK_STR(CONFIG_FDTFILE) "\0"                          \
        "console=ttyS0\0"                                               \
        "fdtaddr=ae0000\0"                                              \
        "fdtfile=" MK_STR(CONFIG_FDTFILE) "\0"                          \
        "console=ttyS0\0"                                               \

diff --git a/include/configs/Sandpoint8240.h b/include/configs/Sandpoint8240.h
index 125b9a2..514bf89 100644 (file)
--- a/include/configs/Sandpoint8240.h
+++ b/include/configs/Sandpoint8240.h
@@ -159,7 +159,7 @@
 #else
 #undef CONFIG_SYS_RAMBOOT
 #define CONFIG_SYS_MONITOR_LEN         0x00030000
 #else
 #undef CONFIG_SYS_RAMBOOT
 #define CONFIG_SYS_MONITOR_LEN         0x00030000

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 
 /*#define CONFIG_SYS_GBL_DATA_SIZE    256*/
 #define CONFIG_SYS_GBL_DATA_SIZE       128
 
 /*#define CONFIG_SYS_GBL_DATA_SIZE    256*/
 #define CONFIG_SYS_GBL_DATA_SIZE       128

diff --git a/include/configs/Sandpoint8245.h b/include/configs/Sandpoint8245.h
index 8cb920e..0381252 100644 (file)
--- a/include/configs/Sandpoint8245.h
+++ b/include/configs/Sandpoint8245.h
@@ -129,7 +129,7 @@
 #else
 #undef CONFIG_SYS_RAMBOOT
 #define CONFIG_SYS_MONITOR_LEN         0x00030000
 #else
 #undef CONFIG_SYS_RAMBOOT
 #define CONFIG_SYS_MONITOR_LEN         0x00030000

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 
 /*#define CONFIG_SYS_GBL_DATA_SIZE    256*/
 #define CONFIG_SYS_GBL_DATA_SIZE       128
 
 /*#define CONFIG_SYS_GBL_DATA_SIZE    256*/
 #define CONFIG_SYS_GBL_DATA_SIZE       128

diff --git a/include/configs/TB5200.h b/include/configs/TB5200.h
index 7a6602c..b675a21 100644 (file)
--- a/include/configs/TB5200.h
+++ b/include/configs/TB5200.h
@@ -132,7 +132,7 @@
 
 #define        CONFIG_TIMESTAMP                /* display image timestamps */
 
 
 #define        CONFIG_TIMESTAMP                /* display image timestamps */
 

-#if (TEXT_BASE == 0xFC000000)          /* Boot low */
+#if (CONFIG_SYS_TEXT_BASE == 0xFC000000)               /* Boot low */

 #   define CONFIG_SYS_LOWBOOT          1
 #endif
 
 #   define CONFIG_SYS_LOWBOOT          1
 #endif
 


@@ -251,7 +251,7 @@
 /*
  * Flash configuration
  */
 /*
  * Flash configuration
  */

-#define CONFIG_SYS_FLASH_BASE          TEXT_BASE /* 0xFC000000 */
+#define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_TEXT_BASE /* 0xFC000000 */

 
 /* use CFI flash driver */
 #define CONFIG_SYS_FLASH_CFI           1       /* Flash is CFI conformant */
 
 /* use CFI flash driver */
 #define CONFIG_SYS_FLASH_CFI           1       /* Flash is CFI conformant */


@@ -329,7 +329,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif

diff --git a/include/configs/TOP5200.h b/include/configs/TOP5200.h
index 50197f4..f9d1446 100644 (file)
--- a/include/configs/TOP5200.h
+++ b/include/configs/TOP5200.h
@@ -138,11 +138,11 @@
 /*
  * MUST be low boot - HIGHBOOT is not supported anymore
  */
 /*
  * MUST be low boot - HIGHBOOT is not supported anymore
  */

-#if (TEXT_BASE == 0xFF000000)          /* Boot low with 16 MB Flash */
+#if (CONFIG_SYS_TEXT_BASE == 0xFF000000)               /* Boot low with 16 MB Flash */

 #   define CONFIG_SYS_LOWBOOT          1
 #   define CONFIG_SYS_LOWBOOT16        1
 #else
 #   define CONFIG_SYS_LOWBOOT          1
 #   define CONFIG_SYS_LOWBOOT16        1
 #else

-#   error "TEXT_BASE must be 0xff000000"
+#   error "CONFIG_SYS_TEXT_BASE must be 0xff000000"

 #endif
 
 /*
 #endif
 
 /*


@@ -299,7 +299,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif

diff --git a/include/configs/TOP860.h b/include/configs/TOP860.h
index b9e450d..4bbd42a 100644 (file)
--- a/include/configs/TOP860.h
+++ b/include/configs/TOP860.h
@@ -212,7 +212,7 @@
  * adresses
  */
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor   */
  * adresses
  */
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor   */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MALLOC_LEN          (128 << 10)     /* Reserve 128 kB for malloc()  */
 
 /*-----------------------------------------------------------------------
 #define CONFIG_SYS_MALLOC_LEN          (128 << 10)     /* Reserve 128 kB for malloc()  */
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 107bff1..a4c7461 100644 (file)
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -214,7 +214,7 @@
 
 #define        CONFIG_TIMESTAMP                /* display image timestamps */
 
 
 #define        CONFIG_TIMESTAMP                /* display image timestamps */
 

-#if (TEXT_BASE != 0xFFF00000)
+#if (CONFIG_SYS_TEXT_BASE != 0xFFF00000)

 #   define CONFIG_SYS_LOWBOOT          1       /* Boot low */
 #endif
 
 #   define CONFIG_SYS_LOWBOOT          1       /* Boot low */
 #endif
 


@@ -489,7 +489,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif

diff --git a/include/configs/TQM8260.h b/include/configs/TQM8260.h
index 582e670..de5a86e 100644 (file)
--- a/include/configs/TQM8260.h
+++ b/include/configs/TQM8260.h
@@ -279,7 +279,7 @@
 
 
 /* What should the base address of the main FLASH be and how big is
 
 
 /* What should the base address of the main FLASH be and how big is

- * it (in MBytes)? This must contain TEXT_BASE from board/tqm8260/config.mk
+ * it (in MBytes)? This must contain CONFIG_SYS_TEXT_BASE from board/tqm8260/config.mk

  * The main FLASH is whichever is connected to *CS0.
  */
 #define CONFIG_SYS_FLASH0_BASE 0x40000000
  * The main FLASH is whichever is connected to *CS0.
  */
 #define CONFIG_SYS_FLASH0_BASE 0x40000000


@@ -375,7 +375,7 @@
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_FLASH0_BASE
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_FLASH0_BASE

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor */
 #define CONFIG_SYS_MALLOC_LEN          (512 << 10)     /* Reserve 512 kB for malloc()*/
 
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor */
 #define CONFIG_SYS_MALLOC_LEN          (512 << 10)     /* Reserve 512 kB for malloc()*/
 

diff --git a/include/configs/TQM8272.h b/include/configs/TQM8272.h
index 12a7eda..e9251dd 100644 (file)
--- a/include/configs/TQM8272.h
+++ b/include/configs/TQM8272.h
@@ -357,7 +357,7 @@
 
 
 /* What should the base address of the main FLASH be and how big is
 
 
 /* What should the base address of the main FLASH be and how big is

- * it (in MBytes)? This must contain TEXT_BASE from board/tqm8272/config.mk
+ * it (in MBytes)? This must contain CONFIG_SYS_TEXT_BASE from board/tqm8272/config.mk

  * The main FLASH is whichever is connected to *CS0.
  */
 #define CONFIG_SYS_FLASH0_BASE 0x40000000
  * The main FLASH is whichever is connected to *CS0.
  */
 #define CONFIG_SYS_FLASH0_BASE 0x40000000


@@ -498,7 +498,7 @@
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_FLASH0_BASE
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_FLASH0_BASE

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (192 << 10)     /* Reserve 192 kB for Monitor */
 #define CONFIG_SYS_MALLOC_LEN          (128 << 10)     /* Reserve 128 kB for malloc()*/
 
 #define CONFIG_SYS_MONITOR_LEN         (192 << 10)     /* Reserve 192 kB for Monitor */
 #define CONFIG_SYS_MALLOC_LEN          (128 << 10)     /* Reserve 128 kB for malloc()*/
 

diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index d0c6a4d..35af262 100644 (file)
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -139,7 +139,7 @@
 /*
  * Monitor config
  */
 /*
  * Monitor config
  */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 # define CONFIG_SYS_RAMBOOT
 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 # define CONFIG_SYS_RAMBOOT

diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h
index ccb339d..2ff3ddc 100644 (file)
--- a/include/configs/TQM85xx.h
+++ b/include/configs/TQM85xx.h
@@ -75,7 +75,7 @@
  * NAND flash support (disabled by default)
  *
  * Warning: NAND support will likely increase the U-Boot image size
  * NAND flash support (disabled by default)
  *
  * Warning: NAND support will likely increase the U-Boot image size

- * to more than 256 KB. Please adjust TEXT_BASE if necessary.
+ * to more than 256 KB. Please adjust CONFIG_SYS_TEXT_BASE if necessary.

  */
 #ifdef CONFIG_TQM8548_BE
 #define CONFIG_NAND
  */
 #ifdef CONFIG_TQM8548_BE
 #define CONFIG_NAND


@@ -219,7 +219,7 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms)     */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms)     */
 
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms)     */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms)     */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor     */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor     */

 
 /*
  * Note: when changing the Local Bus clock divider you have to
 
 /*
  * Note: when changing the Local Bus clock divider you have to


@@ -243,7 +243,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_LEN         (~TEXT_BASE + 1)/* Reserved for Monitor */
+#define CONFIG_SYS_MONITOR_LEN         (~CONFIG_SYS_TEXT_BASE + 1)/* Reserved for Monitor      */

 #define CONFIG_SYS_MALLOC_LEN          (384 * 1024)    /* Reserved for malloc  */
 
 /* Serial Port */
 #define CONFIG_SYS_MALLOC_LEN          (384 * 1024)    /* Reserved for malloc  */
 
 /* Serial Port */


@@ -659,7 +659,7 @@
                                MK_STR(CONFIG_HOSTNAME)".dtb\0"
 #define CONFIG_ENV_BOOTFILE    "bootfile="MK_STR(CONFIG_HOSTNAME)"/uImage\0"
 #define CONFIG_ENV_UBOOT               "uboot="MK_STR(CONFIG_HOSTNAME)"/u-boot.bin\0" \
                                MK_STR(CONFIG_HOSTNAME)".dtb\0"
 #define CONFIG_ENV_BOOTFILE    "bootfile="MK_STR(CONFIG_HOSTNAME)"/uImage\0"
 #define CONFIG_ENV_UBOOT               "uboot="MK_STR(CONFIG_HOSTNAME)"/u-boot.bin\0" \

-                               "uboot_addr="MK_STR(TEXT_BASE)"\0"
+                               "uboot_addr="MK_STR(CONFIG_SYS_TEXT_BASE)"\0"

 
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        CONFIG_ENV_BOOTFILE                                             \
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        CONFIG_ENV_BOOTFILE                                             \

diff --git a/include/configs/Total5200.h b/include/configs/Total5200.h
index 7510ab1..de11d86 100644 (file)
--- a/include/configs/Total5200.h
+++ b/include/configs/Total5200.h
@@ -132,7 +132,7 @@
 #define CONFIG_CMD_USB
 
 
 #define CONFIG_CMD_USB
 
 

-#if (TEXT_BASE == 0xFE000000)          /* Boot low */
+#if (CONFIG_SYS_TEXT_BASE == 0xFE000000)               /* Boot low */

 #   define CONFIG_SYS_LOWBOOT          1
 #endif
 
 #   define CONFIG_SYS_LOWBOOT          1
 #endif
 


@@ -245,7 +245,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif

diff --git a/include/configs/VOH405.h b/include/configs/VOH405.h
index b9ea610..0117cc0 100644 (file)
--- a/include/configs/VOH405.h
+++ b/include/configs/VOH405.h
@@ -257,7 +257,7 @@
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          0xFFF80000
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          0xFFF80000

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (512 * 1024)    /* Reserve 512 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN          (2 * 1024*1024) /* Reserve 2 MB for malloc()    */
 
 #define CONFIG_SYS_MONITOR_LEN         (512 * 1024)    /* Reserve 512 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN          (2 * 1024*1024) /* Reserve 2 MB for malloc()    */
 

diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h
index a88b41a..76016ac 100644 (file)
--- a/include/configs/VOM405.h
+++ b/include/configs/VOM405.h
@@ -183,8 +183,8 @@
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_MONITOR_BASE
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_MONITOR_BASE

-#define CONFIG_SYS_MONITOR_BASE                TEXT_BASE
-#define CONFIG_SYS_MONITOR_LEN         (~(TEXT_BASE) + 1)
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_MONITOR_LEN         (~(CONFIG_SYS_TEXT_BASE) + 1)

 #define CONFIG_SYS_MALLOC_LEN          (256 * 1024)
 
 #if (CONFIG_SYS_MONITOR_BASE < FLASH_BASE0_PRELIM)
 #define CONFIG_SYS_MALLOC_LEN          (256 * 1024)
 
 #if (CONFIG_SYS_MONITOR_BASE < FLASH_BASE0_PRELIM)

diff --git a/include/configs/VoVPN-GW.h b/include/configs/VoVPN-GW.h
index 3614184..8f8b55e 100644 (file)
--- a/include/configs/VoVPN-GW.h
+++ b/include/configs/VoVPN-GW.h
@@ -308,7 +308,7 @@
  */
 #define CONFIG_SYS_SDRAM_BASE                  0x00000000
 #define CONFIG_SYS_SDRAM_SIZE                  (32*1024*1024)
  */
 #define CONFIG_SYS_SDRAM_BASE                  0x00000000
 #define CONFIG_SYS_SDRAM_SIZE                  (32*1024*1024)

-#define CONFIG_SYS_MONITOR_BASE                TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_FLASH               (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_OFFSET)
 #define CONFIG_SYS_MONITOR_LEN                 0x00020000
 #define CONFIG_SYS_MALLOC_LEN                  0x00020000
 #define CONFIG_SYS_MONITOR_FLASH               (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_OFFSET)
 #define CONFIG_SYS_MONITOR_LEN                 0x00020000
 #define CONFIG_SYS_MALLOC_LEN                  0x00020000

diff --git a/include/configs/XPEDITE1000.h b/include/configs/XPEDITE1000.h
index 8b47862..c378542 100644 (file)
--- a/include/configs/XPEDITE1000.h
+++ b/include/configs/XPEDITE1000.h
@@ -52,7 +52,7 @@
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          0xff000000      /* start of FLASH */
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          0xff000000      /* start of FLASH */

-#define CONFIG_SYS_MONITOR_BASE                TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE    /* start of monitor */

 #define CONFIG_SYS_PCI_MEMBASE         0x80000000      /* mapped pci memory */
 #define CONFIG_SYS_ISRAM_BASE          0xc0000000      /* internal SRAM */
 #define CONFIG_SYS_PCI_BASE            0xd0000000      /* internal PCI regs */
 #define CONFIG_SYS_PCI_MEMBASE         0x80000000      /* mapped pci memory */
 #define CONFIG_SYS_ISRAM_BASE          0xc0000000      /* internal SRAM */
 #define CONFIG_SYS_PCI_BASE            0xd0000000      /* internal PCI regs */


@@ -269,7 +269,7 @@ extern void out32(unsigned int, unsigned long);
  * ff000000 - ffbfffff OS Use/Filesystem (12MB)
  */
 
  * ff000000 - ffbfffff OS Use/Filesystem (12MB)
  */
 

-#define CONFIG_UBOOT_ENV_ADDR  MK_STR(TEXT_BASE)
+#define CONFIG_UBOOT_ENV_ADDR  MK_STR(CONFIG_SYS_TEXT_BASE)

 #define CONFIG_FDT_ENV_ADDR    MK_STR(0xfff00000)
 #define CONFIG_OS_ENV_ADDR     MK_STR(0xffc00000)
 
 #define CONFIG_FDT_ENV_ADDR    MK_STR(0xfff00000)
 #define CONFIG_OS_ENV_ADDR     MK_STR(0xffc00000)
 

diff --git a/include/configs/XPEDITE5170.h b/include/configs/XPEDITE5170.h
index 306baed..729a485 100644 (file)
--- a/include/configs/XPEDITE5170.h
+++ b/include/configs/XPEDITE5170.h
@@ -152,7 +152,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 #define CONFIG_SYS_FLASH_AUTOPROTECT_LIST      { {0xfff00000, 0xc0000}, \
                                                  {0xf7f00000, 0xc0000} }
 #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 #define CONFIG_SYS_FLASH_AUTOPROTECT_LIST      { {0xfff00000, 0xc0000}, \
                                                  {0xf7f00000, 0xc0000} }

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 #define CONFIG_SYS_MONITOR_BASE_EARLY  0xfff00000      /* early monitor loc */
 
 /*
 #define CONFIG_SYS_MONITOR_BASE_EARLY  0xfff00000      /* early monitor loc */
 
 /*


@@ -492,7 +492,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
                                 BATL_PP_RW                     |\
                                 BATL_CACHEINHIBIT              |\
                                 BATL_GUARDEDSTORAGE)
                                 BATL_PP_RW                     |\
                                 BATL_CACHEINHIBIT              |\
                                 BATL_GUARDEDSTORAGE)

-#define CONFIG_SYS_DBAT6U_EARLY        (TEXT_BASE                      |\
+#define CONFIG_SYS_DBAT6U_EARLY        (CONFIG_SYS_TEXT_BASE                   |\

                                 BATU_BL_1M                     |\
                                 BATU_VS                        |\
                                 BATU_VP)
                                 BATU_BL_1M                     |\
                                 BATU_VS                        |\
                                 BATU_VP)

diff --git a/include/configs/XPEDITE5200.h b/include/configs/XPEDITE5200.h
index 1fbe4fb..7ff440e 100644 (file)
--- a/include/configs/XPEDITE5200.h
+++ b/include/configs/XPEDITE5200.h
@@ -130,7 +130,7 @@
 #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 #define CONFIG_SYS_FLASH_AUTOPROTECT_LIST      { {0xfff40000, 0xc0000}, \
                                                  {0xfbf40000, 0xc0000} }
 #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 #define CONFIG_SYS_FLASH_AUTOPROTECT_LIST      { {0xfff40000, 0xc0000}, \
                                                  {0xfbf40000, 0xc0000} }

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 /*
  * Chip select configuration
 
 /*
  * Chip select configuration

diff --git a/include/configs/XPEDITE5370.h b/include/configs/XPEDITE5370.h
index 8225fff..634ba74 100644 (file)
--- a/include/configs/XPEDITE5370.h
+++ b/include/configs/XPEDITE5370.h
@@ -151,7 +151,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 #define CONFIG_SYS_FLASH_AUTOPROTECT_LIST      { {0xfff40000, 0xc0000}, \
                                                  {0xf7f40000, 0xc0000} }
 #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 #define CONFIG_SYS_FLASH_AUTOPROTECT_LIST      { {0xfff40000, 0xc0000}, \
                                                  {0xf7f40000, 0xc0000} }

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 /*
  * Chip select configuration
 
 /*
  * Chip select configuration

diff --git a/include/configs/Yukon8220.h b/include/configs/Yukon8220.h
index 8ec6c84..273b4e2 100644 (file)
--- a/include/configs/Yukon8220.h
+++ b/include/configs/Yukon8220.h
@@ -264,7 +264,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif

diff --git a/include/configs/ZPC1900.h b/include/configs/ZPC1900.h
index 8ae765c..d0dc067 100644 (file)
--- a/include/configs/ZPC1900.h
+++ b/include/configs/ZPC1900.h
@@ -215,7 +215,7 @@
 #define BOOTFLAG_COLD          0x01    /* Normal Power-On: Boot from FLASH */
 #define BOOTFLAG_WARM          0x02    /* Software reboot                  */
 
 #define BOOTFLAG_COLD          0x01    /* Normal Power-On: Boot from FLASH */
 #define BOOTFLAG_WARM          0x02    /* Software reboot                  */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 #endif

diff --git a/include/configs/aev.h b/include/configs/aev.h
index 54e6c57..15a242c 100644 (file)
--- a/include/configs/aev.h
+++ b/include/configs/aev.h
@@ -128,7 +128,7 @@
 
 #define        CONFIG_TIMESTAMP                /* display image timestamps */
 
 
 #define        CONFIG_TIMESTAMP                /* display image timestamps */
 

-#if (TEXT_BASE == 0xFC000000)          /* Boot low */
+#if (CONFIG_SYS_TEXT_BASE == 0xFC000000)               /* Boot low */

 #   define CONFIG_SYS_LOWBOOT          1
 #endif
 
 #   define CONFIG_SYS_LOWBOOT          1
 #endif
 


@@ -221,7 +221,7 @@
 /*
  * Flash configuration
  */
 /*
  * Flash configuration
  */

-#define CONFIG_SYS_FLASH_BASE          TEXT_BASE /* 0xFC000000 */
+#define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_TEXT_BASE /* 0xFC000000 */

 
 /* use CFI flash driver if no module variant is spezified */
 #define CONFIG_SYS_FLASH_CFI           1       /* Flash is CFI conformant */
 
 /* use CFI flash driver if no module variant is spezified */
 #define CONFIG_SYS_FLASH_CFI           1       /* Flash is CFI conformant */


@@ -273,7 +273,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif

diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h
index 9c53d37..b9f1f6b 100644 (file)
--- a/include/configs/amcc-common.h
+++ b/include/configs/amcc-common.h
@@ -24,7 +24,7 @@
 #define __AMCC_COMMON_H
 
 #define CONFIG_SYS_SDRAM_BASE          0x00000000      /* _must_ be 0          */
 #define __AMCC_COMMON_H
 
 #define CONFIG_SYS_SDRAM_BASE          0x00000000      /* _must_ be 0          */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* Start of U-Boot      */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* Start of U-Boot      */

 #define CONFIG_SYS_MONITOR_LEN         (0xFFFFFFFF - CONFIG_SYS_MONITOR_BASE + 1)
 #define CONFIG_SYS_MALLOC_LEN          (1 << 20)       /* Reserved for malloc  */
 
 #define CONFIG_SYS_MONITOR_LEN         (0xFFFFFFFF - CONFIG_SYS_MONITOR_BASE + 1)
 #define CONFIG_SYS_MALLOC_LEN          (1 << 20)       /* Reserved for malloc  */
 

diff --git a/include/configs/aria.h b/include/configs/aria.h
index c5a3feb..cb2c726 100644 (file)
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -305,7 +305,7 @@
                                         CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
                                         CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE                TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (384 * 1024)
 
 #ifdef CONFIG_FSL_DIU_FB
 #define CONFIG_SYS_MONITOR_LEN         (384 * 1024)
 
 #ifdef CONFIG_FSL_DIU_FB

diff --git a/include/configs/assabet.h b/include/configs/assabet.h
index d17d4bd..58cdbd5 100644 (file)
--- a/include/configs/assabet.h
+++ b/include/configs/assabet.h
@@ -140,7 +140,7 @@
 #define PHYS_FLASH_BANK_SIZE    0x01000000     /* 16 MB Banks */
 #define PHYS_FLASH_SECT_SIZE    0x00040000     /* 256 KB sectors (x2) */
 
 #define PHYS_FLASH_BANK_SIZE    0x01000000     /* 16 MB Banks */
 #define PHYS_FLASH_SECT_SIZE    0x00040000     /* 256 KB sectors (x2) */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (256 * 1024)    /* Reserve 256 KB for Monitor */
 
 #if CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE
 #define CONFIG_SYS_MONITOR_LEN         (256 * 1024)    /* Reserve 256 KB for Monitor */
 
 #if CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE

diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index 359e9c7..f2bc26a 100644 (file)
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -76,10 +76,10 @@
  */
 #ifdef CONFIG_RAM
 #define CONFIG_MONITOR_IS_IN_RAM
  */
 #ifdef CONFIG_RAM
 #define CONFIG_MONITOR_IS_IN_RAM

-#define CONFIG_TEXT_BASE               0x40020000
+#define CONFIG_SYS_TEXT_BASE           0x40020000

 #define ENABLE_JFFS    0
 #else
 #define ENABLE_JFFS    0
 #else

-#define CONFIG_TEXT_BASE               0x00000000
+#define CONFIG_SYS_TEXT_BASE           0x00000000

 #define ENABLE_JFFS    1
 #endif
 
 #define ENABLE_JFFS    1
 #endif
 


@@ -343,7 +343,7 @@
 #define CONFIG_SYS_FLASH_BASE          0x00000000
 
 #ifdef CONFIG_MONITOR_IS_IN_RAM
 #define CONFIG_SYS_FLASH_BASE          0x00000000
 
 #ifdef CONFIG_MONITOR_IS_IN_RAM

-#define CONFIG_SYS_MONITOR_BASE                CONFIG_TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE

 #else
 /* This is mainly used during relocation in start.S */
 #define CONFIG_SYS_MONITOR_BASE                (CONFIG_SYS_FLASH_BASE + 0x400)
 #else
 /* This is mainly used during relocation in start.S */
 #define CONFIG_SYS_MONITOR_BASE                (CONFIG_SYS_FLASH_BASE + 0x400)

diff --git a/include/configs/atc.h b/include/configs/atc.h
index 24015b7..6f4fa2b 100644 (file)
--- a/include/configs/atc.h
+++ b/include/configs/atc.h
@@ -256,7 +256,7 @@
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_SDRAM_MAX_SIZE      0x08000000      /* max. 128 MB          */
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_SDRAM_MAX_SIZE      0x08000000      /* max. 128 MB          */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (192 << 10)     /* Reserve 192 kB for Monitor */
 #define CONFIG_SYS_MALLOC_LEN          (128 << 10)     /* Reserve 128 kB for malloc()*/
 
 #define CONFIG_SYS_MONITOR_LEN         (192 << 10)     /* Reserve 192 kB for Monitor */
 #define CONFIG_SYS_MALLOC_LEN          (128 << 10)     /* Reserve 128 kB for malloc()*/
 

diff --git a/include/configs/barco.h b/include/configs/barco.h
index b1af701..eef711a 100644 (file)
--- a/include/configs/barco.h
+++ b/include/configs/barco.h
@@ -156,7 +156,7 @@
 #else
 #undef CONFIG_SYS_RAMBOOT
 #define CONFIG_SYS_MONITOR_LEN         0x00030000
 #else
 #undef CONFIG_SYS_RAMBOOT
 #define CONFIG_SYS_MONITOR_LEN         0x00030000

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 
 #define CONFIG_SYS_GBL_DATA_SIZE       128
 
 
 #define CONFIG_SYS_GBL_DATA_SIZE       128
 

diff --git a/include/configs/canmb.h b/include/configs/canmb.h
index 1f275e5..46d966d 100644 (file)
--- a/include/configs/canmb.h
+++ b/include/configs/canmb.h
@@ -77,11 +77,11 @@
 /*
  * MUST be low boot - HIGHBOOT is not supported anymore
  */
 /*
  * MUST be low boot - HIGHBOOT is not supported anymore
  */

-#if (TEXT_BASE == 0xFE000000)          /* Boot low with 32 MB Flash */
+#if (CONFIG_SYS_TEXT_BASE == 0xFE000000)               /* Boot low with 32 MB Flash */

 #   define CONFIG_SYS_LOWBOOT          1
 #   define CONFIG_SYS_LOWBOOT16        1
 #else
 #   define CONFIG_SYS_LOWBOOT          1
 #   define CONFIG_SYS_LOWBOOT16        1
 #else

-#   error "TEXT_BASE must be 0xFE000000"
+#   error "CONFIG_SYS_TEXT_BASE must be 0xFE000000"

 #endif
 
 /*
 #endif
 
 /*


@@ -160,7 +160,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif

diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h
index 72cf941..2893351 100644 (file)
--- a/include/configs/cm5200.h
+++ b/include/configs/cm5200.h
@@ -169,7 +169,7 @@
 
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (384 << 10)     /* 384 kB for Monitor */
 #define CONFIG_SYS_MALLOC_LEN          (256 << 10)     /* 256 kB for malloc() */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)       /* initial mem map for Linux */
 #define CONFIG_SYS_MONITOR_LEN         (384 << 10)     /* 384 kB for Monitor */
 #define CONFIG_SYS_MALLOC_LEN          (256 << 10)     /* 256 kB for malloc() */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)       /* initial mem map for Linux */

diff --git a/include/configs/cmi_mpc5xx.h b/include/configs/cmi_mpc5xx.h
index c3c603b..ae3e15c 100644 (file)
--- a/include/configs/cmi_mpc5xx.h
+++ b/include/configs/cmi_mpc5xx.h
@@ -142,7 +142,7 @@
 #define ANYBUS_BASE            0x03010000      /* Anybus Module */
 
 #define CONFIG_SYS_RESET_ADRESS        0x01000000      /* Adress which causes reset */
 #define ANYBUS_BASE            0x03010000      /* Anybus Module */
 
 #define CONFIG_SYS_RESET_ADRESS        0x01000000      /* Adress which causes reset */

-#define        CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE   /* TEXT_BASE is defined in the board config.mk file.    */
+#define        CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE   /* CONFIG_SYS_TEXT_BASE is defined in the board config.mk file. */

                                                /* This adress is given to the linker with -Ttext to    */
                                                /* locate the text section at this adress.              */
 #define        CONFIG_SYS_MONITOR_LEN          (192 << 10)     /* Reserve 192 kB for Monitor                           */
                                                /* This adress is given to the linker with -Ttext to    */
                                                /* locate the text section at this adress.              */
 #define        CONFIG_SYS_MONITOR_LEN          (192 << 10)     /* Reserve 192 kB for Monitor                           */

diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index 330e3ac..18710fb 100644 (file)
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -107,7 +107,7 @@
  *
  * Setting #if 0: u-boot will start from flash and relocate itself to RAM
  *
  *
  * Setting #if 0: u-boot will start from flash and relocate itself to RAM
  *

- * Please do not forget to modify the setting of TEXT_BASE
+ * Please do not forget to modify the setting of CONFIG_SYS_TEXT_BASE

  * in board/cobra5272/config.mk accordingly (#if 0: 0xffe00000; #if 1: 0x20000)
  *
  * ---
  * in board/cobra5272/config.mk accordingly (#if 0: 0xffe00000; #if 1: 0x20000)
  *
  * ---

diff --git a/include/configs/cogent_mpc8260.h b/include/configs/cogent_mpc8260.h
index 566565a..872333f 100644 (file)
--- a/include/configs/cogent_mpc8260.h
+++ b/include/configs/cogent_mpc8260.h
@@ -238,7 +238,7 @@
 #else
 #define CONFIG_SYS_FLASH_BASE          CMA_MB_FLASH_BASE       /* flash on m/b */
 #endif
 #else
 #define CONFIG_SYS_FLASH_BASE          CMA_MB_FLASH_BASE       /* flash on m/b */
 #endif

-#define        CONFIG_SYS_MONITOR_BASE TEXT_BASE
+#define        CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE

 #define        CONFIG_SYS_MONITOR_LEN          (256 << 10)     /* Reserve 256 kB for Monitor   */
 #define        CONFIG_SYS_MALLOC_LEN           (128 << 10)     /* Reserve 128 kB for malloc()*/
 
 #define        CONFIG_SYS_MONITOR_LEN          (256 << 10)     /* Reserve 256 kB for Monitor   */
 #define        CONFIG_SYS_MALLOC_LEN           (128 << 10)     /* Reserve 128 kB for malloc()*/
 


@@ -368,7 +368,7 @@
  * (the *_SIZE vars must be a power of 2)
  */
 
  * (the *_SIZE vars must be a power of 2)
  */
 

-#define CONFIG_SYS_CMA_CS0_BASE        TEXT_BASE       /* EPROM */
+#define CONFIG_SYS_CMA_CS0_BASE        CONFIG_SYS_TEXT_BASE    /* EPROM */

 #define CONFIG_SYS_CMA_CS0_SIZE        (1 << 20)
 #if 0
 #define CONFIG_SYS_CMA_CS2_BASE        0x10000000      /* Local Bus SDRAM */
 #define CONFIG_SYS_CMA_CS0_SIZE        (1 << 20)
 #if 0
 #define CONFIG_SYS_CMA_CS2_BASE        0x10000000      /* Local Bus SDRAM */

diff --git a/include/configs/cogent_mpc8xx.h b/include/configs/cogent_mpc8xx.h
index 750c0df..329bc99 100644 (file)
--- a/include/configs/cogent_mpc8xx.h
+++ b/include/configs/cogent_mpc8xx.h
@@ -185,7 +185,7 @@
 #else
 #define CONFIG_SYS_FLASH_BASE          CMA_MB_FLASH_BASE       /* flash on m/b */
 #endif
 #else
 #define CONFIG_SYS_FLASH_BASE          CMA_MB_FLASH_BASE       /* flash on m/b */
 #endif

-#define        CONFIG_SYS_MONITOR_BASE TEXT_BASE
+#define        CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE

 #define        CONFIG_SYS_MONITOR_LEN          (128 << 10)     /* Reserve 128 kB for Monitor   */
 #define        CONFIG_SYS_MALLOC_LEN           (128 << 10)     /* Reserve 128 kB for malloc()  */
 
 #define        CONFIG_SYS_MONITOR_LEN          (128 << 10)     /* Reserve 128 kB for Monitor   */
 #define        CONFIG_SYS_MALLOC_LEN           (128 << 10)     /* Reserve 128 kB for malloc()  */
 


@@ -310,7 +310,7 @@
  * (the *_SIZE vars must be a power of 2)
  */
 
  * (the *_SIZE vars must be a power of 2)
  */
 

-#define CONFIG_SYS_CMA_CS0_BASE        TEXT_BASE               /* EPROM */
+#define CONFIG_SYS_CMA_CS0_BASE        CONFIG_SYS_TEXT_BASE            /* EPROM */

 #define CONFIG_SYS_CMA_CS0_SIZE        (1 << 20)
 #define CONFIG_SYS_CMA_CS1_BASE        CMA_MB_RAM_BASE         /* RAM + I/O SLOT 1 */
 #define CONFIG_SYS_CMA_CS1_SIZE        (64 << 20)
 #define CONFIG_SYS_CMA_CS0_SIZE        (1 << 20)
 #define CONFIG_SYS_CMA_CS1_BASE        CMA_MB_RAM_BASE         /* RAM + I/O SLOT 1 */
 #define CONFIG_SYS_CMA_CS1_SIZE        (64 << 20)

diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 9184eeb..9af0a73 100644 (file)
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -240,7 +240,7 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000           /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500             /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000           /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500             /* Flash Write Timeout (ms) */
 

-#define CONFIG_SYS_MONITOR_BASE                TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 #define CONFIG_SYS_FLASH_EMPTY_INFO
 #define CONFIG_SYS_FLASH_AMD_CHECK_DQ7
 
 #define CONFIG_SYS_FLASH_EMPTY_INFO
 #define CONFIG_SYS_FLASH_AMD_CHECK_DQ7


@@ -619,7 +619,7 @@
        "bank_intlv=cs0_cs1\0"                                  \
        "netdev=eth0\0"                                         \
        "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                  \
        "bank_intlv=cs0_cs1\0"                                  \
        "netdev=eth0\0"                                         \
        "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                  \

-       "ubootaddr=" MK_STR(TEXT_BASE) "\0"                     \
+       "ubootaddr=" MK_STR(CONFIG_SYS_TEXT_BASE) "\0"                  \

        "tftpflash=tftpboot $loadaddr $uboot && "               \
        "protect off $ubootaddr +$filesize && "                 \
        "erase $ubootaddr +$filesize && "                       \
        "tftpflash=tftpboot $loadaddr $uboot && "               \
        "protect off $ubootaddr +$filesize && "                 \
        "erase $ubootaddr +$filesize && "                       \

diff --git a/include/configs/cpci5200.h b/include/configs/cpci5200.h
index f7290d6..712db6d 100644 (file)
--- a/include/configs/cpci5200.h
+++ b/include/configs/cpci5200.h
@@ -126,11 +126,11 @@
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_DATE
 
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_DATE
 

-#if (TEXT_BASE == 0xFF000000)  /* Boot low with 16 MB Flash */
+#if (CONFIG_SYS_TEXT_BASE == 0xFF000000)       /* Boot low with 16 MB Flash */

 #   define CONFIG_SYS_LOWBOOT          1
 #   define CONFIG_SYS_LOWBOOT16        1
 #endif
 #   define CONFIG_SYS_LOWBOOT          1
 #   define CONFIG_SYS_LOWBOOT16        1
 #endif

-#if (TEXT_BASE == 0xFF800000)  /* Boot low with  8 MB Flash */
+#if (CONFIG_SYS_TEXT_BASE == 0xFF800000)       /* Boot low with  8 MB Flash */

 #   define CONFIG_SYS_LOWBOOT          1
 #   define CONFIG_SYS_LOWBOOT08        1
 #endif
 #   define CONFIG_SYS_LOWBOOT          1
 #   define CONFIG_SYS_LOWBOOT08        1
 #endif


@@ -240,7 +240,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif

diff --git a/include/configs/csb272.h b/include/configs/csb272.h
index 7108210..2aca605 100644 (file)
--- a/include/configs/csb272.h
+++ b/include/configs/csb272.h
@@ -251,7 +251,7 @@
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          0xFE000000
 #define CONFIG_SYS_FLASH_SIZE          0x02000000
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          0xFE000000
 #define CONFIG_SYS_FLASH_SIZE          0x02000000

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (256 * 1024) /* Reserve 256 KB for Monitor */
 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024) /* Reserve 128 KB for malloc() */
 
 #define CONFIG_SYS_MONITOR_LEN         (256 * 1024) /* Reserve 256 KB for Monitor */
 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024) /* Reserve 128 KB for malloc() */
 

diff --git a/include/configs/csb472.h b/include/configs/csb472.h
index 7b9f29a..3450e24 100644 (file)
--- a/include/configs/csb472.h
+++ b/include/configs/csb472.h
@@ -250,7 +250,7 @@
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          0xFF800000
 #define CONFIG_SYS_FLASH_SIZE          0x00800000
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          0xFF800000
 #define CONFIG_SYS_FLASH_SIZE          0x00800000

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (256 * 1024) /* Reserve 256 KB for Monitor */
 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024) /* Reserve 128 KB for malloc() */
 
 #define CONFIG_SYS_MONITOR_LEN         (256 * 1024) /* Reserve 256 KB for Monitor */
 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024) /* Reserve 128 KB for malloc() */
 

diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index b439c80..d8c9362 100644 (file)
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -186,7 +186,7 @@
 #define CONFIG_FLASH_CFI_DRIVER    1
 
 /* The following #defines are needed to get flash environment right */
 #define CONFIG_FLASH_CFI_DRIVER    1
 
 /* The following #defines are needed to get flash environment right */

-#define        CONFIG_SYS_MONITOR_BASE TEXT_BASE
+#define        CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE

 #define        CONFIG_SYS_MONITOR_LEN          (192 << 10)
 
 #define CONFIG_SYS_INIT_SP_OFFSET      0x400000
 #define        CONFIG_SYS_MONITOR_LEN          (192 << 10)
 
 #define CONFIG_SYS_INIT_SP_OFFSET      0x400000

diff --git a/include/configs/debris.h b/include/configs/debris.h
index dc59df9..33b2120 100644 (file)
--- a/include/configs/debris.h
+++ b/include/configs/debris.h
@@ -204,7 +204,7 @@
 #else
 #undef CONFIG_SYS_RAMBOOT
 #define CONFIG_SYS_MONITOR_LEN         0x00040000
 #else
 #undef CONFIG_SYS_RAMBOOT
 #define CONFIG_SYS_MONITOR_LEN         0x00040000

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 
 /*#define CONFIG_SYS_GBL_DATA_SIZE    256*/
 #define CONFIG_SYS_GBL_DATA_SIZE       128
 
 /*#define CONFIG_SYS_GBL_DATA_SIZE    256*/
 #define CONFIG_SYS_GBL_DATA_SIZE       128

diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index 7a1a7c3..0b366f4 100644 (file)
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -103,7 +103,7 @@
 #define CONFIG_CMD_SPI
 #define CONFIG_CMD_USB
 
 #define CONFIG_CMD_SPI
 #define CONFIG_CMD_USB
 

-#if (TEXT_BASE == 0xFF000000)
+#if (CONFIG_SYS_TEXT_BASE == 0xFF000000)

 #define CONFIG_SYS_LOWBOOT     1
 #endif
 
 #define CONFIG_SYS_LOWBOOT     1
 #endif
 


@@ -308,7 +308,7 @@
        (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
        (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT             1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT             1
 #endif

diff --git a/include/configs/eNET.h b/include/configs/eNET.h
index fc7c1c6..78cab29 100644 (file)
--- a/include/configs/eNET.h
+++ b/include/configs/eNET.h
@@ -172,7 +172,7 @@
 #define CONFIG_SYS_STACK_SIZE          0x8000          /* Size of bootloader stack */
 #define CONFIG_SYS_BL_START_FLASH      0x38040000      /* Address of relocated code */
 #define CONFIG_SYS_BL_START_RAM                0x03fd0000      /* Address of relocated code */
 #define CONFIG_SYS_STACK_SIZE          0x8000          /* Size of bootloader stack */
 #define CONFIG_SYS_BL_START_FLASH      0x38040000      /* Address of relocated code */
 #define CONFIG_SYS_BL_START_RAM                0x03fd0000      /* Address of relocated code */

-#define CONFIG_SYS_MONITOR_BASE                TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (256 * 1024)    /* Reserve 256 kB for Mon       */
 #define CONFIG_SYS_FLASH_BASE          0x38000000      /* Boot Flash */
 #define CONFIG_SYS_FLASH_BASE_1                0x10000000      /* StrataFlash 1 */
 #define CONFIG_SYS_MONITOR_LEN         (256 * 1024)    /* Reserve 256 kB for Mon       */
 #define CONFIG_SYS_FLASH_BASE          0x38000000      /* Boot Flash */
 #define CONFIG_SYS_FLASH_BASE_1                0x10000000      /* StrataFlash 1 */

diff --git a/include/configs/eXalion.h b/include/configs/eXalion.h
index 85bf236..6a71cfa 100644 (file)
--- a/include/configs/eXalion.h
+++ b/include/configs/eXalion.h
@@ -109,7 +109,7 @@
 
 #undef CONFIG_SYS_RAMBOOT
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor       */
 
 #undef CONFIG_SYS_RAMBOOT
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor       */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 
 /*-----------------------------------------------------------------------
  * Definitions for initial stack pointer and data area
 
 /*-----------------------------------------------------------------------
  * Definitions for initial stack pointer and data area

diff --git a/include/configs/ep8248.h b/include/configs/ep8248.h
index a738425..8c042f8 100644 (file)
--- a/include/configs/ep8248.h
+++ b/include/configs/ep8248.h
@@ -197,7 +197,7 @@
 #define CONFIG_SYS_I2C_SLAVE           0x7F    /* I2C slave address            */
 #endif
 
 #define CONFIG_SYS_I2C_SLAVE           0x7F    /* I2C slave address            */
 #endif
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 #endif

diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h
index 3f4425a..482b348 100644 (file)
--- a/include/configs/ep8260.h
+++ b/include/configs/ep8260.h
@@ -97,7 +97,7 @@
 #define CONFIG_SYS_RESET_ADDRESS       0xFFF00100
 
 /* What should the base address of the main FLASH be and how big is
 #define CONFIG_SYS_RESET_ADDRESS       0xFFF00100
 
 /* What should the base address of the main FLASH be and how big is

- * it (in MBytes)? This must contain TEXT_BASE from board/ep8260/config.mk
+ * it (in MBytes)? This must contain CONFIG_SYS_TEXT_BASE from board/ep8260/config.mk

  * The main FLASH is whichever is connected to *CS0. U-Boot expects
  * this to be the SIMM.
  */
  * The main FLASH is whichever is connected to *CS0. U-Boot expects
  * this to be the SIMM.
  */


@@ -438,7 +438,7 @@
  * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
  * Note also that the logic that sets CONFIG_SYS_RAMBOOT is platform dependent.
  */
  * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
  * Note also that the logic that sets CONFIG_SYS_RAMBOOT is platform dependent.
  */

-#define CONFIG_SYS_MONITOR_BASE          TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE          CONFIG_SYS_TEXT_BASE

 
 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 
 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)

diff --git a/include/configs/ep82xxm.h b/include/configs/ep82xxm.h
index b52b941..afa35a3 100644 (file)
--- a/include/configs/ep82xxm.h
+++ b/include/configs/ep82xxm.h
@@ -333,7 +333,7 @@
 #define CONFIG_SYS_I2C_SLAVE           0x7F    /* I2C slave address            */
 #endif
 
 #define CONFIG_SYS_I2C_SLAVE           0x7F    /* I2C slave address            */
 #endif
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 #endif

diff --git a/include/configs/galaxy5200.h b/include/configs/galaxy5200.h
index 29951f7..7bf6de2 100644 (file)
--- a/include/configs/galaxy5200.h
+++ b/include/configs/galaxy5200.h
@@ -76,7 +76,7 @@
 
 #define        CONFIG_TIMESTAMP        1       /* Print image info with timestamp */
 
 
 #define        CONFIG_TIMESTAMP        1       /* Print image info with timestamp */
 

-#if (TEXT_BASE == 0xFE000000)          /* Boot low */
+#if (CONFIG_SYS_TEXT_BASE == 0xFE000000)               /* Boot low */

 #define CONFIG_SYS_LOWBOOT 1
 #endif
 /* RAMBOOT will be defined automatically in memory section */
 #define CONFIG_SYS_LOWBOOT 1
 #endif
 /* RAMBOOT will be defined automatically in memory section */


@@ -204,7 +204,7 @@
                                                CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
                                                CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #      define CONFIG_SYS_RAMBOOT               1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #      define CONFIG_SYS_RAMBOOT               1
 #endif

diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h
index d188439..bb4ea79 100644 (file)
--- a/include/configs/gr_cpci_ax2000.h
+++ b/include/configs/gr_cpci_ax2000.h
@@ -270,7 +270,7 @@
 #define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_PROM_OFFSET-32)
 #define CONFIG_SYS_STACK_SIZE          (0x10000-32)
 
 #define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_PROM_OFFSET-32)
 #define CONFIG_SYS_STACK_SIZE          (0x10000-32)
 

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif


@@ -287,7 +287,7 @@
 #define CONFIG_SYS_RELOC_MONITOR_BASE     (CONFIG_SYS_RELOC_MONITOR_MAX_END-CONFIG_SYS_MONITOR_LEN)
 
 /* make un relocated address from relocated address */
 #define CONFIG_SYS_RELOC_MONITOR_BASE     (CONFIG_SYS_RELOC_MONITOR_MAX_END-CONFIG_SYS_MONITOR_LEN)
 
 /* make un relocated address from relocated address */

-#define UN_RELOC(address) (address-(CONFIG_SYS_RELOC_MONITOR_BASE-TEXT_BASE))
+#define UN_RELOC(address) (address-(CONFIG_SYS_RELOC_MONITOR_BASE-CONFIG_SYS_TEXT_BASE))

 
 /*
  * Ethernet configuration uses on board SMC91C111
 
 /*
  * Ethernet configuration uses on board SMC91C111

diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h
index 3a568ff..35c4a08 100644 (file)
--- a/include/configs/gr_ep2s60.h
+++ b/include/configs/gr_ep2s60.h
@@ -238,7 +238,7 @@
 #define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_PROM_OFFSET-32)
 #define CONFIG_SYS_STACK_SIZE          (0x10000-32)
 
 #define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_PROM_OFFSET-32)
 #define CONFIG_SYS_STACK_SIZE          (0x10000-32)
 

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif


@@ -255,7 +255,7 @@
 #define CONFIG_SYS_RELOC_MONITOR_BASE     (CONFIG_SYS_RELOC_MONITOR_MAX_END-CONFIG_SYS_MONITOR_LEN)
 
 /* make un relocated address from relocated address */
 #define CONFIG_SYS_RELOC_MONITOR_BASE     (CONFIG_SYS_RELOC_MONITOR_MAX_END-CONFIG_SYS_MONITOR_LEN)
 
 /* make un relocated address from relocated address */

-#define UN_RELOC(address) (address-(CONFIG_SYS_RELOC_MONITOR_BASE-TEXT_BASE))
+#define UN_RELOC(address) (address-(CONFIG_SYS_RELOC_MONITOR_BASE-CONFIG_SYS_TEXT_BASE))

 
 /*
  * Ethernet configuration uses on board SMC91C111, however if a mezzanine
 
 /*
  * Ethernet configuration uses on board SMC91C111, however if a mezzanine

diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h
index 4dd9a0f..92fbbbb 100644 (file)
--- a/include/configs/gr_xc3s_1500.h
+++ b/include/configs/gr_xc3s_1500.h
@@ -215,7 +215,7 @@
 #define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_PROM_OFFSET-32)
 #define CONFIG_SYS_STACK_SIZE          (0x10000-32)
 
 #define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_PROM_OFFSET-32)
 #define CONFIG_SYS_STACK_SIZE          (0x10000-32)
 

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif


@@ -232,7 +232,7 @@
 #define CONFIG_SYS_RELOC_MONITOR_BASE     (CONFIG_SYS_RELOC_MONITOR_MAX_END-CONFIG_SYS_MONITOR_LEN)
 
 /* make un relocated address from relocated address */
 #define CONFIG_SYS_RELOC_MONITOR_BASE     (CONFIG_SYS_RELOC_MONITOR_MAX_END-CONFIG_SYS_MONITOR_LEN)
 
 /* make un relocated address from relocated address */

-#define UN_RELOC(address) (address-(CONFIG_SYS_RELOC_MONITOR_BASE-TEXT_BASE))
+#define UN_RELOC(address) (address-(CONFIG_SYS_RELOC_MONITOR_BASE-CONFIG_SYS_TEXT_BASE))

 
 /*
  * Ethernet configuration
 
 /*
  * Ethernet configuration

diff --git a/include/configs/grsim.h b/include/configs/grsim.h
index c3f1a31..5dfdf51 100644 (file)
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -240,7 +240,7 @@
 #define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_PROM_OFFSET-32)
 #define CONFIG_SYS_STACK_SIZE          (0x10000-32)
 
 #define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_PROM_OFFSET-32)
 #define CONFIG_SYS_STACK_SIZE          (0x10000-32)
 

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif


@@ -257,7 +257,7 @@
 #define CONFIG_SYS_RELOC_MONITOR_BASE     (CONFIG_SYS_RELOC_MONITOR_MAX_END-CONFIG_SYS_MONITOR_LEN)
 
 /* make un relocated address from relocated address */
 #define CONFIG_SYS_RELOC_MONITOR_BASE     (CONFIG_SYS_RELOC_MONITOR_MAX_END-CONFIG_SYS_MONITOR_LEN)
 
 /* make un relocated address from relocated address */

-#define UN_RELOC(address) (address-(CONFIG_SYS_RELOC_MONITOR_BASE-TEXT_BASE))
+#define UN_RELOC(address) (address-(CONFIG_SYS_RELOC_MONITOR_BASE-CONFIG_SYS_TEXT_BASE))

 
 /*
  * Ethernet configuration
 
 /*
  * Ethernet configuration

diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h
index 7ebbf25..39af8fe 100644 (file)
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -238,7 +238,7 @@
 #define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_PROM_OFFSET-32)
 #define CONFIG_SYS_STACK_SIZE          (0x10000-32)
 
 #define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_PROM_OFFSET-32)
 #define CONFIG_SYS_STACK_SIZE          (0x10000-32)
 

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif


@@ -255,7 +255,7 @@
 #define CONFIG_SYS_RELOC_MONITOR_BASE     (CONFIG_SYS_RELOC_MONITOR_MAX_END-CONFIG_SYS_MONITOR_LEN)
 
 /* make un relocated address from relocated address */
 #define CONFIG_SYS_RELOC_MONITOR_BASE     (CONFIG_SYS_RELOC_MONITOR_MAX_END-CONFIG_SYS_MONITOR_LEN)
 
 /* make un relocated address from relocated address */

-#define UN_RELOC(address) (address-(CONFIG_SYS_RELOC_MONITOR_BASE-TEXT_BASE))
+#define UN_RELOC(address) (address-(CONFIG_SYS_RELOC_MONITOR_BASE-CONFIG_SYS_TEXT_BASE))

 
 /*
  * Ethernet configuration
 
 /*
  * Ethernet configuration

diff --git a/include/configs/gth2.h b/include/configs/gth2.h
index 677baea..b5f454c 100644 (file)
--- a/include/configs/gth2.h
+++ b/include/configs/gth2.h
@@ -141,7 +141,7 @@
 #define PHYS_FLASH             0xbfc00000 /* Flash Bank #1 */
 
 /* The following #defines are needed to get flash environment right */
 #define PHYS_FLASH             0xbfc00000 /* Flash Bank #1 */
 
 /* The following #defines are needed to get flash environment right */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (192 << 10)
 
 #define CONFIG_SYS_INIT_SP_OFFSET      0x400000
 #define CONFIG_SYS_MONITOR_LEN         (192 << 10)
 
 #define CONFIG_SYS_INIT_SP_OFFSET      0x400000

diff --git a/include/configs/gw8260.h b/include/configs/gw8260.h
index 9ed3846..cb3dd9a 100644 (file)
--- a/include/configs/gw8260.h
+++ b/include/configs/gw8260.h
@@ -83,7 +83,7 @@
 #define CONFIG_SYS_SBC_BOOT_LOW 1
 
 /* What should the base address of the main FLASH be and how big is
 #define CONFIG_SYS_SBC_BOOT_LOW 1
 
 /* What should the base address of the main FLASH be and how big is

- * it (in MBytes)? This must contain TEXT_BASE from board/sbc8260/config.mk
+ * it (in MBytes)? This must contain CONFIG_SYS_TEXT_BASE from board/sbc8260/config.mk

  * The main FLASH is whichever is connected to *CS0. U-Boot expects
  * this to be the SIMM.
  */
  * The main FLASH is whichever is connected to *CS0. U-Boot expects
  * this to be the SIMM.
  */

diff --git a/include/configs/hcu4.h b/include/configs/hcu4.h
index 68bf998..394a45f 100644 (file)
--- a/include/configs/hcu4.h
+++ b/include/configs/hcu4.h
@@ -57,7 +57,7 @@
 
 #define CONFIG_SYS_SDRAM_BASE          0x00000000      /* _must_ be 0          */
 #define CONFIG_SYS_FLASH_BASE          0xfff80000      /* start of FLASH       */
 
 #define CONFIG_SYS_SDRAM_BASE          0x00000000      /* _must_ be 0          */
 #define CONFIG_SYS_FLASH_BASE          0xfff80000      /* start of FLASH       */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 
 /* ... with on-chip memory here (4KBytes) */
 #define CONFIG_SYS_OCM_DATA_ADDR 0xF4000000
 
 /* ... with on-chip memory here (4KBytes) */
 #define CONFIG_SYS_OCM_DATA_ADDR 0xF4000000

diff --git a/include/configs/hcu5.h b/include/configs/hcu5.h
index 5aa304d..a4633e1 100644 (file)
--- a/include/configs/hcu5.h
+++ b/include/configs/hcu5.h
@@ -61,7 +61,7 @@
 #define CONFIG_SYS_BOOT_BASE_ADDR      0xfff00000
 #define CONFIG_SYS_SDRAM_BASE          0x00000000      /* _must_ be 0          */
 #define CONFIG_SYS_FLASH_BASE          0xfff80000      /* start of FLASH       */
 #define CONFIG_SYS_BOOT_BASE_ADDR      0xfff00000
 #define CONFIG_SYS_SDRAM_BASE          0x00000000      /* _must_ be 0          */
 #define CONFIG_SYS_FLASH_BASE          0xfff80000      /* start of FLASH       */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_OCM_BASE            0xe0010000      /* ocm                  */
 #define CONFIG_SYS_OCM_DATA_ADDR       CONFIG_SYS_OCM_BASE
 #define CONFIG_SYS_PCI_BASE            0xe0000000      /* Internal PCI regs    */
 #define CONFIG_SYS_OCM_BASE            0xe0010000      /* ocm                  */
 #define CONFIG_SYS_OCM_DATA_ADDR       CONFIG_SYS_OCM_BASE
 #define CONFIG_SYS_PCI_BASE            0xe0000000      /* Internal PCI regs    */

diff --git a/include/configs/hmi1001.h b/include/configs/hmi1001.h
index 8b0b773..5d99121 100644 (file)
--- a/include/configs/hmi1001.h
+++ b/include/configs/hmi1001.h
@@ -80,7 +80,7 @@
 
 #define        CONFIG_TIMESTAMP        1       /* Print image info with timestamp */
 
 
 #define        CONFIG_TIMESTAMP        1       /* Print image info with timestamp */
 

-#if (TEXT_BASE == 0xFFF00000) /* Boot low */
+#if (CONFIG_SYS_TEXT_BASE == 0xFFF00000) /* Boot low */

 #   define CONFIG_SYS_LOWBOOT          1
 #endif
 
 #   define CONFIG_SYS_LOWBOOT          1
 #endif
 


@@ -149,7 +149,7 @@
 #define CONFIG_SYS_FLASH_SIZE          0x00800000 /* 8 MByte */
 #define CONFIG_SYS_MAX_FLASH_SECT      67      /* max num of sects on one chip */
 
 #define CONFIG_SYS_FLASH_SIZE          0x00800000 /* 8 MByte */
 #define CONFIG_SYS_MAX_FLASH_SECT      67      /* max num of sects on one chip */
 

-#define CONFIG_ENV_ADDR                (TEXT_BASE+0x40000) /* second sector */
+#define CONFIG_ENV_ADDR                (CONFIG_SYS_TEXT_BASE+0x40000) /* second sector */

 #define CONFIG_SYS_MAX_FLASH_BANKS     1       /* max num of flash banks
                                           (= chip selects) */
 #define CONFIG_SYS_FLASH_ERASE_TOUT    240000  /* Flash Erase Timeout (in ms)  */
 #define CONFIG_SYS_MAX_FLASH_BANKS     1       /* max num of flash banks
                                           (= chip selects) */
 #define CONFIG_SYS_FLASH_ERASE_TOUT    240000  /* Flash Erase Timeout (in ms)  */


@@ -204,7 +204,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif

diff --git a/include/configs/hymod.h b/include/configs/hymod.h
index 5a282ff..6efa9d2 100644 (file)
--- a/include/configs/hymod.h
+++ b/include/configs/hymod.h
@@ -386,8 +386,8 @@
  * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
  */
 #define        CONFIG_SYS_SDRAM_BASE           0x00000000
  * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
  */
 #define        CONFIG_SYS_SDRAM_BASE           0x00000000

-#define CONFIG_SYS_FLASH_BASE          TEXT_BASE
-#define        CONFIG_SYS_MONITOR_BASE TEXT_BASE
+#define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_TEXT_BASE
+#define        CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_FPGA_BASE           0x80000000
 /*
  * unfortunately, CONFIG_SYS_MONITOR_LEN must include the
 #define CONFIG_SYS_FPGA_BASE           0x80000000
 /*
  * unfortunately, CONFIG_SYS_MONITOR_LEN must include the

diff --git a/include/configs/incaip.h b/include/configs/incaip.h
index 2129dfd..b7ba6f4 100644 (file)
--- a/include/configs/incaip.h
+++ b/include/configs/incaip.h
@@ -139,7 +139,7 @@
 #define PHYS_FLASH_2           0xb0800000 /* Flash Bank #2 */
 
 /* The following #defines are needed to get flash environment right */
 #define PHYS_FLASH_2           0xb0800000 /* Flash Bank #2 */
 
 /* The following #defines are needed to get flash environment right */

-#define        CONFIG_SYS_MONITOR_BASE TEXT_BASE
+#define        CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE

 #define        CONFIG_SYS_MONITOR_LEN          (192 << 10)
 
 #define CONFIG_SYS_INIT_SP_OFFSET      0x400000
 #define        CONFIG_SYS_MONITOR_LEN          (192 << 10)
 
 #define CONFIG_SYS_INIT_SP_OFFSET      0x400000

diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h
index 69365e6..0f95445 100644 (file)
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -105,7 +105,7 @@
 
 #define        CONFIG_TIMESTAMP        1       /* Print image info with timestamp */
 
 
 #define        CONFIG_TIMESTAMP        1       /* Print image info with timestamp */
 

-#if (TEXT_BASE == 0xFFE00000)          /* Boot low */
+#if (CONFIG_SYS_TEXT_BASE == 0xFFE00000)               /* Boot low */

 #   define CONFIG_SYS_LOWBOOT          1
 #endif
 
 #   define CONFIG_SYS_LOWBOOT          1
 #endif
 


@@ -214,7 +214,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif

diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h
index 6903b36..b515aed 100644 (file)
--- a/include/configs/ipek01.h
+++ b/include/configs/ipek01.h
@@ -274,7 +274,7 @@
                                         CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
                                         CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE                TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif

diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index 9c45acf..082deed 100644 (file)
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -184,7 +184,7 @@
 
 #define CONFIG_SYS_MAX_FLASH_SECT      128     /* max num of sects on one chip */
 
 
 #define CONFIG_SYS_MAX_FLASH_SECT      128     /* max num of sects on one chip */
 

-#define CONFIG_ENV_ADDR                (TEXT_BASE + 0x40000) /* third sector */
+#define CONFIG_ENV_ADDR                (CONFIG_SYS_TEXT_BASE + 0x40000) /* third sector */

 
 #define CONFIG_SYS_FLASH_ERASE_TOUT    240000  /* Flash Erase Timeout (in ms)  */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (in ms)  */
 
 #define CONFIG_SYS_FLASH_ERASE_TOUT    240000  /* Flash Erase Timeout (in ms)  */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (in ms)  */


@@ -226,7 +226,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif

diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h
index 4794256..ecb0228 100644 (file)
--- a/include/configs/kmeter1.h
+++ b/include/configs/kmeter1.h
@@ -157,7 +157,7 @@
 /*
  * The reserved memory
  */
 /*
  * The reserved memory
  */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE /* start of monitor */

 #define CONFIG_SYS_FLASH_BASE          0xF0000000
 #define CONFIG_SYS_PIGGY_BASE          0xE8000000
 #define        CONFIG_SYS_PIGGY_SIZE           128
 #define CONFIG_SYS_FLASH_BASE          0xF0000000
 #define CONFIG_SYS_PIGGY_BASE          0xE8000000
 #define        CONFIG_SYS_PIGGY_SIZE           128

diff --git a/include/configs/korat.h b/include/configs/korat.h
index 55ef4f0..63cdd5d 100644 (file)
--- a/include/configs/korat.h
+++ b/include/configs/korat.h
@@ -64,7 +64,7 @@
 #define CONFIG_SYS_FLASH1_MAX_SIZE     0x08000000
 #define CONFIG_SYS_FLASH1_ADDR         (CONFIG_SYS_FLASH1_TOP - CONFIG_SYS_FLASH1_MAX_SIZE)
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_FLASH1_ADDR  /* start of FLASH       */
 #define CONFIG_SYS_FLASH1_MAX_SIZE     0x08000000
 #define CONFIG_SYS_FLASH1_ADDR         (CONFIG_SYS_FLASH1_TOP - CONFIG_SYS_FLASH1_MAX_SIZE)
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_FLASH1_ADDR  /* start of FLASH       */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_OCM_BASE            0xe0010000      /* ocm                  */
 #define CONFIG_SYS_OCM_DATA_ADDR       CONFIG_SYS_OCM_BASE
 #define CONFIG_SYS_PCI_BASE            0xe0000000      /* Internal PCI regs    */
 #define CONFIG_SYS_OCM_BASE            0xe0010000      /* ocm                  */
 #define CONFIG_SYS_OCM_DATA_ADDR       CONFIG_SYS_OCM_BASE
 #define CONFIG_SYS_PCI_BASE            0xe0000000      /* Internal PCI regs    */

diff --git a/include/configs/kvme080.h b/include/configs/kvme080.h
index 0d95263..7eabefa 100644 (file)
--- a/include/configs/kvme080.h
+++ b/include/configs/kvme080.h
@@ -136,7 +136,7 @@
 #define CONFIG_VERY_BIG_RAM
 
 #define CONFIG_SYS_MONITOR_LEN         0x00040000
 #define CONFIG_VERY_BIG_RAM
 
 #define CONFIG_SYS_MONITOR_LEN         0x00040000

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MALLOC_LEN          (512 << 10)
 
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)
 #define CONFIG_SYS_MALLOC_LEN          (512 << 10)
 
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)

diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h
index 6883e79..54c99ae 100644 (file)
--- a/include/configs/linkstation.h
+++ b/include/configs/linkstation.h
@@ -217,7 +217,7 @@
 
 #define CONFIG_SYS_FLASH_BASE          0xFFC00000
 #define CONFIG_SYS_FLASH_SIZE          0x00400000
 
 #define CONFIG_SYS_FLASH_BASE          0xFFC00000
 #define CONFIG_SYS_FLASH_SIZE          0x00400000

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 
 #define CONFIG_SYS_RESET_ADDRESS       0xFFF00100
 #define CONFIG_SYS_EUMB_ADDR           0x80000000
 
 #define CONFIG_SYS_RESET_ADDRESS       0xFFF00100
 #define CONFIG_SYS_EUMB_ADDR           0x80000000


@@ -240,7 +240,7 @@
 #endif
 
 /*-----------------------------------------------------------------------
 #endif
 
 /*-----------------------------------------------------------------------

- * Change TEXT_BASE in bord/linkstation/config.mk to get a RAM build
+ * Change CONFIG_SYS_TEXT_BASE in bord/linkstation/config.mk to get a RAM build

  *
  * RAM based builds are for testing purposes. A Linux module, uloader.o,
  * exists to load U-Boot and pass control to it
  *
  * RAM based builds are for testing purposes. A Linux module, uloader.o,
  * exists to load U-Boot and pass control to it

diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index 4a3b1dc..b061ddd 100644 (file)
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -48,7 +48,7 @@
  * Base addresses -- Note these are effective addresses where the
  * actual resources get mapped (not physical addresses)
  */
  * Base addresses -- Note these are effective addresses where the
  * actual resources get mapped (not physical addresses)
  */

-#define CONFIG_SYS_MONITOR_BASE                TEXT_BASE       /* Start of U-Boot      */
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE    /* Start of U-Boot      */

 #define CONFIG_SYS_MONITOR_LEN         (0xFFFFFFFF - CONFIG_SYS_MONITOR_BASE + 1)
 #define CONFIG_SYS_MALLOC_LEN          (1 << 20)       /* Reserved for malloc  */
 
 #define CONFIG_SYS_MONITOR_LEN         (0xFFFFFFFF - CONFIG_SYS_MONITOR_BASE + 1)
 #define CONFIG_SYS_MALLOC_LEN          (1 << 20)       /* Reserved for malloc  */
 

diff --git a/include/configs/manroland/common.h b/include/configs/manroland/common.h
index 291b669..79f9965 100644 (file)
--- a/include/configs/manroland/common.h
+++ b/include/configs/manroland/common.h
@@ -106,11 +106,11 @@
        "u-boot=" xstr(CONFIG_HOSTNAME) "/u-boot.bin \0"                \
        "u-boot_addr_r=200000\0"                                        \
        "load=tftp ${u-boot_addr_r} ${u-boot}\0"                        \
        "u-boot=" xstr(CONFIG_HOSTNAME) "/u-boot.bin \0"                \
        "u-boot_addr_r=200000\0"                                        \
        "load=tftp ${u-boot_addr_r} ${u-boot}\0"                        \

-       "update=protect off " xstr(TEXT_BASE) " +${filesize};"          \
-               "erase " xstr(TEXT_BASE) " +${filesize};"               \
-               "cp.b ${u-boot_addr_r} " xstr(TEXT_BASE)                \
+       "update=protect off " xstr(CONFIG_SYS_TEXT_BASE) " +${filesize};"               \
+               "erase " xstr(CONFIG_SYS_TEXT_BASE) " +${filesize};"            \
+               "cp.b ${u-boot_addr_r} " xstr(CONFIG_SYS_TEXT_BASE)             \

                " ${filesize};"                                         \
                " ${filesize};"                                         \

-               "protect on " xstr(TEXT_BASE) " +${filesize}\0"         \
+               "protect on " xstr(CONFIG_SYS_TEXT_BASE) " +${filesize}\0"              \

        ""
 
 #define CONFIG_BOOTCOMMAND     "run net_nfs"
        ""
 
 #define CONFIG_BOOTCOMMAND     "run net_nfs"

diff --git a/include/configs/manroland/mpc5200-common.h b/include/configs/manroland/mpc5200-common.h
index d25e093..7be1354 100644 (file)
--- a/include/configs/manroland/mpc5200-common.h
+++ b/include/configs/manroland/mpc5200-common.h
@@ -42,7 +42,7 @@
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200,\
                                         230400 }
 
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200,\
                                         230400 }
 

-#if (TEXT_BASE == 0xFFF00000) /* Boot low */
+#if (CONFIG_SYS_TEXT_BASE == 0xFFF00000) /* Boot low */

 #   define CONFIG_SYS_LOWBOOT          1
 #endif
 
 #   define CONFIG_SYS_LOWBOOT          1
 #endif
 


@@ -88,7 +88,7 @@
 
 #define CONFIG_SYS_FLASH_SIZE          0x00800000 /* 8 MByte */
 
 
 #define CONFIG_SYS_FLASH_SIZE          0x00800000 /* 8 MByte */
 

-#define CONFIG_ENV_ADDR                (TEXT_BASE+0x40000) /* second sector */
+#define CONFIG_ENV_ADDR                (CONFIG_SYS_TEXT_BASE+0x40000) /* second sector */

 #define CONFIG_SYS_MAX_FLASH_BANKS     1       /* max num of flash banks
                                           (= chip selects) */
 #define CONFIG_SYS_FLASH_ERASE_TOUT    240000  /* Flash Erase Timeout [ms]*/
 #define CONFIG_SYS_MAX_FLASH_BANKS     1       /* max num of flash banks
                                           (= chip selects) */
 #define CONFIG_SYS_FLASH_ERASE_TOUT    240000  /* Flash Erase Timeout [ms]*/


@@ -140,7 +140,7 @@
 #define CONFIG_SYS_INIT_RAM_END        MPC5XXX_SRAM_SIZE
 #endif
 
 #define CONFIG_SYS_INIT_RAM_END        MPC5XXX_SRAM_SIZE
 #endif
 

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif

diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h
index 7ef6385..00097c9 100644 (file)
--- a/include/configs/mcc200.h
+++ b/include/configs/mcc200.h
@@ -169,7 +169,7 @@
        "rootpath=/opt/eldk/ppc_6xx\0"                                  \
        "bootfile=/tftpboot/" CONFIG_SYS__BOARDNAME "/uImage\0"         \
        "load=tftp 200000 /tftpboot/" CONFIG_SYS__BOARDNAME "/u-boot.bin\0"     \
        "rootpath=/opt/eldk/ppc_6xx\0"                                  \
        "bootfile=/tftpboot/" CONFIG_SYS__BOARDNAME "/uImage\0"         \
        "load=tftp 200000 /tftpboot/" CONFIG_SYS__BOARDNAME "/u-boot.bin\0"     \

-       "text_base=" MK_STR(TEXT_BASE) "\0"                             \
+       "text_base=" MK_STR(CONFIG_SYS_TEXT_BASE) "\0"                          \

        "kernel_addr=0xFC0C0000\0"                                      \
        "update=protect off ${text_base} +${filesize};"                 \
                "era ${text_base} +${filesize};"                        \
        "kernel_addr=0xFC0C0000\0"                                      \
        "update=protect off ${text_base} +${filesize};"                 \
                "era ${text_base} +${filesize};"                        \


@@ -239,7 +239,7 @@
 
 #define CONFIG_ENV_OVERWRITE   1       /* allow modification of vendor params */
 
 
 #define CONFIG_ENV_OVERWRITE   1       /* allow modification of vendor params */
 

-#if TEXT_BASE == CONFIG_SYS_FLASH_BASE
+#if CONFIG_SYS_TEXT_BASE == CONFIG_SYS_FLASH_BASE

 #define CONFIG_SYS_LOWBOOT     1
 #endif
 
 #define CONFIG_SYS_LOWBOOT     1
 #endif
 


@@ -259,7 +259,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif

diff --git a/include/configs/mcu25.h b/include/configs/mcu25.h
index 8dd87cb..0f6d161 100644 (file)
--- a/include/configs/mcu25.h
+++ b/include/configs/mcu25.h
@@ -57,7 +57,7 @@
 
 #define CONFIG_SYS_SDRAM_BASE          0x00000000      /* _must_ be 0          */
 #define CONFIG_SYS_FLASH_BASE          0xfff80000      /* start of FLASH       */
 
 #define CONFIG_SYS_SDRAM_BASE          0x00000000      /* _must_ be 0          */
 #define CONFIG_SYS_FLASH_BASE          0xfff80000      /* start of FLASH       */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 
 /* ... with on-chip memory here (4KBytes) */
 #define CONFIG_SYS_OCM_DATA_ADDR       0xF4000000
 
 /* ... with on-chip memory here (4KBytes) */
 #define CONFIG_SYS_OCM_DATA_ADDR       0xF4000000

diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h
index a26de0b..fe32bb2 100644 (file)
--- a/include/configs/mecp5123.h
+++ b/include/configs/mecp5123.h
@@ -210,7 +210,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE                TEXT_BASE       /* Start of monitor */
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE    /* Start of monitor */

 #define CONFIG_SYS_MONITOR_LEN         (256 * 1024)    /* Monitor length */
 #define CONFIG_SYS_MALLOC_LEN          (6 * 1024 * 1024) /* Malloc size */
 
 #define CONFIG_SYS_MONITOR_LEN         (256 * 1024)    /* Monitor length */
 #define CONFIG_SYS_MALLOC_LEN          (6 * 1024 * 1024) /* Malloc size */
 

diff --git a/include/configs/mecp5200.h b/include/configs/mecp5200.h
index 73405ea..5aef5b2 100644 (file)
--- a/include/configs/mecp5200.h
+++ b/include/configs/mecp5200.h
@@ -105,11 +105,11 @@
 #define CONFIG_CMD_ELF
 
 
 #define CONFIG_CMD_ELF
 
 

-#if (TEXT_BASE == 0xFF000000)          /* Boot low with 16 MB Flash */
+#if (CONFIG_SYS_TEXT_BASE == 0xFF000000)               /* Boot low with 16 MB Flash */

 #   define CONFIG_SYS_LOWBOOT          1
 #   define CONFIG_SYS_LOWBOOT16        1
 #endif
 #   define CONFIG_SYS_LOWBOOT          1
 #   define CONFIG_SYS_LOWBOOT16        1
 #endif

-#if (TEXT_BASE == 0xFF800000)          /* Boot low with  8 MB Flash */
+#if (CONFIG_SYS_TEXT_BASE == 0xFF800000)               /* Boot low with  8 MB Flash */

 #   define CONFIG_SYS_LOWBOOT          1
 #   define CONFIG_SYS_LOWBOOT08        1
 #endif
 #   define CONFIG_SYS_LOWBOOT          1
 #   define CONFIG_SYS_LOWBOOT08        1
 #endif


@@ -221,7 +221,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif

diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h
index 55d1fc9..b35faae 100644 (file)
--- a/include/configs/mgcoge.h
+++ b/include/configs/mgcoge.h
@@ -123,7 +123,7 @@
                                        CONFIG_SYS_FLASH_BASE_1, \
                                        CONFIG_SYS_FLASH_BASE_2 }
 
                                        CONFIG_SYS_FLASH_BASE_1, \
                                        CONFIG_SYS_FLASH_BASE_2 }
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 #endif

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index c30cc4c..bcdd86e 100644 (file)
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -57,7 +57,7 @@
 #endif
 
 /* setting reset address */
 #endif
 
 /* setting reset address */

-/*#define      CONFIG_SYS_RESET_ADDRESS        TEXT_BASE*/
+/*#define      CONFIG_SYS_RESET_ADDRESS        CONFIG_SYS_TEXT_BASE*/

 
 /* ethernet */
 #ifdef XILINX_EMACLITE_BASEADDR
 
 /* ethernet */
 #ifdef XILINX_EMACLITE_BASEADDR


@@ -103,7 +103,7 @@
 
 /*
  * memory layout - Example
 
 /*
  * memory layout - Example

- * TEXT_BASE = 0x1200_0000;
+ * CONFIG_SYS_TEXT_BASE = 0x1200_0000;

  * CONFIG_SYS_SRAM_BASE = 0x1000_0000;
  * CONFIG_SYS_SRAM_SIZE = 0x0400_0000;
  *
  * CONFIG_SYS_SRAM_BASE = 0x1000_0000;
  * CONFIG_SYS_SRAM_SIZE = 0x0400_0000;
  *


@@ -113,7 +113,7 @@
  *
  * 0x1000_0000 CONFIG_SYS_SDRAM_BASE
  *                                     FREE
  *
  * 0x1000_0000 CONFIG_SYS_SDRAM_BASE
  *                                     FREE

- * 0x1200_0000 TEXT_BASE
+ * 0x1200_0000 CONFIG_SYS_TEXT_BASE

  *             U-BOOT code
  * 0x1202_0000
  *                                     FREE
  *             U-BOOT code
  * 0x1202_0000
  *                                     FREE

diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index fa4310b..7a7d5b9 100644 (file)
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -192,12 +192,12 @@
  * (e.g., by the BDI). Otherwise we must specify the default boot-up value of
  * MBAR, as given in the doccumentation.
  */
  * (e.g., by the BDI). Otherwise we must specify the default boot-up value of
  * MBAR, as given in the doccumentation.
  */

-#if TEXT_BASE == 0x00100000
+#if CONFIG_SYS_TEXT_BASE == 0x00100000

 #define CONFIG_SYS_DEFAULT_MBAR        0xf0000000
 #define CONFIG_SYS_DEFAULT_MBAR        0xf0000000

-#else /* TEXT_BASE != 0x00100000 */
+#else /* CONFIG_SYS_TEXT_BASE != 0x00100000 */

 #define CONFIG_SYS_DEFAULT_MBAR        0x80000000
 #define CONFIG_SYS_LOWBOOT             1
 #define CONFIG_SYS_DEFAULT_MBAR        0x80000000
 #define CONFIG_SYS_LOWBOOT             1

-#endif /* TEXT_BASE == 0x00100000 */
+#endif /* CONFIG_SYS_TEXT_BASE == 0x00100000 */

 
 /* Use SRAM until RAM will be available */
 #define CONFIG_SYS_INIT_RAM_ADDR       MPC5XXX_SRAM
 
 /* Use SRAM until RAM will be available */
 #define CONFIG_SYS_INIT_RAM_ADDR       MPC5XXX_SRAM


@@ -207,7 +207,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT             1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT             1
 #endif

diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h
index 3740316..07e7747 100644 (file)
--- a/include/configs/mpc5121ads.h
+++ b/include/configs/mpc5121ads.h
@@ -274,7 +274,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE               /* Start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE            /* Start of monitor */

 #define CONFIG_SYS_MONITOR_LEN         (512 * 1024)            /* Reserve 512 kB for Mon */
 #ifdef CONFIG_FSL_DIU_FB
 #define CONFIG_SYS_MALLOC_LEN          (6 * 1024 * 1024)       /* Reserved for malloc */
 #define CONFIG_SYS_MONITOR_LEN         (512 * 1024)            /* Reserve 512 kB for Mon */
 #ifdef CONFIG_FSL_DIU_FB
 #define CONFIG_SYS_MALLOC_LEN          (6 * 1024 * 1024)       /* Reserved for malloc */

diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h
index 497ea42..8068b40 100644 (file)
--- a/include/configs/mpc7448hpc2.h
+++ b/include/configs/mpc7448hpc2.h
@@ -251,7 +251,7 @@
 
 #define CONFIG_SYS_RESET_ADDRESS       0x3fffff00
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor */
 
 #define CONFIG_SYS_RESET_ADDRESS       0x3fffff00
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* u-boot code base */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* u-boot code base */

 #define CONFIG_SYS_MALLOC_LEN          (256 << 10)     /* Reserve 256 kB for malloc */
 
 /* Peripheral Device section */
 #define CONFIG_SYS_MALLOC_LEN          (256 << 10)     /* Reserve 256 kB for malloc */
 
 /* Peripheral Device section */

diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h
index b5a19e4..33d1844 100644 (file)
--- a/include/configs/mpc8308_p1m.h
+++ b/include/configs/mpc8308_p1m.h
@@ -206,7 +206,7 @@
 /*
  * The reserved memory
  */
 /*
  * The reserved memory
  */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE /* start of monitor */

 
 #define CONFIG_SYS_MONITOR_LEN (384 * 1024) /* Reserve 384 kB for Mon */
 #define CONFIG_SYS_MALLOC_LEN  (512 * 1024) /* Reserved for malloc */
 
 #define CONFIG_SYS_MONITOR_LEN (384 * 1024) /* Reserve 384 kB for Mon */
 #define CONFIG_SYS_MALLOC_LEN  (512 * 1024) /* Reserved for malloc */

diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h
index 8c06bf2..02090f2 100644 (file)
--- a/include/configs/ms7750se.h
+++ b/include/configs/ms7750se.h
@@ -65,7 +65,7 @@
 #define CONFIG_SYS_BAUDRATE_TABLE      { 115200, 57600, 38400, 19200, 9600 }
 
 #define CONFIG_SYS_MEMTEST_START       (CONFIG_SYS_SDRAM_BASE)
 #define CONFIG_SYS_BAUDRATE_TABLE      { 115200, 57600, 38400, 19200, 9600 }
 
 #define CONFIG_SYS_MEMTEST_START       (CONFIG_SYS_SDRAM_BASE)

-#define CONFIG_SYS_MEMTEST_END         (TEXT_BASE - 0x100000)
+#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_TEXT_BASE - 0x100000)

 
 /* NOR Flash */
 /* #define CONFIG_SYS_FLASH_BASE               (0xA1000000)*/
 
 /* NOR Flash */
 /* #define CONFIG_SYS_FLASH_BASE               (0xA1000000)*/

diff --git a/include/configs/muas3001.h b/include/configs/muas3001.h
index 43f46bf..d01160d 100644 (file)
--- a/include/configs/muas3001.h
+++ b/include/configs/muas3001.h
@@ -225,7 +225,7 @@
 
 #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE }
 
 
 #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE }
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 #endif

diff --git a/include/configs/munices.h b/include/configs/munices.h
index fa5230f..01756f5 100644 (file)
--- a/include/configs/munices.h
+++ b/include/configs/munices.h
@@ -119,7 +119,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif


@@ -154,11 +154,11 @@
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CONFIG_ENV_OFFSET              0x40000
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CONFIG_ENV_OFFSET              0x40000

-#define CONFIG_ENV_ADDR                (TEXT_BASE + CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_ADDR                (CONFIG_SYS_TEXT_BASE + CONFIG_ENV_OFFSET)

 #define CONFIG_ENV_SECT_SIZE   0x20000
 #define CONFIG_ENV_SIZE                0x4000
 #define CONFIG_ENV_OFFSET_REDUND   (CONFIG_ENV_OFFSET + CONFIG_ENV_SECT_SIZE)
 #define CONFIG_ENV_SECT_SIZE   0x20000
 #define CONFIG_ENV_SIZE                0x4000
 #define CONFIG_ENV_OFFSET_REDUND   (CONFIG_ENV_OFFSET + CONFIG_ENV_SECT_SIZE)

-#define CONFIG_ENV_ADDR_REDUND (TEXT_BASE + CONFIG_ENV_OFFSET_REDUND)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_SYS_TEXT_BASE + CONFIG_ENV_OFFSET_REDUND)

 #define CONFIG_ENV_SIZE_REDUND     (CONFIG_ENV_SIZE)
 #define CONFIG_ENV_OVERWRITE   1
 
 #define CONFIG_ENV_SIZE_REDUND     (CONFIG_ENV_SIZE)
 #define CONFIG_ENV_OVERWRITE   1
 

diff --git a/include/configs/netstal-common.h b/include/configs/netstal-common.h
index 8f42b6c..122f139 100644 (file)
--- a/include/configs/netstal-common.h
+++ b/include/configs/netstal-common.h
@@ -27,7 +27,7 @@
 #define __NETSTAL_COMMON_H
 
 #define CONFIG_SYS_SDRAM_BASE          0x00000000      /* _must_ be 0          */
 #define __NETSTAL_COMMON_H
 
 #define CONFIG_SYS_SDRAM_BASE          0x00000000      /* _must_ be 0          */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* Start of U-Boot      */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* Start of U-Boot      */

 #define CONFIG_SYS_MONITOR_LEN         (320 * 1024)    /* Reserve 320 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN          (256 * 1024)    /* Reserve 256 kB for malloc() */
 
 #define CONFIG_SYS_MONITOR_LEN         (320 * 1024)    /* Reserve 320 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN          (256 * 1024)    /* Reserve 256 kB for malloc() */
 

diff --git a/include/configs/o2dnt.h b/include/configs/o2dnt.h
index bdc0f79..9466dfa 100644 (file)
--- a/include/configs/o2dnt.h
+++ b/include/configs/o2dnt.h
@@ -102,10 +102,10 @@
 #define CONFIG_CMD_PCI
 
 
 #define CONFIG_CMD_PCI
 
 

-#if (TEXT_BASE == 0xFF000000)          /* Boot low with 16 MB Flash */
+#if (CONFIG_SYS_TEXT_BASE == 0xFF000000)               /* Boot low with 16 MB Flash */

 #   define CONFIG_SYS_LOWBOOT          1
 #else
 #   define CONFIG_SYS_LOWBOOT          1
 #else

-#   error "TEXT_BASE must be 0xFF000000"
+#   error "CONFIG_SYS_TEXT_BASE must be 0xFF000000"

 #endif
 
 /*
 #endif
 
 /*


@@ -222,7 +222,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (192 << 10)     /* Reserve 192 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN          (128 << 10)     /* Reserve 128 kB for malloc()  */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)       /* Initial Memory map for Linux */
 #define CONFIG_SYS_MONITOR_LEN         (192 << 10)     /* Reserve 192 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN          (128 << 10)     /* Reserve 128 kB for malloc()  */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)       /* Initial Memory map for Linux */

diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index 5ad745e..d5cf89a 100644 (file)
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -104,7 +104,7 @@
 #define PHYS_FLASH_2           0xbfc00000 /* Flash Bank #2 */
 
 /* The following #defines are needed to get flash environment right */
 #define PHYS_FLASH_2           0xbfc00000 /* Flash Bank #2 */
 
 /* The following #defines are needed to get flash environment right */

-#define        CONFIG_SYS_MONITOR_BASE TEXT_BASE
+#define        CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE

 #define        CONFIG_SYS_MONITOR_LEN          (192 << 10)
 
 #define CONFIG_SYS_INIT_SP_OFFSET      0x4000000
 #define        CONFIG_SYS_MONITOR_LEN          (192 << 10)
 
 #define CONFIG_SYS_INIT_SP_OFFSET      0x4000000

diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h
index 8acf3c7..3443e86 100644 (file)
--- a/include/configs/pcm030.h
+++ b/include/configs/pcm030.h
@@ -71,7 +71,7 @@ Serial console configuration
 
 #define        CONFIG_TIMESTAMP        1       /* Print image info with timestamp */
 
 
 #define        CONFIG_TIMESTAMP        1       /* Print image info with timestamp */
 

-#if (TEXT_BASE == 0xFF000000)  /* Boot low */
+#if (CONFIG_SYS_TEXT_BASE == 0xFF000000)       /* Boot low */

 #define CONFIG_SYS_LOWBOOT 1
 #endif
 /* RAMBOOT will be defined automatically in memory section */
 #define CONFIG_SYS_LOWBOOT 1
 #endif
 /* RAMBOOT will be defined automatically in memory section */


@@ -222,7 +222,7 @@ RTC configuration
                                                CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
                                                CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #      define CONFIG_SYS_RAMBOOT               1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #      define CONFIG_SYS_RAMBOOT               1
 #endif

diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h
index f073fcd..ba7f9ca 100644 (file)
--- a/include/configs/pdm360ng.h
+++ b/include/configs/pdm360ng.h
@@ -271,7 +271,7 @@
 #define CONFIG_FDT_FIXUP_PARTITIONS
 #endif
 
 #define CONFIG_FDT_FIXUP_PARTITIONS
 #endif
 

-#define CONFIG_SYS_MONITOR_BASE                TEXT_BASE       /* Start of monitor */
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE    /* Start of monitor */

 #define CONFIG_SYS_MONITOR_LEN         (512 * 1024)    /* 512 kB for monitor */
 #ifdef CONFIG_FSL_DIU_FB
 #define CONFIG_SYS_MALLOC_LEN          (6 * 1024 * 1024) /* for malloc */
 #define CONFIG_SYS_MONITOR_LEN         (512 * 1024)    /* 512 kB for monitor */
 #ifdef CONFIG_FSL_DIU_FB
 #define CONFIG_SYS_MALLOC_LEN          (6 * 1024 * 1024) /* for malloc */

diff --git a/include/configs/pf5200.h b/include/configs/pf5200.h
index 80a0bc6..8c8e0ab 100644 (file)
--- a/include/configs/pf5200.h
+++ b/include/configs/pf5200.h
@@ -122,11 +122,11 @@
 #define CONFIG_CMD_PCI
 
 
 #define CONFIG_CMD_PCI
 
 

-#if (TEXT_BASE == 0xFF000000)  /* Boot low with 16 MB Flash */
+#if (CONFIG_SYS_TEXT_BASE == 0xFF000000)       /* Boot low with 16 MB Flash */

 #   define CONFIG_SYS_LOWBOOT          1
 #   define CONFIG_SYS_LOWBOOT16        1
 #endif
 #   define CONFIG_SYS_LOWBOOT          1
 #   define CONFIG_SYS_LOWBOOT16        1
 #endif

-#if (TEXT_BASE == 0xFF800000)  /* Boot low with  8 MB Flash */
+#if (CONFIG_SYS_TEXT_BASE == 0xFF800000)       /* Boot low with  8 MB Flash */

 #   define CONFIG_SYS_LOWBOOT          1
 #   define CONFIG_SYS_LOWBOOT08        1
 #endif
 #   define CONFIG_SYS_LOWBOOT          1
 #   define CONFIG_SYS_LOWBOOT08        1
 #endif


@@ -226,7 +226,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif

diff --git a/include/configs/ppmc7xx.h b/include/configs/ppmc7xx.h
index 04779c4..8e807f5 100644 (file)
--- a/include/configs/ppmc7xx.h
+++ b/include/configs/ppmc7xx.h
@@ -240,7 +240,7 @@
  * CONFIG_SYS_MALLOC_LEN               - Size of malloc pool (128KB)
  */
 
  * CONFIG_SYS_MALLOC_LEN               - Size of malloc pool (128KB)
  */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MALLOC_LEN          0x20000
 
 
 #define CONFIG_SYS_MALLOC_LEN          0x20000
 
 

diff --git a/include/configs/ppmc8260.h b/include/configs/ppmc8260.h
index f387601..7db7498 100644 (file)
--- a/include/configs/ppmc8260.h
+++ b/include/configs/ppmc8260.h
@@ -76,7 +76,7 @@
 #define CONFIG_SYS_PPMC_BOOT_LOW 1
 
 /* What should the base address of the main FLASH be and how big is
 #define CONFIG_SYS_PPMC_BOOT_LOW 1
 
 /* What should the base address of the main FLASH be and how big is

- * it (in MBytes)? This must contain TEXT_BASE from board/ppmc8260/config.mk
+ * it (in MBytes)? This must contain CONFIG_SYS_TEXT_BASE from board/ppmc8260/config.mk

  * The main FLASH is whichever is connected to *CS0. U-Boot expects
  * this to be the SIMM.
  */
  * The main FLASH is whichever is connected to *CS0. U-Boot expects
  * this to be the SIMM.
  */

diff --git a/include/configs/purple.h b/include/configs/purple.h
index 2573aa1..25d8ebe 100644 (file)
--- a/include/configs/purple.h
+++ b/include/configs/purple.h
@@ -134,7 +134,7 @@
 #define PHYS_FLASH_1           0xb0000000 /* Flash Bank #1 */
 
 /* The following #defines are needed to get flash environment right */
 #define PHYS_FLASH_1           0xb0000000 /* Flash Bank #1 */
 
 /* The following #defines are needed to get flash environment right */

-#define        CONFIG_SYS_MONITOR_BASE TEXT_BASE
+#define        CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE

 #define        CONFIG_SYS_MONITOR_LEN          (192 << 10)
 
 #define CONFIG_SYS_FLASH_BASE          PHYS_FLASH_1
 #define        CONFIG_SYS_MONITOR_LEN          (192 << 10)
 
 #define CONFIG_SYS_FLASH_BASE          PHYS_FLASH_1

diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index cbacdf9..fb697d5 100644 (file)
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -136,7 +136,7 @@
  */
 
 /* The following #defines are needed to get flash environment right */
  */
 
 /* The following #defines are needed to get flash environment right */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (192 << 10)
 
 #define CONFIG_SYS_INIT_SP_OFFSET      0x400000
 #define CONFIG_SYS_MONITOR_LEN         (192 << 10)
 
 #define CONFIG_SYS_INIT_SP_OFFSET      0x400000

diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h
index 0764cc8..83d1733 100644 (file)
--- a/include/configs/quad100hd.h
+++ b/include/configs/quad100hd.h
@@ -175,7 +175,7 @@
 #define CONFIG_SYS_FLASH_BASE          0xFFC00000
 #define CONFIG_SYS_MONITOR_LEN         (256 * 1024)    /* Reserve 256 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024)    /* Reserve 128 kB for malloc()  */
 #define CONFIG_SYS_FLASH_BASE          0xFFC00000
 #define CONFIG_SYS_MONITOR_LEN         (256 * 1024)    /* Reserve 256 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024)    /* Reserve 128 kB for malloc()  */

-#define CONFIG_SYS_MONITOR_BASE        (TEXT_BASE)
+#define CONFIG_SYS_MONITOR_BASE        (CONFIG_SYS_TEXT_BASE)

 
 /*
  * For booting Linux, the board info and command line data
 
 /*
  * For booting Linux, the board info and command line data


@@ -207,7 +207,7 @@
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_SECT_SIZE   0x10000 /* size of one complete sector  */
 /* the environment is located before u-boot */
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_SECT_SIZE   0x10000 /* size of one complete sector  */
 /* the environment is located before u-boot */

-#define CONFIG_ENV_ADDR                (TEXT_BASE - CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_ADDR                (CONFIG_SYS_TEXT_BASE - CONFIG_ENV_SECT_SIZE)

 
 /* Address and size of Redundant Environment Sector    */
 #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR - CONFIG_ENV_SECT_SIZE)
 
 /* Address and size of Redundant Environment Sector    */
 #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR - CONFIG_ENV_SECT_SIZE)

diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 955f3ff..bc518db 100644 (file)
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -49,7 +49,7 @@
 #define CONFIG_SYS_BAUDRATE_TABLE      { 115200, 57600, 38400, 19200, 9600 }
 
 #define CONFIG_SYS_MEMTEST_START       (CONFIG_SYS_SDRAM_BASE)
 #define CONFIG_SYS_BAUDRATE_TABLE      { 115200, 57600, 38400, 19200, 9600 }
 
 #define CONFIG_SYS_MEMTEST_START       (CONFIG_SYS_SDRAM_BASE)

-#define CONFIG_SYS_MEMTEST_END         (TEXT_BASE - 0x100000)
+#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_TEXT_BASE - 0x100000)

 
 #define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE + 32 * 1024 * 1024)
 /* Address of u-boot image in Flash */
 
 #define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE + 32 * 1024 * 1024)
 /* Address of u-boot image in Flash */

diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index 3afe93a..41376da 100644 (file)
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -73,7 +73,7 @@
 #define CONFIG_SYS_BAUDRATE_TABLE      { 115200, 57600, 38400, 19200, 9600 }
 
 #define CONFIG_SYS_MEMTEST_START       (CONFIG_SYS_SDRAM_BASE)
 #define CONFIG_SYS_BAUDRATE_TABLE      { 115200, 57600, 38400, 19200, 9600 }
 
 #define CONFIG_SYS_MEMTEST_START       (CONFIG_SYS_SDRAM_BASE)

-#define CONFIG_SYS_MEMTEST_END         (TEXT_BASE - 0x100000)
+#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_TEXT_BASE - 0x100000)

 
 /* Flash board support */
 #define CONFIG_SYS_FLASH_BASE          (0xA0000000)
 
 /* Flash board support */
 #define CONFIG_SYS_FLASH_BASE          (0xA0000000)

diff --git a/include/configs/rmu.h b/include/configs/rmu.h
index 026826b..fefb17f 100644 (file)
--- a/include/configs/rmu.h
+++ b/include/configs/rmu.h
@@ -169,7 +169,7 @@
 #else
 #define        CONFIG_SYS_MONITOR_LEN          (128 << 10)     /* Reserve 128 kB for Monitor   */
 #endif
 #else
 #define        CONFIG_SYS_MONITOR_LEN          (128 << 10)     /* Reserve 128 kB for Monitor   */
 #endif

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define        CONFIG_SYS_MALLOC_LEN           (128 << 10)     /* Reserve 128 kB for malloc()  */
 
 /*
 #define        CONFIG_SYS_MALLOC_LEN           (128 << 10)     /* Reserve 128 kB for malloc()  */
 
 /*


@@ -189,7 +189,7 @@
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Timeout for Flash Write (in ms)      */
 
 #define        CONFIG_ENV_IS_IN_FLASH  1

-#define CONFIG_ENV_ADDR                ((TEXT_BASE) + 0x40000)
+#define CONFIG_ENV_ADDR                ((CONFIG_SYS_TEXT_BASE) + 0x40000)

 #define        CONFIG_ENV_SECT_SIZE    0x40000         /* Total Size of Environment Sector     */
 #define        CONFIG_ENV_SIZE         CONFIG_ENV_SECT_SIZE    /* Used size for environment    */
 
 #define        CONFIG_ENV_SECT_SIZE    0x40000         /* Total Size of Environment Sector     */
 #define        CONFIG_ENV_SIZE         CONFIG_ENV_SECT_SIZE    /* Used size for environment    */
 

diff --git a/include/configs/sacsng.h b/include/configs/sacsng.h
index b0198aa..9b39e15 100644 (file)
--- a/include/configs/sacsng.h
+++ b/include/configs/sacsng.h
@@ -85,7 +85,7 @@
 #define CONFIG_SYS_SBC_BOOT_LOW 1
 
 /* What should the base address of the main FLASH be and how big is
 #define CONFIG_SYS_SBC_BOOT_LOW 1
 
 /* What should the base address of the main FLASH be and how big is

- * it (in MBytes)?  This must contain TEXT_BASE from board/sacsng/config.mk
+ * it (in MBytes)?  This must contain CONFIG_SYS_TEXT_BASE from board/sacsng/config.mk

  * The main FLASH is whichever is connected to *CS0.
  */
 #define CONFIG_SYS_FLASH0_BASE 0x40000000
  * The main FLASH is whichever is connected to *CS0.
  */
 #define CONFIG_SYS_FLASH0_BASE 0x40000000

diff --git a/include/configs/sbc8240.h b/include/configs/sbc8240.h
index 1cc2920..b00667f 100644 (file)
--- a/include/configs/sbc8240.h
+++ b/include/configs/sbc8240.h
@@ -175,7 +175,7 @@ typedef unsigned int led_id_t;
 
 #define CONFIG_SYS_EUMB_ADDR       0xFCE00000
 
 
 #define CONFIG_SYS_EUMB_ADDR       0xFCE00000
 

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 
 #define CONFIG_SYS_MONITOR_LEN     (256 << 10) /* Reserve 256 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN      (128 << 10) /* Reserve 128 kB for malloc()  */
 
 #define CONFIG_SYS_MONITOR_LEN     (256 << 10) /* Reserve 256 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN      (128 << 10) /* Reserve 128 kB for malloc()  */

diff --git a/include/configs/sbc8260.h b/include/configs/sbc8260.h
index 3fa80a8..16dc4bb 100644 (file)
--- a/include/configs/sbc8260.h
+++ b/include/configs/sbc8260.h
@@ -84,7 +84,7 @@
 #define CONFIG_SYS_SBC_BOOT_LOW 1
 
 /* What should the base address of the main FLASH be and how big is
 #define CONFIG_SYS_SBC_BOOT_LOW 1
 
 /* What should the base address of the main FLASH be and how big is

- * it (in MBytes)? This must contain TEXT_BASE from board/sbc8260/config.mk
+ * it (in MBytes)? This must contain CONFIG_SYS_TEXT_BASE from board/sbc8260/config.mk

  * The main FLASH is whichever is connected to *CS0. U-Boot expects
  * this to be the SIMM.
  */
  * The main FLASH is whichever is connected to *CS0. U-Boot expects
  * this to be the SIMM.
  */

diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 94588e2..5ef32d8 100644 (file)
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -168,7 +168,7 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT

diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index 9eb8525..3624d37 100644 (file)
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -205,7 +205,7 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_FLASH_CFI
 
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_FLASH_CFI


@@ -327,12 +327,12 @@
 
 /*
  * For soldered on flash, (128kB/sector) we use 2 sectors for u-boot and
 
 /*
  * For soldered on flash, (128kB/sector) we use 2 sectors for u-boot and

- * one for env+bootpg (TEXT_BASE=0xfffa_0000, 384kB total).  For SODIMM
+ * one for env+bootpg (CONFIG_SYS_TEXT_BASE=0xfffa_0000, 384kB total).  For SODIMM

  * flash (512kB/sector) we use 1 sector for u-boot, and one for env+bootpg
  * flash (512kB/sector) we use 1 sector for u-boot, and one for env+bootpg

- * (TEXT_BASE=0xfff0_0000, 1MB total).  This dynamically sets the right
+ * (CONFIG_SYS_TEXT_BASE=0xfff0_0000, 1MB total).  This dynamically sets the right

  * thing for MONITOR_LEN in both cases.
  */
  * thing for MONITOR_LEN in both cases.
  */

-#define CONFIG_SYS_MONITOR_LEN         (~TEXT_BASE + 1)
+#define CONFIG_SYS_MONITOR_LEN         (~CONFIG_SYS_TEXT_BASE + 1)

 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024)    /* Reserved for malloc */
 
 /* Serial Port */
 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024)    /* Reserved for malloc */
 
 /* Serial Port */


@@ -450,10 +450,10 @@
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CONFIG_ENV_SIZE                0x2000
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CONFIG_ENV_SIZE                0x2000

-#if TEXT_BASE == 0xfff00000    /* Boot from 64MB SODIMM */
+#if CONFIG_SYS_TEXT_BASE == 0xfff00000 /* Boot from 64MB SODIMM */

 #define CONFIG_ENV_ADDR                (CONFIG_SYS_MONITOR_BASE + 0x80000)
 #define CONFIG_ENV_SECT_SIZE   0x80000 /* 512K(one sector) for env */
 #define CONFIG_ENV_ADDR                (CONFIG_SYS_MONITOR_BASE + 0x80000)
 #define CONFIG_ENV_SECT_SIZE   0x80000 /* 512K(one sector) for env */

-#elif TEXT_BASE == 0xfffa0000  /* Boot from 8MB soldered flash */
+#elif CONFIG_SYS_TEXT_BASE == 0xfffa0000       /* Boot from 8MB soldered flash */

 #define CONFIG_ENV_ADDR                (CONFIG_SYS_MONITOR_BASE + 0x40000)
 #define CONFIG_ENV_SECT_SIZE   0x20000 /* 128K(one sector) for env */
 #else
 #define CONFIG_ENV_ADDR                (CONFIG_SYS_MONITOR_BASE + 0x40000)
 #define CONFIG_ENV_SECT_SIZE   0x20000 /* 128K(one sector) for env */
 #else


@@ -562,11 +562,11 @@
  "netdev=eth0\0"                                               \
  "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                                \
  "tftpflash=tftpboot $loadaddr $uboot; "                       \
  "netdev=eth0\0"                                               \
  "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                                \
  "tftpflash=tftpboot $loadaddr $uboot; "                       \

-       "protect off " MK_STR(TEXT_BASE) " +$filesize; "        \
-       "erase " MK_STR(TEXT_BASE) " +$filesize; "              \
-       "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; "      \
-       "protect on " MK_STR(TEXT_BASE) " +$filesize; "         \
-       "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0"     \
+       "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "     \
+       "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "           \
+       "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; "   \
+       "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; "              \
+       "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0"  \

  "consoledev=ttyS0\0"                          \
  "ramdiskaddr=2000000\0"                       \
  "ramdiskfile=uRamdisk\0"                      \
  "consoledev=ttyS0\0"                          \
  "ramdiskaddr=2000000\0"                       \
  "ramdiskfile=uRamdisk\0"                      \

diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h
index 09f0a70..0d0fbdd 100644 (file)
--- a/include/configs/sbc8560.h
+++ b/include/configs/sbc8560.h
@@ -327,7 +327,7 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT    200000  /* Timeout for Flash Erase (in ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    50000   /* Timeout for Flash Write (in ms) */
 
 #define CONFIG_SYS_FLASH_ERASE_TOUT    200000  /* Timeout for Flash Erase (in ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    50000   /* Timeout for Flash Write (in ms) */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE /* start of monitor   */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE /* start of monitor        */

 
 #if 0
 /* XXX This doesn't work and I don't want to fix it */
 
 #if 0
 /* XXX This doesn't work and I don't want to fix it */

diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index 490d4f5..32c8c18 100644 (file)
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -230,7 +230,7 @@
 #undef CONFIG_SYS_FLASH_CHECKSUM
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 #undef CONFIG_SYS_FLASH_CHECKSUM
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 #define CONFIG_SYS_MONITOR_BASE_EARLY   0xfff00000     /* early monitor loc */
 
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_MONITOR_BASE_EARLY   0xfff00000     /* early monitor loc */
 
 #define CONFIG_FLASH_CFI_DRIVER


@@ -477,7 +477,7 @@
 /* Map the last 1M of flash where we're running from reset */
 #define CONFIG_SYS_DBAT6L_EARLY        (CONFIG_SYS_MONITOR_BASE_EARLY | BATL_PP_RW \
                                 | BATL_CACHEINHIBIT | BATL_GUARDEDSTORAGE)
 /* Map the last 1M of flash where we're running from reset */
 #define CONFIG_SYS_DBAT6L_EARLY        (CONFIG_SYS_MONITOR_BASE_EARLY | BATL_PP_RW \
                                 | BATL_CACHEINHIBIT | BATL_GUARDEDSTORAGE)

-#define CONFIG_SYS_DBAT6U_EARLY        (TEXT_BASE | BATU_BL_1M | BATU_VS | BATU_VP)
+#define CONFIG_SYS_DBAT6U_EARLY        (CONFIG_SYS_TEXT_BASE | BATU_BL_1M | BATU_VS | BATU_VP)

 #define CONFIG_SYS_IBAT6L_EARLY        (CONFIG_SYS_MONITOR_BASE_EARLY | BATL_PP_RW \
                                 | BATL_MEMCOHERENCE)
 #define CONFIG_SYS_IBAT6U_EARLY        CONFIG_SYS_DBAT6U_EARLY
 #define CONFIG_SYS_IBAT6L_EARLY        (CONFIG_SYS_MONITOR_BASE_EARLY | BATL_PP_RW \
                                 | BATL_MEMCOHERENCE)
 #define CONFIG_SYS_IBAT6U_EARLY        CONFIG_SYS_DBAT6U_EARLY

diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index 278b60e..4a854a9 100644 (file)
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -377,7 +377,7 @@
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          0xFFE00000
 
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          0xFFE00000
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* Start of U-Boot      */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* Start of U-Boot      */

 #define CONFIG_SYS_MONITOR_LEN         (0xFFFFFFFF - CONFIG_SYS_MONITOR_BASE + 1)
 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024)    /* Reserve 128 KiB for malloc() */
 
 #define CONFIG_SYS_MONITOR_LEN         (0xFFFFFFFF - CONFIG_SYS_MONITOR_BASE + 1)
 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024)    /* Reserve 128 KiB for malloc() */
 

diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index 988d41f..cfda957 100644 (file)
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.h
@@ -53,7 +53,7 @@
 
 /*
  * Define this if you want support for video console with radeon 9200 pci card
 
 /*
  * Define this if you want support for video console with radeon 9200 pci card

- * Also set TEXT_BASE to 0xFFF80000 in board/amcc/sequoia/config.mk in this case
+ * Also set CONFIG_SYS_TEXT_BASE to 0xFFF80000 in board/amcc/sequoia/config.mk in this case

  */
 #undef CONFIG_VIDEO
 
  */
 #undef CONFIG_VIDEO
 

diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h
index 624fe04..451b534 100644 (file)
--- a/include/configs/smdk6400.h
+++ b/include/configs/smdk6400.h
@@ -51,7 +51,7 @@
 /* input clock of PLL: SMDK6400 has 12MHz input clock */
 #define CONFIG_SYS_CLK_FREQ    12000000
 
 /* input clock of PLL: SMDK6400 has 12MHz input clock */
 #define CONFIG_SYS_CLK_FREQ    12000000
 

-#if !defined(CONFIG_NAND_SPL) && (TEXT_BASE >= 0xc0000000)
+#if !defined(CONFIG_NAND_SPL) && (CONFIG_SYS_TEXT_BASE >= 0xc0000000)

 #define CONFIG_ENABLE_MMU
 #endif
 
 #define CONFIG_ENABLE_MMU
 #endif
 

diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 595d174..bfd09a0 100644 (file)
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -210,7 +210,7 @@
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* 256 KiB */
 #define CONFIG_IDENT_STRING            " for SMDKC100"
 
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* 256 KiB */
 #define CONFIG_IDENT_STRING            " for SMDKC100"
 

-#if !defined(CONFIG_NAND_SPL) && (TEXT_BASE >= 0xc0000000)
+#if !defined(CONFIG_NAND_SPL) && (CONFIG_SYS_TEXT_BASE >= 0xc0000000)

 #define CONFIG_ENABLE_MMU
 #endif
 
 #define CONFIG_ENABLE_MMU
 #endif
 

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 88be349..8cf3974 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -159,7 +159,7 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms)     */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms)     */
 
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms)     */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms)     */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor     */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor     */

 
 #define CONFIG_SYS_LBC_LCRR            0x00030004    /* LB clock ratio reg     */
 #define CONFIG_SYS_LBC_LBCR            0x00000000    /* LB config reg          */
 
 #define CONFIG_SYS_LBC_LCRR            0x00030004    /* LB clock ratio reg     */
 #define CONFIG_SYS_LBC_LBCR            0x00000000    /* LB config reg          */

diff --git a/include/configs/sorcery.h b/include/configs/sorcery.h
index 5db1379..6792ba4 100644 (file)
--- a/include/configs/sorcery.h
+++ b/include/configs/sorcery.h
@@ -234,7 +234,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif

diff --git a/include/configs/spc1920.h b/include/configs/spc1920.h
index 1fe2a04..f81165b 100644 (file)
--- a/include/configs/spc1920.h
+++ b/include/configs/spc1920.h
@@ -161,7 +161,7 @@
  */
 #define        CONFIG_SYS_BOOTMAPSZ            (8 << 20)       /* Initial Memory map for Linux */
 
  */
 #define        CONFIG_SYS_BOOTMAPSZ            (8 << 20)       /* Initial Memory map for Linux */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define        CONFIG_SYS_MONITOR_LEN          (256 << 10)     /* Reserve 256 KB for monitor   */
 
 #ifdef CONFIG_BZIP2
 #define        CONFIG_SYS_MONITOR_LEN          (256 << 10)     /* Reserve 256 KB for monitor   */
 
 #ifdef CONFIG_BZIP2

diff --git a/include/configs/spieval.h b/include/configs/spieval.h
index d377e19..93c0990 100644 (file)
--- a/include/configs/spieval.h
+++ b/include/configs/spieval.h
@@ -176,7 +176,7 @@
 
 #define        CONFIG_TIMESTAMP                /* display image timestamps */
 
 
 #define        CONFIG_TIMESTAMP                /* display image timestamps */
 

-#if (TEXT_BASE == 0xFC000000)          /* Boot low */
+#if (CONFIG_SYS_TEXT_BASE == 0xFC000000)               /* Boot low */

 #   define CONFIG_SYS_LOWBOOT          1
 #endif
 
 #   define CONFIG_SYS_LOWBOOT          1
 #endif
 


@@ -283,7 +283,7 @@
 /*
  * Flash configuration
  */
 /*
  * Flash configuration
  */

-#define CONFIG_SYS_FLASH_BASE          TEXT_BASE /* 0xFC000000 */
+#define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_TEXT_BASE /* 0xFC000000 */

 
 /* use CFI flash driver if no module variant is spezified */
 #define CONFIG_SYS_FLASH_CFI           1       /* Flash is CFI conformant */
 
 /* use CFI flash driver if no module variant is spezified */
 #define CONFIG_SYS_FLASH_CFI           1       /* Flash is CFI conformant */


@@ -335,7 +335,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif

diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h
index 891d2bf..abc48b3 100644 (file)
--- a/include/configs/stxgp3.h
+++ b/include/configs/stxgp3.h
@@ -97,7 +97,7 @@
 #define CONFIG_SYS_OR1_PRELIM          0xffff0ff7      /* 64K is enough */
 #define CONFIG_SYS_LBC_LCLDEVS_BASE    0xfc000000      /* Base of localbus devices */
 
 #define CONFIG_SYS_OR1_PRELIM          0xffff0ff7      /* 64K is enough */
 #define CONFIG_SYS_LBC_LCLDEVS_BASE    0xfc000000      /* Base of localbus devices */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor     */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor     */

 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT

diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h
index 911c906..2a4758e 100644 (file)
--- a/include/configs/stxssa.h
+++ b/include/configs/stxssa.h
@@ -109,7 +109,7 @@
 #define CONFIG_SYS_BR1_PRELIM          0xFB001801      /* 32-bit port */
 #define CONFIG_SYS_OR1_PRELIM          0xFFFF0FF7      /* 64K is enough */
 
 #define CONFIG_SYS_BR1_PRELIM          0xFB001801      /* 32-bit port */
 #define CONFIG_SYS_OR1_PRELIM          0xFFFF0FF7      /* 64K is enough */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor     */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor     */

 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT

diff --git a/include/configs/tb0229.h b/include/configs/tb0229.h
index 9285c9d..011a683 100644 (file)
--- a/include/configs/tb0229.h
+++ b/include/configs/tb0229.h
@@ -142,7 +142,7 @@
 #define PHYS_FLASH_1           0xbfc00000 /* Flash Bank #1 */
 
 /* The following #defines are needed to get flash environment right */
 #define PHYS_FLASH_1           0xbfc00000 /* Flash Bank #1 */
 
 /* The following #defines are needed to get flash environment right */

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (192 << 10)
 
 #define CONFIG_SYS_INIT_SP_OFFSET      0x400000
 #define CONFIG_SYS_MONITOR_LEN         (192 << 10)
 
 #define CONFIG_SYS_INIT_SP_OFFSET      0x400000

diff --git a/include/configs/tnetv107x_evm.h b/include/configs/tnetv107x_evm.h
index 454e9b2..f423a0e 100644 (file)
--- a/include/configs/tnetv107x_evm.h
+++ b/include/configs/tnetv107x_evm.h
@@ -33,7 +33,7 @@
 #define CONFIG_TNETV107X
 #define CONFIG_TNETV107X_EVM
 #define CONFIG_ARCH_CPU_INIT
 #define CONFIG_TNETV107X
 #define CONFIG_TNETV107X_EVM
 #define CONFIG_ARCH_CPU_INIT

-#define CONFIG_SYS_UBOOT_BASE          TEXT_BASE
+#define CONFIG_SYS_UBOOT_BASE          CONFIG_SYS_TEXT_BASE

 #define CONFIG_DISABLE_TCM
 #define CONFIG_PERIPORT_REMAP
 #define CONFIG_PERIPORT_BASE           0x2000000
 #define CONFIG_DISABLE_TCM
 #define CONFIG_PERIPORT_REMAP
 #define CONFIG_PERIPORT_BASE           0x2000000

diff --git a/include/configs/utx8245.h b/include/configs/utx8245.h
index 1a47aad..6a0c68d 100644 (file)
--- a/include/configs/utx8245.h
+++ b/include/configs/utx8245.h
@@ -176,7 +176,7 @@ protect on ${u-boot_startaddr} ${u-boot_endaddr}"
 
 #define CONFIG_SYS_EUMB_ADDR       0xFC000000
 
 
 #define CONFIG_SYS_EUMB_ADDR       0xFC000000
 

-#define CONFIG_SYS_MONITOR_BASE    TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_TEXT_BASE

 
 #define CONFIG_SYS_MONITOR_LEN     (256 << 10) /* Reserve 256 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN      (128 << 10) /* Reserve 128 kB for malloc()  */
 
 #define CONFIG_SYS_MONITOR_LEN     (256 << 10) /* Reserve 256 kB for Monitor   */
 #define CONFIG_SYS_MALLOC_LEN      (128 << 10) /* Reserve 128 kB for malloc()  */

diff --git a/include/configs/v38b.h b/include/configs/v38b.h
index 600ccfb..e2db0b0 100644 (file)
--- a/include/configs/v38b.h
+++ b/include/configs/v38b.h
@@ -233,7 +233,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif

diff --git a/include/configs/vct.h b/include/configs/vct.h
index 1b894a6..4894969 100644 (file)
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -45,7 +45,7 @@
 
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* SDRAM is initialized by the bootstrap code */
 
 
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* SDRAM is initialized by the bootstrap code */
 

-#define CONFIG_SYS_MONITOR_BASE                TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)
 #define CONFIG_STACKSIZE               (256 << 10)
 #define CONFIG_SYS_MALLOC_LEN          (1 << 20)
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)
 #define CONFIG_STACKSIZE               (256 << 10)
 #define CONFIG_SYS_MALLOC_LEN          (1 << 20)

diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h
index 45976db..016143c 100644 (file)
--- a/include/configs/ve8313.h
+++ b/include/configs/ve8313.h
@@ -159,7 +159,7 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT

diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index 3c5dba3..aefe0e5 100644 (file)
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -149,7 +149,7 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase TO (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write TO (ms) */
 
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase TO (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write TO (ms) */
 

-#define CONFIG_SYS_MONITOR_BASE                TEXT_BASE       /* start of monitor */
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE    /* start of monitor */

 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT

diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h
index 6efe342..b4a9675 100644 (file)
--- a/include/configs/xilinx-ppc.h
+++ b/include/configs/xilinx-ppc.h
@@ -28,7 +28,7 @@
 
 /*Mem Map*/
 #define CONFIG_SYS_SDRAM_BASE          0x0
 
 /*Mem Map*/
 #define CONFIG_SYS_SDRAM_BASE          0x0

-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_MONITOR_LEN         (192 * 1024)
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 128 * 1024)
 
 #define CONFIG_SYS_MONITOR_LEN         (192 * 1024)
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 128 * 1024)
 

diff --git a/nand_spl/board/amcc/acadia/Makefile b/nand_spl/board/amcc/acadia/Makefile
index 46fbe3c..bee24bc 100644 (file)
--- a/nand_spl/board/amcc/acadia/Makefile
+++ b/nand_spl/board/amcc/acadia/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
 include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds

-LDFLAGS        = -Bstatic -T $(nandobj)u-boot.lds -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)
+LDFLAGS        = -Bstatic -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)

 AFLAGS += -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_NAND_SPL
 
 AFLAGS += -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_NAND_SPL
 

diff --git a/nand_spl/board/amcc/acadia/config.mk b/nand_spl/board/amcc/acadia/config.mk
index fcc838a..75a065a 100644 (file)
--- a/nand_spl/board/amcc/acadia/config.mk
+++ b/nand_spl/board/amcc/acadia/config.mk
@@ -25,17 +25,17 @@
 #
 
 #
 #
 
 #

-# TEXT_BASE for SPL:
+# CONFIG_SYS_TEXT_BASE for SPL:

 #
 # On 4xx platforms the SPL is located at 0xfffff000...0xffffffff,
 # in the last 4kBytes of memory space in cache.
 # We will copy this SPL into internal SRAM in start.S. So we set
 #
 # On 4xx platforms the SPL is located at 0xfffff000...0xffffffff,
 # in the last 4kBytes of memory space in cache.
 # We will copy this SPL into internal SRAM in start.S. So we set

-# TEXT_BASE to starting address in internal SRAM here.
+# CONFIG_SYS_TEXT_BASE to starting address in internal SRAM here.

 #
 #

-TEXT_BASE = 0xf8004000
+CONFIG_SYS_TEXT_BASE = 0xf8004000

 
 # PAD_TO used to generate a 16kByte binary needed for the combined image
 
 # PAD_TO used to generate a 16kByte binary needed for the combined image

-# -> PAD_TO = TEXT_BASE + 0x4000
+# -> PAD_TO = CONFIG_SYS_TEXT_BASE + 0x4000

 PAD_TO = 0xf8008000
 
 ifeq ($(debug),1)
 PAD_TO = 0xf8008000
 
 ifeq ($(debug),1)

diff --git a/nand_spl/board/amcc/bamboo/Makefile b/nand_spl/board/amcc/bamboo/Makefile
index a114ca5..0288c58 100644 (file)
--- a/nand_spl/board/amcc/bamboo/Makefile
+++ b/nand_spl/board/amcc/bamboo/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
 include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds

-LDFLAGS        = -Bstatic -T $(nandobj)u-boot.lds -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)
+LDFLAGS        = -Bstatic -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)

 AFLAGS += -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_NAND_SPL
 
 AFLAGS += -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_NAND_SPL
 

diff --git a/nand_spl/board/amcc/bamboo/config.mk b/nand_spl/board/amcc/bamboo/config.mk
index 6377b52..f81d03a 100644 (file)
--- a/nand_spl/board/amcc/bamboo/config.mk
+++ b/nand_spl/board/amcc/bamboo/config.mk
@@ -25,17 +25,17 @@
 #
 
 #
 #
 
 #

-# TEXT_BASE for SPL:
+# CONFIG_SYS_TEXT_BASE for SPL:

 #
 # On 440EP(x) platforms the SPL is located at 0xfffff000...0xffffffff,
 # in the last 4kBytes of memory space in cache.
 # We will copy this SPL into instruction-cache in start.S. So we set
 #
 # On 440EP(x) platforms the SPL is located at 0xfffff000...0xffffffff,
 # in the last 4kBytes of memory space in cache.
 # We will copy this SPL into instruction-cache in start.S. So we set

-# TEXT_BASE to starting address in i-cache here.
+# CONFIG_SYS_TEXT_BASE to starting address in i-cache here.

 #
 #

-TEXT_BASE = 0x00800000
+CONFIG_SYS_TEXT_BASE = 0x00800000

 
 # PAD_TO used to generate a 16kByte binary needed for the combined image
 
 # PAD_TO used to generate a 16kByte binary needed for the combined image

-# -> PAD_TO = TEXT_BASE + 0x4000
+# -> PAD_TO = CONFIG_SYS_TEXT_BASE + 0x4000

 PAD_TO = 0x00804000
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 PAD_TO = 0x00804000
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1

diff --git a/nand_spl/board/amcc/canyonlands/Makefile b/nand_spl/board/amcc/canyonlands/Makefile
index e798237..ab98d6f 100644 (file)
--- a/nand_spl/board/amcc/canyonlands/Makefile
+++ b/nand_spl/board/amcc/canyonlands/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
 include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds

-LDFLAGS        = -Bstatic -T $(nandobj)u-boot.lds -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)
+LDFLAGS        = -Bstatic -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)

 AFLAGS += -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_NAND_SPL
 
 AFLAGS += -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_NAND_SPL
 

diff --git a/nand_spl/board/amcc/canyonlands/config.mk b/nand_spl/board/amcc/canyonlands/config.mk
index 688c92b..6819265 100644 (file)
--- a/nand_spl/board/amcc/canyonlands/config.mk
+++ b/nand_spl/board/amcc/canyonlands/config.mk
@@ -25,17 +25,17 @@
 #
 
 #
 #
 
 #

-# TEXT_BASE for SPL:
+# CONFIG_SYS_TEXT_BASE for SPL:

 #
 # On 460EX platforms the SPL is located at 0xfffff000...0xffffffff,
 # in the last 4kBytes of memory space in cache.
 # We will copy this SPL into internal SRAM in start.S. So we set
 #
 # On 460EX platforms the SPL is located at 0xfffff000...0xffffffff,
 # in the last 4kBytes of memory space in cache.
 # We will copy this SPL into internal SRAM in start.S. So we set

-# TEXT_BASE to starting address in internal SRAM here.
+# CONFIG_SYS_TEXT_BASE to starting address in internal SRAM here.

 #
 #

-TEXT_BASE = 0xE3003000
+CONFIG_SYS_TEXT_BASE = 0xE3003000

 
 # PAD_TO used to generate a 128kByte binary needed for the combined image
 
 # PAD_TO used to generate a 128kByte binary needed for the combined image

-# -> PAD_TO = TEXT_BASE + 0x20000
+# -> PAD_TO = CONFIG_SYS_TEXT_BASE + 0x20000

 PAD_TO = 0xE3023000
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 PAD_TO = 0xE3023000
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1

diff --git a/nand_spl/board/amcc/kilauea/Makefile b/nand_spl/board/amcc/kilauea/Makefile
index a49ba07..78c67a2 100644 (file)
--- a/nand_spl/board/amcc/kilauea/Makefile
+++ b/nand_spl/board/amcc/kilauea/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
 include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds

-LDFLAGS        = -Bstatic -T $(nandobj)u-boot.lds -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)
+LDFLAGS        = -Bstatic -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)

 AFLAGS += -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_NAND_SPL
 
 AFLAGS += -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_NAND_SPL
 

diff --git a/nand_spl/board/amcc/kilauea/config.mk b/nand_spl/board/amcc/kilauea/config.mk
index f6bcd21..6240277 100644 (file)
--- a/nand_spl/board/amcc/kilauea/config.mk
+++ b/nand_spl/board/amcc/kilauea/config.mk
@@ -25,18 +25,18 @@
 #
 
 #
 #
 
 #

-# TEXT_BASE for SPL:
+# CONFIG_SYS_TEXT_BASE for SPL:

 #
 # On 4xx platforms the SPL is located at 0xfffff000...0xffffffff,
 # in the last 4kBytes of memory space in cache.
 # We will copy this SPL into SDRAM since we can't access the NAND
 # controller at CS0 while running from this location. So we set
 #
 # On 4xx platforms the SPL is located at 0xfffff000...0xffffffff,
 # in the last 4kBytes of memory space in cache.
 # We will copy this SPL into SDRAM since we can't access the NAND
 # controller at CS0 while running from this location. So we set

-# TEXT_BASE to starting address in SDRAM here.
+# CONFIG_SYS_TEXT_BASE to starting address in SDRAM here.

 #
 #

-TEXT_BASE = 0x00800000
+CONFIG_SYS_TEXT_BASE = 0x00800000

 
 # PAD_TO used to generate a 16kByte binary needed for the combined image
 
 # PAD_TO used to generate a 16kByte binary needed for the combined image

-# -> PAD_TO = TEXT_BASE + 0x4000
+# -> PAD_TO = CONFIG_SYS_TEXT_BASE + 0x4000

 PAD_TO = 0x00804000
 
 ifeq ($(debug),1)
 PAD_TO = 0x00804000
 
 ifeq ($(debug),1)

diff --git a/nand_spl/board/amcc/sequoia/Makefile b/nand_spl/board/amcc/sequoia/Makefile
index 951fe46..d3e28ce 100644 (file)
--- a/nand_spl/board/amcc/sequoia/Makefile
+++ b/nand_spl/board/amcc/sequoia/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
 include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds

-LDFLAGS        = -Bstatic -T $(nandobj)u-boot.lds -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)
+LDFLAGS        = -Bstatic -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)

 AFLAGS += -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_NAND_SPL
 
 AFLAGS += -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_NAND_SPL
 

diff --git a/nand_spl/board/amcc/sequoia/config.mk b/nand_spl/board/amcc/sequoia/config.mk
index e8c6333..52d150b 100644 (file)
--- a/nand_spl/board/amcc/sequoia/config.mk
+++ b/nand_spl/board/amcc/sequoia/config.mk
@@ -25,17 +25,17 @@
 #
 
 #
 #
 
 #

-# TEXT_BASE for SPL:
+# CONFIG_SYS_TEXT_BASE for SPL:

 #
 # On 440EP(x) platforms the SPL is located at 0xfffff000...0xffffffff,
 # in the last 4kBytes of memory space in cache.
 # We will copy this SPL into internal SRAM in start.S. So we set
 #
 # On 440EP(x) platforms the SPL is located at 0xfffff000...0xffffffff,
 # in the last 4kBytes of memory space in cache.
 # We will copy this SPL into internal SRAM in start.S. So we set

-# TEXT_BASE to starting address in internal SRAM here.
+# CONFIG_SYS_TEXT_BASE to starting address in internal SRAM here.

 #
 #

-TEXT_BASE = 0xE0013000
+CONFIG_SYS_TEXT_BASE = 0xE0013000

 
 # PAD_TO used to generate a 16kByte binary needed for the combined image
 
 # PAD_TO used to generate a 16kByte binary needed for the combined image

-# -> PAD_TO = TEXT_BASE + 0x4000
+# -> PAD_TO = CONFIG_SYS_TEXT_BASE + 0x4000

 PAD_TO = 0xE0017000
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 PAD_TO = 0xE0017000
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1

diff --git a/nand_spl/board/freescale/mpc8313erdb/Makefile b/nand_spl/board/freescale/mpc8313erdb/Makefile
index 98edb09..05cd2fd 100644 (file)
--- a/nand_spl/board/freescale/mpc8313erdb/Makefile
+++ b/nand_spl/board/freescale/mpc8313erdb/Makefile
@@ -23,13 +23,13 @@
 #
 
 NAND_SPL := y
 #
 
 NAND_SPL := y

-TEXT_BASE := 0xfff00000
+CONFIG_SYS_TEXT_BASE := 0xfff00000

 PAD_TO := 0xfff04000
 
 include $(TOPDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
 PAD_TO := 0xfff04000
 
 include $(TOPDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds

-LDFLAGS        = -Bstatic -T $(nandobj)u-boot.lds -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)
+LDFLAGS        = -Bstatic -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)

 AFLAGS += -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_NAND_SPL
 
 AFLAGS += -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_NAND_SPL
 

diff --git a/nand_spl/board/freescale/mpc8315erdb/Makefile b/nand_spl/board/freescale/mpc8315erdb/Makefile
index 98edb09..05cd2fd 100644 (file)
--- a/nand_spl/board/freescale/mpc8315erdb/Makefile
+++ b/nand_spl/board/freescale/mpc8315erdb/Makefile
@@ -23,13 +23,13 @@
 #
 
 NAND_SPL := y
 #
 
 NAND_SPL := y

-TEXT_BASE := 0xfff00000
+CONFIG_SYS_TEXT_BASE := 0xfff00000

 PAD_TO := 0xfff04000
 
 include $(TOPDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
 PAD_TO := 0xfff04000
 
 include $(TOPDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds

-LDFLAGS        = -Bstatic -T $(nandobj)u-boot.lds -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)
+LDFLAGS        = -Bstatic -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)

 AFLAGS += -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_NAND_SPL
 
 AFLAGS += -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_NAND_SPL
 

diff --git a/nand_spl/board/freescale/mpc8536ds/Makefile b/nand_spl/board/freescale/mpc8536ds/Makefile
index 3d0936a..d1c0ef8 100644 (file)
--- a/nand_spl/board/freescale/mpc8536ds/Makefile
+++ b/nand_spl/board/freescale/mpc8536ds/Makefile
@@ -24,13 +24,13 @@
 #
 
 NAND_SPL := y
 #
 
 NAND_SPL := y

-TEXT_BASE := 0xfff00000
+CONFIG_SYS_TEXT_BASE := 0xfff00000

 PAD_TO := 0xfff01000
 
 include $(TOPDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds
 PAD_TO := 0xfff01000
 
 include $(TOPDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds

-LDFLAGS        = -Bstatic -T $(LDSCRIPT) -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)
+LDFLAGS        = -Bstatic -T $(LDSCRIPT) -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)

 AFLAGS += -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_NAND_SPL
 
 AFLAGS += -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_NAND_SPL
 

diff --git a/nand_spl/board/freescale/mpc8569mds/Makefile b/nand_spl/board/freescale/mpc8569mds/Makefile
index 3d0936a..d1c0ef8 100644 (file)
--- a/nand_spl/board/freescale/mpc8569mds/Makefile
+++ b/nand_spl/board/freescale/mpc8569mds/Makefile
@@ -24,13 +24,13 @@
 #
 
 NAND_SPL := y
 #
 
 NAND_SPL := y

-TEXT_BASE := 0xfff00000
+CONFIG_SYS_TEXT_BASE := 0xfff00000

 PAD_TO := 0xfff01000
 
 include $(TOPDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds
 PAD_TO := 0xfff01000
 
 include $(TOPDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds

-LDFLAGS        = -Bstatic -T $(LDSCRIPT) -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)
+LDFLAGS        = -Bstatic -T $(LDSCRIPT) -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)

 AFLAGS += -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_NAND_SPL
 
 AFLAGS += -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_NAND_SPL
 

diff --git a/nand_spl/board/freescale/mx31pdk/Makefile b/nand_spl/board/freescale/mx31pdk/Makefile
index c1dcf05..3568e8c 100644 (file)
--- a/nand_spl/board/freescale/mx31pdk/Makefile
+++ b/nand_spl/board/freescale/mx31pdk/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/config.mk
 include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
 include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds

-LDFLAGS        = -Bstatic -T $(nandobj)u-boot.lds -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)
+LDFLAGS        = -Bstatic -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)

 AFLAGS += -DCONFIG_PRELOADER -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_PRELOADER -DCONFIG_NAND_SPL
 
 AFLAGS += -DCONFIG_PRELOADER -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_PRELOADER -DCONFIG_NAND_SPL
 

diff --git a/nand_spl/board/freescale/p1_p2_rdb/Makefile b/nand_spl/board/freescale/p1_p2_rdb/Makefile
index 3d0936a..d1c0ef8 100644 (file)
--- a/nand_spl/board/freescale/p1_p2_rdb/Makefile
+++ b/nand_spl/board/freescale/p1_p2_rdb/Makefile
@@ -24,13 +24,13 @@
 #
 
 NAND_SPL := y
 #
 
 NAND_SPL := y

-TEXT_BASE := 0xfff00000
+CONFIG_SYS_TEXT_BASE := 0xfff00000

 PAD_TO := 0xfff01000
 
 include $(TOPDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds
 PAD_TO := 0xfff01000
 
 include $(TOPDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds

-LDFLAGS        = -Bstatic -T $(LDSCRIPT) -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)
+LDFLAGS        = -Bstatic -T $(LDSCRIPT) -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)

 AFLAGS += -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_NAND_SPL
 
 AFLAGS += -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_NAND_SPL
 

diff --git a/nand_spl/board/karo/tx25/Makefile b/nand_spl/board/karo/tx25/Makefile
index 62aa583..140440d 100644 (file)
--- a/nand_spl/board/karo/tx25/Makefile
+++ b/nand_spl/board/karo/tx25/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
 include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds

-LDFLAGS        = -Bstatic -T $(nandobj)u-boot.lds -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)
+LDFLAGS        = -Bstatic -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)

 AFLAGS += -DCONFIG_PRELOADER -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_PRELOADER -DCONFIG_NAND_SPL
 
 AFLAGS += -DCONFIG_PRELOADER -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_PRELOADER -DCONFIG_NAND_SPL
 

diff --git a/nand_spl/board/samsung/smdk6400/Makefile b/nand_spl/board/samsung/smdk6400/Makefile
index 9cb4853..2111e57 100644 (file)
--- a/nand_spl/board/samsung/smdk6400/Makefile
+++ b/nand_spl/board/samsung/smdk6400/Makefile
@@ -30,7 +30,7 @@ include $(TOPDIR)/config.mk
 include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
 include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds

-LDFLAGS        = -Bstatic -T $(nandobj)u-boot.lds -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)
+LDFLAGS        = -Bstatic -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)

 AFLAGS += -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_NAND_SPL
 
 AFLAGS += -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_NAND_SPL
 

diff --git a/nand_spl/board/samsung/smdk6400/config.mk b/nand_spl/board/samsung/smdk6400/config.mk
index 4b16230..8bea498 100644 (file)
--- a/nand_spl/board/samsung/smdk6400/config.mk
+++ b/nand_spl/board/samsung/smdk6400/config.mk
@@ -23,17 +23,17 @@
 #
 # Samsung S3C64xx Reference Platform (smdk6400) board
 
 #
 # Samsung S3C64xx Reference Platform (smdk6400) board
 

-# TEXT_BASE for SPL:
+# CONFIG_SYS_TEXT_BASE for SPL:

 #
 # On S3C64xx platforms the SPL is located in SRAM at 0.
 #
 #
 # On S3C64xx platforms the SPL is located in SRAM at 0.
 #

-# TEXT_BASE = 0
+# CONFIG_SYS_TEXT_BASE = 0

 
 include $(TOPDIR)/board/$(BOARDDIR)/config.mk
 
 # PAD_TO used to generate a 4kByte binary needed for the combined image
 
 include $(TOPDIR)/board/$(BOARDDIR)/config.mk
 
 # PAD_TO used to generate a 4kByte binary needed for the combined image

-# -> PAD_TO = TEXT_BASE + 4096
-PAD_TO := $(shell expr $$[$(TEXT_BASE) + 4096])
+# -> PAD_TO = CONFIG_SYS_TEXT_BASE + 4096
+PAD_TO := $(shell expr $$[$(CONFIG_SYS_TEXT_BASE) + 4096])

 
 ifeq ($(debug),1)
 PLATFORM_CPPFLAGS += -DDEBUG
 
 ifeq ($(debug),1)
 PLATFORM_CPPFLAGS += -DDEBUG

diff --git a/nand_spl/board/sheldon/simpc8313/Makefile b/nand_spl/board/sheldon/simpc8313/Makefile
index 2da6142..678c80b 100644 (file)
--- a/nand_spl/board/sheldon/simpc8313/Makefile
+++ b/nand_spl/board/sheldon/simpc8313/Makefile
@@ -24,12 +24,12 @@
 #
 
 NAND_SPL := y
 #
 
 NAND_SPL := y

-TEXT_BASE := 0xfff00000
+CONFIG_SYS_TEXT_BASE := 0xfff00000

 
 include $(TOPDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
 
 include $(TOPDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds

-LDFLAGS        = -Bstatic -T $(nandobj)u-boot.lds -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)
+LDFLAGS        = -Bstatic -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)

 AFLAGS += -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_NAND_SPL
 
 AFLAGS += -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_NAND_SPL
 

diff --git a/nand_spl/nand_boot.c b/nand_spl/nand_boot.c
index 0580dbf..4d6db14 100644 (file)
--- a/nand_spl/nand_boot.c
+++ b/nand_spl/nand_boot.c
@@ -224,7 +224,7 @@ static int nand_load(struct mtd_info *mtd, unsigned int offs,
 #if defined(CONFIG_ARM) && !defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 void board_init_f (ulong bootflag)
 {
 #if defined(CONFIG_ARM) && !defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 void board_init_f (ulong bootflag)
 {

-       relocate_code (TEXT_BASE - TOTAL_MALLOC_LEN, NULL, TEXT_BASE);
+       relocate_code (CONFIG_SYS_TEXT_BASE - TOTAL_MALLOC_LEN, NULL, TEXT_BASE);

 }
 #endif
 
 }
 #endif
 

diff --git a/nand_spl/nand_boot_fsl_nfc.c b/nand_spl/nand_boot_fsl_nfc.c
index f89d542..959f162 100644 (file)
--- a/nand_spl/nand_boot_fsl_nfc.c
+++ b/nand_spl/nand_boot_fsl_nfc.c
@@ -266,7 +266,7 @@ static int nand_load(unsigned int from, unsigned int size, unsigned char *buf)
 #if defined(CONFIG_ARM) && !defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 void board_init_f (ulong bootflag)
 {
 #if defined(CONFIG_ARM) && !defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 void board_init_f (ulong bootflag)
 {

-       relocate_code (TEXT_BASE - TOTAL_MALLOC_LEN, NULL, TEXT_BASE);
+       relocate_code (CONFIG_SYS_TEXT_BASE - TOTAL_MALLOC_LEN, NULL, TEXT_BASE);

 }
 #endif
 
 }
 #endif
 

diff --git a/onenand_ipl/board/apollon/Makefile b/onenand_ipl/board/apollon/Makefile
index 6f1df01..5397186 100644 (file)
--- a/onenand_ipl/board/apollon/Makefile
+++ b/onenand_ipl/board/apollon/Makefile
@@ -3,7 +3,7 @@ include $(TOPDIR)/config.mk
 include $(TOPDIR)/onenand_ipl/board/$(BOARDDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/onenand_ipl/board/$(BOARDDIR)/u-boot.onenand.lds
 include $(TOPDIR)/onenand_ipl/board/$(BOARDDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/onenand_ipl/board/$(BOARDDIR)/u-boot.onenand.lds

-LDFLAGS        = -Bstatic -T $(onenandobj)u-boot.lds -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)
+LDFLAGS        = -Bstatic -T $(onenandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)

 AFLAGS += -DCONFIG_PRELOADER -DCONFIG_ONENAND_IPL
 CFLAGS += -DCONFIG_PRELOADER -DCONFIG_ONENAND_IPL
 OBJCFLAGS += --gap-fill=0x00
 AFLAGS += -DCONFIG_PRELOADER -DCONFIG_ONENAND_IPL
 CFLAGS += -DCONFIG_PRELOADER -DCONFIG_ONENAND_IPL
 OBJCFLAGS += --gap-fill=0x00

diff --git a/onenand_ipl/board/apollon/config.mk b/onenand_ipl/board/apollon/config.mk
index fd9c506..62956e8 100644 (file)
--- a/onenand_ipl/board/apollon/config.mk
+++ b/onenand_ipl/board/apollon/config.mk
@@ -11,4 +11,4 @@
 # Linux-Kernel is expected to be at 8000'8000, entry 8000'8000
 # (mem base + reserved)
 
 # Linux-Kernel is expected to be at 8000'8000, entry 8000'8000
 # (mem base + reserved)
 

-TEXT_BASE = 0x00000000
+CONFIG_SYS_TEXT_BASE = 0x00000000

diff --git a/onenand_ipl/board/apollon/low_levelinit.S b/onenand_ipl/board/apollon/low_levelinit.S
index 205170f..cab4227 100644 (file)
--- a/onenand_ipl/board/apollon/low_levelinit.S
+++ b/onenand_ipl/board/apollon/low_levelinit.S
@@ -65,7 +65,7 @@
 #endif
 
 _TEXT_BASE:
 #endif
 
 _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
 lowlevel_init:
 
 .globl lowlevel_init
 lowlevel_init:

diff --git a/onenand_ipl/board/vpac270/Makefile b/onenand_ipl/board/vpac270/Makefile
index 22d0410..ac7a8f0 100644 (file)
--- a/onenand_ipl/board/vpac270/Makefile
+++ b/onenand_ipl/board/vpac270/Makefile
@@ -2,7 +2,7 @@ IPL     =onenand_ipl
 include $(TOPDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/onenand_ipl/board/$(BOARDDIR)/u-boot.onenand.lds
 include $(TOPDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/onenand_ipl/board/$(BOARDDIR)/u-boot.onenand.lds

-LDFLAGS        = -Bstatic -T $(onenandobj)u-boot.lds -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)
+LDFLAGS        = -Bstatic -T $(onenandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)

 AFLAGS += -DCONFIG_PRELOADER -DCONFIG_ONENAND_IPL
 CFLAGS += -DCONFIG_PRELOADER -DCONFIG_ONENAND_IPL
 OBJCFLAGS += --gap-fill=0x00
 AFLAGS += -DCONFIG_PRELOADER -DCONFIG_ONENAND_IPL
 CFLAGS += -DCONFIG_PRELOADER -DCONFIG_ONENAND_IPL
 OBJCFLAGS += --gap-fill=0x00

diff --git a/onenand_ipl/board/vpac270/config.mk b/onenand_ipl/board/vpac270/config.mk
index f071dea..752836d 100644 (file)
--- a/onenand_ipl/board/vpac270/config.mk
+++ b/onenand_ipl/board/vpac270/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x5c03fc00
+CONFIG_SYS_TEXT_BASE = 0x5c03fc00

diff --git a/tools/Makefile b/tools/Makefile
index 8ec92d2..619c9f2 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -145,7 +145,8 @@ HOSTCPPFLAGS =      -idirafter $(SRCTREE)/include \
                -idirafter $(OBJTREE)/include \
                -I $(SRCTREE)/lib/libfdt \
                -I $(SRCTREE)/tools \
                -idirafter $(OBJTREE)/include \
                -I $(SRCTREE)/lib/libfdt \
                -I $(SRCTREE)/tools \

-               -DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC \
+               -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+               -DUSE_HOSTCC \

                -D__KERNEL_STRICT_NAMES
 
 
                -D__KERNEL_STRICT_NAMES