GitHub-Mirror/build
2
0
Fork 0
mirror of https://github.com/Fishwaldo/build.git synced 2025-07-09 22:49:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[ mvebu ] Rename uboot patch dir for helios4 & clearfog

Browse source
This commit is contained in:
Jannis 2020-04-08 23:37:34 +02:00
parent 0a344ebb57
commit 7243bdaf54
38 changed files with 0 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

60
patch/u-boot/u-boot-helios4/ARMADA-A388-SOM-U-Boot-ODT-Update.patch Normal file
View file

@ -0,0 +1,60 @@
From befbb65412d22f698703207d8d29b7707fcb62b3 Mon Sep 17 00:00:00 2001
Message-Id: <befbb65412d22f698703207d8d29b7707fcb62b3.1561459213.git.aditya@kobol.io>
From: Aditya Prayoga <aditya@kobol.io>
Date: Tue, 19 Mar 2019 19:28:44 +0800
Subject: [PATCH] ARMADA A388 SOM U-Boot ODT Update
Old versions of U-Boot did not configure correctly the ODT on data
signals of DDR RAM on ARMADA A388 SOMs.[1]
The changes on [2] adapted into current source.
[1]
https://developer.solid-run.com/knowledge-base/armada-38x-som-u-boot-odt-update/
[2]https://github.com/SolidRun/u-boot/commit/ab15b2d5b6ee50c106628dc0aa5943747a5dd772
Signed-off-by: Aditya Prayoga <aditya@kobol.io>
---
drivers/ddr/marvell/a38x/ddr3_training.c | 4 ++--
drivers/ddr/marvell/a38x/mv_ddr_plat.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/ddr/marvell/a38x/ddr3_training.c b/drivers/ddr/marvell/a38x/ddr3_training.c
index 799c5ba089..33d4255bba 100644
--- a/drivers/ddr/marvell/a38x/ddr3_training.c
+++ b/drivers/ddr/marvell/a38x/ddr3_training.c
@@ -1606,7 +1606,7 @@ int ddr3_tip_freq_set(u32 dev_num, enum hws_access_type access_type,
CHECK_STATUS(ddr3_tip_if_write(dev_num, access_type,
if_id, DDR_ODT_TIMING_LOW_REG,
val, 0xffff0));
- val = 0x91 | ((cwl_value - 1) << 8) | ((cwl_value + 5) << 12);
+ val = 0x71 | ((cwl_value - 1) << 8) | ((cwl_value + 5) << 12);
CHECK_STATUS(ddr3_tip_if_write(dev_num, access_type,
if_id, DDR_ODT_TIMING_HIGH_REG,
val, 0xffff));
@@ -1661,7 +1661,7 @@ static int ddr3_tip_write_odt(u32 dev_num, enum hws_access_type access_type,
CHECK_STATUS(ddr3_tip_if_write(dev_num, access_type, if_id,
DDR_ODT_TIMING_LOW_REG, val, 0xffff0));
- val = 0x91 | ((cwl_value - 1) << 8) | ((cwl_value + 5) << 12);
+ val = 0x71 | ((cwl_value - 1) << 8) | ((cwl_value + 5) << 12);
CHECK_STATUS(ddr3_tip_if_write(dev_num, access_type, if_id,
DDR_ODT_TIMING_HIGH_REG, val, 0xffff));
if (odt_additional == 1) {
diff --git a/drivers/ddr/marvell/a38x/mv_ddr_plat.h b/drivers/ddr/marvell/a38x/mv_ddr_plat.h
index 9c5fdecd93..e01e89ca05 100644
--- a/drivers/ddr/marvell/a38x/mv_ddr_plat.h
+++ b/drivers/ddr/marvell/a38x/mv_ddr_plat.h
@@ -33,7 +33,7 @@
#define TUNE_TRAINING_PARAMS_N_ODT_CTRL 45
#define TUNE_TRAINING_PARAMS_DIC 0x2
#define TUNE_TRAINING_PARAMS_ODT_CONFIG_2CS 0x120012
-#define TUNE_TRAINING_PARAMS_ODT_CONFIG_1CS 0x10000
+#define TUNE_TRAINING_PARAMS_ODT_CONFIG_1CS 0x30000
#define TUNE_TRAINING_PARAMS_RTT_NOM 0x44
#define TUNE_TRAINING_PARAMS_RTT_WR_1CS 0x0 /*off*/
--
2.17.1

210
patch/u-boot/u-boot-helios4/Add-DM-driver-for-mvebu-rtc.patch Normal file
View file

@ -0,0 +1,210 @@
From 187573405d9fd1d070f035806769cfee52224ac9 Mon Sep 17 00:00:00 2001
Message-Id: <187573405d9fd1d070f035806769cfee52224ac9.1540752056.git.aditya@kobol.io>
In-Reply-To: <3eb15c0c6a0f26e418074cf3be9490a36f9161fd.1540752056.git.aditya@kobol.io>
References: <3eb15c0c6a0f26e418074cf3be9490a36f9161fd.1540752056.git.aditya@kobol.io>
From: Jon Nettleton <jon@solid-run.com>
Date: Thu, 24 Aug 2017 22:28:06 +0200
Subject: [PATCH 03/11] mvebu: rtc: Add DM driver for mvebu rtc
This is heavily based on the linux kernel driver. Please note the
long timeout I have added. I have found that adding this additional
time fixes a lot of the other timing problems that were worked around
with various delays and repeated commands.
Signed-off-by: Jon Nettleton <jon@solid-run.com>
---
drivers/rtc/Kconfig | 7 +++
drivers/rtc/Makefile | 1 +
drivers/rtc/mvebu_rtc.c | 151 ++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 159 insertions(+)
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index bcc01b1..59b3d2c 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -31,6 +31,13 @@ config TPL_DM_RTC
drivers to perform the actual functions. See rtc.h for a
description of the API.
+config RTC_MVEBU
+ bool "Armada 38x Marvell SoC RTC"
+ depends on DM_RTC
+ help
+ If you say yes here you will get support for the in-chip RTC
+ that can be found in the Armada 38x Marvell's SoC device
+
config RTC_PCF2127
bool "Enable PCF2127 driver"
depends on DM_RTC
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 1724602..0e23190 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -38,6 +38,7 @@ obj-$(CONFIG_RTC_MCP79411) += ds1307.o
obj-$(CONFIG_MCFRTC) += mcfrtc.o
obj-$(CONFIG_RTC_MK48T59) += mk48t59.o
obj-$(CONFIG_RTC_MV) += mvrtc.o
+obj-$(CONFIG_RTC_MVEBU) += mvebu_rtc.o
obj-$(CONFIG_RTC_MX27) += mx27rtc.o
obj-$(CONFIG_RTC_MXS) += mxsrtc.o
obj-$(CONFIG_RTC_PCF8563) += pcf8563.o
diff --git a/drivers/rtc/mvebu_rtc.c b/drivers/rtc/mvebu_rtc.c
new file mode 100644
index 0000000..b04d8e6
--- /dev/null
+++ b/drivers/rtc/mvebu_rtc.c
@@ -0,0 +1,151 @@
+/*
+ * (C) Copyright 2015 Solid Run Ltd.
+ * Author: Jon Nettleton <jon@solid-run.com>
+ *
+ * Based on Linux Kernel driver rtc-armada38x.c
+ * Copyright (C) 2015 Marvell
+ * Gregory Clement <gregory.clement@free-electrons.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <dm.h>
+#include <rtc.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#define RTC_NOMINAL_TIMING 0x2000
+
+#define RTC_STATUS 0x0
+#define RTC_STATUS_ALARM1 BIT(0)
+#define RTC_STATUS_ALARM2 BIT(1)
+#define RTC_TIME 0xC
+#define RTC_ALARM1 0x10
+#define RTC_CLOCK_CORR 0x18
+#define RTC_TEST_CONF 0x1C
+
+/* armada38x SoC registers */
+#define RTC_38X_BRIDGE_TIMING_CTRL_REG_OFFS 0x0
+#define RTC_38X_WRCLK_PERIOD_OFFS 0
+#define RTC_38X_WRCLK_PERIOD_MASK (0x3FF << RTC_38X_WRCLK_PERIOD_OFFS)
+#define RTC_38X_READ_OUTPUT_DELAY_OFFS 26
+#define RTC_38X_READ_OUTPUT_DELAY_MASK (0x1F << RTC_38X_READ_OUTPUT_DELAY_OFFS)
+
+struct mvebu_rtc_platdata {
+ fdt_addr_t base;
+ fdt_addr_t soc_base;
+};
+
+/*
+ * According to the datasheet, the OS should wait 5us after every
+ * register write to the RTC hard macro so that the required update
+ * can occur without holding off the system bus
+ * According to errata FE-3124064, Write to any RTC register
+ * may fail. As a workaround, before writing to RTC
+ * register, issue a dummy write of 0x0 twice to RTC Status
+ * register.
+ */
+
+static void rtc_delayed_write(u32 val, struct mvebu_rtc_platdata *rtc, int offset)
+{
+ writel(0, rtc->base + RTC_STATUS);
+ writel(0, rtc->base + RTC_STATUS);
+ writel(val, rtc->base + offset);
+ mdelay(10);
+}
+
+static unsigned long read_rtc_reg(struct mvebu_rtc_platdata *rtc, uint8_t rtc_reg)
+{
+ unsigned long value = readl(rtc->base + rtc_reg);
+
+ return value;
+}
+
+static void rtc_update_38x_mbus_timing_params(struct mvebu_rtc_platdata *rtc)
+{
+ uint32_t reg;
+
+ reg = readl(rtc->soc_base + RTC_38X_BRIDGE_TIMING_CTRL_REG_OFFS);
+ reg &= ~RTC_38X_WRCLK_PERIOD_MASK;
+ reg |= 0x3FF << RTC_38X_WRCLK_PERIOD_OFFS; /*Maximum value*/
+ reg &= ~RTC_38X_READ_OUTPUT_DELAY_MASK;
+ reg |= 0x1F << RTC_38X_READ_OUTPUT_DELAY_OFFS; /*Maximum value*/
+ writel(reg, rtc->soc_base + RTC_38X_BRIDGE_TIMING_CTRL_REG_OFFS);
+}
+
+static int mvebu_rtc_get(struct udevice *dev, struct rtc_time *tm)
+{
+ struct mvebu_rtc_platdata *rtc = dev_get_platdata(dev);
+
+ rtc_to_tm(read_rtc_reg(rtc, RTC_TIME), tm);
+
+ return 0;
+}
+
+static int mvebu_rtc_set(struct udevice *dev, const struct rtc_time *tm)
+{
+ struct mvebu_rtc_platdata *rtc = dev_get_platdata(dev);
+ unsigned long time;
+
+ time = rtc_mktime(tm);
+ rtc_delayed_write(time, rtc, RTC_TIME);
+
+ return 0;
+}
+
+static int mvebu_rtc_reset(struct udevice *dev)
+{
+ struct mvebu_rtc_platdata *rtc = dev_get_platdata(dev);
+
+ rtc_delayed_write(0, rtc, RTC_TEST_CONF);
+ rtc_delayed_write(0, rtc, RTC_TIME);
+ rtc_delayed_write((RTC_STATUS_ALARM1 | RTC_STATUS_ALARM2), rtc, RTC_STATUS);
+ rtc_delayed_write(RTC_NOMINAL_TIMING, rtc, RTC_CLOCK_CORR);
+
+ return 0;
+}
+
+static int mvebu_rtc_read8(struct udevice *dev, unsigned int reg)
+{
+ return -ENOSYS;
+}
+
+static int mvebu_rtc_write8(struct udevice *dev, unsigned int reg, int val)
+{
+ return -ENOSYS;
+}
+
+static int mvebu_rtc_probe(struct udevice *dev)
+{
+ struct mvebu_rtc_platdata *rtc = dev_get_platdata(dev);
+
+ rtc->base = devfdt_get_addr(dev);
+ rtc->soc_base = devfdt_get_addr_name(dev, "rtc-soc");
+
+ rtc_update_38x_mbus_timing_params(rtc);
+
+ return 0;
+}
+
+static const struct rtc_ops mvebu_rtc_ops = {
+ .get = mvebu_rtc_get,
+ .set = mvebu_rtc_set,
+ .reset = mvebu_rtc_reset,
+ .read8 = mvebu_rtc_read8,
+ .write8 = mvebu_rtc_write8,
+};
+
+static const struct udevice_id mvebu_rtc_ids[] = {
+ { .compatible = "marvell,armada-380-rtc" },
+ { }
+};
+
+U_BOOT_DRIVER(rtc_mvebu) = {
+ .name = "rtc-mvebu",
+ .id = UCLASS_RTC,
+ .of_match = mvebu_rtc_ids,
+ .probe = mvebu_rtc_probe,
+ .ops = &mvebu_rtc_ops,
+};
--
2.7.4

60
patch/u-boot/u-boot-helios4/add-boot-marvell.cmd-backward-compatibility.patch Normal file
View file

@ -0,0 +1,60 @@
From 68876ccdd2fdb5bf450d9d546e18286b4508cf33 Mon Sep 17 00:00:00 2001
Message-Id: <68876ccdd2fdb5bf450d9d546e18286b4508cf33.1561531622.git.aditya@kobol.io>
From: Aditya Prayoga <aditya@kobol.io>
Date: Wed, 26 Jun 2019 14:42:30 +0800
Subject: [PATCH] mvebu: configs: add boot-marvell.cmd backward compatibility
On system that still use boot.scr derived from boot-marvell.cmd, new
u-boot 2018 will failed to load dtb and script due to missing some
variables. This will render the system unbootable.
These changes added the missing variables.
Signed-off-by: Aditya Prayoga <aditya@kobol.io>
---
include/config_distro_bootcmd.h | 1 +
include/configs/clearfog.h | 2 ++
include/configs/helios4.h | 2 ++
3 files changed, 5 insertions(+)
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
index 4993303f..97af842e 100644
--- a/include/config_distro_bootcmd.h
+++ b/include/config_distro_bootcmd.h
@@ -411,6 +411,7 @@
"boot_a_script=" \
"load ${devtype} ${devnum}:${distro_bootpart} " \
"${scriptaddr} ${prefix}${script}; " \
+ "setenv boot_interface ${devtype};" \
"source ${scriptaddr}\0" \
\
"scan_dev_for_scripts=" \
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index c51cf284..bbbfff71 100644
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -148,6 +148,8 @@
LOAD_ADDRESS_ENV_SETTINGS \
"fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
"console=ttyS0,115200\0" \
+ "loadaddr=0x02000000\0" \
+ "fdt_addr=" FDT_ADDR_R "\0" \
BOOTENV
#endif /* CONFIG_SPL_BUILD */
diff --git a/include/configs/helios4.h b/include/configs/helios4.h
index df4d8bcb..ef6c4ed6 100644
--- a/include/configs/helios4.h
+++ b/include/configs/helios4.h
@@ -174,6 +174,8 @@
LOAD_ADDRESS_ENV_SETTINGS \
"fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
"console=ttyS0,115200\0" \
+ "loadaddr=0x02000000\0" \
+ "fdt_addr=" FDT_ADDR_R "\0" \
BOOTENV
#endif /* CONFIG_SPL_BUILD */
--
2.17.1

85
patch/u-boot/u-boot-helios4/arm-dts-armada-38x-Fix-broken-SPI-support-after-dts-sync.patch Normal file
View file

@ -0,0 +1,85 @@
From 5e830c7c547daf781a93b69140bdded5609b6f08 Mon Sep 17 00:00:00 2001
Message-Id: <5e830c7c547daf781a93b69140bdded5609b6f08.1561706494.git.aditya@kobol.io>
From: Aditya Prayoga <aditya@kobol.io>
Date: Fri, 28 Jun 2019 15:21:18 +0800
Subject: [PATCH] arm: dts: armada-38x: Fix broken SPI support after dts sync
SPI support on mainline u-boot is broken since
commit 30c4383 (ARM: mvebu: sync Armada-38x dts with Linux 4.20)
revert the changes on SPI node only.
Signed-off-by: Aditya Prayoga <aditya@kobol.io>
---
arch/arm/dts/armada-38x.dtsi | 48 ++++++++++++++++++------------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/arch/arm/dts/armada-38x.dtsi b/arch/arm/dts/armada-38x.dtsi
index 72c49beb71..f21a817444 100644
--- a/arch/arm/dts/armada-38x.dtsi
+++ b/arch/arm/dts/armada-38x.dtsi
@@ -133,6 +133,30 @@
clocks = <&coreclk 2>;
};
+ spi0: spi@10600 {
+ compatible = "marvell,armada-380-spi",
+ "marvell,orion-spi";
+ reg = <0x10600 0x50>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ cell-index = <0>;
+ interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&coreclk 0>;
+ status = "disabled";
+ };
+
+ spi1: spi@10680 {
+ compatible = "marvell,armada-380-spi",
+ "marvell,orion-spi";
+ reg = <0x10680 0x50>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ cell-index = <1>;
+ interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&coreclk 0>;
+ status = "disabled";
+ };
+
gic: interrupt-controller@d000 {
compatible = "arm,cortex-a9-gic";
#interrupt-cells = <3>;
@@ -620,30 +644,6 @@
no-memory-wc;
status = "disabled";
};
-
- spi0: spi@10600 {
- compatible = "marvell,armada-380-spi",
- "marvell,orion-spi";
- reg = <MBUS_ID(0xf0, 0x01) 0x10600 0x50>;
- #address-cells = <1>;
- #size-cells = <0>;
- cell-index = <0>;
- interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&coreclk 0>;
- status = "disabled";
- };
-
- spi1: spi@10680 {
- compatible = "marvell,armada-380-spi",
- "marvell,orion-spi";
- reg = <MBUS_ID(0xf0, 0x01) 0x10680 0x50>;
- #address-cells = <1>;
- #size-cells = <0>;
- cell-index = <1>;
- interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&coreclk 0>;
- status = "disabled";
- };
};
clocks {
--
2.17.1

34
patch/u-boot/u-boot-helios4/board_clearfogbase/Add-RTC-to-clearfog.patch Normal file
View file

@ -0,0 +1,34 @@
From 351f4566aeaff51d999554a2be40ab6a40fb617d Mon Sep 17 00:00:00 2001
Message-Id: <351f4566aeaff51d999554a2be40ab6a40fb617d.1561517341.git.aditya@kobol.io>
From: Aditya Prayoga <aditya@kobol.io>
Date: Wed, 26 Jun 2019 10:07:05 +0800
Subject: [PATCH 1/2] configs: Enable U-Boot RTC support on Clearfog
---
configs/clearfog_defconfig | 3 +++
1 file changed, 3 insertions(+)
diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig
index 0429071..8cc34f3 100644
--- a/configs/clearfog_defconfig
+++ b/configs/clearfog_defconfig
@@ -30,6 +30,7 @@ CONFIG_CMD_PCI=y
CONFIG_CMD_SF=y
CONFIG_CMD_SPI=y
CONFIG_CMD_USB=y
+CONFIG_CMD_DATE=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_TFTPPUT=y
CONFIG_CMD_CACHE=y
@@ -58,6 +59,8 @@ CONFIG_MII=y
CONFIG_PCI=y
CONFIG_PCI_MVEBU=y
CONFIG_SCSI=y
+CONFIG_DM_RTC=y
+CONFIG_RTC_MVEBU=y
CONFIG_DEBUG_UART_SHIFT=2
CONFIG_SYS_NS16550=y
CONFIG_KIRKWOOD_SPI=y
--
2.17.1

27
patch/u-boot/u-boot-helios4/board_clearfogbase/add-clearfog-base-DT.patch Normal file
View file

@ -0,0 +1,27 @@
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 762429c463..c627bf0a5d 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -86,6 +86,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += \
armada-3720-espressobin.dtb \
armada-375-db.dtb \
armada-388-clearfog.dtb \
+ armada-388-clearfog-base.dtb \
armada-388-gp.dtb \
armada-385-amc.dtb \
armada-7040-db.dtb \
diff --git a/arch/arm/dts/armada-388-clearfog-base.dts b/arch/arm/dts/armada-388-clearfog-base.dts
new file mode 100644
index 0000000000..d20ec739c9
--- /dev/null
+++ b/arch/arm/dts/armada-388-clearfog-base.dts
@@ -0,0 +1,9 @@
+#include "armada-388-clearfog.dts"
+
+/ {
+ model = "SolidRun Clearfog Base";
+ compatible = "solidrun,clearfog-base", "marvell,armada388",
+ "marvell,armada385", "marvell,armada380";
+
+ /delete-node/ dsa@0;
+};

13
patch/u-boot/u-boot-helios4/board_clearfogbase/adjust-fdtfile-env-clearfog-base.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig
index 580eaf3e57..d93be41082 100644
--- a/configs/clearfog_defconfig
+++ b/configs/clearfog_defconfig
@@ -7,7 +7,7 @@ CONFIG_TARGET_CLEARFOG=y
CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_LIBDISK_SUPPORT=y
-CONFIG_DEFAULT_DEVICE_TREE="armada-388-clearfog"
+CONFIG_DEFAULT_DEVICE_TREE="armada-388-clearfog-base"
CONFIG_DEBUG_UART=y
CONFIG_DISTRO_DEFAULTS=y
CONFIG_BOOTDELAY=3

37
patch/u-boot/u-boot-helios4/board_clearfogbase/arm-mvebu-clearfog-Update-Load-address.patch Normal file
View file

@ -0,0 +1,37 @@
From 1e9b721fe025578f00b7150665909e74f4f9fe9d Mon Sep 17 00:00:00 2001
Message-Id: <1e9b721fe025578f00b7150665909e74f4f9fe9d.1561531622.git.aditya@kobol.io>
From: Aditya Prayoga <aditya@kobol.io>
Date: Wed, 26 Jun 2019 14:46:02 +0800
Subject: [PATCH 1/2] arm: mvebu: clearfog: Update Load address
Use the values from U-Boot 2013.01 Marvell version: 2015_T1.0p16
Signed-off-by: Aditya Prayoga <aditya@kobol.io>
---
include/configs/clearfog.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index bbbfff71..5707ea24 100644
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -128,11 +128,11 @@
func(PXE, pxe, na) \
func(DHCP, dhcp, na)
-#define KERNEL_ADDR_R __stringify(0x800000)
-#define FDT_ADDR_R __stringify(0x100000)
-#define RAMDISK_ADDR_R __stringify(0x1800000)
-#define SCRIPT_ADDR_R __stringify(0x200000)
-#define PXEFILE_ADDR_R __stringify(0x300000)
+#define KERNEL_ADDR_R __stringify(0x2080000)
+#define FDT_ADDR_R __stringify(0x2040000)
+#define RAMDISK_ADDR_R __stringify(0x2880000)
+#define SCRIPT_ADDR_R __stringify(0x3000000)
+#define PXEFILE_ADDR_R __stringify(0x3100000)
#define LOAD_ADDRESS_ENV_SETTINGS \
"kernel_addr_r=" KERNEL_ADDR_R "\0" \
--
2.17.1

29
patch/u-boot/u-boot-helios4/board_clearfogbase/board-name-to-clearfog-base.patch Normal file
View file

@ -0,0 +1,29 @@
diff --git a/arch/arm/dts/armada-388-clearfog.dts b/arch/arm/dts/armada-388-clearfog.dts
index 4ddeaa02f1..2792209b64 100644
--- a/arch/arm/dts/armada-388-clearfog.dts
+++ b/arch/arm/dts/armada-388-clearfog.dts
@@ -53,7 +53,7 @@
#include "armada-38x-solidrun-microsom.dtsi"
/ {
- model = "SolidRun Clearfog A1";
+ model = "SolidRun Clearfog";
compatible = "solidrun,clearfog-a1", "marvell,armada388",
"marvell,armada385", "marvell,armada380";
diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c
index 03724fee10..4650d754c2 100644
--- a/board/solidrun/clearfog/clearfog.c
+++ b/board/solidrun/clearfog/clearfog.c
@@ -125,7 +125,7 @@ int board_init(void)
int checkboard(void)
{
- puts("Board: SolidRun ClearFog\n");
+ puts("Board: SolidRun ClearFog Base\n");
return 0;
}
--
2.17.1

16
patch/u-boot/u-boot-helios4/board_clearfogbase/set-serdes-lane-4-as-usb-3-host.patch Normal file
View file

@ -0,0 +1,16 @@
diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c
index 4650d754c2..53922793ad 100644
--- a/board/solidrun/clearfog/clearfog.c
+++ b/board/solidrun/clearfog/clearfog.c
@@ -33,7 +33,7 @@ static struct serdes_map board_serdes_map[] = {
{SGMII1, SERDES_SPEED_1_25_GBPS, SERDES_DEFAULT_MODE, 0, 0},
{PEX1, SERDES_SPEED_5_GBPS, PEX_ROOT_COMPLEX_X1, 0, 0},
{USB3_HOST1, SERDES_SPEED_5_GBPS, SERDES_DEFAULT_MODE, 0, 0},
- {PEX2, SERDES_SPEED_5_GBPS, PEX_ROOT_COMPLEX_X1, 0, 0},
+ {USB3_HOST0, SERDES_SPEED_5_GBPS, SERDES_DEFAULT_MODE, 0, 0},
{SGMII2, SERDES_SPEED_1_25_GBPS, SERDES_DEFAULT_MODE, 0, 0},
};
--
2.17.1

34
patch/u-boot/u-boot-helios4/board_clearfogpro/Add-RTC-to-clearfog.patch Normal file
View file

@ -0,0 +1,34 @@
From 351f4566aeaff51d999554a2be40ab6a40fb617d Mon Sep 17 00:00:00 2001
Message-Id: <351f4566aeaff51d999554a2be40ab6a40fb617d.1561517341.git.aditya@kobol.io>
From: Aditya Prayoga <aditya@kobol.io>
Date: Wed, 26 Jun 2019 10:07:05 +0800
Subject: [PATCH 1/2] configs: Enable U-Boot RTC support on Clearfog
---
configs/clearfog_defconfig | 3 +++
1 file changed, 3 insertions(+)
diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig
index 0429071..8cc34f3 100644
--- a/configs/clearfog_defconfig
+++ b/configs/clearfog_defconfig
@@ -30,6 +30,7 @@ CONFIG_CMD_PCI=y
CONFIG_CMD_SF=y
CONFIG_CMD_SPI=y
CONFIG_CMD_USB=y
+CONFIG_CMD_DATE=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_TFTPPUT=y
CONFIG_CMD_CACHE=y
@@ -58,6 +59,8 @@ CONFIG_MII=y
CONFIG_PCI=y
CONFIG_PCI_MVEBU=y
CONFIG_SCSI=y
+CONFIG_DM_RTC=y
+CONFIG_RTC_MVEBU=y
CONFIG_DEBUG_UART_SHIFT=2
CONFIG_SYS_NS16550=y
CONFIG_KIRKWOOD_SPI=y
--
2.17.1

37
patch/u-boot/u-boot-helios4/board_clearfogpro/arm-mvebu-clearfog-Update-Load-address.patch Normal file
View file

@ -0,0 +1,37 @@
From 1e9b721fe025578f00b7150665909e74f4f9fe9d Mon Sep 17 00:00:00 2001
Message-Id: <1e9b721fe025578f00b7150665909e74f4f9fe9d.1561531622.git.aditya@kobol.io>
From: Aditya Prayoga <aditya@kobol.io>
Date: Wed, 26 Jun 2019 14:46:02 +0800
Subject: [PATCH 1/2] arm: mvebu: clearfog: Update Load address
Use the values from U-Boot 2013.01 Marvell version: 2015_T1.0p16
Signed-off-by: Aditya Prayoga <aditya@kobol.io>
---
include/configs/clearfog.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index bbbfff71..5707ea24 100644
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -128,11 +128,11 @@
func(PXE, pxe, na) \
func(DHCP, dhcp, na)
-#define KERNEL_ADDR_R __stringify(0x800000)
-#define FDT_ADDR_R __stringify(0x100000)
-#define RAMDISK_ADDR_R __stringify(0x1800000)
-#define SCRIPT_ADDR_R __stringify(0x200000)
-#define PXEFILE_ADDR_R __stringify(0x300000)
+#define KERNEL_ADDR_R __stringify(0x2080000)
+#define FDT_ADDR_R __stringify(0x2040000)
+#define RAMDISK_ADDR_R __stringify(0x2880000)
+#define SCRIPT_ADDR_R __stringify(0x3000000)
+#define PXEFILE_ADDR_R __stringify(0x3100000)
#define LOAD_ADDRESS_ENV_SETTINGS \
"kernel_addr_r=" KERNEL_ADDR_R "\0" \
--
2.17.1

29
patch/u-boot/u-boot-helios4/board_clearfogpro/board-name-to-clearfog-pro.patch Normal file
View file

@ -0,0 +1,29 @@
diff --git a/arch/arm/dts/armada-388-clearfog.dts b/arch/arm/dts/armada-388-clearfog.dts
index 4ddeaa02f1..2792209b64 100644
--- a/arch/arm/dts/armada-388-clearfog.dts
+++ b/arch/arm/dts/armada-388-clearfog.dts
@@ -53,7 +53,7 @@
#include "armada-38x-solidrun-microsom.dtsi"
/ {
- model = "SolidRun Clearfog A1";
+ model = "SolidRun Clearfog";
compatible = "solidrun,clearfog-a1", "marvell,armada388",
"marvell,armada385", "marvell,armada380";
diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c
index 03724fee10..f644547c12 100644
--- a/board/solidrun/clearfog/clearfog.c
+++ b/board/solidrun/clearfog/clearfog.c
@@ -125,7 +125,7 @@ int board_init(void)
int checkboard(void)
{
- puts("Board: SolidRun ClearFog\n");
+ puts("Board: SolidRun ClearFog Pro\n");
return 0;
}
--
2.17.1

36
patch/u-boot/u-boot-helios4/board_helios4/Add-RTC-to-helios4.patch Normal file
View file

@ -0,0 +1,36 @@
From 6eecc75c169fd9b1a3c26a3c8043f63d4a689d9e Mon Sep 17 00:00:00 2001
Message-Id: <6eecc75c169fd9b1a3c26a3c8043f63d4a689d9e.1561517341.git.aditya@kobol.io>
In-Reply-To: <351f4566aeaff51d999554a2be40ab6a40fb617d.1561517341.git.aditya@kobol.io>
References: <351f4566aeaff51d999554a2be40ab6a40fb617d.1561517341.git.aditya@kobol.io>
From: Aditya Prayoga <aditya@kobol.io>
Date: Wed, 26 Jun 2019 10:48:38 +0800
Subject: [PATCH 2/2] configs: Enable U-Boot RTC support on Helios4
---
configs/helios4_defconfig | 3 +++
1 file changed, 3 insertions(+)
diff --git a/configs/helios4_defconfig b/configs/helios4_defconfig
index 699ce06..0a1bb8e 100644
--- a/configs/helios4_defconfig
+++ b/configs/helios4_defconfig
@@ -27,6 +27,7 @@ CONFIG_CMD_MMC=y
CONFIG_CMD_SF=y
CONFIG_CMD_SPI=y
CONFIG_CMD_USB=y
+CONFIG_CMD_DATE=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_TFTPPUT=y
CONFIG_CMD_CACHE=y
@@ -54,6 +55,8 @@ CONFIG_PHY_GIGE=y
CONFIG_MVNETA=y
CONFIG_MII=y
CONFIG_SCSI=y
+CONFIG_DM_RTC=y
+CONFIG_RTC_MVEBU=y
CONFIG_DEBUG_UART_SHIFT=2
CONFIG_SYS_NS16550=y
CONFIG_KIRKWOOD_SPI=y
--
2.17.1

39
patch/u-boot/u-boot-helios4/board_helios4/arm-mvebu-helios4-Update-Load-address.patch Normal file
View file

@ -0,0 +1,39 @@
From 86c6ccfc00e36152348dc74f98915d12a4adcb47 Mon Sep 17 00:00:00 2001
Message-Id: <86c6ccfc00e36152348dc74f98915d12a4adcb47.1561531622.git.aditya@kobol.io>
In-Reply-To: <1e9b721fe025578f00b7150665909e74f4f9fe9d.1561531622.git.aditya@kobol.io>
References: <1e9b721fe025578f00b7150665909e74f4f9fe9d.1561531622.git.aditya@kobol.io>
From: Aditya Prayoga <aditya@kobol.io>
Date: Wed, 26 Jun 2019 14:46:30 +0800
Subject: [PATCH 2/2] arm: mvebu: helios4: Update Load address
Use the values from U-Boot 2013.01 Marvell version: 2015_T1.0p16
Signed-off-by: Aditya Prayoga <aditya@kobol.io>
---
include/configs/helios4.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/configs/helios4.h b/include/configs/helios4.h
index ef6c4ed6..c523f6a7 100644
--- a/include/configs/helios4.h
+++ b/include/configs/helios4.h
@@ -154,11 +154,11 @@
func(PXE, pxe, na) \
func(DHCP, dhcp, na)
-#define KERNEL_ADDR_R __stringify(0x800000)
-#define FDT_ADDR_R __stringify(0x100000)
-#define RAMDISK_ADDR_R __stringify(0x1800000)
-#define SCRIPT_ADDR_R __stringify(0x200000)
-#define PXEFILE_ADDR_R __stringify(0x300000)
+#define KERNEL_ADDR_R __stringify(0x2080000)
+#define FDT_ADDR_R __stringify(0x2040000)
+#define RAMDISK_ADDR_R __stringify(0x2880000)
+#define SCRIPT_ADDR_R __stringify(0x3000000)
+#define PXEFILE_ADDR_R __stringify(0x3100000)
#define LOAD_ADDRESS_ENV_SETTINGS \
"kernel_addr_r=" KERNEL_ADDR_R "\0" \
--
2.17.1

13
patch/u-boot/u-boot-helios4/enable-DT-overlays-support.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4a23e32..121f336 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -440,6 +440,8 @@ config ARCH_MVEBU
select DM_SPI_FLASH
select OF_CONTROL
select OF_SEPARATE
+ select OF_LIBFDT
+ select OF_LIBFDT_OVERLAY
select SPI
imply CMD_DM

88
patch/u-boot/u-boot-helios4/target_spi/clearfog-add-spi-support-in-spl.patch Normal file
View file

@ -0,0 +1,88 @@
diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig
index 04290710a7..15ea602bc3 100644
--- a/configs/clearfog_defconfig
+++ b/configs/clearfog_defconfig
@@ -8,7 +8,6 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_CLEARFOG=y
CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC=y
-CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL=y
CONFIG_DEBUG_UART_BASE=0xd0012000
@@ -50,7 +49,6 @@ CONFIG_MMC_SDHCI_MV=y
CONFIG_SPI_FLASH=y
CONFIG_SF_DEFAULT_BUS=1
CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_SPI_FLASH_MTD=y
CONFIG_PHY_MARVELL=y
CONFIG_PHY_GIGE=y
CONFIG_MVNETA=y
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index c51cf28450..d0e023ae44 100644
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -6,6 +6,8 @@
#ifndef _CONFIG_CLEARFOG_H
#define _CONFIG_CLEARFOG_H
+#include <linux/sizes.h>
+
/*
* High Level Configuration Options (easy to change)
*/
@@ -21,7 +23,19 @@
* Commands configuration
*/
-/* SPI NOR flash default params, used by sf commands */
+#ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI
+/*
+ * SPI Flash configuration for the environment access
+ */
+#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
+#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
+#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
+
+/* Environment in SPI NOR flash */
+#define CONFIG_ENV_SECT_SIZE SZ_64K
+#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
+#define CONFIG_ENV_OFFSET SZ_1M
+#endif
/*
* SDIO/MMC Card Configuration
@@ -37,6 +51,7 @@
#define CONFIG_ENV_MIN_ENTRIES 128
+#ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC
/* Environment in MMC */
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_ENV_SECT_SIZE 0x200
@@ -49,6 +64,7 @@
*/
#define CONFIG_ENV_OFFSET 0xf0000
#define CONFIG_ENV_ADDR CONFIG_ENV_OFFSET
+#endif
#define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
@@ -90,10 +106,14 @@
#if defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI)
/* SPL related SPI defines */
+#define CONFIG_SPL_SPI_FLASH_SUPPORT
+#define CONFIG_SPL_SPI_LOAD
+#define CONFIG_SPL_SPI_SUPPORT
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000
#define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS
#elif defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC)
/* SPL related MMC defines */
+#define CONFIG_SPL_MMC_SUPPORT
#define CONFIG_SYS_MMC_U_BOOT_OFFS (160 << 10)
#define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_MMC_U_BOOT_OFFS
#ifdef CONFIG_SPL_BUILD
--
2.17.1

29
patch/u-boot/u-boot-helios4/target_spi/clearfog-set-default-boot-target-to-spi.patch Normal file
View file

@ -0,0 +1,29 @@
diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig
index 15ea602bc3..919fe93b28 100644
--- a/configs/clearfog_defconfig
+++ b/configs/clearfog_defconfig
@@ -7,7 +7,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_CLEARFOG=y
-CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC=y
+CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL=y
CONFIG_DEBUG_UART_BASE=0xd0012000
@@ -33,9 +33,11 @@ CONFIG_CMD_USB=y
CONFIG_CMD_TFTPPUT=y
CONFIG_CMD_CACHE=y
CONFIG_CMD_TIME=y
+CONFIG_CMD_MVEBU_BUBT=y
+CONFIG_MVEBU_UBOOT_DFLT_NAME="u-boot-spl-spi.kwb"
# CONFIG_SPL_PARTITION_UUIDS is not set
CONFIG_DEFAULT_DEVICE_TREE="armada-388-clearfog"
-CONFIG_ENV_IS_IN_MMC=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_SPL_OF_TRANSLATE=y
CONFIG_SCSI_AHCI=y
--
2.17.1

23
patch/u-boot/u-boot-helios4/target_spi/helios4-config-set-boot-device-spinor.patch Normal file
View file

@ -0,0 +1,23 @@
diff --git a/configs/helios4_defconfig b/configs/helios4_defconfig
index ddd075e..50bdc7e 100644
--- a/configs/helios4_defconfig
+++ b/configs/helios4_defconfig
@@ -5,7 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_HELIOS4=y
-CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC=y
+CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL=y
@@ -34,7 +34,8 @@ CONFIG_CMD_CACHE=y
CONFIG_CMD_TIME=y
# CONFIG_SPL_PARTITION_UUIDS is not set
CONFIG_DEFAULT_DEVICE_TREE="armada-388-helios4"
-CONFIG_ENV_IS_IN_MMC=y
+# CONFIG_ENV_IS_IN_MMC is not set
+CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_SPL_OF_TRANSLATE=y
CONFIG_SCSI_AHCI=y

15
patch/u-boot/u-boot-helios4/target_spi/helios4-reorder-boot-device.patch Normal file
View file

@ -0,0 +1,15 @@
diff --git a/include/configs/helios4.h b/include/configs/helios4.h
index 299c58d..7ccb9e0 100644
--- a/include/configs/helios4.h
+++ b/include/configs/helios4.h
@@ -159,9 +159,9 @@
#endif
#define BOOT_TARGET_DEVICES(func) \
- BOOT_TARGET_DEVICES_MMC(func) \
BOOT_TARGET_DEVICES_USB(func) \
BOOT_TARGET_DEVICES_SATA(func) \
+ BOOT_TARGET_DEVICES_MMC(func) \
func(PXE, pxe, na) \
func(DHCP, dhcp, na)

24
patch/u-boot/u-boot-helios4/target_uart/clearfog-disable-autoboot-and-env-storage.patch Normal file
View file

@ -0,0 +1,24 @@
diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig
index 04290710a7..f48f5e15cd 100644
--- a/configs/clearfog_defconfig
+++ b/configs/clearfog_defconfig
@@ -16,7 +16,7 @@ CONFIG_DEBUG_UART_CLOCK=250000000
CONFIG_DEBUG_UART=y
CONFIG_DISTRO_DEFAULTS=y
CONFIG_NR_DRAM_BANKS=2
-CONFIG_BOOTDELAY=3
+CONFIG_BOOTDELAY=-1
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
@@ -36,7 +36,6 @@ CONFIG_CMD_CACHE=y
CONFIG_CMD_TIME=y
# CONFIG_SPL_PARTITION_UUIDS is not set
CONFIG_DEFAULT_DEVICE_TREE="armada-388-clearfog"
-CONFIG_ENV_IS_IN_MMC=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_SPL_OF_TRANSLATE=y
CONFIG_SCSI_AHCI=y
--
2.17.1

53
patch/u-boot/u-boot-helios4/target_uart/helios4-prepare-for-uart-image.patch Normal file
View file

@ -0,0 +1,53 @@
From bf63030982e9b2c555dab11b3f53bfd27a48f567 Mon Sep 17 00:00:00 2001
Message-Id: <bf63030982e9b2c555dab11b3f53bfd27a48f567.1562323529.git.aditya@kobol.io>
From: Aditya Prayoga <aditya@kobol.io>
Date: Fri, 5 Jul 2019 18:45:05 +0800
Subject: [PATCH] mvebu: helios4: Prepare for UART image
SPL failed to continue the booting process if ECC is enabled.
So disable the ECC and while at it also disable env storage and
autoboot.
Signed-off-by: Aditya Prayoga <aditya@kobol.io>
---
board/kobol/helios4/helios4.c | 2 +-
configs/helios4_defconfig | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/board/kobol/helios4/helios4.c b/board/kobol/helios4/helios4.c
index 3c3592ecf5..780bef12a9 100644
--- a/board/kobol/helios4/helios4.c
+++ b/board/kobol/helios4/helios4.c
@@ -66,7 +66,7 @@ static struct mv_ddr_topology_map board_topology_map = {
0, 0, /* cas_wl cas_l */
MV_DDR_TEMP_LOW, /* temperature */
MV_DDR_TIM_DEFAULT} }, /* timing */
- BUS_MASK_32BIT_ECC, /* Busses mask */
+ BUS_MASK_32BIT, /* Busses mask */
MV_DDR_CFG_DEFAULT, /* ddr configuration data source */
{ {0} }, /* raw spd data */
{0} /* timing parameters */
diff --git a/configs/helios4_defconfig b/configs/helios4_defconfig
index 699ce0609f..3ccb613b8d 100644
--- a/configs/helios4_defconfig
+++ b/configs/helios4_defconfig
@@ -14,7 +14,7 @@ CONFIG_DEBUG_UART=y
CONFIG_AHCI=y
CONFIG_DISTRO_DEFAULTS=y
CONFIG_NR_DRAM_BANKS=2
-CONFIG_BOOTDELAY=3
+CONFIG_BOOTDELAY=-1
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
@@ -33,7 +33,6 @@ CONFIG_CMD_CACHE=y
CONFIG_CMD_TIME=y
# CONFIG_SPL_PARTITION_UUIDS is not set
CONFIG_DEFAULT_DEVICE_TREE="armada-388-helios4"
-CONFIG_ENV_IS_IN_MMC=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_SPL_OF_TRANSLATE=y
CONFIG_SCSI_AHCI=y
--
2.17.1