initial support for Blackfin processors
PATCH 1/1 initial support for Blackfin processors
--- Makefile | 1 + boot/u-boot/Config.in | 4 ++++ boot/u-boot/u-boot.mk | 2 ++ linux/Config.in | 2 +- linux/linux.mk | 4 ++++ target/Config.in.arch | 17 ++++++++++++++++- target/generic/Config.in | 19 ++++++++++++++++++- 7 files changed, 46 insertions(+), 3 deletions(-)
Makefile +1 -0
@@ -251,6 +251,7 @@ endif KERNEL_ARCH:=$(shell echo "$(ARCH)" | sed -e "s/-.*//" \ -e s/i.86/i386/ -e s/sun4u/sparc64/ \ -e s/arm.*/arm/ -e s/sa110/arm/ \ + -e s/bfin/blackfin/ \ -e s/parisc64/parisc/ \ -e s/powerpc64/powerpc/ \ -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
boot/u-boot/Config.in +4 -0
@@ -71,6 +71,10 @@ config BR2_TARGET_UBOOT_FORMAT_KWB depends on BR2_arm bool "u-boot.kwb (Marvell)" +config BR2_TARGET_UBOOT_FORMAT_LDR + depends on BR2_bfin + bool "u-boot.ldr" + endchoice config BR2_TARGET_UBOOT_TOOL_MKIMAGE
boot/u-boot/u-boot.mk +2 -0
@@ -31,6 +31,8 @@ U_BOOT_CAT:=$(BZCAT) ifeq ($(BR2_TARGET_UBOOT_FORMAT_KWB),y) U_BOOT_BIN:=u-boot.kwb U_BOOT_MAKE_OPT:=$(U_BOOT_BIN) +else ifeq ($(BR2_TARGET_UBOOT_FORMAT_LDR),y) +U_BOOT_BIN:=u-boot.ldr else U_BOOT_BIN:=u-boot.bin endif
linux/Config.in +1 -1
@@ -123,7 +123,7 @@ choice config BR2_LINUX_KERNEL_UIMAGE bool "uImage" - depends on BR2_arm || BR2_armeb || BR2_powerpc || BR2_avr32 || BR2_sh || BR2_sh64 + depends on BR2_arm || BR2_armeb || BR2_bfin || BR2_powerpc || BR2_avr32 || BR2_sh || BR2_sh64 config BR2_LINUX_KERNEL_BZIMAGE bool "bzImage"
linux/linux.mk +4 -0
@@ -41,7 +41,11 @@ endif LINUX26_VERSION_PROBED = $(shell $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_SOURCE_DIR) --no-print-directory -s kernelrelease) ifeq ($(BR2_LINUX_KERNEL_UIMAGE),y) +ifeq ($(KERNEL_ARCH),blackfin) +LINUX26_IMAGE_NAME=vmImage +else LINUX26_IMAGE_NAME=uImage +endif LINUX26_DEPENDENCIES+=$(MKIMAGE) else ifeq ($(BR2_LINUX_KERNEL_BZIMAGE),y) LINUX26_IMAGE_NAME=bzImage
target/Config.in.arch +16 -1
@@ -14,6 +14,8 @@ config BR2_armeb config BR2_avr32 bool "avr32" select BR2_SOFT_FLOAT +config BR2_bfin + bool "bfin" config BR2_i386 bool "i386" config BR2_m68k
@@ -128,6 +130,18 @@ config BR2_ARM_OABI endchoice choice + prompt "Target ABI" + depends on BR2_bfin + default BR2_BFIN_FLAT +config BR2_BFIN_FDPIC + bool "FDPIC" +config BR2_BFIN_FLAT + bool "FLAT" +config BR2_BFIN_SHARED_FLAT + bool "Shared FLAT" +endchoice + +choice prompt "Target Architecture Variant" depends on BR2_mips || BR2_mipsel default BR2_mips_3 if BR2_mips
@@ -440,6 +454,7 @@ config BR2_ARCH default "arm" if BR2_arm default "armeb" if BR2_armeb default "avr32" if BR2_avr32 + default "bfin" if BR2_bfin default "i386" if BR2_x86_i386 default "i486" if BR2_x86_i486 default "i586" if BR2_x86_i586
@@ -477,7 +492,7 @@ config BR2_ARCH config BR2_ENDIAN string - default "LITTLE" if BR2_arm || BR2_i386 || BR2_mipsel || \ + default "LITTLE" if BR2_arm || BR2_bfin || BR2_i386 || BR2_mipsel || \ BR2_sh3 || BR2_sh4 || BR2_x86_64 || BR2_sh64 default "BIG" if BR2_armeb || BR2_avr32 || BR2_m68k || BR2_mips || \ BR2_powerpc || BR2_sh2a_nofpueb || BR2_sh2eb || \
target/generic/Config.in +18 -1
@@ -19,7 +19,8 @@ if BR2_TARGET_GENERIC_GETTY choice prompt "Serial port to run a getty on" - default BR2_TARGET_GENERIC_GETTY_TTYS0 + default BR2_TARGET_GENERIC_GETTY_TTYS0 if !BR2_bfin + default BR2_TARGET_GENERIC_GETTY_TTYBF0 if BR2_bfin help Select a port to run a getty (login prompt) on.
@@ -66,6 +67,18 @@ config BR2_TARGET_GENERIC_GETTY_TTYMXC1 config BR2_TARGET_GENERIC_GETTY_TTYMXC2 bool "ttymxc2" depends on BR2_arm +config BR2_TARGET_GENERIC_GETTY_TTYBF0 + bool "ttyBF0" + depends on BR2_bfin +config BR2_TARGET_GENERIC_GETTY_TTYBF1 + bool "ttyBF1" + depends on BR2_bfin +config BR2_TARGET_GENERIC_GETTY_TTYBF2 + bool "ttyBF2" + depends on BR2_bfin +config BR2_TARGET_GENERIC_GETTY_TTYBF3 + bool "ttyBF3" + depends on BR2_bfin config BR2_TARGET_GENERIC_GETTY_TTYUL0 bool "ttyUL0" depends on BR2_powerpc
@@ -122,6 +135,10 @@ config BR2_TARGET_GENERIC_GETTY_PORT default "ttymxc0" if BR2_TARGET_GENERIC_GETTY_TTYMXC0 default "ttymxc1" if BR2_TARGET_GENERIC_GETTY_TTYMXC1 default "ttymxc2" if BR2_TARGET_GENERIC_GETTY_TTYMXC2 + default "ttyBF0" if BR2_TARGET_GENERIC_GETTY_TTYBF0 + default "ttyBF1" if BR2_TARGET_GENERIC_GETTY_TTYBF1 + default "ttyBF2" if BR2_TARGET_GENERIC_GETTY_TTYBF2 + default "ttyBF3" if BR2_TARGET_GENERIC_GETTY_TTYBF3 default "ttyUL0" if BR2_TARGET_GENERIC_GETTY_TTYUL0 default "ttyUL1" if BR2_TARGET_GENERIC_GETTY_TTYUL1 default "ttyUL2" if BR2_TARGET_GENERIC_GETTY_TTYUL2
Signature · 1 line
1.7.3.2
PATCH 1/1 initial support for Blackfin processors
Hello,
Nice to see support for Blackfin processors!
boot/u-boot/Config.in config BR2_TARGET_UBOOT_FORMAT_KWB · line 77
Quoted 12 lines · On Thu, 18 Nov 2010 05:27:24 -0500 Mike Frysinger <[email protected]> wrote:
boot/u-boot/Config.in +4
-0@@ -71,6 +71,10 @@ config BR2_TARGET_UBOOT_FORMAT_KWB depends on BR2_arm bool "u-boot.kwb (Marvell)" +config BR2_TARGET_UBOOT_FORMAT_LDR + depends on BR2_bfin + bool "u-boot.ldr" +
Maybe make it the default choice when BR2_bfin is enabled ?
boot/u-boot/Config.in config BR2_TARGET_UBOOT_FORMAT_KWB
Quoted 6 lines
boot/u-boot/Config.in +4
-0ifeq ($(BR2_LINUX_KERNEL_UIMAGE),y) +ifeq ($(KERNEL_ARCH),blackfin) +LINUX26_IMAGE_NAME=vmImage +else LINUX26_IMAGE_NAME=uImage +endif
That looks strange, if you want uImage, you want uImage, right ? Or is Blackfin's vmImage in fact a uImage (in which case a short comment above this condition would be nice).
boot/u-boot/Config.in
Quoted 5 lines
choice
boot/u-boot/Config.in +2
-1prompt "Serial port to run a getty on" - default BR2_TARGET_GENERIC_GETTY_TTYS0 + default BR2_TARGET_GENERIC_GETTY_TTYS0 if !BR2_bfin + default BR2_TARGET_GENERIC_GETTY_TTYBF0 if BR2_bfin
We are going to move away from this and replace all that stuff by a free-form text field. Patches have been posted, but haven't been merged yet. As I am reworking board support and system-level configuration, I think I'll take care of them.
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH v2 1/1 initial support for Blackfin processors
In reply to Mike Frysinger---
v2
- add comment for vmImage name
note:
- not all Blackfin boards use "u-boot.ldr" ... half use "u-boot.bin"
- i dont care about the ttyBF0 stuff ... i can simply drop it if the rewrite will be merged soonish
Makefile | 1 + boot/u-boot/Config.in | 4 ++++ boot/u-boot/u-boot.mk | 2 ++ linux/Config.in | 2 +- linux/linux.mk | 5 +++++ target/Config.in.arch | 19 ++++++++++++++++++- target/generic/Config.in | 19 ++++++++++++++++++- 7 files changed, 49 insertions(+), 3 deletions(-)
Makefile +1 -0
@@ -251,6 +251,7 @@ endif KERNEL_ARCH:=$(shell echo "$(ARCH)" | sed -e "s/-.*//" \ -e s/i.86/i386/ -e s/sun4u/sparc64/ \ -e s/arm.*/arm/ -e s/sa110/arm/ \ + -e s/bfin/blackfin/ \ -e s/parisc64/parisc/ \ -e s/powerpc64/powerpc/ \ -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
boot/u-boot/Config.in +4 -0
@@ -71,6 +71,10 @@ config BR2_TARGET_UBOOT_FORMAT_KWB depends on BR2_arm bool "u-boot.kwb (Marvell)" +config BR2_TARGET_UBOOT_FORMAT_LDR + depends on BR2_bfin + bool "u-boot.ldr" + endchoice config BR2_TARGET_UBOOT_TOOL_MKIMAGE
boot/u-boot/u-boot.mk +2 -0
@@ -31,6 +31,8 @@ U_BOOT_CAT:=$(BZCAT) ifeq ($(BR2_TARGET_UBOOT_FORMAT_KWB),y) U_BOOT_BIN:=u-boot.kwb U_BOOT_MAKE_OPT:=$(U_BOOT_BIN) +else ifeq ($(BR2_TARGET_UBOOT_FORMAT_LDR),y) +U_BOOT_BIN:=u-boot.ldr else U_BOOT_BIN:=u-boot.bin endif
linux/Config.in +1 -1
@@ -123,7 +123,7 @@ choice config BR2_LINUX_KERNEL_UIMAGE bool "uImage" - depends on BR2_arm || BR2_armeb || BR2_powerpc || BR2_avr32 || BR2_sh || BR2_sh64 + depends on BR2_arm || BR2_armeb || BR2_bfin || BR2_powerpc || BR2_avr32 || BR2_sh || BR2_sh64 config BR2_LINUX_KERNEL_BZIMAGE bool "bzImage"
linux/linux.mk +5 -0
@@ -41,7 +41,12 @@ endif LINUX26_VERSION_PROBED = $(shell $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_SOURCE_DIR) --no-print-directory -s kernelrelease) ifeq ($(BR2_LINUX_KERNEL_UIMAGE),y) +ifeq ($(KERNEL_ARCH),blackfin) +# a uImage, but with a diff file name +LINUX26_IMAGE_NAME=vmImage +else LINUX26_IMAGE_NAME=uImage +endif LINUX26_DEPENDENCIES+=$(MKIMAGE) else ifeq ($(BR2_LINUX_KERNEL_BZIMAGE),y) LINUX26_IMAGE_NAME=bzImage
target/Config.in.arch +18 -1
@@ -14,6 +14,8 @@ config BR2_armeb config BR2_avr32 bool "avr32" select BR2_SOFT_FLOAT +config BR2_bfin + bool "bfin" config BR2_i386 bool "i386" config BR2_m68k
@@ -128,6 +130,20 @@ config BR2_ARM_OABI endchoice choice + prompt "Target ABI" + depends on BR2_bfin + default BR2_BFIN_FLAT +config BR2_BFIN_FDPIC + bool "FDPIC" +config BR2_BFIN_FLAT + bool "FLAT" +config BR2_BFIN_FLAT_SEP_DATA + bool "FLAT (Separate data)" +config BR2_BFIN_SHARED_FLAT + bool "Shared FLAT" +endchoice + +choice prompt "Target Architecture Variant" depends on BR2_mips || BR2_mipsel default BR2_mips_3 if BR2_mips
@@ -440,6 +456,7 @@ config BR2_ARCH default "arm" if BR2_arm default "armeb" if BR2_armeb default "avr32" if BR2_avr32 + default "bfin" if BR2_bfin default "i386" if BR2_x86_i386 default "i486" if BR2_x86_i486 default "i586" if BR2_x86_i586
@@ -477,7 +494,7 @@ config BR2_ARCH config BR2_ENDIAN string - default "LITTLE" if BR2_arm || BR2_i386 || BR2_mipsel || \ + default "LITTLE" if BR2_arm || BR2_bfin || BR2_i386 || BR2_mipsel || \ BR2_sh3 || BR2_sh4 || BR2_x86_64 || BR2_sh64 default "BIG" if BR2_armeb || BR2_avr32 || BR2_m68k || BR2_mips || \ BR2_powerpc || BR2_sh2a_nofpueb || BR2_sh2eb || \
target/generic/Config.in +18 -1
@@ -19,7 +19,8 @@ if BR2_TARGET_GENERIC_GETTY choice prompt "Serial port to run a getty on" - default BR2_TARGET_GENERIC_GETTY_TTYS0 + default BR2_TARGET_GENERIC_GETTY_TTYS0 if !BR2_bfin + default BR2_TARGET_GENERIC_GETTY_TTYBF0 if BR2_bfin help Select a port to run a getty (login prompt) on.
@@ -66,6 +67,18 @@ config BR2_TARGET_GENERIC_GETTY_TTYMXC1 config BR2_TARGET_GENERIC_GETTY_TTYMXC2 bool "ttymxc2" depends on BR2_arm +config BR2_TARGET_GENERIC_GETTY_TTYBF0 + bool "ttyBF0" + depends on BR2_bfin +config BR2_TARGET_GENERIC_GETTY_TTYBF1 + bool "ttyBF1" + depends on BR2_bfin +config BR2_TARGET_GENERIC_GETTY_TTYBF2 + bool "ttyBF2" + depends on BR2_bfin +config BR2_TARGET_GENERIC_GETTY_TTYBF3 + bool "ttyBF3" + depends on BR2_bfin config BR2_TARGET_GENERIC_GETTY_TTYUL0 bool "ttyUL0" depends on BR2_powerpc
@@ -122,6 +135,10 @@ config BR2_TARGET_GENERIC_GETTY_PORT default "ttymxc0" if BR2_TARGET_GENERIC_GETTY_TTYMXC0 default "ttymxc1" if BR2_TARGET_GENERIC_GETTY_TTYMXC1 default "ttymxc2" if BR2_TARGET_GENERIC_GETTY_TTYMXC2 + default "ttyBF0" if BR2_TARGET_GENERIC_GETTY_TTYBF0 + default "ttyBF1" if BR2_TARGET_GENERIC_GETTY_TTYBF1 + default "ttyBF2" if BR2_TARGET_GENERIC_GETTY_TTYBF2 + default "ttyBF3" if BR2_TARGET_GENERIC_GETTY_TTYBF3 default "ttyUL0" if BR2_TARGET_GENERIC_GETTY_TTYUL0 default "ttyUL1" if BR2_TARGET_GENERIC_GETTY_TTYUL1 default "ttyUL2" if BR2_TARGET_GENERIC_GETTY_TTYUL2
Signature · 1 line
1.7.3.2