* [PATCH 00/11] Convert MVEBU SoCs to DT and PBL_MULTI_IMAGE
@ 2014-06-23 20:10 Sebastian Hesselbarth
2014-06-23 20:10 ` [PATCH 01/11] ARM: dts: sort pbl entries by alphabet Sebastian Hesselbarth
` (11 more replies)
0 siblings, 12 replies; 13+ messages in thread
From: Sebastian Hesselbarth @ 2014-06-23 20:10 UTC (permalink / raw)
To: Sebastian Hesselbarth; +Cc: barebox
This patch set converts Kirkwood and Armada 370/XP to DT and provides
PBL_MULTI_IMAGE support as we already have for Dove.
Patch 1 resorts pbl entries in arch/arm/dts/Makefile back to alphabetical
order.
Patch 2 reworks mvebu pbl image Makefile to ease integration of other SoCs.
Patches 3 and 4 convert Kirkwood and Armada 370/XP SoC init to DT probing.
Patches 5-9 convert existing Kirkwood and Armada 370/XP boards to
PBL_MULTI_IMAGES.
Patch 10 then reworks MVEBU related Kconfig to allow multiple board selection
per-SoC.
Patch 11 removes now redundant dtb Makefile targets.
The patches are based on today's next with previously sent cleanup patches
applied. They have been tested on Guruplug (Kirkwood) and Mirabox (Armada 370).
A branch based on *unstable* next with cleanup applied is available at:
https://github.com/shesselba/barebox-dove.git mvebu/soc
Sebastian Hesselbarth (11):
ARM: dts: sort pbl entries by alphabet
ARM: mvebu: sort pbl image target by board
ARM: mvebu: convert Kirkwood devices to be probed from DT
ARM: mvebu: convert Armada 370/XP devices to be probed from DT
ARM: mvebu: convert Globalscale Guruplug to PBL_MULTI_IMAGES
ARM: mvebu: convert USI Topkick to PBL_MULTI_IMAGES
ARM: mvebu: convert Globalscale Mirabox to PBL_MULTI_IMAGES
ARM: mvebu: convert Marvell Armada XP GP to PBL_MULTI_IMAGES
ARM: mvebu: convert PlatHome Openblocks AX3-4 to PBL_MULTI_IMAGES
ARM: mvebu: convert to multiple board selection
ARM: mvebu: remove dtb Makefile entries
arch/arm/Kconfig | 1 +
arch/arm/Makefile | 6 --
arch/arm/boards/Makefile | 6 ++
arch/arm/boards/globalscale-guruplug/Makefile | 1 +
arch/arm/boards/globalscale-guruplug/lowlevel.c | 35 +++++++++++
arch/arm/boards/globalscale-mirabox/Makefile | 1 +
arch/arm/boards/globalscale-mirabox/kwbimage.cfg | 2 +-
arch/arm/boards/globalscale-mirabox/lowlevel.c | 35 +++++++++++
arch/arm/boards/marvell-armada-xp-gp/Makefile | 1 +
arch/arm/boards/marvell-armada-xp-gp/kwbimage.cfg | 2 +-
arch/arm/boards/marvell-armada-xp-gp/lowlevel.c | 34 ++++++++++
arch/arm/boards/plathome-openblocks-ax3/Makefile | 1 +
.../boards/plathome-openblocks-ax3/kwbimage.cfg | 2 +-
arch/arm/boards/plathome-openblocks-ax3/lowlevel.c | 35 +++++++++++
arch/arm/boards/usi-topkick/Makefile | 1 +
arch/arm/boards/usi-topkick/lowlevel.c | 34 ++++++++++
arch/arm/dts/Makefile | 32 +++++-----
arch/arm/dts/armada-370-mirabox-bb.dts | 25 ++++++++
arch/arm/dts/armada-xp-gp-bb.dts | 12 ++++
arch/arm/dts/armada-xp-openblocks-ax3-4-bb.dts | 26 ++++++++
arch/arm/dts/kirkwood-guruplug-server-plus-bb.dts | 14 +++++
arch/arm/dts/kirkwood-topkick-bb.dts | 14 +++++
arch/arm/mach-mvebu/Kconfig | 21 -------
arch/arm/mach-mvebu/armada-370-xp.c | 66 +-------------------
arch/arm/mach-mvebu/kirkwood.c | 46 --------------
images/Makefile.mvebu | 72 +++++++++++++++++++---
26 files changed, 363 insertions(+), 162 deletions(-)
create mode 100644 arch/arm/boards/globalscale-guruplug/lowlevel.c
create mode 100644 arch/arm/boards/globalscale-mirabox/lowlevel.c
create mode 100644 arch/arm/boards/marvell-armada-xp-gp/lowlevel.c
create mode 100644 arch/arm/boards/plathome-openblocks-ax3/lowlevel.c
create mode 100644 arch/arm/boards/usi-topkick/lowlevel.c
create mode 100644 arch/arm/dts/armada-370-mirabox-bb.dts
create mode 100644 arch/arm/dts/armada-xp-gp-bb.dts
create mode 100644 arch/arm/dts/armada-xp-openblocks-ax3-4-bb.dts
create mode 100644 arch/arm/dts/kirkwood-guruplug-server-plus-bb.dts
create mode 100644 arch/arm/dts/kirkwood-topkick-bb.dts
---
Cc: barebox@lists.infradead.org
--
2.0.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 01/11] ARM: dts: sort pbl entries by alphabet
2014-06-23 20:10 [PATCH 00/11] Convert MVEBU SoCs to DT and PBL_MULTI_IMAGE Sebastian Hesselbarth
@ 2014-06-23 20:10 ` Sebastian Hesselbarth
2014-06-23 20:10 ` [PATCH 02/11] ARM: mvebu: sort pbl image target by board Sebastian Hesselbarth
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Sebastian Hesselbarth @ 2014-06-23 20:10 UTC (permalink / raw)
To: Sebastian Hesselbarth; +Cc: barebox
Clean up pbl Makefile entries, that are out of alphabetical order.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Cc: barebox@lists.infradead.org
---
arch/arm/dts/Makefile | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 6bbb4dcbed05..a5e6fd29c39e 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -46,37 +46,37 @@ BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_BUILTIN_DTB_NAME))
obj-$(CONFIG_BUILTIN_DTB) += $(BUILTIN_DTB).dtb.o
pbl-$(CONFIG_MACH_BEAGLEBONE) += am335x-bone.dtb.o am335x-boneblack.dtb.o am335x-bone-common.dtb.o
+pbl-$(CONFIG_MACH_DFI_FS700_M60) += imx6q-dfi-fs700-m60-6q.dtb.o imx6dl-dfi-fs700-m60-6s.dtb.o
pbl-$(CONFIG_MACH_EFIKA_MX_SMARTBOOK) += imx51-genesi-efika-sb.dtb.o
pbl-$(CONFIG_MACH_EMBEST_RIOTBOARD) += imx6s-riotboard.dtb.o
pbl-$(CONFIG_MACH_FREESCALE_MX51_PDK) += imx51-babbage.dtb.o
pbl-$(CONFIG_MACH_FREESCALE_MX53_LOCO) += imx53-qsb.dtb.o imx53-qsrb.dtb.o
pbl-$(CONFIG_MACH_FREESCALE_MX53_VMX53) += imx53-voipac-bsb.dtb.o
-pbl-$(CONFIG_MACH_DFI_FS700_M60) += imx6q-dfi-fs700-m60-6q.dtb.o imx6dl-dfi-fs700-m60-6s.dtb.o
+pbl-$(CONFIG_MACH_GK802) += imx6q-gk802.dtb.o
+pbl-$(CONFIG_MACH_GUF_SANTARO) += imx6q-guf-santaro.dtb.o
+pbl-$(CONFIG_MACH_NITROGEN6X) += imx6q-nitrogen6x.dtb.o imx6dl-nitrogen6x.dtb.o
pbl-$(CONFIG_MACH_NVIDIA_BEAVER) += tegra30-beaver.dtb.o
pbl-$(CONFIG_MACH_NVIDIA_JETSON) += tegra124-jetson-tk1.dtb.o
+pbl-$(CONFIG_MACH_PCA100) += imx27-phytec-phycard-s-rdk-bb.dtb.o
+pbl-$(CONFIG_MACH_PCAAXL3) += imx6q-phytec-pbaa03.dtb.o
+pbl-$(CONFIG_MACH_PCM038) += imx27-phytec-phycore-rdk.dtb.o
pbl-$(CONFIG_MACH_PCM051) += am335x-phytec-phycore.dtb.o
pbl-$(CONFIG_MACH_PHYTEC_PFLA02) += imx6s-phytec-pbab01.dtb.o imx6dl-phytec-pbab01.dtb.o imx6q-phytec-pbab01.dtb.o
+pbl-$(CONFIG_MACH_RADXA_ROCK) += rk3188-radxarock.dtb.o
pbl-$(CONFIG_MACH_REALQ7) += imx6q-dmo-edmqmx6.dtb.o
+pbl-$(CONFIG_MACH_SABRELITE) += imx6q-sabrelite.dtb.o imx6dl-sabrelite.dtb.o
+pbl-$(CONFIG_MACH_SABRESD) += imx6q-sabresd.dtb.o
+pbl-$(CONFIG_MACH_SOCFPGA_EBV_SOCRATES) += socfpga_cyclone5_socrates.dtb.o
+pbl-$(CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT) += socfpga_cyclone5_sockit.dtb.o
pbl-$(CONFIG_MACH_SOLIDRUN_CUBOX) += dove-cubox-bb.dtb.o
-pbl-$(CONFIG_MACH_GK802) += imx6q-gk802.dtb.o
-pbl-$(CONFIG_MACH_PCA100) += imx27-phytec-phycard-s-rdk-bb.dtb.o
-pbl-$(CONFIG_MACH_PCM038) += imx27-phytec-phycore-rdk.dtb.o
+pbl-$(CONFIG_MACH_SOLIDRUN_HUMMINGBOARD) += imx6dl-hummingboard.dtb.o
pbl-$(CONFIG_MACH_TORADEX_COLIBRI_T20) += tegra20-colibri-iris.dtb.o
pbl-$(CONFIG_MACH_TOSHIBA_AC100) += tegra20-paz00.dtb.o
pbl-$(CONFIG_MACH_TQMA53) += imx53-mba53.dtb.o
pbl-$(CONFIG_MACH_TQMA6X) += imx6dl-mba6x.dtb.o imx6q-mba6x.dtb.o
pbl-$(CONFIG_MACH_TX25) += imx25-karo-tx25.dtb.o
-pbl-$(CONFIG_MACH_RADXA_ROCK) += rk3188-radxarock.dtb.o
-pbl-$(CONFIG_MACH_SOCFPGA_EBV_SOCRATES) += socfpga_cyclone5_socrates.dtb.o
-pbl-$(CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT) += socfpga_cyclone5_sockit.dtb.o
-pbl-$(CONFIG_MACH_SOLIDRUN_HUMMINGBOARD) += imx6dl-hummingboard.dtb.o
-pbl-$(CONFIG_MACH_SABRELITE) += imx6q-sabrelite.dtb.o imx6dl-sabrelite.dtb.o
-pbl-$(CONFIG_MACH_SABRESD) += imx6q-sabresd.dtb.o
-pbl-$(CONFIG_MACH_GUF_SANTARO) += imx6q-guf-santaro.dtb.o
-pbl-$(CONFIG_MACH_NITROGEN6X) += imx6q-nitrogen6x.dtb.o imx6dl-nitrogen6x.dtb.o
pbl-$(CONFIG_MACH_UDOO) += imx6q-udoo.dtb.o
pbl-$(CONFIG_MACH_VARISCITE_MX6) += imx6q-var-custom.dtb.o
-pbl-$(CONFIG_MACH_PCAAXL3) += imx6q-phytec-pbaa03.dtb.o
.SECONDARY: $(obj)/$(BUILTIN_DTB).dtb.S
.SECONDARY: $(patsubst %,$(obj)/%.S,$(dtb-y))
--
2.0.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 02/11] ARM: mvebu: sort pbl image target by board
2014-06-23 20:10 [PATCH 00/11] Convert MVEBU SoCs to DT and PBL_MULTI_IMAGE Sebastian Hesselbarth
2014-06-23 20:10 ` [PATCH 01/11] ARM: dts: sort pbl entries by alphabet Sebastian Hesselbarth
@ 2014-06-23 20:10 ` Sebastian Hesselbarth
2014-06-23 20:10 ` [PATCH 03/11] ARM: mvebu: convert Kirkwood devices to be probed from DT Sebastian Hesselbarth
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Sebastian Hesselbarth @ 2014-06-23 20:10 UTC (permalink / raw)
To: Sebastian Hesselbarth; +Cc: barebox
This reorders images/Makefile.mvebu targets by board to ease integration
of new boards.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Cc: barebox@lists.infradead.org
---
images/Makefile.mvebu | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/images/Makefile.mvebu b/images/Makefile.mvebu
index fe92cc2f5839..8559556e203c 100644
--- a/images/Makefile.mvebu
+++ b/images/Makefile.mvebu
@@ -11,16 +11,16 @@ $(obj)/%.kwbuartimg: $(obj)/% FORCE
board = $(srctree)/arch/$(ARCH)/boards
+KWBOPTS = -c -d 0x1000000 -e 0x1000000
+
# ----------------------- Dove 88AP510 based boards ---------------------------
-SOLIDRUN_CUBOX_KWBOPTS = -c -i $(board)/solidrun-cubox/kwbimage.cfg -d 0x1000000 -e 0x1000000
-pblx-$(CONFIG_MACH_SOLIDRUN_CUBOX) += start_solidrun_cubox
+SOLIDRUN_CUBOX_KWBOPTS = ${KWBOPTS} -i $(board)/solidrun-cubox/kwbimage.cfg
OPTS_start_solidrun_cubox.pblx.kwbimg = $(SOLIDRUN_CUBOX_KWBOPTS)
-FILE_barebox-solidrun-cubox.img = start_solidrun_cubox.pblx.kwbimg
-image-$(CONFIG_MACH_SOLIDRUN_CUBOX) += barebox-solidrun-cubox.img
-
OPTS_start_solidrun_cubox.pblx.kwbuartimg = -m uart $(SOLIDRUN_CUBOX_KWBOPTS)
+FILE_barebox-solidrun-cubox.img = start_solidrun_cubox.pblx.kwbimg
FILE_barebox-solidrun-cubox-uart.img = start_solidrun_cubox.pblx.kwbuartimg
-image-$(CONFIG_MACH_SOLIDRUN_CUBOX) += barebox-solidrun-cubox-uart.img
-
FILE_barebox-solidrun-cubox-2nd.img = start_solidrun_cubox.pblx
+pblx-$(CONFIG_MACH_SOLIDRUN_CUBOX) += start_solidrun_cubox
+image-$(CONFIG_MACH_SOLIDRUN_CUBOX) += barebox-solidrun-cubox.img
+image-$(CONFIG_MACH_SOLIDRUN_CUBOX) += barebox-solidrun-cubox-uart.img
image-$(CONFIG_MACH_SOLIDRUN_CUBOX) += barebox-solidrun-cubox-2nd.img
--
2.0.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 03/11] ARM: mvebu: convert Kirkwood devices to be probed from DT
2014-06-23 20:10 [PATCH 00/11] Convert MVEBU SoCs to DT and PBL_MULTI_IMAGE Sebastian Hesselbarth
2014-06-23 20:10 ` [PATCH 01/11] ARM: dts: sort pbl entries by alphabet Sebastian Hesselbarth
2014-06-23 20:10 ` [PATCH 02/11] ARM: mvebu: sort pbl image target by board Sebastian Hesselbarth
@ 2014-06-23 20:10 ` Sebastian Hesselbarth
2014-06-23 20:10 ` [PATCH 04/11] ARM: mvebu: convert Armada 370/XP " Sebastian Hesselbarth
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Sebastian Hesselbarth @ 2014-06-23 20:10 UTC (permalink / raw)
To: Sebastian Hesselbarth; +Cc: barebox
With Kirkwood DT files available, convert Kirkwood SoC init
to register basic devices from DT only. Makefile targets for
dtbs will be removed again as soon as MULTI_PBL is available.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Cc: barebox@lists.infradead.org
---
arch/arm/dts/Makefile | 4 +-
arch/arm/dts/kirkwood-guruplug-server-plus-bb.dts | 14 +++++++
arch/arm/dts/kirkwood-topkick-bb.dts | 14 +++++++
arch/arm/mach-mvebu/kirkwood.c | 46 -----------------------
4 files changed, 31 insertions(+), 47 deletions(-)
create mode 100644 arch/arm/dts/kirkwood-guruplug-server-plus-bb.dts
create mode 100644 arch/arm/dts/kirkwood-topkick-bb.dts
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index a5e6fd29c39e..547dba4461f8 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -32,7 +32,9 @@ dtb-$(CONFIG_ARCH_IMX6) += imx6q-gk802.dtb \
imx6q-var-custom.dtb \
imx6s-riotboard.dtb \
imx6q-phytec-pbaa03.dtb
-dtb-$(CONFIG_ARCH_MVEBU) += dove-cubox-bb.dtb
+dtb-$(CONFIG_ARCH_MVEBU) += dove-cubox-bb.dtb \
+ kirkwood-guruplug-server-plus-bb.dtb \
+ kirkwood-topkick-bb.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3188-radxarock.dtb
dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5_sockit.dtb \
socfpga_cyclone5_socrates.dtb
diff --git a/arch/arm/dts/kirkwood-guruplug-server-plus-bb.dts b/arch/arm/dts/kirkwood-guruplug-server-plus-bb.dts
new file mode 100644
index 000000000000..aba7c06160d0
--- /dev/null
+++ b/arch/arm/dts/kirkwood-guruplug-server-plus-bb.dts
@@ -0,0 +1,14 @@
+/*
+ * Barebox specific DT overlay for Globalscale Guruplug
+ * Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
+ */
+
+#include "arm/kirkwood-guruplug-server-plus.dts"
+
+/ {
+ gpio-leds {
+ health-r {
+ barebox,default-trigger = "heartbeat";
+ };
+ };
+};
diff --git a/arch/arm/dts/kirkwood-topkick-bb.dts b/arch/arm/dts/kirkwood-topkick-bb.dts
new file mode 100644
index 000000000000..20b74b111d91
--- /dev/null
+++ b/arch/arm/dts/kirkwood-topkick-bb.dts
@@ -0,0 +1,14 @@
+/*
+ * Barebox specific DT overlay for USI Topkick
+ * Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
+ */
+
+#include "arm/kirkwood-topkick.dts"
+
+/ {
+ gpio-leds {
+ system {
+ barebox,default-trigger = "heartbeat";
+ };
+ };
+};
diff --git a/arch/arm/mach-mvebu/kirkwood.c b/arch/arm/mach-mvebu/kirkwood.c
index c79d13002a6a..fe9ca9cbe4d3 100644
--- a/arch/arm/mach-mvebu/kirkwood.c
+++ b/arch/arm/mach-mvebu/kirkwood.c
@@ -16,16 +16,9 @@
#include <common.h>
#include <init.h>
#include <io.h>
-#include <ns16550.h>
-#include <linux/clk.h>
-#include <linux/clkdev.h>
#include <asm/memory.h>
#include <mach/kirkwood-regs.h>
-#define CONSOLE_UART_BASE KIRKWOOD_UARTn_BASE(CONFIG_MVEBU_CONSOLE_UART)
-
-static struct clk *tclk;
-
static inline void kirkwood_memory_find(unsigned long *phys_base,
unsigned long *phys_size)
{
@@ -49,39 +42,6 @@ static inline void kirkwood_memory_find(unsigned long *phys_base,
}
}
-static struct NS16550_plat uart_plat = {
- .shift = 2,
-};
-
-static int kirkwood_add_uart(void)
-{
- uart_plat.clock = clk_get_rate(tclk);
- if (!add_ns16550_device(DEVICE_ID_DYNAMIC,
- (unsigned int)CONSOLE_UART_BASE, 32,
- IORESOURCE_MEM | IORESOURCE_MEM_32BIT,
- &uart_plat))
- return -ENODEV;
- return 0;
-}
-
-static int kirkwood_init_clocks(void)
-{
- u32 val = readl(KIRKWOOD_SAR_BASE);
- unsigned int rate;
-
- /*
- * On Kirkwood, the TCLK frequency can be either
- * 166 Mhz or 200 Mhz
- */
- if ((val & SAR_TCLK_FREQ) == SAR_TCLK_FREQ)
- rate = 166666667;
- else
- rate = 200000000;
-
- tclk = clk_fixed("tclk", rate);
- return 0;
-}
-
static int kirkwood_init_soc(void)
{
unsigned long phys_base, phys_size;
@@ -89,14 +49,8 @@ static int kirkwood_init_soc(void)
barebox_set_model("Marvell Kirkwood");
barebox_set_hostname("kirkwood");
- kirkwood_init_clocks();
- clkdev_add_physbase(tclk, (unsigned int)KIRKWOOD_TIMER_BASE, NULL);
- add_generic_device("orion-timer", DEVICE_ID_SINGLE, NULL,
- (unsigned int)KIRKWOOD_TIMER_BASE, 0x30,
- IORESOURCE_MEM, NULL);
kirkwood_memory_find(&phys_base, &phys_size);
arm_add_mem_device("ram0", phys_base, phys_size);
- kirkwood_add_uart();
return 0;
}
--
2.0.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 04/11] ARM: mvebu: convert Armada 370/XP devices to be probed from DT
2014-06-23 20:10 [PATCH 00/11] Convert MVEBU SoCs to DT and PBL_MULTI_IMAGE Sebastian Hesselbarth
` (2 preceding siblings ...)
2014-06-23 20:10 ` [PATCH 03/11] ARM: mvebu: convert Kirkwood devices to be probed from DT Sebastian Hesselbarth
@ 2014-06-23 20:10 ` Sebastian Hesselbarth
2014-06-23 20:10 ` [PATCH 05/11] ARM: mvebu: convert Globalscale Guruplug to PBL_MULTI_IMAGES Sebastian Hesselbarth
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Sebastian Hesselbarth @ 2014-06-23 20:10 UTC (permalink / raw)
To: Sebastian Hesselbarth; +Cc: barebox
With Armada 370/XP DT files available, convert Armada 370/XP SoC init
to register basic devices from DT only. Makefile targets for dtbs will
be removed again as soon as MULTI_PBL is available.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Cc: barebox@lists.infradead.org
---
arch/arm/dts/Makefile | 3 ++
arch/arm/dts/armada-370-mirabox-bb.dts | 18 +++++++
arch/arm/dts/armada-xp-gp-bb.dts | 6 +++
arch/arm/dts/armada-xp-openblocks-ax3-4-bb.dts | 18 +++++++
arch/arm/mach-mvebu/armada-370-xp.c | 66 +-------------------------
5 files changed, 46 insertions(+), 65 deletions(-)
create mode 100644 arch/arm/dts/armada-370-mirabox-bb.dts
create mode 100644 arch/arm/dts/armada-xp-gp-bb.dts
create mode 100644 arch/arm/dts/armada-xp-openblocks-ax3-4-bb.dts
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 547dba4461f8..4642f979f6d5 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -33,6 +33,9 @@ dtb-$(CONFIG_ARCH_IMX6) += imx6q-gk802.dtb \
imx6s-riotboard.dtb \
imx6q-phytec-pbaa03.dtb
dtb-$(CONFIG_ARCH_MVEBU) += dove-cubox-bb.dtb \
+ armada-370-mirabox-bb.dtb \
+ armada-xp-gp-bb.dtb \
+ armada-xp-openblocks-ax3-4-bb.dtb \
kirkwood-guruplug-server-plus-bb.dtb \
kirkwood-topkick-bb.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3188-radxarock.dtb
diff --git a/arch/arm/dts/armada-370-mirabox-bb.dts b/arch/arm/dts/armada-370-mirabox-bb.dts
new file mode 100644
index 000000000000..22fec18aaf93
--- /dev/null
+++ b/arch/arm/dts/armada-370-mirabox-bb.dts
@@ -0,0 +1,18 @@
+/*
+ * Barebox specific DT overlay for Globalscale Mirabox
+ * Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
+ */
+
+#include "arm/armada-370-mirabox.dts"
+
+/ {
+ soc {
+ internal-regs {
+ gpio_leds {
+ green_pwr_led {
+ barebox,default-trigger = "heartbeat";
+ };
+ };
+ };
+ };
+};
diff --git a/arch/arm/dts/armada-xp-gp-bb.dts b/arch/arm/dts/armada-xp-gp-bb.dts
new file mode 100644
index 000000000000..e27a9664451d
--- /dev/null
+++ b/arch/arm/dts/armada-xp-gp-bb.dts
@@ -0,0 +1,6 @@
+/*
+ * Barebox specific DT overlay for Marvell Armada XP DB-MV784MP-GP
+ * Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
+ */
+
+#include "arm/armada-xp-gp.dts"
diff --git a/arch/arm/dts/armada-xp-openblocks-ax3-4-bb.dts b/arch/arm/dts/armada-xp-openblocks-ax3-4-bb.dts
new file mode 100644
index 000000000000..350aa1cb0a6d
--- /dev/null
+++ b/arch/arm/dts/armada-xp-openblocks-ax3-4-bb.dts
@@ -0,0 +1,18 @@
+/*
+ * Barebox specific DT overlay for OpenBlocks AX3-4 board
+ * Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
+ */
+
+#include "arm/armada-xp-openblocks-ax3-4.dts"
+
+/ {
+ soc {
+ internal-regs {
+ gpio_leds {
+ red_led {
+ barebox,default-trigger = "heartbeat";
+ };
+ };
+ };
+ };
+};
diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c
index 051323eeb36c..e416a3876539 100644
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@ -17,18 +17,9 @@
#include <common.h>
#include <init.h>
#include <io.h>
-#include <ns16550.h>
-#include <linux/clk.h>
-#include <linux/clkdev.h>
#include <asm/memory.h>
#include <mach/armada-370-xp-regs.h>
-#define CONSOLE_UART_BASE \
- ARMADA_370_XP_UARTn_BASE(CONFIG_MVEBU_CONSOLE_UART)
-
-static struct clk *tclk;
-static struct clk *refclk;
-
static inline void armada_370_xp_memory_find(unsigned long *phys_base,
unsigned long *phys_size)
{
@@ -52,53 +43,6 @@ static inline void armada_370_xp_memory_find(unsigned long *phys_base,
}
}
-static struct NS16550_plat uart_plat = {
- .shift = 2,
-};
-
-static int armada_370_xp_add_uart(void)
-{
- uart_plat.clock = clk_get_rate(tclk);
- if (!add_ns16550_device(DEVICE_ID_DYNAMIC,
- (unsigned int)CONSOLE_UART_BASE, 32,
- IORESOURCE_MEM | IORESOURCE_MEM_32BIT,
- &uart_plat))
- return -ENODEV;
- return 0;
-}
-
-#if defined(CONFIG_ARCH_ARMADA_370)
-static int armada_370_init_clocks(void)
-{
- u32 val = readl(ARMADA_370_XP_SAR_BASE + SAR_LOW);
- unsigned int rate;
-
- /*
- * On Armada 370, the TCLK frequency can be either
- * 166 Mhz or 200 Mhz
- */
- if ((val & SAR_TCLK_FREQ) == SAR_TCLK_FREQ)
- rate = 200000000;
- else
- rate = 166000000;
-
- tclk = clk_fixed("tclk", rate);
- return clk_register_clkdev(tclk, NULL, "mvebu-timer");
-}
-#define armada_370_xp_init_clocks() armada_370_init_clocks()
-#endif
-
-#if defined(CONFIG_ARCH_ARMADA_XP)
-static int armada_xp_init_clocks(void)
-{
- /* On Armada XP, the TCLK frequency is always 250 Mhz */
- tclk = clk_fixed("tclk", 250000000);
- refclk = clk_fixed("ref25M", 25000000);
- return 0;
-}
-#define armada_370_xp_init_clocks() armada_xp_init_clocks()
-#endif
-
static int armada_370_xp_init_soc(void)
{
unsigned long phys_base, phys_size;
@@ -106,17 +50,9 @@ static int armada_370_xp_init_soc(void)
barebox_set_model("Marvell Armada 370/XP");
barebox_set_hostname("armada");
- armada_370_xp_init_clocks();
- clkdev_add_physbase(tclk, (unsigned int)ARMADA_370_XP_TIMER_BASE, NULL);
- if (refclk && !IS_ERR(refclk))
- clkdev_add_physbase(refclk, (u32)ARMADA_370_XP_TIMER_BASE,
- "fixed");
- add_generic_device("mvebu-timer", DEVICE_ID_SINGLE, NULL,
- (unsigned int)ARMADA_370_XP_TIMER_BASE, 0x30,
- IORESOURCE_MEM, NULL);
armada_370_xp_memory_find(&phys_base, &phys_size);
arm_add_mem_device("ram0", phys_base, phys_size);
- armada_370_xp_add_uart();
+
return 0;
}
core_initcall(armada_370_xp_init_soc);
--
2.0.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 05/11] ARM: mvebu: convert Globalscale Guruplug to PBL_MULTI_IMAGES
2014-06-23 20:10 [PATCH 00/11] Convert MVEBU SoCs to DT and PBL_MULTI_IMAGE Sebastian Hesselbarth
` (3 preceding siblings ...)
2014-06-23 20:10 ` [PATCH 04/11] ARM: mvebu: convert Armada 370/XP " Sebastian Hesselbarth
@ 2014-06-23 20:10 ` Sebastian Hesselbarth
2014-06-23 20:10 ` [PATCH 06/11] ARM: mvebu: convert USI Topkick " Sebastian Hesselbarth
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Sebastian Hesselbarth @ 2014-06-23 20:10 UTC (permalink / raw)
To: Sebastian Hesselbarth; +Cc: barebox
This converts Marvell Kirkwood based Globalscale Guruplug to
PBL_MULTI_IMAGES.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Cc: barebox@lists.infradead.org
---
arch/arm/boards/globalscale-guruplug/Makefile | 1 +
arch/arm/boards/globalscale-guruplug/lowlevel.c | 35 +++++++++++++++++++++++++
arch/arm/dts/Makefile | 1 +
images/Makefile.mvebu | 12 +++++++++
4 files changed, 49 insertions(+)
create mode 100644 arch/arm/boards/globalscale-guruplug/lowlevel.c
diff --git a/arch/arm/boards/globalscale-guruplug/Makefile b/arch/arm/boards/globalscale-guruplug/Makefile
index dcfc2937d325..01c7a259e9a5 100644
--- a/arch/arm/boards/globalscale-guruplug/Makefile
+++ b/arch/arm/boards/globalscale-guruplug/Makefile
@@ -1 +1,2 @@
obj-y += board.o
+lwl-y += lowlevel.o
diff --git a/arch/arm/boards/globalscale-guruplug/lowlevel.c b/arch/arm/boards/globalscale-guruplug/lowlevel.c
new file mode 100644
index 000000000000..508746a06f81
--- /dev/null
+++ b/arch/arm/boards/globalscale-guruplug/lowlevel.c
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2014
+ * Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <common.h>
+#include <sizes.h>
+#include <asm/barebox-arm.h>
+#include <asm/barebox-arm-head.h>
+#include <mach/lowlevel.h>
+
+extern char __dtb_kirkwood_guruplug_server_plus_bb_start[];
+
+ENTRY_FUNCTION(start_globalscale_guruplug, r0, r1, r2)
+{
+ void *fdt;
+
+ arm_cpu_lowlevel_init();
+
+ fdt = __dtb_kirkwood_guruplug_server_plus_bb_start -
+ get_runtime_offset();
+
+ mvebu_barebox_entry(fdt);
+}
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 4642f979f6d5..b747c59c460f 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -58,6 +58,7 @@ pbl-$(CONFIG_MACH_FREESCALE_MX51_PDK) += imx51-babbage.dtb.o
pbl-$(CONFIG_MACH_FREESCALE_MX53_LOCO) += imx53-qsb.dtb.o imx53-qsrb.dtb.o
pbl-$(CONFIG_MACH_FREESCALE_MX53_VMX53) += imx53-voipac-bsb.dtb.o
pbl-$(CONFIG_MACH_GK802) += imx6q-gk802.dtb.o
+pbl-$(CONFIG_MACH_GLOBALSCALE_GURUPLUG) += kirkwood-guruplug-server-plus-bb.dtb.o
pbl-$(CONFIG_MACH_GUF_SANTARO) += imx6q-guf-santaro.dtb.o
pbl-$(CONFIG_MACH_NITROGEN6X) += imx6q-nitrogen6x.dtb.o imx6dl-nitrogen6x.dtb.o
pbl-$(CONFIG_MACH_NVIDIA_BEAVER) += tegra30-beaver.dtb.o
diff --git a/images/Makefile.mvebu b/images/Makefile.mvebu
index 8559556e203c..c09a77d1473c 100644
--- a/images/Makefile.mvebu
+++ b/images/Makefile.mvebu
@@ -24,3 +24,15 @@ pblx-$(CONFIG_MACH_SOLIDRUN_CUBOX) += start_solidrun_cubox
image-$(CONFIG_MACH_SOLIDRUN_CUBOX) += barebox-solidrun-cubox.img
image-$(CONFIG_MACH_SOLIDRUN_CUBOX) += barebox-solidrun-cubox-uart.img
image-$(CONFIG_MACH_SOLIDRUN_CUBOX) += barebox-solidrun-cubox-2nd.img
+
+# ----------------------- Kirkwood based boards ---------------------------
+GLOBALSCALE_GURUPLUG_KWBOPTS = ${KWBOPTS} -i $(board)/globalscale-guruplug/kwbimage.cfg
+OPTS_start_globalscale_guruplug.pblx.kwbimg = $(GLOBALSCALE_GURUPLUG_KWBOPTS)
+OPTS_start_globalscale_guruplug.pblx.kwbuartimg = -m uart $(GLOBALSCALE_GURUPLUG_KWBOPTS)
+FILE_barebox-globalscale-guruplug.img = start_globalscale_guruplug.pblx.kwbimg
+FILE_barebox-globalscale-guruplug-uart.img = start_globalscale_guruplug.pblx.kwbuartimg
+FILE_barebox-globalscale-guruplug-2nd.img = start_globalscale_guruplug.pblx
+pblx-$(CONFIG_MACH_GLOBALSCALE_GURUPLUG) += start_globalscale_guruplug
+image-$(CONFIG_MACH_GLOBALSCALE_GURUPLUG) += barebox-globalscale-guruplug.img
+image-$(CONFIG_MACH_GLOBALSCALE_GURUPLUG) += barebox-globalscale-guruplug-uart.img
+image-$(CONFIG_MACH_GLOBALSCALE_GURUPLUG) += barebox-globalscale-guruplug-2nd.img
--
2.0.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 06/11] ARM: mvebu: convert USI Topkick to PBL_MULTI_IMAGES
2014-06-23 20:10 [PATCH 00/11] Convert MVEBU SoCs to DT and PBL_MULTI_IMAGE Sebastian Hesselbarth
` (4 preceding siblings ...)
2014-06-23 20:10 ` [PATCH 05/11] ARM: mvebu: convert Globalscale Guruplug to PBL_MULTI_IMAGES Sebastian Hesselbarth
@ 2014-06-23 20:10 ` Sebastian Hesselbarth
2014-06-23 20:10 ` [PATCH 07/11] ARM: mvebu: convert Globalscale Mirabox " Sebastian Hesselbarth
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Sebastian Hesselbarth @ 2014-06-23 20:10 UTC (permalink / raw)
To: Sebastian Hesselbarth; +Cc: barebox
This converts Marvell Kirkwood based USI Topkick to
PBL_MULTI_IMAGES.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Cc: barebox@lists.infradead.org
---
arch/arm/boards/usi-topkick/Makefile | 1 +
arch/arm/boards/usi-topkick/lowlevel.c | 34 ++++++++++++++++++++++++++++++++++
arch/arm/dts/Makefile | 1 +
images/Makefile.mvebu | 11 +++++++++++
4 files changed, 47 insertions(+)
create mode 100644 arch/arm/boards/usi-topkick/lowlevel.c
diff --git a/arch/arm/boards/usi-topkick/Makefile b/arch/arm/boards/usi-topkick/Makefile
index dcfc2937d325..01c7a259e9a5 100644
--- a/arch/arm/boards/usi-topkick/Makefile
+++ b/arch/arm/boards/usi-topkick/Makefile
@@ -1 +1,2 @@
obj-y += board.o
+lwl-y += lowlevel.o
diff --git a/arch/arm/boards/usi-topkick/lowlevel.c b/arch/arm/boards/usi-topkick/lowlevel.c
new file mode 100644
index 000000000000..df661564dac4
--- /dev/null
+++ b/arch/arm/boards/usi-topkick/lowlevel.c
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2014
+ * Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <common.h>
+#include <sizes.h>
+#include <asm/barebox-arm.h>
+#include <asm/barebox-arm-head.h>
+#include <mach/lowlevel.h>
+
+extern char __dtb_kirkwood_topkick_bb_start[];
+
+ENTRY_FUNCTION(start_usi_topkick, r0, r1, r2)
+{
+ void *fdt;
+
+ arm_cpu_lowlevel_init();
+
+ fdt = __dtb_kirkwood_topkick_bb_start - get_runtime_offset();
+
+ mvebu_barebox_entry(fdt);
+}
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index b747c59c460f..1b369100a537 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -82,6 +82,7 @@ pbl-$(CONFIG_MACH_TQMA53) += imx53-mba53.dtb.o
pbl-$(CONFIG_MACH_TQMA6X) += imx6dl-mba6x.dtb.o imx6q-mba6x.dtb.o
pbl-$(CONFIG_MACH_TX25) += imx25-karo-tx25.dtb.o
pbl-$(CONFIG_MACH_UDOO) += imx6q-udoo.dtb.o
+pbl-$(CONFIG_MACH_USI_TOPKICK) += kirkwood-topkick-bb.dtb.o
pbl-$(CONFIG_MACH_VARISCITE_MX6) += imx6q-var-custom.dtb.o
.SECONDARY: $(obj)/$(BUILTIN_DTB).dtb.S
diff --git a/images/Makefile.mvebu b/images/Makefile.mvebu
index c09a77d1473c..fdc6822bd968 100644
--- a/images/Makefile.mvebu
+++ b/images/Makefile.mvebu
@@ -36,3 +36,14 @@ pblx-$(CONFIG_MACH_GLOBALSCALE_GURUPLUG) += start_globalscale_guruplug
image-$(CONFIG_MACH_GLOBALSCALE_GURUPLUG) += barebox-globalscale-guruplug.img
image-$(CONFIG_MACH_GLOBALSCALE_GURUPLUG) += barebox-globalscale-guruplug-uart.img
image-$(CONFIG_MACH_GLOBALSCALE_GURUPLUG) += barebox-globalscale-guruplug-2nd.img
+
+USI_TOPKICK_KWBOPTS = ${KWBOPTS} -i $(board)/usi-topkick/kwbimage.cfg
+OPTS_start_usi_topkick.pblx.kwbimg = $(USI_TOPKICK_KWBOPTS)
+OPTS_start_usi_topkick.pblx.kwbuartimg = -m uart $(USI_TOPKICK_KWBOPTS)
+FILE_barebox-usi-topkick.img = start_usi_topkick.pblx.kwbimg
+FILE_barebox-usi-topkick-uart.img = start_usi_topkick.pblx.kwbuartimg
+FILE_barebox-usi-topkick-2nd.img = start_usi_topkick.pblx
+pblx-$(CONFIG_MACH_USI_TOPKICK) += start_usi_topkick
+image-$(CONFIG_MACH_USI_TOPKICK) += barebox-usi-topkick.img
+image-$(CONFIG_MACH_USI_TOPKICK) += barebox-usi-topkick-uart.img
+image-$(CONFIG_MACH_USI_TOPKICK) += barebox-usi-topkick-2nd.img
--
2.0.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 07/11] ARM: mvebu: convert Globalscale Mirabox to PBL_MULTI_IMAGES
2014-06-23 20:10 [PATCH 00/11] Convert MVEBU SoCs to DT and PBL_MULTI_IMAGE Sebastian Hesselbarth
` (5 preceding siblings ...)
2014-06-23 20:10 ` [PATCH 06/11] ARM: mvebu: convert USI Topkick " Sebastian Hesselbarth
@ 2014-06-23 20:10 ` Sebastian Hesselbarth
2014-06-23 20:10 ` [PATCH 08/11] ARM: mvebu: convert Marvell Armada XP GP " Sebastian Hesselbarth
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Sebastian Hesselbarth @ 2014-06-23 20:10 UTC (permalink / raw)
To: Sebastian Hesselbarth; +Cc: barebox
This converts Marvell Armada 370 based Globalscale Mirabox
to PBL_MULTI_IMAGES. A DT overlay is added to keep possible
barebox-specific changes separated and added to lowlevel
board init.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Cc: barebox@lists.infradead.org
---
arch/arm/boards/globalscale-mirabox/Makefile | 1 +
arch/arm/boards/globalscale-mirabox/kwbimage.cfg | 2 +-
arch/arm/boards/globalscale-mirabox/lowlevel.c | 35 ++++++++++++++++++++++++
arch/arm/dts/Makefile | 1 +
arch/arm/dts/armada-370-mirabox-bb.dts | 7 +++++
images/Makefile.mvebu | 12 ++++++++
6 files changed, 57 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/boards/globalscale-mirabox/lowlevel.c
diff --git a/arch/arm/boards/globalscale-mirabox/Makefile b/arch/arm/boards/globalscale-mirabox/Makefile
index dcfc2937d325..01c7a259e9a5 100644
--- a/arch/arm/boards/globalscale-mirabox/Makefile
+++ b/arch/arm/boards/globalscale-mirabox/Makefile
@@ -1 +1,2 @@
obj-y += board.o
+lwl-y += lowlevel.o
diff --git a/arch/arm/boards/globalscale-mirabox/kwbimage.cfg b/arch/arm/boards/globalscale-mirabox/kwbimage.cfg
index 72283d9b69f2..16fb77c31f18 100644
--- a/arch/arm/boards/globalscale-mirabox/kwbimage.cfg
+++ b/arch/arm/boards/globalscale-mirabox/kwbimage.cfg
@@ -2,4 +2,4 @@ VERSION 1
BOOT_FROM nand
NAND_BLKSZ 00020000
NAND_BADBLK_LOCATION 01
-BINARY globalscale-mirabox-binary.0 0000005b 00000068
+BINARY arch/arm/boards/globalscale-mirabox/binary.0 0000005b 00000068
diff --git a/arch/arm/boards/globalscale-mirabox/lowlevel.c b/arch/arm/boards/globalscale-mirabox/lowlevel.c
new file mode 100644
index 000000000000..92203b768ab6
--- /dev/null
+++ b/arch/arm/boards/globalscale-mirabox/lowlevel.c
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2014
+ * Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <common.h>
+#include <sizes.h>
+#include <asm/barebox-arm.h>
+#include <asm/barebox-arm-head.h>
+#include <mach/lowlevel.h>
+
+extern char __dtb_armada_370_mirabox_bb_start[];
+
+ENTRY_FUNCTION(start_globalscale_mirabox, r0, r1, r2)
+{
+ void *fdt;
+
+ arm_cpu_lowlevel_init();
+
+ fdt = __dtb_armada_370_mirabox_bb_start -
+ get_runtime_offset();
+
+ mvebu_barebox_entry(fdt);
+}
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 1b369100a537..c5a782befd07 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -59,6 +59,7 @@ pbl-$(CONFIG_MACH_FREESCALE_MX53_LOCO) += imx53-qsb.dtb.o imx53-qsrb.dtb.o
pbl-$(CONFIG_MACH_FREESCALE_MX53_VMX53) += imx53-voipac-bsb.dtb.o
pbl-$(CONFIG_MACH_GK802) += imx6q-gk802.dtb.o
pbl-$(CONFIG_MACH_GLOBALSCALE_GURUPLUG) += kirkwood-guruplug-server-plus-bb.dtb.o
+pbl-$(CONFIG_MACH_GLOBALSCALE_MIRABOX) += armada-370-mirabox-bb.dtb.o
pbl-$(CONFIG_MACH_GUF_SANTARO) += imx6q-guf-santaro.dtb.o
pbl-$(CONFIG_MACH_NITROGEN6X) += imx6q-nitrogen6x.dtb.o imx6dl-nitrogen6x.dtb.o
pbl-$(CONFIG_MACH_NVIDIA_BEAVER) += tegra30-beaver.dtb.o
diff --git a/arch/arm/dts/armada-370-mirabox-bb.dts b/arch/arm/dts/armada-370-mirabox-bb.dts
index 22fec18aaf93..de37a75bb960 100644
--- a/arch/arm/dts/armada-370-mirabox-bb.dts
+++ b/arch/arm/dts/armada-370-mirabox-bb.dts
@@ -6,7 +6,14 @@
#include "arm/armada-370-mirabox.dts"
/ {
+ chosen {
+ stdout-path = "/soc/internal-regs/serial@12000";
+ };
+
soc {
+ ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
+ MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>;
+
internal-regs {
gpio_leds {
green_pwr_led {
diff --git a/images/Makefile.mvebu b/images/Makefile.mvebu
index fdc6822bd968..3b89f36fa610 100644
--- a/images/Makefile.mvebu
+++ b/images/Makefile.mvebu
@@ -13,6 +13,18 @@ board = $(srctree)/arch/$(ARCH)/boards
KWBOPTS = -c -d 0x1000000 -e 0x1000000
+# ----------------------- Armada 370 based boards ---------------------------
+GLOBALSCALE_MIRABOX_KWBOPTS = ${KWBOPTS} -i $(board)/globalscale-mirabox/kwbimage.cfg
+OPTS_start_globalscale_mirabox.pblx.kwbimg = $(GLOBALSCALE_MIRABOX_KWBOPTS)
+OPTS_start_globalscale_mirabox.pblx.kwbuartimg = -m uart $(GLOBALSCALE_MIRABOX_KWBOPTS)
+FILE_barebox-globalscale-mirabox.img = start_globalscale_mirabox.pblx.kwbimg
+FILE_barebox-globalscale-mirabox-uart.img = start_globalscale_mirabox.pblx.kwbuartimg
+FILE_barebox-globalscale-mirabox-2nd.img = start_globalscale_mirabox.pblx
+pblx-$(CONFIG_MACH_GLOBALSCALE_MIRABOX) += start_globalscale_mirabox
+image-$(CONFIG_MACH_GLOBALSCALE_MIRABOX) += barebox-globalscale-mirabox.img
+image-$(CONFIG_MACH_GLOBALSCALE_MIRABOX) += barebox-globalscale-mirabox-uart.img
+image-$(CONFIG_MACH_GLOBALSCALE_MIRABOX) += barebox-globalscale-mirabox-2nd.img
+
# ----------------------- Dove 88AP510 based boards ---------------------------
SOLIDRUN_CUBOX_KWBOPTS = ${KWBOPTS} -i $(board)/solidrun-cubox/kwbimage.cfg
OPTS_start_solidrun_cubox.pblx.kwbimg = $(SOLIDRUN_CUBOX_KWBOPTS)
--
2.0.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 08/11] ARM: mvebu: convert Marvell Armada XP GP to PBL_MULTI_IMAGES
2014-06-23 20:10 [PATCH 00/11] Convert MVEBU SoCs to DT and PBL_MULTI_IMAGE Sebastian Hesselbarth
` (6 preceding siblings ...)
2014-06-23 20:10 ` [PATCH 07/11] ARM: mvebu: convert Globalscale Mirabox " Sebastian Hesselbarth
@ 2014-06-23 20:10 ` Sebastian Hesselbarth
2014-06-23 20:11 ` [PATCH 09/11] ARM: mvebu: convert PlatHome Openblocks AX3-4 " Sebastian Hesselbarth
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Sebastian Hesselbarth @ 2014-06-23 20:10 UTC (permalink / raw)
To: Sebastian Hesselbarth; +Cc: barebox
This converts Marvell Armada XP based Marvell Armada XP GP
to PBL_MULTI_IMAGES. A DT overlay is added to keep possible
barebox-specific changes separated and added to lowlevel
board init.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Cc: barebox@lists.infradead.org
---
arch/arm/boards/marvell-armada-xp-gp/Makefile | 1 +
arch/arm/boards/marvell-armada-xp-gp/kwbimage.cfg | 2 +-
arch/arm/boards/marvell-armada-xp-gp/lowlevel.c | 34 +++++++++++++++++++++++
arch/arm/dts/Makefile | 1 +
arch/arm/dts/armada-xp-gp-bb.dts | 6 ++++
images/Makefile.mvebu | 12 ++++++++
6 files changed, 55 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/boards/marvell-armada-xp-gp/lowlevel.c
diff --git a/arch/arm/boards/marvell-armada-xp-gp/Makefile b/arch/arm/boards/marvell-armada-xp-gp/Makefile
index dcfc2937d325..01c7a259e9a5 100644
--- a/arch/arm/boards/marvell-armada-xp-gp/Makefile
+++ b/arch/arm/boards/marvell-armada-xp-gp/Makefile
@@ -1 +1,2 @@
obj-y += board.o
+lwl-y += lowlevel.o
diff --git a/arch/arm/boards/marvell-armada-xp-gp/kwbimage.cfg b/arch/arm/boards/marvell-armada-xp-gp/kwbimage.cfg
index db75969fe0cb..3f66aa080edb 100644
--- a/arch/arm/boards/marvell-armada-xp-gp/kwbimage.cfg
+++ b/arch/arm/boards/marvell-armada-xp-gp/kwbimage.cfg
@@ -1,3 +1,3 @@
VERSION 1
BOOT_FROM spi
-BINARY marvell-armada-xp-gp-binary.0 0000005b 00000068
+BINARY arch/arm/boards/marvell-armada-xp-gp/binary.0 0000005b 00000068
diff --git a/arch/arm/boards/marvell-armada-xp-gp/lowlevel.c b/arch/arm/boards/marvell-armada-xp-gp/lowlevel.c
new file mode 100644
index 000000000000..046057f56ab1
--- /dev/null
+++ b/arch/arm/boards/marvell-armada-xp-gp/lowlevel.c
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2014
+ * Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <common.h>
+#include <sizes.h>
+#include <asm/barebox-arm.h>
+#include <asm/barebox-arm-head.h>
+#include <mach/lowlevel.h>
+
+extern char __dtb_armada_xp_gp_bb_start[];
+
+ENTRY_FUNCTION(start_marvell_armada_xp_gp, r0, r1, r2)
+{
+ void *fdt;
+
+ arm_cpu_lowlevel_init();
+
+ fdt = __dtb_armada_xp_gp_bb_start - get_runtime_offset();
+
+ mvebu_barebox_entry(fdt);
+}
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index c5a782befd07..a185afdfe881 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -61,6 +61,7 @@ pbl-$(CONFIG_MACH_GK802) += imx6q-gk802.dtb.o
pbl-$(CONFIG_MACH_GLOBALSCALE_GURUPLUG) += kirkwood-guruplug-server-plus-bb.dtb.o
pbl-$(CONFIG_MACH_GLOBALSCALE_MIRABOX) += armada-370-mirabox-bb.dtb.o
pbl-$(CONFIG_MACH_GUF_SANTARO) += imx6q-guf-santaro.dtb.o
+pbl-$(CONFIG_MACH_MARVELL_ARMADA_XP_GP) += armada-xp-gp-bb.dtb.o
pbl-$(CONFIG_MACH_NITROGEN6X) += imx6q-nitrogen6x.dtb.o imx6dl-nitrogen6x.dtb.o
pbl-$(CONFIG_MACH_NVIDIA_BEAVER) += tegra30-beaver.dtb.o
pbl-$(CONFIG_MACH_NVIDIA_JETSON) += tegra124-jetson-tk1.dtb.o
diff --git a/arch/arm/dts/armada-xp-gp-bb.dts b/arch/arm/dts/armada-xp-gp-bb.dts
index e27a9664451d..3836016425b9 100644
--- a/arch/arm/dts/armada-xp-gp-bb.dts
+++ b/arch/arm/dts/armada-xp-gp-bb.dts
@@ -4,3 +4,9 @@
*/
#include "arm/armada-xp-gp.dts"
+
+/ {
+ chosen {
+ stdout-path = "/soc/internal-regs/serial@12000";
+ };
+};
diff --git a/images/Makefile.mvebu b/images/Makefile.mvebu
index 3b89f36fa610..faaf93f331ee 100644
--- a/images/Makefile.mvebu
+++ b/images/Makefile.mvebu
@@ -25,6 +25,18 @@ image-$(CONFIG_MACH_GLOBALSCALE_MIRABOX) += barebox-globalscale-mirabox.img
image-$(CONFIG_MACH_GLOBALSCALE_MIRABOX) += barebox-globalscale-mirabox-uart.img
image-$(CONFIG_MACH_GLOBALSCALE_MIRABOX) += barebox-globalscale-mirabox-2nd.img
+# ----------------------- Armada XP based boards ---------------------------
+MARVELL_ARMADA_XP_GP_KWBOPTS = ${KWBOPTS} -i $(board)/marvell-armada-xp-gp/kwbimage.cfg
+OPTS_start_marvell_armada_xp_gp.pblx.kwbimg = $(MARVELL_ARMADA_XP_GP_KWBOPTS)
+OPTS_start_marvell_armada_xp_gp.pblx.kwbuartimg = -m uart $(MARVELL_ARMADA_XP_GP_KWBOPTS)
+FILE_barebox-marvell-armada-xp-gp.img = start_marvell_armada_xp_gp.pblx.kwbimg
+FILE_barebox-marvell-armada-xp-gp-uart.img = start_marvell_armada_xp_gp.pblx.kwbuartimg
+FILE_barebox-marvell-armada-xp-gp-2nd.img = start_marvell_armada_xp_gp.pblx
+pblx-$(CONFIG_MACH_MARVELL_ARMADA_XP_GP) += start_marvell_armada_xp_gp
+image-$(CONFIG_MACH_MARVELL_ARMADA_XP_GP) += barebox-marvell-armada-xp-gp.img
+image-$(CONFIG_MACH_MARVELL_ARMADA_XP_GP) += barebox-marvell-armada-xp-gp-uart.img
+image-$(CONFIG_MACH_MARVELL_ARMADA_XP_GP) += barebox-marvell-armada-xp-gp-2nd.img
+
# ----------------------- Dove 88AP510 based boards ---------------------------
SOLIDRUN_CUBOX_KWBOPTS = ${KWBOPTS} -i $(board)/solidrun-cubox/kwbimage.cfg
OPTS_start_solidrun_cubox.pblx.kwbimg = $(SOLIDRUN_CUBOX_KWBOPTS)
--
2.0.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 09/11] ARM: mvebu: convert PlatHome Openblocks AX3-4 to PBL_MULTI_IMAGES
2014-06-23 20:10 [PATCH 00/11] Convert MVEBU SoCs to DT and PBL_MULTI_IMAGE Sebastian Hesselbarth
` (7 preceding siblings ...)
2014-06-23 20:10 ` [PATCH 08/11] ARM: mvebu: convert Marvell Armada XP GP " Sebastian Hesselbarth
@ 2014-06-23 20:11 ` Sebastian Hesselbarth
2014-06-23 20:11 ` [PATCH 10/11] ARM: mvebu: convert to multiple board selection Sebastian Hesselbarth
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Sebastian Hesselbarth @ 2014-06-23 20:11 UTC (permalink / raw)
To: Sebastian Hesselbarth; +Cc: barebox
This converts Marvell Armada XP based PlatHome Openblocks AX3-4
to PBL_MULTI_IMAGES. A DT overlay is added to keep possible
barebox-specific changes separated and added to lowlevel
board init.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Cc: barebox@lists.infradead.org
---
arch/arm/boards/plathome-openblocks-ax3/Makefile | 1 +
.../boards/plathome-openblocks-ax3/kwbimage.cfg | 2 +-
arch/arm/boards/plathome-openblocks-ax3/lowlevel.c | 35 ++++++++++++++++++++++
arch/arm/dts/Makefile | 1 +
arch/arm/dts/armada-xp-openblocks-ax3-4-bb.dts | 8 +++++
images/Makefile.mvebu | 11 +++++++
6 files changed, 57 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/boards/plathome-openblocks-ax3/lowlevel.c
diff --git a/arch/arm/boards/plathome-openblocks-ax3/Makefile b/arch/arm/boards/plathome-openblocks-ax3/Makefile
index dcfc2937d325..01c7a259e9a5 100644
--- a/arch/arm/boards/plathome-openblocks-ax3/Makefile
+++ b/arch/arm/boards/plathome-openblocks-ax3/Makefile
@@ -1 +1,2 @@
obj-y += board.o
+lwl-y += lowlevel.o
diff --git a/arch/arm/boards/plathome-openblocks-ax3/kwbimage.cfg b/arch/arm/boards/plathome-openblocks-ax3/kwbimage.cfg
index 69fd1fd1c1cf..1d0571503a7b 100644
--- a/arch/arm/boards/plathome-openblocks-ax3/kwbimage.cfg
+++ b/arch/arm/boards/plathome-openblocks-ax3/kwbimage.cfg
@@ -1,3 +1,3 @@
VERSION 1
BOOT_FROM spi
-BINARY plathome-openblocks-ax3-binary.0 0000005b 00000068
+BINARY arch/arm/boards/plathome-openblocks-ax3/binary.0 0000005b 00000068
diff --git a/arch/arm/boards/plathome-openblocks-ax3/lowlevel.c b/arch/arm/boards/plathome-openblocks-ax3/lowlevel.c
new file mode 100644
index 000000000000..721d2de978f9
--- /dev/null
+++ b/arch/arm/boards/plathome-openblocks-ax3/lowlevel.c
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2014
+ * Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <common.h>
+#include <sizes.h>
+#include <asm/barebox-arm.h>
+#include <asm/barebox-arm-head.h>
+#include <mach/lowlevel.h>
+
+extern char __dtb_armada_xp_openblocks_ax3_4_bb_start[];
+
+ENTRY_FUNCTION(start_plathome_openblocks_ax3, r0, r1, r2)
+{
+ void *fdt;
+
+ arm_cpu_lowlevel_init();
+
+ fdt = __dtb_armada_xp_openblocks_ax3_4_bb_start -
+ get_runtime_offset();
+
+ mvebu_barebox_entry(fdt);
+}
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index a185afdfe881..f35d9386d6e7 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -70,6 +70,7 @@ pbl-$(CONFIG_MACH_PCAAXL3) += imx6q-phytec-pbaa03.dtb.o
pbl-$(CONFIG_MACH_PCM038) += imx27-phytec-phycore-rdk.dtb.o
pbl-$(CONFIG_MACH_PCM051) += am335x-phytec-phycore.dtb.o
pbl-$(CONFIG_MACH_PHYTEC_PFLA02) += imx6s-phytec-pbab01.dtb.o imx6dl-phytec-pbab01.dtb.o imx6q-phytec-pbab01.dtb.o
+pbl-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_AX3) += armada-xp-openblocks-ax3-4-bb.dtb.o
pbl-$(CONFIG_MACH_RADXA_ROCK) += rk3188-radxarock.dtb.o
pbl-$(CONFIG_MACH_REALQ7) += imx6q-dmo-edmqmx6.dtb.o
pbl-$(CONFIG_MACH_SABRELITE) += imx6q-sabrelite.dtb.o imx6dl-sabrelite.dtb.o
diff --git a/arch/arm/dts/armada-xp-openblocks-ax3-4-bb.dts b/arch/arm/dts/armada-xp-openblocks-ax3-4-bb.dts
index 350aa1cb0a6d..611d72707fa2 100644
--- a/arch/arm/dts/armada-xp-openblocks-ax3-4-bb.dts
+++ b/arch/arm/dts/armada-xp-openblocks-ax3-4-bb.dts
@@ -6,7 +6,15 @@
#include "arm/armada-xp-openblocks-ax3-4.dts"
/ {
+ chosen {
+ stdout-path = "/soc/internal-regs/serial@12000";
+ };
+
soc {
+ ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
+ MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
+ MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x8000000>;
+
internal-regs {
gpio_leds {
red_led {
diff --git a/images/Makefile.mvebu b/images/Makefile.mvebu
index faaf93f331ee..009807d7c29c 100644
--- a/images/Makefile.mvebu
+++ b/images/Makefile.mvebu
@@ -26,6 +26,17 @@ image-$(CONFIG_MACH_GLOBALSCALE_MIRABOX) += barebox-globalscale-mirabox-uart.img
image-$(CONFIG_MACH_GLOBALSCALE_MIRABOX) += barebox-globalscale-mirabox-2nd.img
# ----------------------- Armada XP based boards ---------------------------
+PLATHOME_OPENBLOCKS_AX3_KWBOPTS = ${KWBOPTS} -i $(board)/plathome-openblocks-ax3/kwbimage.cfg
+OPTS_start_plathome_openblocks_ax3.pblx.kwbimg = $(PLATHOME_OPENBLOCKS_AX3_KWBOPTS)
+OPTS_start_plathome_openblocks_ax3.pblx.kwbuartimg = -m uart $(PLATHOME_OPENBLOCKS_AX3_KWBOPTS)
+FILE_barebox-plathome-openblocks-ax3.img = start_plathome_openblocks_ax3.pblx.kwbimg
+FILE_barebox-plathome-openblocks-ax3-uart.img = start_plathome_openblocks_ax3.pblx.kwbuartimg
+FILE_barebox-plathome-openblocks-ax3-2nd.img = start_plathome_openblocks_ax3.pblx
+pblx-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_AX3) += start_plathome_openblocks_ax3
+image-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_AX3) += barebox-plathome-openblocks-ax3.img
+image-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_AX3) += barebox-plathome-openblocks-ax3-uart.img
+image-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_AX3) += barebox-plathome-openblocks-ax3-2nd.img
+
MARVELL_ARMADA_XP_GP_KWBOPTS = ${KWBOPTS} -i $(board)/marvell-armada-xp-gp/kwbimage.cfg
OPTS_start_marvell_armada_xp_gp.pblx.kwbimg = $(MARVELL_ARMADA_XP_GP_KWBOPTS)
OPTS_start_marvell_armada_xp_gp.pblx.kwbuartimg = -m uart $(MARVELL_ARMADA_XP_GP_KWBOPTS)
--
2.0.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 10/11] ARM: mvebu: convert to multiple board selection
2014-06-23 20:10 [PATCH 00/11] Convert MVEBU SoCs to DT and PBL_MULTI_IMAGE Sebastian Hesselbarth
` (8 preceding siblings ...)
2014-06-23 20:11 ` [PATCH 09/11] ARM: mvebu: convert PlatHome Openblocks AX3-4 " Sebastian Hesselbarth
@ 2014-06-23 20:11 ` Sebastian Hesselbarth
2014-06-23 20:11 ` [PATCH 11/11] ARM: mvebu: remove dtb Makefile entries Sebastian Hesselbarth
2014-06-24 6:57 ` [PATCH 00/11] Convert MVEBU SoCs to DT and PBL_MULTI_IMAGE Sascha Hauer
11 siblings, 0 replies; 13+ messages in thread
From: Sebastian Hesselbarth @ 2014-06-23 20:11 UTC (permalink / raw)
To: Sebastian Hesselbarth; +Cc: barebox
With all SoCs converted to DT based probing, select
PBL_MULTI_IMAGES support and get rid of SoCs Kconfig
choice to allow multiple boards to be selected.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Cc: barebox@lists.infradead.org
---
arch/arm/Kconfig | 1 +
arch/arm/Makefile | 6 ------
arch/arm/boards/Makefile | 6 ++++++
arch/arm/mach-mvebu/Kconfig | 21 ---------------------
4 files changed, 7 insertions(+), 27 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 8674a2d17cf2..3b8a2a2207e4 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -92,6 +92,7 @@ config ARCH_MVEBU
select CLKDEV_LOOKUP
select GPIOLIB
select HAS_DEBUG_LL
+ select HAVE_PBL_MULTI_IMAGES
select MVEBU_MBUS
select OFTREE
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 64db73c62e35..983f7f57cd26 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -86,17 +86,11 @@ machine-$(CONFIG_ARCH_ZYNQ) := zynq
board-$(CONFIG_MACH_A9M2410) += a9m2410
board-$(CONFIG_MACH_A9M2440) += a9m2440
board-$(CONFIG_MACH_AT91RM9200EK) += at91rm9200ek
-board-$(CONFIG_MACH_GLOBALSCALE_GURUPLUG) += globalscale-guruplug
-board-$(CONFIG_MACH_GLOBALSCALE_MIRABOX) += globalscale-mirabox
-board-$(CONFIG_MACH_MARVELL_ARMADA_XP_GP) += marvell-armada-xp-gp
board-$(CONFIG_MACH_MINI2440) += friendlyarm-mini2440
board-$(CONFIG_MACH_MINI6410) += friendlyarm-mini6410
board-$(CONFIG_MACH_PCM027) += phytec-phycore-pxa270
-board-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_AX3) += plathome-openblocks-ax3/
-board-$(CONFIG_MACH_SOLIDRUN_CUBOX) += solidrun-cubox
board-$(CONFIG_MACH_TINY210) += friendlyarm-tiny210
board-$(CONFIG_MACH_TINY6410) += friendlyarm-tiny6410
-board-$(CONFIG_MACH_USI_TOPKICK) += usi-topkick
machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile
index 4eccc92930ad..f85ddccc550a 100644
--- a/arch/arm/boards/Makefile
+++ b/arch/arm/boards/Makefile
@@ -41,6 +41,8 @@ obj-$(CONFIG_MACH_FREESCALE_MX53_SMD) += freescale-mx53-smd/
obj-$(CONFIG_MACH_FREESCALE_MX53_VMX53) += freescale-mx53-vmx53/
obj-$(CONFIG_MACH_GE863) += telit-evk-pro3/
obj-$(CONFIG_MACH_GK802) += gk802/
+obj-$(CONFIG_MACH_GLOBALSCALE_GURUPLUG) += globalscale-guruplug/
+obj-$(CONFIG_MACH_GLOBALSCALE_MIRABOX) += globalscale-mirabox/
obj-$(CONFIG_MACH_GUF_CUPID) += guf-cupid/
obj-$(CONFIG_MACH_GUF_SANTARO) += guf-santaro/
obj-$(CONFIG_MACH_GUF_VINCELL) += guf-vincell/
@@ -48,6 +50,7 @@ obj-$(CONFIG_MACH_HIGHBANK) += highbank/
obj-$(CONFIG_MACH_IMX21ADS) += freescale-mx21-ads/
obj-$(CONFIG_MACH_IMX233_OLINUXINO) += imx233-olinuxino/
obj-$(CONFIG_MACH_IMX27ADS) += freescale-mx27-ads/
+obj-$(CONFIG_MACH_MARVELL_ARMADA_XP_GP) += marvell-armada-xp-gp/
obj-$(CONFIG_MACH_MB7707) += module-mb7707/
obj-$(CONFIG_MACH_MIOA701) += mioa701/
obj-$(CONFIG_MACH_MMCCPU) += mmccpu/
@@ -73,6 +76,7 @@ obj-$(CONFIG_MACH_PCM043) += phytec-phycore-imx35/
obj-$(CONFIG_MACH_PCM049) += phytec-phycore-omap4460/
obj-$(CONFIG_MACH_PCM051) += phytec-phycore-am335x/
obj-$(CONFIG_MACH_PHYTEC_PFLA02) += phytec-phyflex-imx6/
+obj-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_AX3) += plathome-openblocks-ax3/
obj-$(CONFIG_MACH_PM9261) += pm9261/
obj-$(CONFIG_MACH_PM9263) += pm9263/
obj-$(CONFIG_MACH_PM9G45) += pm9g45/
@@ -88,6 +92,7 @@ obj-$(CONFIG_MACH_SAMA5D3_XPLAINED) += sama5d3_xplained/
obj-$(CONFIG_MACH_SCB9328) += scb9328/
obj-$(CONFIG_MACH_SOCFPGA_EBV_SOCRATES) += ebv-socrates/
obj-$(CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT) += terasic-sockit/
+obj-$(CONFIG_MACH_SOLIDRUN_CUBOX) += solidrun-cubox/
obj-$(CONFIG_MACH_SOLIDRUN_HUMMINGBOARD) += solidrun-hummingboard/
obj-$(CONFIG_MACH_TNY_A9260) += tny-a926x/
obj-$(CONFIG_MACH_TNY_A9263) += tny-a926x/
@@ -104,6 +109,7 @@ obj-$(CONFIG_MACH_UDOO) += udoo/
obj-$(CONFIG_MACH_USB_A9260) += usb-a926x/
obj-$(CONFIG_MACH_USB_A9263) += usb-a926x/
obj-$(CONFIG_MACH_USB_A9G20) += usb-a926x/
+obj-$(CONFIG_MACH_USI_TOPKICK) += usi-topkick/
obj-$(CONFIG_MACH_VERSATILEPB) += versatile/
obj-$(CONFIG_MACH_VEXPRESS) += vexpress/
obj-$(CONFIG_MACH_VIRT2REAL) += virt2real/
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index 80e8687916df..9b790a3a908f 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -38,14 +38,9 @@ endchoice
if ARCH_ARMADA_370
-choice
- prompt "Armada 370 Board Type"
-
config MACH_GLOBALSCALE_MIRABOX
bool "Globalscale Mirabox"
-endchoice
-
endif # ARCH_ARMADA_370
#
@@ -54,17 +49,12 @@ endif # ARCH_ARMADA_370
if ARCH_ARMADA_XP
-choice
- prompt "Armada XP Board Type"
-
config MACH_PLATHOME_OPENBLOCKS_AX3
bool "PlatHome OpenBlocks AX3"
config MACH_MARVELL_ARMADA_XP_GP
bool "Marvell Armada XP GP"
-endchoice
-
endif # ARCH_ARMADA_XP
#
@@ -73,14 +63,8 @@ endif # ARCH_ARMADA_XP
if ARCH_DOVE
-choice
- prompt "Dove 88AP510 Board Type"
-
config MACH_SOLIDRUN_CUBOX
bool "SolidRun CuBox"
- select HAVE_PBL_MULTI_IMAGES
-
-endchoice
endif # ARCH_DOVE
@@ -90,17 +74,12 @@ endif # ARCH_DOVE
if ARCH_KIRKWOOD
-choice
- prompt "Kirkwood Board Type"
-
config MACH_GLOBALSCALE_GURUPLUG
bool "Guruplug"
config MACH_USI_TOPKICK
bool "Topkick"
-endchoice
-
endif # ARCH_KIRKWOOD
#
--
2.0.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 11/11] ARM: mvebu: remove dtb Makefile entries
2014-06-23 20:10 [PATCH 00/11] Convert MVEBU SoCs to DT and PBL_MULTI_IMAGE Sebastian Hesselbarth
` (9 preceding siblings ...)
2014-06-23 20:11 ` [PATCH 10/11] ARM: mvebu: convert to multiple board selection Sebastian Hesselbarth
@ 2014-06-23 20:11 ` Sebastian Hesselbarth
2014-06-24 6:57 ` [PATCH 00/11] Convert MVEBU SoCs to DT and PBL_MULTI_IMAGE Sascha Hauer
11 siblings, 0 replies; 13+ messages in thread
From: Sebastian Hesselbarth @ 2014-06-23 20:11 UTC (permalink / raw)
To: Sebastian Hesselbarth; +Cc: barebox
MULTI_PBL images have a built-in dtb by default. With all MVEBU
SoCs converted to MULTI_PBL images, get rid of the extra Makefile
rules for appended dtbs.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Cc: barebox@lists.infradead.org
---
arch/arm/dts/Makefile | 6 ------
1 file changed, 6 deletions(-)
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index f35d9386d6e7..12915776e7cf 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -32,12 +32,6 @@ dtb-$(CONFIG_ARCH_IMX6) += imx6q-gk802.dtb \
imx6q-var-custom.dtb \
imx6s-riotboard.dtb \
imx6q-phytec-pbaa03.dtb
-dtb-$(CONFIG_ARCH_MVEBU) += dove-cubox-bb.dtb \
- armada-370-mirabox-bb.dtb \
- armada-xp-gp-bb.dtb \
- armada-xp-openblocks-ax3-4-bb.dtb \
- kirkwood-guruplug-server-plus-bb.dtb \
- kirkwood-topkick-bb.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3188-radxarock.dtb
dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5_sockit.dtb \
socfpga_cyclone5_socrates.dtb
--
2.0.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 00/11] Convert MVEBU SoCs to DT and PBL_MULTI_IMAGE
2014-06-23 20:10 [PATCH 00/11] Convert MVEBU SoCs to DT and PBL_MULTI_IMAGE Sebastian Hesselbarth
` (10 preceding siblings ...)
2014-06-23 20:11 ` [PATCH 11/11] ARM: mvebu: remove dtb Makefile entries Sebastian Hesselbarth
@ 2014-06-24 6:57 ` Sascha Hauer
11 siblings, 0 replies; 13+ messages in thread
From: Sascha Hauer @ 2014-06-24 6:57 UTC (permalink / raw)
To: Sebastian Hesselbarth; +Cc: barebox
On Mon, Jun 23, 2014 at 10:10:51PM +0200, Sebastian Hesselbarth wrote:
> This patch set converts Kirkwood and Armada 370/XP to DT and provides
> PBL_MULTI_IMAGE support as we already have for Dove.
>
> Patch 1 resorts pbl entries in arch/arm/dts/Makefile back to alphabetical
> order.
>
> Patch 2 reworks mvebu pbl image Makefile to ease integration of other SoCs.
>
> Patches 3 and 4 convert Kirkwood and Armada 370/XP SoC init to DT probing.
>
> Patches 5-9 convert existing Kirkwood and Armada 370/XP boards to
> PBL_MULTI_IMAGES.
>
> Patch 10 then reworks MVEBU related Kconfig to allow multiple board selection
> per-SoC.
>
> Patch 11 removes now redundant dtb Makefile targets.
>
> The patches are based on today's next with previously sent cleanup patches
> applied. They have been tested on Guruplug (Kirkwood) and Mirabox (Armada 370).
>
> A branch based on *unstable* next with cleanup applied is available at:
> https://github.com/shesselba/barebox-dove.git mvebu/soc
>
> Sebastian Hesselbarth (11):
> ARM: dts: sort pbl entries by alphabet
> ARM: mvebu: sort pbl image target by board
> ARM: mvebu: convert Kirkwood devices to be probed from DT
> ARM: mvebu: convert Armada 370/XP devices to be probed from DT
> ARM: mvebu: convert Globalscale Guruplug to PBL_MULTI_IMAGES
> ARM: mvebu: convert USI Topkick to PBL_MULTI_IMAGES
> ARM: mvebu: convert Globalscale Mirabox to PBL_MULTI_IMAGES
> ARM: mvebu: convert Marvell Armada XP GP to PBL_MULTI_IMAGES
> ARM: mvebu: convert PlatHome Openblocks AX3-4 to PBL_MULTI_IMAGES
> ARM: mvebu: convert to multiple board selection
> ARM: mvebu: remove dtb Makefile entries
Applied, thanks.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2014-06-24 6:57 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-23 20:10 [PATCH 00/11] Convert MVEBU SoCs to DT and PBL_MULTI_IMAGE Sebastian Hesselbarth
2014-06-23 20:10 ` [PATCH 01/11] ARM: dts: sort pbl entries by alphabet Sebastian Hesselbarth
2014-06-23 20:10 ` [PATCH 02/11] ARM: mvebu: sort pbl image target by board Sebastian Hesselbarth
2014-06-23 20:10 ` [PATCH 03/11] ARM: mvebu: convert Kirkwood devices to be probed from DT Sebastian Hesselbarth
2014-06-23 20:10 ` [PATCH 04/11] ARM: mvebu: convert Armada 370/XP " Sebastian Hesselbarth
2014-06-23 20:10 ` [PATCH 05/11] ARM: mvebu: convert Globalscale Guruplug to PBL_MULTI_IMAGES Sebastian Hesselbarth
2014-06-23 20:10 ` [PATCH 06/11] ARM: mvebu: convert USI Topkick " Sebastian Hesselbarth
2014-06-23 20:10 ` [PATCH 07/11] ARM: mvebu: convert Globalscale Mirabox " Sebastian Hesselbarth
2014-06-23 20:10 ` [PATCH 08/11] ARM: mvebu: convert Marvell Armada XP GP " Sebastian Hesselbarth
2014-06-23 20:11 ` [PATCH 09/11] ARM: mvebu: convert PlatHome Openblocks AX3-4 " Sebastian Hesselbarth
2014-06-23 20:11 ` [PATCH 10/11] ARM: mvebu: convert to multiple board selection Sebastian Hesselbarth
2014-06-23 20:11 ` [PATCH 11/11] ARM: mvebu: remove dtb Makefile entries Sebastian Hesselbarth
2014-06-24 6:57 ` [PATCH 00/11] Convert MVEBU SoCs to DT and PBL_MULTI_IMAGE Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox