diff options
| author | Juergen Beisert <jbe@isonoe.(none)> | 2007-10-17 18:12:33 +0200 |
|---|---|---|
| committer | Juergen Beisert <jbe@isonoe.(none)> | 2007-10-17 18:12:33 +0200 |
| commit | 3d1940a4a0ab8f83d60516007a99a3e78009d532 (patch) | |
| tree | 24904407648646077eb2d91e2481011fb37b08f9 /arch/arm | |
| parent | 0641f18c36ef27e94b8947cc64bf7549f8aa56d5 (diff) | |
| parent | d59ca7feb3220ae846a10b6f7da0712e2c1feae3 (diff) | |
| download | barebox-3d1940a4a0ab8f83d60516007a99a3e78009d532.tar.gz barebox-3d1940a4a0ab8f83d60516007a99a3e78009d532.tar.xz | |
merge sha + jbe
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/Kconfig | 17 | ||||
| -rw-r--r-- | arch/arm/Makefile | 4 | ||||
| -rw-r--r-- | arch/arm/lib/Makefile | 2 |
3 files changed, 21 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 8ac34116a9..b232276b3e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1,4 +1,6 @@ - +# +# +# config ARCH_TEXT_BASE hex default 0x08f00000 if MACH_MX1ADS @@ -7,7 +9,9 @@ config ARCH_TEXT_BASE default 0x21e00000 if MACH_ECO920 default 0xa0000000 if MACH_PCM038 default 0x87f00000 if MACH_IMX31 - +# +# +# config BOARDINFO default "Synertronixx scb9328" if MACH_SCB9328 @@ -20,6 +24,15 @@ config BOARDINFO config BOARDINFO default "Phytec Phycore i.MX31" if MACH_IMX31 +config BOARD_LINKER_SCRIPT + bool + default n + +config GENERIC_LINKER_SCRIPT + bool + default y + depends on !BOARD_LINKER_SCRIPT + config ARM bool select HAS_KALLSYMS diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 4e3a351de4..5d9661d7f6 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -79,4 +79,8 @@ endif common-y += $(BOARD) $(MACH) common-y += arch/arm/lib/ arch/arm/cpu/ +lds-$(CONFIG_GENERIC_LINKER_SCRIPT) := arch/arm/lib/u-boot.lds +lds-$(CONFIG_BOARD_LINKER_SCRIPT) := $(BOARD)/u-boot.lds + +CLEAN_FILES += arch/arm/lib/u-boot.lds MRPROPER_FILES += include/asm-arm/arch include/asm-arm/proc diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index 5c207457e4..9656ca81d9 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -10,3 +10,5 @@ obj-y += _umodsi3.o obj-y += _lshrdi3.o obj-y += arm.o obj-$(CONFIG_MODULES) += module.o +extra-$(CONFIG_GENERIC_LINKER_SCRIPT) += u-boot.lds + |