* [PATCH 1/4] include asm/sections.h instead of asm-generic/sections.h
2013-03-10 10:19 [PATCH] misc cleanups Sascha Hauer
@ 2013-03-10 10:19 ` Sascha Hauer
2013-03-10 10:19 ` [PATCH 2/4] MMC i.MX: remove unnecessary mach include Sascha Hauer
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Sascha Hauer @ 2013-03-10 10:19 UTC (permalink / raw)
To: barebox
To let the architectures override asm-generic/sections.h
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/boards/a9m2410/a9m2410.c | 2 +-
arch/arm/boards/a9m2440/a9m2440.c | 2 +-
arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c | 2 +-
arch/arm/boards/eukrea_cpuimx25/lowlevel.c | 2 +-
arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c | 2 +-
arch/arm/boards/eukrea_cpuimx35/lowlevel.c | 2 +-
arch/arm/boards/freescale-mx25-3-stack/3stack.c | 2 +-
arch/arm/boards/freescale-mx35-3-stack/3stack.c | 2 +-
arch/arm/boards/friendlyarm-mini2440/mini2440.c | 2 +-
arch/arm/boards/guf-cupid/lowlevel.c | 2 +-
arch/arm/boards/guf-neso/lowlevel.c | 2 +-
arch/arm/boards/imx21ads/imx21ads.c | 2 +-
arch/arm/boards/karo-tx25/board.c | 2 +-
arch/arm/boards/karo-tx25/lowlevel.c | 2 +-
arch/arm/boards/pcm037/pcm037.c | 2 +-
arch/arm/boards/pcm038/lowlevel.c | 2 +-
arch/arm/boards/pcm043/lowlevel.c | 2 +-
arch/arm/boards/phycard-i.MX27/pca100.c | 2 +-
arch/arm/lib/unwind.c | 2 +-
| 2 +-
common/kallsyms.c | 2 +-
common/meminfo.c | 2 +-
drivers/mtd/nand/nand_s3c24xx.c | 2 +-
23 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/arch/arm/boards/a9m2410/a9m2410.c b/arch/arm/boards/a9m2410/a9m2410.c
index f1ad594..537e1e9 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 ff5d513..36216aa 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 98c9b43..2ea6913 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 bda1b22..11d990d 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 d690581..dc53272 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 88e9b28..a667e4c 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 4d048be..1909582 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 e1cb73c..f8656f1 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 9f4363c..c4b97a2 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 774dd55..d5298c1 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 56bafa9..386751d 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 6087ad4..8717774 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 e581886..cdbb0c5 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 6c7614b..d010043 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 959cc8a..276f9cd 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 77b7bf5..0ea2939 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 9485a9b..ebd6b29 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 1a21c8a..0ebc0cd 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/lib/unwind.c b/arch/arm/lib/unwind.c
index 62d26af..7932bca 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)
--git a/arch/arm/mach-imx/include/mach/imx-flash-header.h b/arch/arm/mach-imx/include/mach/imx-flash-header.h
index a1f4a48..7a8d5cc 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 0218991..94dfcdc 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 5e3ff71..ad9bbd9 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/mtd/nand/nand_s3c24xx.c b/drivers/mtd/nand/nand_s3c24xx.c
index fef9432..e41d9bf 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)
{
--
1.8.2.rc2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 4/4] ARM: Add missing barebox_arm_boarddata function
2013-03-10 10:19 [PATCH] misc cleanups Sascha Hauer
` (2 preceding siblings ...)
2013-03-10 10:19 ` [PATCH 3/4] ARM i.MX: Add double include protection for generic.h Sascha Hauer
@ 2013-03-10 10:19 ` Sascha Hauer
3 siblings, 0 replies; 5+ messages in thread
From: Sascha Hauer @ 2013-03-10 10:19 UTC (permalink / raw)
To: barebox
The comment above barebox_arm_entry promises to preserve the boarddata
variable passed to it which can then later get back with
barebox_arm_boarddata(). This function was missing so far, add it.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/cpu/start.c | 10 ++++++++++
arch/arm/include/asm/barebox-arm.h | 1 +
2 files changed, 11 insertions(+)
diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c
index cd34d9c..943fa46 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 9c10e36..f097092 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_ */
--
1.8.2.rc2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread