Skip to content

Commit ff4c020

Browse files
committed
refactor: Renamed boot overlay folder to boot-overlay
1 parent e5e9c43 commit ff4c020

File tree

11 files changed

+29
-17
lines changed

11 files changed

+29
-17
lines changed

buildroot-external/board/remote/build-hook.sh

+18-6
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,26 @@ function yios_post_build() {
1212
}
1313

1414
function yios_pre_image() {
15+
local BOOT_OVERLAY="${BOARD_DIR}/boot-overlay"
16+
local BOOT_DATA="${BINARIES_DIR}/boot"
17+
18+
mkdir -p ${BOOT_DATA}
19+
1520
# gather files for boot partition
16-
cp ${BOARD_DIR}/boot/*.txt ${BINARIES_DIR}/
17-
cp ${TARGET_DIR}/opt/yio/app/config.json.def ${BINARIES_DIR}/config.json
18-
cp ${BOARD_DIR}/boot/*.md ${BINARIES_DIR}/
19-
cp ${BOARD_DIR}/boot/*.template ${BINARIES_DIR}/
21+
cp -r "${BOOT_OVERLAY}"/* "${BOOT_DATA}/"
22+
cp "${TARGET_DIR}/opt/yio/app/config.json.def" "${BOOT_DATA}/config.json"
23+
24+
cp "${BINARIES_DIR}"/*.dtb "${BOOT_DATA}/"
25+
26+
cp -t "${BOOT_DATA}" \
27+
"${BINARIES_DIR}/rpi-firmware/fixup.dat" \
28+
"${BINARIES_DIR}/rpi-firmware/start.elf" \
29+
"${BINARIES_DIR}/rpi-firmware/bootcode.bin"
30+
31+
# move README file for /scrips/post-image.sh to patch common placeholders
32+
mv "${BOOT_DATA}/README.md" "${BINARIES_DIR}/"
2033

21-
mkdir -p ${BINARIES_DIR}/overlays
22-
cp ${BOARD_DIR}/boot/overlays/*.dtbo ${BINARIES_DIR}/overlays/
34+
cp "${BINARIES_DIR}"/kernel.img "${BOOT_DATA}/"
2335
}
2436

2537
function yios_post_image() {

buildroot-external/board/remote/genimage.cfg

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ image boot.vfat {
33
# set volume name with mkfs.vfat parameter
44
extraargs = "-n \"YIO BOOT\""
55
files = {
6-
"bcm2708-rpi-zero-w.dtb",
7-
"config.txt",
8-
"cmdline.txt",
9-
"config.json",
10-
"rpi-firmware/bootcode.bin",
11-
"rpi-firmware/fixup.dat",
12-
"rpi-firmware/start.elf",
13-
"overlays",
14-
"kernel.img",
156
"README.md",
16-
"wpa_supplicant.conf.template"
7+
"boot/bcm2708-rpi-zero-w.dtb",
8+
"boot/config.txt",
9+
"boot/cmdline.txt",
10+
"boot/config.json",
11+
"boot/bootcode.bin",
12+
"boot/fixup.dat",
13+
"boot/start.elf",
14+
"boot/overlays",
15+
"boot/kernel.img",
16+
"boot/wpa_supplicant.conf.template"
1717
}
1818
}
1919
size = 256M

buildroot-external/scripts/post-build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Buildroot post-build script: configured in BR2_ROOTFS_POST_BUILD_SCRIPT.
44
# Parameters:
5-
# $1: target output directory (Buildroot default)
5+
# $1: target output directory (Buildroot default, also set in $TARGET_DIR)
66
# $2: board directory (configured in BR2_ROOTFS_POST_SCRIPT_ARGS)
77
# $3: board hook file (configured in BR2_ROOTFS_POST_SCRIPT_ARGS)
88

0 commit comments

Comments
 (0)