Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Blackfin: convert BFIN_CPU to CONFIG_BFIN_CPU

Browse Source 
Stop tying things to the processor that should be tied to other defines and
change BFIN_CPU to CONFIG_BFIN_CPU so that it can be used in the build
system to select the -mcpu option.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
master
Mike Frysinger 17 years ago
parent 86a20fb920
commit f7ce12cb65
9 changed files with 29 additions and 79 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      blackfin_config.mk
  2. 7
      board/bf533-ezkit/bf533-ezkit.c
  3. 7
      board/bf533-stamp/bf533-stamp.c
  4. 11
      board/bf537-stamp/bf537-stamp.c
  5. 9
      include/configs/bf533-ezkit.h
  6. 25
      include/configs/bf533-stamp.h
  7. 34
      include/configs/bf537-stamp.h
  8. 6
      include/configs/bf561-ezkit.h
  9. 3
      lib_blackfin/board.c

6
blackfin_config.mk
Unescape View File

@ -24,9 +24,13 @@
PLATFORM_RELFLAGS += -ffixed-P5 PLATFORM_RELFLAGS += -ffixed-P5
PLATFORM_CPPFLAGS += -DCONFIG_BLACKFIN PLATFORM_CPPFLAGS += -DCONFIG_BLACKFIN
ifneq (,$(CONFIG_BFIN_CPU))
PLATFORM_RELFLAGS += -mcpu=$(CONFIG_BFIN_CPU)
endif
SYM_PREFIX = _ SYM_PREFIX = _
LDR_FLAGS += --use-vmas LDR_FLAGS += --use-vmas
ifeq (,$(findstring s,$(MAKEFLAGS))) ifneq (,$(findstring s,$(MAKEFLAGS)))
LDR_FLAGS += --quiet LDR_FLAGS += --quiet
endif endif

7
board/bf533-ezkit/bf533-ezkit.c
Unescape View File

@ -34,13 +34,6 @@ DECLARE_GLOBAL_DATA_PTR;
int checkboard(void) int checkboard(void)
{ {
#if (BFIN_CPU == ADSP_BF531)
printf("CPU: ADSP BF531 Rev.: 0.%d\n", *pCHIPID >> 28);
#elif (BFIN_CPU == ADSP_BF532)
printf("CPU: ADSP BF532 Rev.: 0.%d\n", *pCHIPID >> 28);
#else
printf("CPU: ADSP BF533 Rev.: 0.%d\n", *pCHIPID >> 28);
#endif
printf("Board: ADI BF533 EZ-Kit Lite board\n"); printf("Board: ADI BF533 EZ-Kit Lite board\n");
printf(" Support: http://blackfin.uclinux.org/\n"); printf(" Support: http://blackfin.uclinux.org/\n");
return 0; return 0;

7
board/bf533-stamp/bf533-stamp.c
Unescape View File

@ -43,13 +43,6 @@ DECLARE_GLOBAL_DATA_PTR;
int checkboard(void) int checkboard(void)
{ {
#if (BFIN_CPU == ADSP_BF531)
printf("CPU: ADSP BF531 Rev.: 0.%d\n", *pCHIPID >> 28);
#elif (BFIN_CPU == ADSP_BF532)
printf("CPU: ADSP BF532 Rev.: 0.%d\n", *pCHIPID >> 28);
#else
printf("CPU: ADSP BF533 Rev.: 0.%d\n", *pCHIPID >> 28);
#endif
printf("Board: ADI BF533 Stamp board\n"); printf("Board: ADI BF533 Stamp board\n");
printf(" Support: http://blackfin.uclinux.org/\n"); printf(" Support: http://blackfin.uclinux.org/\n");
return 0; return 0;

11
board/bf537-stamp/bf537-stamp.c
Unescape View File

@ -31,7 +31,6 @@
#include <asm/blackfin.h> #include <asm/blackfin.h>
#include <asm/io.h> #include <asm/io.h>
#include <net.h> #include <net.h>
#include "ether_bf537.h"
#include <asm/mach-common/bits/bootrom.h> #include <asm/mach-common/bits/bootrom.h>
/** /**
@ -56,13 +55,6 @@ DECLARE_GLOBAL_DATA_PTR;
int checkboard(void) int checkboard(void)
{ {
#if (BFIN_CPU == ADSP_BF534)
printf("CPU: ADSP BF534 Rev.: 0.%d\n", *pCHIPID >> 28);
#elif (BFIN_CPU == ADSP_BF536)
printf("CPU: ADSP BF536 Rev.: 0.%d\n", *pCHIPID >> 28);
#else
printf("CPU: ADSP BF537 Rev.: 0.%d\n", *pCHIPID >> 28);
#endif
printf("Board: ADI BF537 stamp board\n"); printf("Board: ADI BF537 stamp board\n");
printf(" Support: http://blackfin.uclinux.org/\n"); printf(" Support: http://blackfin.uclinux.org/\n");
return 0; return 0;
@ -142,9 +134,6 @@ int misc_init_r(void)
pMACaddr[2], pMACaddr[3], pMACaddr[4], pMACaddr[5]); pMACaddr[2], pMACaddr[3], pMACaddr[4], pMACaddr[5]);
setenv("ethaddr", nid); setenv("ethaddr", nid);
} }
if (getenv("ethaddr")) {
SetupMacAddr(SrcAddr);
}
#endif #endif
#endif /* BFIN_BOOT_MODE == BF537_BYPASS_BOOT */ #endif /* BFIN_BOOT_MODE == BF537_BYPASS_BOOT */

9
include/configs/bf533-ezkit.h
Unescape View File

@ -5,6 +5,8 @@
#ifndef __CONFIG_EZKIT533_H__ #ifndef __CONFIG_EZKIT533_H__
#define __CONFIG_EZKIT533_H__ #define __CONFIG_EZKIT533_H__
#include <asm/blackfin-config-pre.h>
#define CONFIG_BAUDRATE 57600 #define CONFIG_BAUDRATE 57600
#define CONFIG_STAMP 1 #define CONFIG_STAMP 1
@ -41,10 +43,7 @@
#define CONFIG_PANIC_HANG 1 #define CONFIG_PANIC_HANG 1
#define ADSP_BF531 0x31 #define CONFIG_BFIN_CPU bf533-0.3
#define ADSP_BF532 0x32
#define ADSP_BF533 0x33
#define BFIN_CPU ADSP_BF533
/* This sets the default state of the cache on U-Boot's boot */ /* This sets the default state of the cache on U-Boot's boot */
#define CONFIG_ICACHE_ON #define CONFIG_ICACHE_ON
@ -120,7 +119,7 @@
#define CONFIG_BOOTARGS "root=/dev/mtdblock0 ip=192.168.0.15:192.168.0.2:192.168.0.1:255.255.255.0:ezkit:eth0:off console=ttyBF0,57600" #define CONFIG_BOOTARGS "root=/dev/mtdblock0 ip=192.168.0.15:192.168.0.2:192.168.0.1:255.255.255.0:ezkit:eth0:off console=ttyBF0,57600"
#define CFG_PROMPT "ezkit> " /* Monitor Command Prompt */ #define CFG_PROMPT "bfin> " /* Monitor Command Prompt */
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
#define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
#else #else

25
include/configs/bf533-stamp.h
Unescape View File

@ -5,6 +5,8 @@
#ifndef __CONFIG_STAMP_H__ #ifndef __CONFIG_STAMP_H__
#define __CONFIG_STAMP_H__ #define __CONFIG_STAMP_H__
#include <asm/blackfin-config-pre.h>
#define CONFIG_STAMP 1 #define CONFIG_STAMP 1
#define CONFIG_RTC_BFIN 1 #define CONFIG_RTC_BFIN 1
#define CONFIG_BF533 1 #define CONFIG_BF533 1
@ -21,10 +23,7 @@
#define CONFIG_PANIC_HANG 1 #define CONFIG_PANIC_HANG 1
#define ADSP_BF531 0x31 #define CONFIG_BFIN_CPU bf533-0.3
#define ADSP_BF532 0x32
#define ADSP_BF533 0x33
#define BFIN_CPU ADSP_BF533
/* This sets the default state of the cache on U-Boot's boot */ /* This sets the default state of the cache on U-Boot's boot */
#define CONFIG_ICACHE_ON #define CONFIG_ICACHE_ON
@ -329,23 +328,7 @@
#define CONFIG_BAUDRATE 57600 #define CONFIG_BAUDRATE 57600
#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
#if (BFIN_BOOT_MODE == BF533_SPI_BOOT) #define CFG_PROMPT "bfin> " /* Monitor Command Prompt */
#if (BFIN_CPU == ADSP_BF531)
#define CFG_PROMPT "serial_bf531> " /* Monitor Command Prompt */
#elif (BFIN_CPU == ADSP_BF532)
#define CFG_PROMPT "serial_bf532> " /* Monitor Command Prompt */
#else
#define CFG_PROMPT "serial_bf533> " /* Monitor Command Prompt */
#endif
#else
#if (BFIN_CPU == ADSP_BF531)
#define CFG_PROMPT "bf531> " /* Monitor Command Prompt */
#elif (BFIN_CPU == ADSP_BF532)
#define CFG_PROMPT "bf532> " /* Monitor Command Prompt */
#else
#define CFG_PROMPT "bf533> " /* Monitor Command Prompt */
#endif
#endif
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
#define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */

34
include/configs/bf537-stamp.h
Unescape View File

@ -5,6 +5,8 @@
#ifndef __CONFIG_BF537_H__ #ifndef __CONFIG_BF537_H__
#define __CONFIG_BF537_H__ #define __CONFIG_BF537_H__
#include <asm/blackfin-config-pre.h>
#define CFG_LONGHELP 1 #define CFG_LONGHELP 1
#define CONFIG_CMDLINE_EDITING 1 #define CONFIG_CMDLINE_EDITING 1
#define CONFIG_BAUDRATE 57600 #define CONFIG_BAUDRATE 57600
@ -31,10 +33,8 @@
#define CONFIG_PANIC_HANG 1 #define CONFIG_PANIC_HANG 1
#define ADSP_BF534 0x34 #define CONFIG_BFIN_CPU bf537-0.2
#define ADSP_BF536 0x36 #define CONFIG_BFIN_MAC
#define ADSP_BF537 0x37
#define BFIN_CPU ADSP_BF537
/* This sets the default state of the cache on U-Boot's boot */ /* This sets the default state of the cache on U-Boot's boot */
#define CONFIG_ICACHE_ON #define CONFIG_ICACHE_ON
@ -113,7 +113,7 @@
* Network Settings * Network Settings
*/ */
/* network support */ /* network support */
#if (BFIN_CPU != ADSP_BF534) #ifdef CONFIG_BFIN_MAC
#define CONFIG_IPADDR 192.168.0.15 #define CONFIG_IPADDR 192.168.0.15
#define CONFIG_NETMASK 255.255.255.0 #define CONFIG_NETMASK 255.255.255.0
#define CONFIG_GATEWAYIP 192.168.0.1 #define CONFIG_GATEWAYIP 192.168.0.1
@ -186,7 +186,7 @@
#define CONFIG_CMD_EEPROM #define CONFIG_CMD_EEPROM
#define CONFIG_CMD_DATE #define CONFIG_CMD_DATE
#if (BFIN_CPU == ADSP_BF534) #ifndef CONFIG_BFIN_MAC
#undef CONFIG_CMD_NET #undef CONFIG_CMD_NET
#else #else
#define CONFIG_CMD_PING #define CONFIG_CMD_PING
@ -219,7 +219,7 @@
#define CONFIG_LOADADDR 0x1000000 #define CONFIG_LOADADDR 0x1000000
#if (BFIN_BOOT_MODE == BF537_BYPASS_BOOT) #if (BFIN_BOOT_MODE == BF537_BYPASS_BOOT)
#if (BFIN_CPU != ADSP_BF534) #ifdef CONFIG_BFIN_MAC
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"ramargs=setenv bootargs root=/dev/mtdblock0 rw console=ttyBF0,57600\0" \ "ramargs=setenv bootargs root=/dev/mtdblock0 rw console=ttyBF0,57600\0" \
"nfsargs=setenv bootargs root=/dev/nfs rw " \ "nfsargs=setenv bootargs root=/dev/nfs rw " \
@ -243,7 +243,7 @@
"" ""
#endif #endif
#elif (BFIN_BOOT_MODE == BF537_SPI_MASTER_BOOT) #elif (BFIN_BOOT_MODE == BF537_SPI_MASTER_BOOT)
#if (BFIN_CPU != ADSP_BF534) #ifdef CONFIG_BFIN_MAC
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"ramargs=setenv bootargs root=/dev/mtdblock0 rw console=ttyBF0,57600\0" \ "ramargs=setenv bootargs root=/dev/mtdblock0 rw console=ttyBF0,57600\0" \
"nfsargs=setenv bootargs root=/dev/nfs rw " \ "nfsargs=setenv bootargs root=/dev/nfs rw " \
@ -267,23 +267,7 @@
#endif #endif
#endif #endif
#if (BFIN_BOOT_MODE == BF537_SPI_MASTER_BOOT) #define CFG_PROMPT "bfin> " /* Monitor Command Prompt */
#if (BFIN_CPU == ADSP_BF534)
#define CFG_PROMPT "serial_bf534> " /* Monitor Command Prompt */
#elif (BFIN_CPU == ADSP_BF536)
#define CFG_PROMPT "serial_bf536> " /* Monitor Command Prompt */
#else
#define CFG_PROMPT "serial_bf537> " /* Monitor Command Prompt */
#endif
#else
#if (BFIN_CPU == ADSP_BF534)
#define CFG_PROMPT "bf534> " /* Monitor Command Prompt */
#elif (BFIN_CPU == ADSP_BF536)
#define CFG_PROMPT "bf536> " /* Monitor Command Prompt */
#else
#define CFG_PROMPT "bf537> " /* Monitor Command Prompt */
#endif
#endif
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
#define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */

6
include/configs/bf561-ezkit.h
Unescape View File

@ -5,6 +5,8 @@
#ifndef __CONFIG_EZKIT561_H__ #ifndef __CONFIG_EZKIT561_H__
#define __CONFIG_EZKIT561_H__ #define __CONFIG_EZKIT561_H__
#include <asm/blackfin-config-pre.h>
#define CONFIG_VDSP 1 #define CONFIG_VDSP 1
#define CONFIG_BF561 1 #define CONFIG_BF561 1
@ -18,6 +20,8 @@
#define CONFIG_PANIC_HANG 1 #define CONFIG_PANIC_HANG 1
#define CONFIG_BFIN_CPU bf561-0.3
/* /*
* Boot Mode Set * Boot Mode Set
* Blackfin can support several boot modes * Blackfin can support several boot modes
@ -216,7 +220,7 @@
*/ */
#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
#define CFG_PROMPT "ezkit> " /* Monitor Command Prompt */ #define CFG_PROMPT "bfin> " /* Monitor Command Prompt */
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
#define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */

3
lib_blackfin/board.c
Unescape View File

@ -116,6 +116,7 @@ static int display_banner(void)
{ {
sprintf(version_string, VERSION_STRING_FORMAT, VERSION_STRING); sprintf(version_string, VERSION_STRING_FORMAT, VERSION_STRING);
printf("%s\n", version_string); printf("%s\n", version_string);
printf("CPU: ADSP " MK_STR(CONFIG_BFIN_CPU) " (Detected Rev: 0.%d)\n", bfin_revid());
return (0); return (0);
} }
@ -404,7 +405,7 @@ void board_init_r(gd_t * id, ulong dest_addr)
misc_init_r(); misc_init_r();
#endif #endif
#if ((BFIN_CPU == ADSP_BF537) || (BFIN_CPU == ADSP_BF536)) #ifdef CONFIG_CMD_NET
printf("Net: "); printf("Net: ");
eth_initialize(bd); eth_initialize(bd);
#endif #endif

Write Preview
Loading…
Cancel
Save