d-two/operating-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

os: fix u-boot env size (#153)

Browse Source 
* os: fix u-boot env size

* Delete fw_env.config
This commit is contained in:
Pascal Vizeli
2018-08-08 12:48:07 +02:00
committed by GitHub
parent 72a3aec55b
commit 12b5731e20
12 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
buildroot-external/board/raspberrypi/patches/uboot/0001-Support-HassOS-bootstate-partition.patch
View File

@@ -1,24 +1,25 @@
From 1529062f72cee8061b4733e1148357d227639900 Mon Sep 17 00:00:00 2001 From 8458beb24f2540fff3c3faed4fa068553b9e474e Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch> From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Mon, 11 Jun 2018 11:09:10 +0000 Date: Wed, 8 Aug 2018 09:45:07 +0000
Subject: [PATCH 1/1] Support HassOS bootstate partition Subject: [PATCH 1/1] Support HassOS bootstate partition
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
--- ---
env/mmc.c | 4 ++++ env/mmc.c | 5 +++++
1 file changed, 4 insertions(+) 1 file changed, 5 insertions(+)
diff --git a/env/mmc.c b/env/mmc.c diff --git a/env/mmc.c b/env/mmc.c
index 5e3da6dca7..75c06899d1 100644 index 5e3da6dca75..353f58a12c9 100644
--- a/env/mmc.c --- a/env/mmc.c
+++ b/env/mmc.c +++ b/env/mmc.c
@@ -18,6 +18,10 @@ @@ -18,6 +18,11 @@
#include <search.h> #include <search.h>
#include <errno.h> #include <errno.h>
+#undef CONFIG_SYS_MMC_ENV_DEV
+#define CONFIG_SYS_MMC_ENV_DEV 0 +#define CONFIG_SYS_MMC_ENV_DEV 0
+#undef CONFIG_ENV_OFFSET
+#define CONFIG_ENV_OFFSET 0x25100000 +#define CONFIG_ENV_OFFSET 0x25100000
+#define CONFIG_ENV_SIZE 0x400000
+ +
#define __STR(X) #X #define __STR(X) #X
#define STR(X) __STR(X) #define STR(X) __STR(X)

1
buildroot-external/board/raspberrypi/rpi/info
View File

@@ -4,3 +4,4 @@ CHASSIS=embedded
BOOTLOADER=uboot BOOTLOADER=uboot
KERNEL_FILE=zImage KERNEL_FILE=zImage
BOOT_SYS=mbr BOOT_SYS=mbr
BOOT_ENV_SIZE=0x4000

1
buildroot-external/board/raspberrypi/rpi0-w/info
View File

@@ -4,3 +4,4 @@ CHASSIS=embedded
BOOTLOADER=uboot BOOTLOADER=uboot
KERNEL_FILE=zImage KERNEL_FILE=zImage
BOOT_SYS=mbr BOOT_SYS=mbr
BOOT_ENV_SIZE=0x4000

1
buildroot-external/board/raspberrypi/rpi2/info
View File

@@ -4,3 +4,4 @@ CHASSIS=embedded
BOOTLOADER=uboot BOOTLOADER=uboot
KERNEL_FILE=zImage KERNEL_FILE=zImage
BOOT_SYS=mbr BOOT_SYS=mbr
BOOT_ENV_SIZE=0x4000

1
buildroot-external/board/raspberrypi/rpi3-64/info
View File

@@ -4,3 +4,4 @@ CHASSIS=embedded
BOOTLOADER=uboot BOOTLOADER=uboot
KERNEL_FILE=Image KERNEL_FILE=Image
BOOT_SYS=mbr BOOT_SYS=mbr
BOOT_ENV_SIZE=0x4000

1
buildroot-external/board/raspberrypi/rpi3/info
View File

@@ -4,3 +4,4 @@ CHASSIS=embedded
BOOTLOADER=uboot BOOTLOADER=uboot
KERNEL_FILE=zImage KERNEL_FILE=zImage
BOOT_SYS=mbr BOOT_SYS=mbr
BOOT_ENV_SIZE=0x4000

1
buildroot-external/board/tinker/info
View File

@@ -4,3 +4,4 @@ CHASSIS=embedded
BOOTLOADER=uboot BOOTLOADER=uboot
KERNEL_FILE=zImage KERNEL_FILE=zImage
BOOT_SYS=spl BOOT_SYS=spl
BOOT_ENV_SIZE=0x8000

15
buildroot-external/board/tinker/patches/uboot/0001-Support-HassOS-bootstate-partition.patch
View File

@@ -1,24 +1,25 @@
From 1529062f72cee8061b4733e1148357d227639900 Mon Sep 17 00:00:00 2001 From 8458beb24f2540fff3c3faed4fa068553b9e474e Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch> From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Mon, 11 Jun 2018 11:09:10 +0000 Date: Wed, 8 Aug 2018 09:45:07 +0000
Subject: [PATCH 1/1] Support HassOS bootstate partition Subject: [PATCH 1/1] Support HassOS bootstate partition
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
--- ---
env/mmc.c | 4 ++++ env/mmc.c | 5 +++++
1 file changed, 4 insertions(+) 1 file changed, 5 insertions(+)
diff --git a/env/mmc.c b/env/mmc.c diff --git a/env/mmc.c b/env/mmc.c
index 5e3da6dca7..75c06899d1 100644 index 5e3da6dca75..353f58a12c9 100644
--- a/env/mmc.c --- a/env/mmc.c
+++ b/env/mmc.c +++ b/env/mmc.c
@@ -18,6 +18,10 @@ @@ -18,6 +18,11 @@
#include <search.h> #include <search.h>
#include <errno.h> #include <errno.h>
+#undef CONFIG_SYS_MMC_ENV_DEV
+#define CONFIG_SYS_MMC_ENV_DEV 1 +#define CONFIG_SYS_MMC_ENV_DEV 1
+#undef CONFIG_ENV_OFFSET
+#define CONFIG_ENV_OFFSET 0x25100000 +#define CONFIG_ENV_OFFSET 0x25100000
+#define CONFIG_ENV_SIZE 0x400000
+ +
#define __STR(X) #X #define __STR(X) #X
#define STR(X) __STR(X) #define STR(X) __STR(X)

2
buildroot-external/board/tinker/uboot.config
View File

@@ -1,4 +1,4 @@
# CONFIG_USB_STORAGE is not set # CONFIG_USB_STORAGE is not set
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_CMD_FILEENV=y CONFIG_CMD_FILEENV=y
CONFIG_ENV_OFFSET=0x25100000

2
buildroot-external/bootloader/uboot.config
View File

@@ -16,5 +16,3 @@ CONFIG_ENV_IS_IN_MMC=y
CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_CONSOLE_SCROLL_LINES=10
# CONFIG_EFI_LOADER is not set # CONFIG_EFI_LOADER is not set
CONFIG_CMD_SETEXPR=y CONFIG_CMD_SETEXPR=y
CONFIG_ENV_OFFSET=0x25100000
CONFIG_ENV_SIZE=0x400000

1
buildroot-external/misc/fw_env.config
View File

@@ -1 +0,0 @@
/dev/disk/by-partlabel/hassos-bootstate 0x00 0x400000

2
buildroot-external/scripts/rauc.sh
View File

@@ -77,7 +77,7 @@ function install_rauc_certs() {
function install_bootloader_config() { function install_bootloader_config() {
if [ "${BOOTLOADER}" == "uboot" ]; then if [ "${BOOTLOADER}" == "uboot" ]; then
cp ${BR2_EXTERNAL_HASSOS_PATH}/misc/fw_env.config ${TARGET_DIR}/etc/fw_env.config echo -e "/dev/disk/by-partlabel/hassos-bootstatei\t0x00\t${BOOT_ENV_SIZE}" > ${TARGET_DIR}/etc/fw_env.config
else else
cp ${BR2_EXTERNAL_HASSOS_PATH}/misc/barebox-state-efi.dtb ${TARGET_DIR}/etc/barebox-state.dtb cp ${BR2_EXTERNAL_HASSOS_PATH}/misc/barebox-state-efi.dtb ${TARGET_DIR}/etc/barebox-state.dtb
fi fi