diff options
author | Enrik Berkhan <Enrik.Berkhan@ge.com> | 2008-01-23 12:12:01 +0100 |
---|---|---|
committer | Wolfram Sang <w.sang@pengutronix.de> | 2008-01-23 12:13:23 +0100 |
commit | 9f27a5f0683975a1adbd0563566152c8f22a44c7 (patch) | |
tree | 3978f34dec176169f80c162c991fa489824c285e | |
parent | 0449be2dc1133631d22105dd8770f7bc3e1de56b (diff) | |
download | barebox-9f27a5f0683975a1adbd0563566152c8f22a44c7.tar.gz barebox-9f27a5f0683975a1adbd0563566152c8f22a44c7.tar.xz |
Enable blackfin boot rom boot modes
Signed-Off-By: Enrik Berkhan <Enrik.Berkhan@ge.com>
-rw-r--r-- | arch/blackfin/Kconfig | 21 | ||||
-rw-r--r-- | arch/blackfin/Makefile | 20 |
2 files changed, 40 insertions, 1 deletions
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index a956dd5a25..7c4fd9fb2c 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig @@ -27,6 +27,27 @@ config MACH_IPE337 endchoice +choice + prompt "Boot Mode" + default BFIN_BOOT_BYPASS + +config BFIN_BOOT_BYPASS + bool "bypass" + help + blackfin is strapped to boot from parallel flash on CS0 + +config BFIN_BOOT_FLASH8 + bool "flash 8 bit" + help + blackfin is strapped to boot from 8bit wide flash via boot ROM + +config BFIN_BOOT_FLASH16 + bool "flash 16 bit" + help + blackfin is strapped to boot from 16bit wide flash via boot ROM + +endchoice + source common/Kconfig source commands/Kconfig source net/Kconfig diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile index 8f3bc7173f..f68da3231d 100644 --- a/arch/blackfin/Makefile +++ b/arch/blackfin/Makefile @@ -13,6 +13,10 @@ CFLAGS := -fno-common -Os -D__blackfin__ # -Ttext $(TEXT_BASE) KALLSYMS += --symbol-prefix=_ +ifndef CONFIG_BFIN_BOOT_BYPASS +all: uboot.ldr +endif + ifeq ($(incdir-y),) incdir-y := $(machine-y) endif @@ -55,4 +59,18 @@ common-y += arch/blackfin/lib/ $(CPU) lds-y += $(BOARD)/u-boot.lds -MRPROPER_FILES += include/asm-arm/arch include/asm-arm/proc +MRPROPER_FILES += include/asm-blackfin/arch include/asm-blackfin/proc + +ifdef CONFIG_BFIN_BOOT_FLASH16 +FLASHBITS :=-B 16 +else +FLASHBITS := +endif + +ifneq ($(cpu-y),) +ifndef CONFIG_BFIN_BOOT_BYPASS +uboot.ldr: uboot + rm -f $@ + $(CROSS_COMPILE)ldr -T $(cpu-y) -c $(FLASHBITS) -i $(CPU)/init_sdram.o $@ $< +endif +endif |