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

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

diff --git a/arch/m68k/include/asm/u-boot.h b/arch/m68k/include/asm/u-boot.h
index a0f2983750f453d30b503e9b3d27e5289a445a0c..8c7c554a460b7ad282ba4b644f132d1fa2398191 100644 (file)
--- a/arch/m68k/include/asm/u-boot.h
+++ b/arch/m68k/include/asm/u-boot.h
@@ -47,7 +47,6 @@ typedef struct bd_info {
        unsigned long bi_mbar_base;     /* base of internal registers */
        unsigned long bi_bootflags;     /* boot / reboot flag (for LynxOS) */
        unsigned long bi_boot_params;   /* where this board expects params */
-       unsigned long bi_ip_addr;       /* IP Address */
        unsigned short bi_ethspeed;     /* Ethernet speed in Mbps */
        unsigned long bi_intfreq;       /* Internal Freq, in MHz */
        unsigned long bi_busfreq;       /* Bus Freq, in MHz */
@@ -59,9 +58,12 @@ typedef struct bd_info {
        unsigned long bi_vcofreq;       /* vco Freq in MHz */
        unsigned long bi_flbfreq;       /* Flexbus Freq in MHz */
 #endif
-       unsigned long bi_baudrate;      /* Console Baudrate */
+       unsigned int bi_baudrate;       /* Console Baudrate */
 } bd_t;
 
 #endif                         /* __ASSEMBLY__ */
 
+/* For image.h:image_check_target_arch() */
+#define IH_ARCH_DEFAULT IH_ARCH_M68K
+
 #endif                         /* __U_BOOT_H__ */