Merge tag 'xilinx-for-v2017.09' of git://www.denx.de/git/u-boot-microblaze

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

diff --git a/arch/arm/include/asm/u-boot.h b/arch/arm/include/asm/u-boot.h
index 2b5fce86ab6fe893699a1f9bef0fb2f5d28a83cc..ef9196f898b9876503d19b584fc6207685bd1035 100644 (file)
--- a/arch/arm/include/asm/u-boot.h
+++ b/arch/arm/include/asm/u-boot.h
@@ -20,30 +20,15 @@
 #ifndef _U_BOOT_H_
 #define _U_BOOT_H_     1
 
-#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 int    bi_baudrate;    /* serial console baudrate */
-    ulong              bi_arch_number; /* unique id for this board */
-    ulong              bi_boot_params; /* where this board expects params */
-       unsigned long   bi_arm_freq; /* arm frequency */
-       unsigned long   bi_dsp_freq; /* dsp core frequency */
-       unsigned long   bi_ddr_freq; /* ddr frequency */
-    struct                             /* RAM configuration */
-    {
-       ulong start;
-       ulong size;
-    }                  bi_dram[CONFIG_NR_DRAM_BANKS];
-} bd_t;
-#endif
-
-#endif /* !CONFIG_SYS_GENERIC_BOARD */
+#include <asm/u-boot-arm.h>
 
 /* For image.h:image_check_target_arch() */
+#ifndef CONFIG_ARM64
 #define IH_ARCH_DEFAULT IH_ARCH_ARM
+#else
+#define IH_ARCH_DEFAULT IH_ARCH_ARM64
+#endif
 
 #endif /* _U_BOOT_H_ */