Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Helios4: attempt to resurrect old board with most recent boot-loader #7805

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Helios4: attempt to resurrect old board with most recent boot-loader #7805

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions config/sources/families/include/mvebu-helios4.inc
View file
Original file line number Diff line number Diff line change
@@ -10,16 +10,16 @@ case $BRANCH in

legacy | current | edge)

BOOTSOURCE=$MAINLINE_UBOOT_SOURCE
BOOTBRANCH='tag:v2019.04'
BOOTSOURCE='https://github.com/SolidRun/u-boot'
BOOTBRANCH='branch:v2024.04-solidrun-a38x'
BOOTDIR=$MAINLINE_UBOOT_DIR
BOOTPATCHDIR='legacy/u-boot-helios4'
BOOTSCRIPT='boot-mvebu.cmd:boot.cmd'

UBOOT_TARGET_MAP=";sdhc;u-boot-spl.kwb:u-boot.mmc
;spi;u-boot-spl.kwb:u-boot.flash
;uart;u-boot-spl.kwb:u-boot.uart"

UBOOT_TARGET_MAP=";sdhc;u-boot-with-spl.kwb:u-boot.mmc"
# disabled spi and uart, patches needs rework
# ;spi;u-boot-with-spl.kwb:u-boot.flash
# ;uart;u-boot-with-spl.kwb:u-boot.uart
UBOOT_USE_GCC='> 7.0'

OVERLAY_PREFIX='armada-388-helios4'
0 ...-boot-helios4/0001-fixing-dtc-error.patch → ...ios4/0001-fixing-dtc-error.patch.disabled
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions ...helios4/Add-DM-driver-for-mvebu-rtc.patch → ...d-DM-driver-for-mvebu-rtc.patch.disableds
View file
Original file line number Diff line number Diff line change
@@ -41,11 +41,11 @@ index 1724602..0e23190 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -38,6 +38,7 @@ obj-$(CONFIG_RTC_MCP79411) += ds1307.o
obj-$(CONFIG_RTC_MC13XXX) += mc13xxx-rtc.o
obj-$(CONFIG_RTC_MC146818) += mc146818.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_MV) += mvrtc.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
10 changes: 5 additions & 5 deletions ...s4/board_helios4/Add-RTC-to-helios4.patch → ...helios4/Add-RTC-to-helios4.patch.disabled
View file
Original file line number Diff line number Diff line change
@@ -15,22 +15,22 @@ 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_PCI=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
CONFIG_CMD_TIME=y
@@ -54,6 +55,8 @@ CONFIG_PHY_GIGE=y
CONFIG_MVNETA=y
CONFIG_MII=y
CONFIG_SCSI=y
CONFIG_MVMDIO=y
+CONFIG_DM_RTC=y
+CONFIG_RTC_MVEBU=y
CONFIG_PCI_MVEBU=y
CONFIG_SPL_DEBUG_UART_BASE=0xd0012000
CONFIG_DEBUG_UART_SHIFT=2
CONFIG_SYS_NS16550=y
CONFIG_KIRKWOOD_SPI=y
--
2.17.1