[Blackfin][PATCH-2/2] Common files changed to support bf533 platform

diff --git a/MAKEALL b/MAKEALL
index 04108bedf3f31022579f17346c9149aa262b18e8..54563981b61ddb40c0ec320c36a993fe4cdc4f80 100755 (executable)
--- a/MAKEALL
+++ b/MAKEALL
@@ -312,6 +312,14 @@ LIST_coldfire="    \
 
 LIST_avr32="atstk1002"
 
+#########################################################################
+## Blackfin Systems
+#########################################################################
+
+LIST_blackfin=" \
+       bf533-ezkit     bf533-stamp                                     \
+"
+
 #-----------------------------------------------------------------------
 
 #----- for now, just run PPC by default -----
@@ -345,6 +353,7 @@ do
        nios|nios2| \
        x86|I486| \
        coldfire| \
+       blackfin| \
        avr32)
                        for target in `eval echo '$LIST_'${arg}`
                        do

diff --git a/Makefile b/Makefile
index 29180f3ea1520db386a579f06b1811154e5fd58f..8bb82c5f8eca480f0ca0efaa553b34ba9e908877 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -146,7 +146,7 @@ ifeq ($(ARCH),microblaze)
 CROSS_COMPILE = mb-
 endif
 ifeq ($(ARCH),blackfin)
-CROSS_COMPILE = bfin-elf-
+CROSS_COMPILE = bfin-uclinux-
 endif
 ifeq ($(ARCH),avr32)
 CROSS_COMPILE = avr32-
@@ -178,7 +178,7 @@ OBJS += cpu/$(CPU)/resetvec.o
 endif
 ifeq ($(CPU),bf533)
 OBJS += cpu/$(CPU)/start1.o    cpu/$(CPU)/interrupt.o  cpu/$(CPU)/cache.o
-OBJS += cpu/$(CPU)/cplbhdlr.o  cpu/$(CPU)/cplbmgr.o    cpu/$(CPU)/flush.o
+OBJS += cpu/$(CPU)/flush.o     cpu/$(CPU)/init_sdram.o
 endif
 
 OBJS := $(addprefix $(obj),$(OBJS))
@@ -2350,14 +2350,11 @@ suzaku_config:  unconfig
 #########################################################################
 ## Blackfin
 #########################################################################
-ezkit533_config        :       unconfig
-       @$(MKCONFIG) $(@:_config=) blackfin bf533 ezkit533
+bf533-ezkit_config:    unconfig
+       @$(MKCONFIG) $(@:_config=) blackfin bf533 bf533-ezkit
 
-stamp_config   :       unconfig
-       @$(MKCONFIG) $(@:_config=) blackfin bf533 stamp
-
-dspstamp_config        :       unconfig
-       @$(MKCONFIG) $(@:_config=) blackfin bf533 dsp_stamp
+bf533-stamp_config:    unconfig
+       @$(MKCONFIG) $(@:_config=) blackfin bf533 bf533-stamp
 
 #========================================================================
 # AVR32
@@ -2394,6 +2391,7 @@ clean:
        rm -f $(obj)board/netstar/*.srec $(obj)board/netstar/*.bin
        rm -f $(obj)board/trab/trab_fkt $(obj)board/voiceblue/eeprom
        rm -f $(obj)board/integratorap/u-boot.lds $(obj)board/integratorcp/u-boot.lds
+       rm -f $(obj)board/bf*/u-boot.lds
        rm -f $(obj)include/bmp_logo.h
        rm -f $(obj)nand_spl/u-boot-spl $(obj)nand_spl/u-boot-spl.map
 

diff --git a/blackfin_config.mk b/blackfin_config.mk
index e2747aafe97411356fcfc8ed13b99b4f29cc6ca8..df324b7efa9a76d384dbaed26852d93b05dba7a1 100644 (file)
--- a/blackfin_config.mk
+++ b/blackfin_config.mk
@@ -21,4 +21,4 @@
 # MA 02111-1307 USA
 #
 
-PLATFORM_CPPFLAGS += -DCONFIG_BLACKFIN -D__blackfin__
+PLATFORM_CPPFLAGS += -DCONFIG_BLACKFIN

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 7aae8a6d1b0a2f9919a1219c5a7f067f87dc7564..727b8726f5910832695f2b092cb84339fdc9bb5a 100644 (file)
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -258,7 +258,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        if (hdr->ih_arch != IH_CPU_MICROBLAZE)
 #elif defined(__nios2__)
        if (hdr->ih_arch != IH_CPU_NIOS2)
-#elif defined(__blackfin__)
+#elif defined(__bfin__)
        if (hdr->ih_arch != IH_CPU_BLACKFIN)
 #elif defined(__avr32__)
        if (hdr->ih_arch != IH_CPU_AVR32)
@@ -1367,6 +1367,7 @@ print_type (image_header_t *hdr)
        case IH_CPU_MICROBLAZE: arch = "Microblaze";            break;
        case IH_CPU_NIOS:       arch = "Nios";                  break;
        case IH_CPU_NIOS2:      arch = "Nios-II";               break;
+       case IH_CPU_BLACKFIN:   arch = "Blackfin";              break;
        default:                arch = "Unknown Architecture";  break;
        }
 

diff --git a/config.mk b/config.mk
index 6e280bc83487dc8b062be7b602de7b05839dc7bd..582df329a47b4e85bbbd2ae909c01d11cf71223d 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -70,7 +70,7 @@ endif
 endif
 
 ifeq ($(ARCH),blackfin)
-PLATFORM_CPPFLAGS+= -D__BLACKFIN__ -mno-underscore
+PLATFORM_CPPFLAGS+= -D__BLACKFIN__
 endif
 
 ifdef  ARCH

diff --git a/examples/stubs.c b/examples/stubs.c
index ffd314e6b35c9985799b7ca8b5489484ec85d9fc..26df6e06a15ea58d8853fbbcd30ce3b14002581e 100644 (file)
--- a/examples/stubs.c
+++ b/examples/stubs.c
@@ -132,7 +132,7 @@ gd_t *global_data;
  */
 #define EXPORT_FUNC(x)                 \
        asm volatile (                  \
-"       .globl " #x "\n"               \
+"       .globl _" #x "\n_"             \
 #x ":\n"                               \
 "      P0 = [P5 + %0]\n"               \
 "      P0 = [P0 + %1]\n"               \

diff --git a/include/linux/stat.h b/include/linux/stat.h
index f9422cb1fafcf2d2bb24e2b36ece2fe39335bda2..4d05aa92d98f3d293d0c4275cc42f534480b673a 100644 (file)
--- a/include/linux/stat.h
+++ b/include/linux/stat.h
@@ -67,7 +67,7 @@ struct stat {
 
 #endif /* __PPC__ */
 
-#if defined (__ARM__) || defined (__I386__) || defined (__M68K__) || defined (__blackfin__)
+#if defined (__ARM__) || defined (__I386__) || defined (__M68K__) || defined (__bfin__)
 
 struct stat {
        unsigned short st_dev;