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.

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

at91bootstrap: update to v4.0.8 and patch to fix RTC #28

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 24 additions & 0 deletions at91bootstrap/0001-SFRBU-Fix-RTC-battery-backup-config.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
From 799af0c466c1c65ffccd51e367017415a15e83a3 Mon Sep 17 00:00:00 2001
From: Jon Ringle <[email protected]>
Date: Mon, 25 Mar 2024 09:34:50 -0400
Subject: [PATCH] SFRBU: Fix RTC battery backup config

---
device/sama5d2/sama5d2.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/device/sama5d2/sama5d2.c b/device/sama5d2/sama5d2.c
index d18f3ce..49e02c3 100644
--- a/device/sama5d2/sama5d2.c
+++ b/device/sama5d2/sama5d2.c
@@ -487,6 +487,7 @@ void hw_init(void)
{
#ifdef CONFIG_BACKUP_VDDIN33
/* Switch backup area to VDDIN33. */
+ writel(AT91C_PSWBU_PSWKEY, AT91C_BASE_SFRBU + SFRBU_PSWBU);
sfrbu_select_ba_power_source(true);
#endif

--
2.34.1

2 changes: 1 addition & 1 deletion fwup.conf
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ file-resource rootfs.img {
}

mbr mbr {
bootstrap-code-host-path = "${NERVES_SDK_IMAGES}/sama5d2-sdcardboot-uboot-4.0.6.bin"
bootstrap-code-host-path = "${NERVES_SDK_IMAGES}/sama5d2-sdcardboot-uboot-4.0.8.bin"
partition 0 {
block-offset = ${BOOT_PART_OFFSET}
block-count = ${BOOT_PART_COUNT}
Expand Down
3 changes: 2 additions & 1 deletion nerves_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ BR2_PACKAGE_WPA_SUPPLICANT_CTRL_IFACE=y
BR2_TARGET_AT91BOOTSTRAP3=y
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v4.0.6"
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v4.0.8"
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_PATCH_DIR="${NERVES_DEFCONFIG_DIR}/at91bootstrap"
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d27_wlsom1_eksd_uboot"
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
Expand Down