diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2020-10-05 10:10:57 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-07 10:07:51 +0200 |
| commit | 751a9120dabc8c23a0a2230a0122eaadb1d942a1 (patch) | |
| tree | c914801ca81c3a6bd1bd5a97f7e03637b83bbc71 /arch/arm/boards | |
| parent | a03af1e0b38bca202325f57b19f9a95cbbb7c4c5 (diff) | |
| download | barebox-751a9120dabc8c23a0a2230a0122eaadb1d942a1.tar.gz barebox-751a9120dabc8c23a0a2230a0122eaadb1d942a1.tar.xz | |
ARM: stm32mp: dk2: rename to dkx to make dk1 support clearer
As we now support both the stm32mp157a-dk1 and stm32mp157c-dk2 with
the same barebox image, we should call the board stm32mp15xx-dkx
instead. That's also how the upstream DTSI is named.
Suggested-by: Holger Assmann <has@pengutronix.de>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards')
| -rw-r--r-- | arch/arm/boards/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/boards/stm32mp15xx-dkx/Makefile (renamed from arch/arm/boards/stm32mp157c-dk2/Makefile) | 0 | ||||
| -rw-r--r-- | arch/arm/boards/stm32mp15xx-dkx/board.c (renamed from arch/arm/boards/stm32mp157c-dk2/board.c) | 10 | ||||
| -rw-r--r-- | arch/arm/boards/stm32mp15xx-dkx/lowlevel.c (renamed from arch/arm/boards/stm32mp157c-dk2/lowlevel.c) | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile index 986ea7a983..9183da684b 100644 --- a/arch/arm/boards/Makefile +++ b/arch/arm/boards/Makefile @@ -132,7 +132,7 @@ obj-$(CONFIG_MACH_SOCFPGA_TERASIC_DE0_NANO_SOC) += terasic-de0-nano-soc/ obj-$(CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT) += terasic-sockit/ obj-$(CONFIG_MACH_SOLIDRUN_CUBOX) += solidrun-cubox/ obj-$(CONFIG_MACH_SOLIDRUN_MICROSOM) += solidrun-microsom/ -obj-$(CONFIG_MACH_STM32MP157C_DK2) += stm32mp157c-dk2/ +obj-$(CONFIG_MACH_STM32MP15XX_DKX) += stm32mp15xx-dkx/ obj-$(CONFIG_MACH_LXA_MC1) += lxa-mc1/ obj-$(CONFIG_MACH_TECHNEXION_PICO_HOBBIT) += technexion-pico-hobbit/ obj-$(CONFIG_MACH_TECHNEXION_WANDBOARD) += technexion-wandboard/ diff --git a/arch/arm/boards/stm32mp157c-dk2/Makefile b/arch/arm/boards/stm32mp15xx-dkx/Makefile index 092c31d6b2..092c31d6b2 100644 --- a/arch/arm/boards/stm32mp157c-dk2/Makefile +++ b/arch/arm/boards/stm32mp15xx-dkx/Makefile diff --git a/arch/arm/boards/stm32mp157c-dk2/board.c b/arch/arm/boards/stm32mp15xx-dkx/board.c index a547209cdf..1ddfee698d 100644 --- a/arch/arm/boards/stm32mp157c-dk2/board.c +++ b/arch/arm/boards/stm32mp15xx-dkx/board.c @@ -5,16 +5,22 @@ static int dkx_probe(struct device_d *dev) { + const void *model; + stm32mp_bbu_mmc_register_handler("sd", "/dev/mmc0.ssbl", BBU_HANDLER_FLAG_DEFAULT); - barebox_set_model("STM32MP157C-DK2"); + if (dev_get_drvdata(dev, &model) == 0) + barebox_set_model(model); + + barebox_set_hostname("stm32mp15xx-dkx"); return 0; } static const struct of_device_id dkx_of_match[] = { - { .compatible = "st,stm32mp157c-dk2" }, + { .compatible = "st,stm32mp157a-dk1", .data = "STM32MP157A-DK1" }, + { .compatible = "st,stm32mp157c-dk2", .data = "STM32MP157C-DK2" }, { /* sentinel */ }, }; diff --git a/arch/arm/boards/stm32mp157c-dk2/lowlevel.c b/arch/arm/boards/stm32mp15xx-dkx/lowlevel.c index d79bfa4f4d..65f4bbb4da 100644 --- a/arch/arm/boards/stm32mp157c-dk2/lowlevel.c +++ b/arch/arm/boards/stm32mp15xx-dkx/lowlevel.c @@ -13,7 +13,7 @@ static void setup_uart(void) putc_ll('>'); } -ENTRY_FUNCTION(start_stm32mp157c_dk2, r0, r1, r2) +ENTRY_FUNCTION(start_stm32mp15xx_dkx, r0, r1, r2) { void *fdt; u32 cputype; |