aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Walle <michael@walle.cc>2020-12-20 22:35:13 +0100
committerTom Rini <trini@konsulko.com>2020-12-20 16:53:25 -0500
commite668bec96a5f8d9f6c1619038e8147816f040192 (patch)
treecf90987a316b307665028a9650de59a19dfef865
parent46a4d752034646b7c10178988c08b85c08b44bf6 (diff)
downloadu-boot-e668bec96a5f8d9f6c1619038e8147816f040192.zip
u-boot-e668bec96a5f8d9f6c1619038e8147816f040192.tar.gz
u-boot-e668bec96a5f8d9f6c1619038e8147816f040192.tar.bz2
board: kontron: sl28: reorder mmc devices
Since linux commit 2e6cde96873253fd9eb0f20afd8ffd18278cff75 ("arm64: dts: ls1028a: make the eMMC and SD card controllers use fixed indices") mmc0 is the eMMC and mmc1 is the SD card. Also swap it in u-boot to avoid any confusion by the user and to be aligned with linux. Signed-off-by: Michael Walle <michael@walle.cc>
-rw-r--r--arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi4
-rw-r--r--include/configs/kontron_sl28.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi b/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi
index 2375549..e63684c 100644
--- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi
+++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi
@@ -4,8 +4,8 @@
/ {
aliases {
- mmc0 = &esdhc0;
- mmc1 = &esdhc1;
+ mmc0 = &esdhc1;
+ mmc1 = &esdhc0;
i2c0 = &i2c0;
i2c1 = &i2c3;
i2c2 = &i2c4;
diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h
index afe512a..442fb58 100644
--- a/include/configs/kontron_sl28.h
+++ b/include/configs/kontron_sl28.h
@@ -89,8 +89,8 @@
"ramdisk_addr_r=0x88080000\0"
#define BOOT_TARGET_DEVICES(func) \
- func(MMC, mmc, 1) \
func(MMC, mmc, 0) \
+ func(MMC, mmc, 1) \
func(NVME, nvme, 0) \
func(USB, usb, 0) \
func(DHCP, dhcp, 0) \