colibri_imx6: fix video stdout in default environment

[oweals/u-boot.git] / include / common.h

diff --git a/include/common.h b/include/common.h
index 09b5f62ae3141553d7c5c28f7f0a9a44e41895d4..f0679ac70544fdf2f89812b8f2c9ff4d8334cf39 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -2,9 +2,8 @@
 /*
  * Common header file for U-Boot
  *
- * This file still includes quite a bit of stuff that should be in separate
- * headers. Please think before adding more things.
- * Patches to remove things are welcome.
+ * This file still includes quite a few headers that should be included
+ * individually as needed. Patches to remove things are welcome.
  *
  * (C) Copyright 2000-2009
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -14,96 +13,21 @@
 #define __COMMON_H_    1
 
 #ifndef __ASSEMBLY__           /* put C only stuff in this section */
-
 #include <config.h>
 #include <errno.h>
 #include <time.h>
-#include <asm-offsets.h>
-#include <linux/bitops.h>
-#include <linux/bug.h>
-#include <linux/delay.h>
 #include <linux/types.h>
 #include <linux/printk.h>
 #include <linux/string.h>
-#include <linux/stringify.h>
-#include <asm/ptrace.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <linux/kernel.h>
-
-#include <part.h>
-#include <flash.h>
-#include <image.h>
-
-#ifdef __LP64__
-#define CONFIG_SYS_SUPPORT_64BIT_DATA
-#endif
-
-#include <log.h>
-
 #include <asm/u-boot.h> /* boot information for Linux kernel */
 #include <asm/global_data.h>   /* global data used for startup functions */
-
-/* startup functions, used in:
- * common/board_f.c
- * common/init/board_init.c
- * common/board_r.c
- * common/board_info.c
- */
-#include <init.h>
-
-/*
- * Function Prototypes
- */
-void   hang            (void) __attribute__ ((noreturn));
-
 #include <display_options.h>
-
-/* common/cmd_source.c */
-int    source (ulong addr, const char *fit_uname);
-
-extern ulong image_load_addr;          /* Default Load Address */
-extern ulong image_save_addr;          /* Default Save Address */
-extern ulong image_save_size;          /* Default Save Size */
-
-/* common/memsize.c */
-long   get_ram_size  (long *, long);
-phys_size_t get_effective_memsize(void);
-
-#if defined(CONFIG_SYS_DRAM_TEST)
-int testdram(void);
-#endif /* CONFIG_SYS_DRAM_TEST */
-
-/* lib/uuid.c */
-#include <uuid.h>
-
-/* lib/vsprintf.c */
 #include <vsprintf.h>
-
-/* lib/net_utils.c */
-#include <net.h>
-
-#include <bootstage.h>
-
-#else  /* __ASSEMBLY__ */
-
 #endif /* __ASSEMBLY__ */
 
-/* Put only stuff here that the assembler can digest */
-
-#define ROUND(a,b)             (((a) + (b) - 1) & ~((b) - 1))
-
-/*
- * check_member() - Check the offset of a structure member
- *
- * @structure: Name of structure (e.g. global_data)
- * @member:    Name of member (e.g. baudrate)
- * @offset:    Expected offset in bytes
- */
-#define check_member(structure, member, offset) _Static_assert( \
-       offsetof(struct structure, member) == offset, \
-       "`struct " #structure "` offset for `" #member "` is not " #offset)
-
 /* Pull in stuff for the build system */
 #ifdef DO_DEPS_ONLY
 # include <env_internal.h>