diff options
27 files changed, 38 insertions, 24 deletions
diff --git a/arch/arm/boards/a9m2410/a9m2410.c b/arch/arm/boards/a9m2410/a9m2410.c index f1ad594947..537e1e9669 100644 --- a/arch/arm/boards/a9m2410/a9m2410.c +++ b/arch/arm/boards/a9m2410/a9m2410.c @@ -25,7 +25,7 @@ #include <init.h> #include <asm/armlinux.h> #include <generated/mach-types.h> -#include <asm-generic/sections.h> +#include <asm/sections.h> #include <partition.h> #include <nand.h> #include <io.h> diff --git a/arch/arm/boards/a9m2440/a9m2440.c b/arch/arm/boards/a9m2440/a9m2440.c index ff5d513864..36216aa36e 100644 --- a/arch/arm/boards/a9m2440/a9m2440.c +++ b/arch/arm/boards/a9m2440/a9m2440.c @@ -24,7 +24,7 @@ #include <driver.h> #include <init.h> #include <asm/armlinux.h> -#include <asm-generic/sections.h> +#include <asm/sections.h> #include <generated/mach-types.h> #include <partition.h> #include <nand.h> diff --git a/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c b/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c index b7d8258774..a6f27dc32d 100644 --- a/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c +++ b/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c @@ -25,7 +25,7 @@ #include <mach/imx25-regs.h> #include <asm/armlinux.h> #include <asm/barebox-arm.h> -#include <asm-generic/sections.h> +#include <asm/sections.h> #include <mach/gpio.h> #include <io.h> #include <asm/mmu.h> diff --git a/arch/arm/boards/eukrea_cpuimx25/lowlevel.c b/arch/arm/boards/eukrea_cpuimx25/lowlevel.c index bda1b22312..11d990dfd9 100644 --- a/arch/arm/boards/eukrea_cpuimx25/lowlevel.c +++ b/arch/arm/boards/eukrea_cpuimx25/lowlevel.c @@ -26,7 +26,7 @@ #include <mach/imx-nand.h> #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> -#include <asm-generic/sections.h> +#include <asm/sections.h> #include <asm-generic/memory_layout.h> #include <asm/system.h> diff --git a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c index 4176d63317..75f32395ea 100644 --- a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c +++ b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c @@ -26,7 +26,7 @@ #include <notifier.h> #include <mach/gpio.h> #include <asm/armlinux.h> -#include <asm-generic/sections.h> +#include <asm/sections.h> #include <asm/barebox-arm.h> #include <generated/mach-types.h> #include <partition.h> diff --git a/arch/arm/boards/eukrea_cpuimx35/lowlevel.c b/arch/arm/boards/eukrea_cpuimx35/lowlevel.c index 88e9b28854..a667e4c5eb 100644 --- a/arch/arm/boards/eukrea_cpuimx35/lowlevel.c +++ b/arch/arm/boards/eukrea_cpuimx35/lowlevel.c @@ -26,7 +26,7 @@ #include <mach/imx-nand.h> #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> -#include <asm-generic/sections.h> +#include <asm/sections.h> #include <asm-generic/memory_layout.h> #include <asm/system.h> diff --git a/arch/arm/boards/freescale-mx25-3-stack/3stack.c b/arch/arm/boards/freescale-mx25-3-stack/3stack.c index 27a39b764d..ea4d4ba4f4 100644 --- a/arch/arm/boards/freescale-mx25-3-stack/3stack.c +++ b/arch/arm/boards/freescale-mx25-3-stack/3stack.c @@ -23,7 +23,7 @@ #include <environment.h> #include <mach/imx25-regs.h> #include <asm/armlinux.h> -#include <asm-generic/sections.h> +#include <asm/sections.h> #include <asm/barebox-arm.h> #include <mach/gpio.h> #include <io.h> diff --git a/arch/arm/boards/freescale-mx35-3-stack/3stack.c b/arch/arm/boards/freescale-mx35-3-stack/3stack.c index 791a3ed3dd..dfb1f855d6 100644 --- a/arch/arm/boards/freescale-mx35-3-stack/3stack.c +++ b/arch/arm/boards/freescale-mx35-3-stack/3stack.c @@ -34,7 +34,7 @@ #include <partition.h> #include <asm/armlinux.h> -#include <asm-generic/sections.h> +#include <asm/sections.h> #include <asm/barebox-arm.h> #include <io.h> #include <generated/mach-types.h> diff --git a/arch/arm/boards/friendlyarm-mini2440/mini2440.c b/arch/arm/boards/friendlyarm-mini2440/mini2440.c index 9f4363cd54..c4b97a2bb8 100644 --- a/arch/arm/boards/friendlyarm-mini2440/mini2440.c +++ b/arch/arm/boards/friendlyarm-mini2440/mini2440.c @@ -32,7 +32,7 @@ #include <mci.h> #include <fb.h> #include <asm/armlinux.h> -#include <asm-generic/sections.h> +#include <asm/sections.h> #include <io.h> #include <mach/gpio.h> #include <mach/s3c-iomap.h> diff --git a/arch/arm/boards/guf-cupid/lowlevel.c b/arch/arm/boards/guf-cupid/lowlevel.c index 774dd55623..d5298c1836 100644 --- a/arch/arm/boards/guf-cupid/lowlevel.c +++ b/arch/arm/boards/guf-cupid/lowlevel.c @@ -26,7 +26,7 @@ #include <mach/imx-nand.h> #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> -#include <asm-generic/sections.h> +#include <asm/sections.h> #include <asm-generic/memory_layout.h> #include <asm/system.h> diff --git a/arch/arm/boards/guf-neso/lowlevel.c b/arch/arm/boards/guf-neso/lowlevel.c index 56bafa98ad..386751d5ef 100644 --- a/arch/arm/boards/guf-neso/lowlevel.c +++ b/arch/arm/boards/guf-neso/lowlevel.c @@ -27,7 +27,7 @@ #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> #include <asm/system.h> -#include <asm-generic/sections.h> +#include <asm/sections.h> #include <asm-generic/memory_layout.h> #define ESDCTL0_VAL (ESDCTL0_SDE | ESDCTL0_ROW13 | ESDCTL0_COL10) diff --git a/arch/arm/boards/imx21ads/imx21ads.c b/arch/arm/boards/imx21ads/imx21ads.c index 6087ad4dd4..8717774d18 100644 --- a/arch/arm/boards/imx21ads/imx21ads.c +++ b/arch/arm/boards/imx21ads/imx21ads.c @@ -23,7 +23,7 @@ #include <environment.h> #include <mach/imx21-regs.h> #include <asm/armlinux.h> -#include <asm-generic/sections.h> +#include <asm/sections.h> #include <asm/barebox-arm.h> #include <io.h> #include <mach/gpio.h> diff --git a/arch/arm/boards/karo-tx25/board.c b/arch/arm/boards/karo-tx25/board.c index b2f6856c73..bffa11edb5 100644 --- a/arch/arm/boards/karo-tx25/board.c +++ b/arch/arm/boards/karo-tx25/board.c @@ -24,7 +24,7 @@ #include <environment.h> #include <mach/imx25-regs.h> #include <asm/armlinux.h> -#include <asm-generic/sections.h> +#include <asm/sections.h> #include <asm/barebox-arm.h> #include <mach/gpio.h> #include <io.h> diff --git a/arch/arm/boards/karo-tx25/lowlevel.c b/arch/arm/boards/karo-tx25/lowlevel.c index 6c7614baf8..d0100437e6 100644 --- a/arch/arm/boards/karo-tx25/lowlevel.c +++ b/arch/arm/boards/karo-tx25/lowlevel.c @@ -27,7 +27,7 @@ #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> #include <asm/system.h> -#include <asm-generic/sections.h> +#include <asm/sections.h> #include <asm-generic/memory_layout.h> static inline void __bare_init setup_sdram(uint32_t base, uint32_t esdctl, diff --git a/arch/arm/boards/pcm037/pcm037.c b/arch/arm/boards/pcm037/pcm037.c index 959cc8ad8c..276f9cda41 100644 --- a/arch/arm/boards/pcm037/pcm037.c +++ b/arch/arm/boards/pcm037/pcm037.c @@ -27,7 +27,7 @@ #include <mach/imx31-regs.h> #include <mach/iomux-mx31.h> #include <asm/armlinux.h> -#include <asm-generic/sections.h> +#include <asm/sections.h> #include <mach/gpio.h> #include <mach/weim.h> #include <io.h> diff --git a/arch/arm/boards/pcm038/lowlevel.c b/arch/arm/boards/pcm038/lowlevel.c index 77b7bf54d1..0ea293981b 100644 --- a/arch/arm/boards/pcm038/lowlevel.c +++ b/arch/arm/boards/pcm038/lowlevel.c @@ -26,7 +26,7 @@ #include <asm/barebox-arm.h> #include <asm/system.h> #include <asm-generic/memory_layout.h> -#include <asm-generic/sections.h> +#include <asm/sections.h> #include <asm/barebox-arm-head.h> #include "pll.h" diff --git a/arch/arm/boards/pcm043/lowlevel.c b/arch/arm/boards/pcm043/lowlevel.c index 9485a9ba02..ebd6b29543 100644 --- a/arch/arm/boards/pcm043/lowlevel.c +++ b/arch/arm/boards/pcm043/lowlevel.c @@ -26,7 +26,7 @@ #include <mach/imx-nand.h> #include <asm/barebox-arm.h> #include <asm/barebox-arm-head.h> -#include <asm-generic/sections.h> +#include <asm/sections.h> #include <asm-generic/memory_layout.h> #include <asm/system.h> diff --git a/arch/arm/boards/phycard-i.MX27/pca100.c b/arch/arm/boards/phycard-i.MX27/pca100.c index fb286db2cd..47407565ba 100644 --- a/arch/arm/boards/phycard-i.MX27/pca100.c +++ b/arch/arm/boards/phycard-i.MX27/pca100.c @@ -22,7 +22,7 @@ #include <fec.h> #include <mach/gpio.h> #include <asm/armlinux.h> -#include <asm-generic/sections.h> +#include <asm/sections.h> #include <generated/mach-types.h> #include <partition.h> #include <fs.h> diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c index cd34d9c66d..943fa46281 100644 --- a/arch/arm/cpu/start.c +++ b/arch/arm/cpu/start.c @@ -30,6 +30,15 @@ #include "mmu-early.h" unsigned long arm_stack_top; +static unsigned long barebox_boarddata; + +/* + * return the boarddata variable passed to barebox_arm_entry + */ +unsigned long barebox_arm_boarddata(void) +{ + return barebox_boarddata; +} static noinline __noreturn void __start(uint32_t membase, uint32_t memsize, uint32_t boarddata) @@ -39,6 +48,7 @@ static noinline __noreturn void __start(uint32_t membase, uint32_t memsize, setup_c(); + barebox_boarddata = boarddata; arm_stack_top = endmem; endmem -= STACK_SIZE; /* Stack */ diff --git a/arch/arm/include/asm/barebox-arm.h b/arch/arm/include/asm/barebox-arm.h index 9c10e366d9..f09709221e 100644 --- a/arch/arm/include/asm/barebox-arm.h +++ b/arch/arm/include/asm/barebox-arm.h @@ -41,5 +41,6 @@ uint32_t get_runtime_offset(void); void setup_c(void); void __noreturn barebox_arm_entry(uint32_t membase, uint32_t memsize, uint32_t boarddata); +unsigned long barebox_arm_boarddata(void); #endif /* _BAREBOX_ARM_H_ */ diff --git a/arch/arm/lib/unwind.c b/arch/arm/lib/unwind.c index 62d26af5d1..7932bca702 100644 --- a/arch/arm/lib/unwind.c +++ b/arch/arm/lib/unwind.c @@ -2,7 +2,7 @@ #include <init.h> #include <asm/stacktrace.h> #include <asm/unwind.h> -#include <asm-generic/sections.h> +#include <asm/sections.h> /* Dummy functions to avoid linker complaints */ void __aeabi_unwind_cpp_pr0(void) diff --git a/arch/arm/mach-imx/include/mach/generic.h b/arch/arm/mach-imx/include/mach/generic.h index 6bce7876bd..189b32f2c3 100644 --- a/arch/arm/mach-imx/include/mach/generic.h +++ b/arch/arm/mach-imx/include/mach/generic.h @@ -1,3 +1,5 @@ +#ifndef __MACH_GENERIC_H +#define __MACH_GENERIC_H u64 imx_uid(void); @@ -68,3 +70,5 @@ void imx6_boot_save_loc(void __iomem *src_base); #define cpu_is_mx23() (0) #define cpu_is_mx28() (0) + +#endif /* __MACH_GENERIC_H */ diff --git a/arch/arm/mach-imx/include/mach/imx-flash-header.h b/arch/arm/mach-imx/include/mach/imx-flash-header.h index a1f4a4848f..7a8d5cc306 100644 --- a/arch/arm/mach-imx/include/mach/imx-flash-header.h +++ b/arch/arm/mach-imx/include/mach/imx-flash-header.h @@ -1,7 +1,7 @@ #ifndef __MACH_FLASH_HEADER_H #define __MACH_FLASH_HEADER_H -#include <asm-generic/sections.h> +#include <asm/sections.h> #define __flash_header_start __section(.flash_header_start) diff --git a/common/kallsyms.c b/common/kallsyms.c index 0218991c46..94dfcdce84 100644 --- a/common/kallsyms.c +++ b/common/kallsyms.c @@ -1,7 +1,7 @@ #include <common.h> #include <init.h> #include <kallsyms.h> -#include <asm-generic/sections.h> +#include <asm/sections.h> #ifndef DOXYGEN_SHOULD_SKIP_THIS diff --git a/common/meminfo.c b/common/meminfo.c index 5e3ff716a5..ad9bbd98ed 100644 --- a/common/meminfo.c +++ b/common/meminfo.c @@ -2,7 +2,7 @@ #include <init.h> #include <memory.h> #include <asm-generic/memory_layout.h> -#include <asm-generic/sections.h> +#include <asm/sections.h> static int display_meminfo(void) { diff --git a/drivers/mci/imx.c b/drivers/mci/imx.c index 1210a1d2b1..3d9bd0deb1 100644 --- a/drivers/mci/imx.c +++ b/drivers/mci/imx.c @@ -27,7 +27,6 @@ #include <driver.h> #include <linux/clk.h> #include <linux/err.h> -#include <mach/clock.h> #include <io.h> #define DRIVER_NAME "imx-mmc" diff --git a/drivers/mtd/nand/nand_s3c24xx.c b/drivers/mtd/nand/nand_s3c24xx.c index fef94328b1..e41d9bf472 100644 --- a/drivers/mtd/nand/nand_s3c24xx.c +++ b/drivers/mtd/nand/nand_s3c24xx.c @@ -602,7 +602,7 @@ void __nand_boot_init s3c24x0_nand_load_image(void *dest, int size, int page) disable_nand_controller(host); } -#include <asm-generic/sections.h> +#include <asm/sections.h> void __nand_boot_init nand_boot(void) { |