Page MenuHomeFreeBSD
Files F174326341

D59235.id.diff
No OneTemporary
Actions

D59235.id.diff
View Options

diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh
--- a/tools/tools/nanobsd/defaults.sh
+++ b/tools/tools/nanobsd/defaults.sh
@@ -1375,6 +1375,7 @@
echo " # if the 'bypass_before_seeding' knob is enabled"
echo " # and a request is submitted prior to initial"
echo " # seeding."
+ is_defined nanobsd_loader_conf_extra && nanobsd_loader_conf_extra
} >> boot/defaults/loader.conf
[ -n "${NANO_NOPRIV_BUILD}" ] && chmod 444 boot/defaults/loader.conf
if $do_precompiled && [ -z "$NANO_NOPKGBASE" ]; then
diff --git a/tools/tools/nanobsd/sbc/PINE64-LTS.conf b/tools/tools/nanobsd/sbc/PINE64-LTS.conf
new file mode 100644
--- /dev/null
+++ b/tools/tools/nanobsd/sbc/PINE64-LTS.conf
@@ -0,0 +1,25 @@
+NANO_CIDATA_SIZE="54m"
+EMBEDDEDPORTS="sysutils/u-boot-pine64-lts"
+
+FDT_OVERLAYS="sun50i-a64-timer"
+
+UBOOT_DIR="/usr/local/share/u-boot/u-boot-pine64-lts"
+UBOOT_FILES="u-boot-sunxi-with-spl.bin"
+
+NANO_CIDATADIR="${NANO_OBJ}/_.cidata"
+
+populate_cidata_partition() {
+ for _UF in ${UBOOT_FILES}; do
+ cp -p ${UBOOT_DIR}/${_UF} \
+ ${NANO_CIDATADIR}/${_UF}
+ done
+}
+
+nanobsd_loader_conf_extra() {
+ if [ -z "${FDT_OVERLAYS}" ]; then
+ return
+ fi
+
+ echo '# DTB OVERLAYS'
+ echo "fdt_overlays=\"${FDT_OVERLAYS}\""
+}
diff --git a/tools/tools/nanobsd/sbc/PINE64.conf b/tools/tools/nanobsd/sbc/PINE64.conf
new file mode 100644
--- /dev/null
+++ b/tools/tools/nanobsd/sbc/PINE64.conf
@@ -0,0 +1,25 @@
+NANO_CIDATA_SIZE="54m"
+EMBEDDEDPORTS="sysutils/u-boot-pine64"
+
+FDT_OVERLAYS="sun50i-a64-timer"
+
+UBOOT_DIR="/usr/local/share/u-boot/u-boot-pine64"
+UBOOT_FILES="u-boot-sunxi-with-spl.bin"
+
+NANO_CIDATADIR="${NANO_OBJ}/_.cidata"
+
+populate_cidata_partition() {
+ for _UF in ${UBOOT_FILES}; do
+ cp -p ${UBOOT_DIR}/${_UF} \
+ ${NANO_CIDATADIR}/${_UF}
+ done
+}
+
+nanobsd_loader_conf_extra() {
+ if [ -z "${FDT_OVERLAYS}" ]; then
+ return
+ fi
+
+ echo '# DTB OVERLAYS'
+ echo "fdt_overlays=\"${FDT_OVERLAYS}\""
+}
diff --git a/tools/tools/nanobsd/sbc/PINEBOOK.conf b/tools/tools/nanobsd/sbc/PINEBOOK.conf
new file mode 100644
--- /dev/null
+++ b/tools/tools/nanobsd/sbc/PINEBOOK.conf
@@ -0,0 +1,30 @@
+NANO_CIDATA_SIZE="54m"
+EMBEDDEDPORTS="sysutils/u-boot-pinebook"
+
+FDT_OVERLAYS="sun50i-a64-timer"
+
+UBOOT_DIR="/usr/local/share/u-boot/u-boot-pinebook"
+UBOOT_FILES="u-boot-sunxi-with-spl.bin"
+
+NANO_CIDATADIR="${NANO_OBJ}/_.cidata"
+
+populate_cidata_partition() {
+ for _UF in ${UBOOT_FILES}; do
+ cp -p ${UBOOT_DIR}/${_UF} \
+ ${NANO_CIDATADIR}/${_UF}
+ done
+}
+
+nanobsd_loader_conf_extra() {
+ if [ -z "${FDT_OVERLAYS}" ]; then
+ return
+ fi
+
+ echo '# DTB OVERLAYS'
+ echo "fdt_overlays=\"${FDT_OVERLAYS}\""
+ echo '# Enable quirk for trackpad'
+ echo 'usb_quirk_load=YES'
+ echo 'ums_load=YES'
+ echo 'hw.usb.quirk="0x258a 0x000c 0x0000 0xffff UQ_CFG_INDEX=1"'
+ echo 'hw.regulator.disable_unused=0'
+}
diff --git a/tools/tools/nanobsd/sbc/ROCK64.conf b/tools/tools/nanobsd/sbc/ROCK64.conf
new file mode 100644
--- /dev/null
+++ b/tools/tools/nanobsd/sbc/ROCK64.conf
@@ -0,0 +1,14 @@
+NANO_CIDATA_SIZE="50m"
+EMBEDDEDPORTS="sysutils/u-boot-rock64"
+
+UBOOT_DIR="/usr/local/share/u-boot/u-boot-rock64"
+UBOOT_FILES="idbloader.img u-boot.itb"
+
+NANO_CIDATADIR="${NANO_OBJ}/_.cidata"
+
+populate_cidata_partition() {
+ for _UF in ${UBOOT_FILES}; do
+ cp -p ${UBOOT_DIR}/${_UF} \
+ ${NANO_CIDATADIR}/${_UF}
+ done
+}
diff --git a/tools/tools/nanobsd/sbc/ROCKPRO64.conf b/tools/tools/nanobsd/sbc/ROCKPRO64.conf
new file mode 100644
--- /dev/null
+++ b/tools/tools/nanobsd/sbc/ROCKPRO64.conf
@@ -0,0 +1,14 @@
+NANO_CIDATA_SIZE="50m"
+EMBEDDEDPORTS="sysutils/u-boot-rockpro64"
+
+UBOOT_DIR="/usr/local/share/u-boot/u-boot-rockpro64"
+UBOOT_FILES="idbloader.img u-boot.itb"
+
+NANO_CIDATADIR="${NANO_OBJ}/_.cidata"
+
+populate_cidata_partition() {
+ for _UF in ${UBOOT_FILES}; do
+ cp -p ${UBOOT_DIR}/${_UF} \
+ ${NANO_CIDATADIR}/${_UF}
+ done
+}
diff --git a/tools/tools/nanobsd/sbc/RPI.conf b/tools/tools/nanobsd/sbc/RPI.conf
new file mode 100644
--- /dev/null
+++ b/tools/tools/nanobsd/sbc/RPI.conf
@@ -0,0 +1,43 @@
+NANO_CIDATA_SIZE="50m"
+
+DTB_DIR="/usr/local/share/rpi-firmware"
+DTB="bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb bcm2710-rpi-3-b-plus.dtb \
+ bcm2710-rpi-cm3.dtb bcm2710-rpi-zero-2-w.dtb bcm2711-rpi-4-b.dtb \
+ bcm2711-rpi-cm4-io.dtb bcm2711-rpi-cm4.dtb"
+
+EMBEDDEDPORTS="sysutils/u-boot-rpi-arm64 sysutils/rpi-firmware"
+
+OL_DIR="${DTB_DIR}/overlays"
+OVERLAYS="mmc.dtbo pwm.dtbo disable-bt.dtbo"
+
+UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi-arm64"
+UBOOT_FILES="README u-boot.bin"
+DTB_FILES="armstub8.bin armstub8-gic.bin bootcode.bin fixup_cd.dat \
+ fixup_db.dat fixup_x.dat fixup.dat LICENCE.broadcom \
+ start_cd.elf start_db.elf start_x.elf start.elf \
+ fixup4.dat fixup4cd.dat fixup4db.dat fixup4x.dat start4.elf \
+ start4cd.elf start4db.elf start4x.elf ${DTB}"
+
+
+NANO_CIDATADIR="${NANO_OBJ}/_.cidata"
+
+populate_cidata_partition() {
+ for _UF in ${UBOOT_FILES}; do
+ cp -p ${UBOOT_DIR}/${_UF} \
+ ${NANO_CIDATADIR}/${_UF}
+ done
+
+ for _DF in ${DTB_FILES}; do
+ cp -p ${DTB_DIR}/${_DF} \
+ ${NANO_CIDATADIR}/${_DF}
+ done
+ cp -p ${DTB_DIR}/config_arm64.txt \
+ ${NANO_CIDATADIR}/config.txt
+
+ mkdir -p ${NANO_CIDATADIR}/overlays
+
+ for _OL in ${OVERLAYS}; do
+ cp -p ${OL_DIR}/${_OL} \
+ ${NANO_CIDATADIR}/overlays/${_OL}
+ done
+}
diff --git a/tools/tools/nanobsd/ufs.sh b/tools/tools/nanobsd/ufs.sh
--- a/tools/tools/nanobsd/ufs.sh
+++ b/tools/tools/nanobsd/ufs.sh
@@ -215,6 +215,8 @@
rm -rf "$cidatadir"
mkdir -p "$cidatadir"
+ is_defined populate_cidata_partition && populate_cidata_partition
+
create_msdos_partition "cidata" "CIDATA" "$cidatadir" "${NANO_OBJ}/_.cidata.image"
rm -rf "$cidatadir"

File Metadata

Mime Type
text/plain
Expires
Sat, Oct 3, 10:17 AM (19 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40123365
Default Alt Text
D59235.id.diff (5 KB)

Event Timeline