diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-04 15:49:07 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-04 15:49:07 +0100 |
commit | cfb14ce242c4681062c741d383a4c1e20ae4db2b (patch) | |
tree | fe0ba1a04a4ff4b547bfb6c57301f06b5ce876e2 /arch/arm/include | |
parent | 0b12784089b6a4372ed27cf1fd578d85a7d3dbd4 (diff) | |
parent | 5862bd4faff8b9b3343c8ab9454b0095aee7eb49 (diff) | |
download | barebox-cfb14ce242c4681062c741d383a4c1e20ae4db2b.tar.gz barebox-cfb14ce242c4681062c741d383a4c1e20ae4db2b.tar.xz |
Merge branch 'for-next/omap'
Diffstat (limited to 'arch/arm/include')
-rw-r--r-- | arch/arm/include/asm/armlinux.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/include/asm/armlinux.h b/arch/arm/include/asm/armlinux.h index 8ec8c4df7c..07479fb15c 100644 --- a/arch/arm/include/asm/armlinux.h +++ b/arch/arm/include/asm/armlinux.h @@ -2,6 +2,7 @@ #define __ARCH_ARMLINUX_H #include <asm/memory.h> +#include <asm/setup.h> #if defined CONFIG_ARM_LINUX void armlinux_set_bootparams(void *params); @@ -26,6 +27,14 @@ static inline void armlinux_set_serial(u64 serial) } #endif +#if defined CONFIG_ARM_BOARD_APPEND_ATAG +void armlinux_set_atag_appender(struct tag *(*)(struct tag *)); +#else +static inline void armlinux_set_atag_appender(struct tag *(*func)(struct tag *)) +{ +} +#endif + struct image_data; void start_linux(void *adr, int swap, unsigned long initrd_address, |