Merge http://git.denx.de/u-boot-samsung

[u-boot] / 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 911c0d398c503acaa4c936ebc3dda4bdccba1e00..82038443c904bb9706cb7981b43851843d7c0a21 100644 (file)
--- a/arch/m68k/include/asm/u-boot.h
+++ b/arch/m68k/include/asm/u-boot.h
@@ -14,47 +14,8 @@
 #ifndef __U_BOOT_H__
 #define __U_BOOT_H__
 
-/*
- * Board information passed to Linux kernel from U-Boot
- *
- * include/asm-ppc/u-boot.h
- */
-
-#ifdef CONFIG_SYS_GENERIC_BOARD
 /* Use the generic board which requires a unified bd_info */
 #include <asm-generic/u-boot.h>
-#else
-
-#ifndef __ASSEMBLY__
-
-typedef struct bd_info {
-       unsigned long bi_memstart;      /* start of DRAM memory */
-       phys_size_t bi_memsize;         /* size  of DRAM memory in bytes */
-       unsigned long bi_flashstart;    /* start of FLASH memory */
-       unsigned long bi_flashsize;     /* size  of FLASH memory */
-       unsigned long bi_flashoffset;   /* reserved area for startup monitor */
-       unsigned long bi_sramstart;     /* start of SRAM memory */
-       unsigned long bi_sramsize;      /* size  of SRAM memory */
-       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 short bi_ethspeed;     /* Ethernet speed in Mbps */
-       unsigned long bi_intfreq;       /* Internal Freq, in MHz */
-       unsigned long bi_busfreq;       /* Bus Freq, in MHz */
-#ifdef CONFIG_PCI
-       unsigned long bi_pcifreq;       /* pci Freq in MHz */
-#endif
-#ifdef CONFIG_EXTRA_CLOCK
-       unsigned long bi_inpfreq;       /* input Freq in MHz */
-       unsigned long bi_vcofreq;       /* vco Freq in MHz */
-       unsigned long bi_flbfreq;       /* Flexbus Freq in MHz */
-#endif
-} bd_t;
-
-#endif                         /* __ASSEMBLY__ */
-
-#endif                         /* !CONFIG_SYS_GENERIC_BOARD */
-
 
 /* For image.h:image_check_target_arch() */
 #define IH_ARCH_DEFAULT IH_ARCH_M68K