Merge branch 'master' of git://git.denx.de/u-boot

[oweals/u-boot.git] / arch / blackfin / include / asm / u-boot.h

diff --git a/arch/blackfin/include/asm/u-boot.h b/arch/blackfin/include/asm/u-boot.h
index a6e6cf0f5422ea4c3ae6d38bdae140e5642eca96..7abd6c2a329dc5bdb23c574f950c1dda59b12cc2 100644 (file)
--- a/arch/blackfin/include/asm/u-boot.h
+++ b/arch/blackfin/include/asm/u-boot.h
@@ -29,8 +29,7 @@
 #define _U_BOOT_H_     1
 
 typedef struct bd_info {
-       int bi_baudrate;                /* serial console baudrate */
-       unsigned long bi_ip_addr;       /* IP Address */
+       unsigned int bi_baudrate;       /* serial console baudrate */
        unsigned long bi_boot_params;   /* where this board expects params */
        unsigned long bi_memstart;      /* start of DRAM memory */
        phys_size_t bi_memsize;         /* size  of DRAM memory in bytes */
@@ -45,4 +44,7 @@ typedef struct bd_info {
        unsigned long bi_sclk;
 } bd_t;
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_BLACKFIN
+
 #endif /* _U_BOOT_H_ */