diff options
| author | Ye.Li <B37916@freescale.com> | 2014-06-09 14:03:10 +0800 |
|---|---|---|
| committer | Ye.Li <B37916@freescale.com> | 2014-06-17 11:13:50 +0800 |
| commit | ef39118d8172657f7dc9b3087e11a01a296716b6 (patch) | |
| tree | 8b03923a079b64df35e31f7b1386e2b4554337fd /common | |
| parent | 0b67ab303873c6e3be0e8cc83175efd740c94c5c (diff) | |
| download | u-boot-imx-ef39118d8172657f7dc9b3087e11a01a296716b6.zip u-boot-imx-ef39118d8172657f7dc9b3087e11a01a296716b6.tar.gz u-boot-imx-ef39118d8172657f7dc9b3087e11a01a296716b6.tar.bz2 | |
ENGR00315894-41 i.mx6:sabresd/sabreauto/slevk Fix build break for android support
Add the android header file "mx6slevkandroid.h" for imx6slevk android support.
Fix header file and pin name problems in BSP codes.
Remove build warning in cmd_fastboot.c
Signed-off-by: Ye.Li <B37916@freescale.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_fastboot.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/common/cmd_fastboot.c b/common/cmd_fastboot.c index ef37f8e..fc3bdba 100644 --- a/common/cmd_fastboot.c +++ b/common/cmd_fastboot.c @@ -63,6 +63,10 @@ #include <environment.h> #include <mmc.h> +#if defined(CONFIG_OF_LIBFDT) +#include <libfdt.h> +#include <fdt_support.h> +#endif #ifdef CONFIG_FASTBOOT @@ -1525,6 +1529,13 @@ static void boot_start_lmb(bootm_headers_t *images) static inline void boot_start_lmb(bootm_headers_t *images) { } #endif +/* Allow for arch specific config before we boot */ +static void __arch_preboot_os(void) +{ + /* please define platform specific arch_preboot_os() */ +} +void arch_preboot_os(void) __attribute__((weak, alias("__arch_preboot_os"))); + /* booti <addr> [ mmc0 | mmc1 [ <partition> ] ] */ int do_booti(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { |