aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2020-01-23 09:52:50 -0600
committerTrevor Woerner <twoerner@gmail.com>2020-01-27 10:18:44 -0500
commitfdd07d09c2ba1e6c5fe1f3d867c7909a8c869df4 (patch)
treee73afb579ce5481794259889a7875ba149f74c92
parentd59f392f3f67da495f2fbb4b8c347494709335ae (diff)
downloadmeta-rockchip-fdd07d09c2ba1e6c5fe1f3d867c7909a8c869df4.tar.gz
meta-rockchip-fdd07d09c2ba1e6c5fe1f3d867c7909a8c869df4.tar.bz2
meta-rockchip-fdd07d09c2ba1e6c5fe1f3d867c7909a8c869df4.zip
rk3288: Add common rk3288 boot include wic
Adds a common rk3288-boot.wks file that all machine kickstart files can include to get their boot partitions correctly configured. Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
-rw-r--r--wic/firefly-rk3288.wks23
-rw-r--r--wic/rk3288-boot.wks24
-rw-r--r--wic/tinker-rk3288.wks23
-rw-r--r--wic/vyasa-rk3288.wks25
4 files changed, 31 insertions, 64 deletions
diff --git a/wic/firefly-rk3288.wks b/wic/firefly-rk3288.wks
index 5013aea..c2027bd 100644
--- a/wic/firefly-rk3288.wks
+++ b/wic/firefly-rk3288.wks
@@ -1,26 +1,7 @@
# Copyright (C) 2019 Garmin Ltd. or its subsidiaries
# Released under the MIT license (see COPYING.MIT for the terms)
-#
-# Disk layout
-# Note that the reference documentation refers to 512 byte disk sectors, but
-# wic uses 1KB blocks
-#
-# Partition Start Sector Number of Sectors
-# loader1 64 8000
-# reserved1 8064 128
-# reserved2 8192 8192
-# loader2 16384 8192
-# atf 24576 8192
-# boot 32768 229376
-# root 262144 -
-#
-part loader1 --ondisk mmcblk0 --align 32 --size 4000K --source rawcopy --sourceparams="file=idbloader.img"
-part reserved1 --ondisk mmcblk0 --align 4032 --size 64K
-part reserved2 --ondisk mmcblk0 --align 4096 --size 4096K
-part loader2 --ondisk mmcblk0 --align 8192 --size 4096K --source rawcopy --sourceparams="file=u-boot.bin"
-part atf --ondisk mmcblk0 --align 12288 --size 4096K
-part /boot --ondisk mmcblk0 --align 16384 --size=114688K --active --source bootimg-partition --fstype=vfat --label boot --sourceparams="loader=u-boot"
-part / --ondisk mmcblk0 --align 131072 --source rootfs --fstype=ext4 --label root
+include rk3288-boot.wks
+part / --align 131072 --source rootfs --fstype=ext4 --label root
bootloader --ptable gpt --append="console=tty1 console=ttyS2,115200n8 rw root=/dev/mmcblk0p7 rootfstype=ext4 init=/sbin/init"
diff --git a/wic/rk3288-boot.wks b/wic/rk3288-boot.wks
new file mode 100644
index 0000000..53c8162
--- /dev/null
+++ b/wic/rk3288-boot.wks
@@ -0,0 +1,24 @@
+# Copyright (C) 2020 Garmin Ltd. or its subsidiaries
+# Released under the MIT license (see COPYING.MIT for the terms)
+#
+# Disk layout
+# Note that the reference documentation refers to 512 byte disk sectors, but
+# wic uses 1KB blocks
+#
+# Partition Start Sector Number of Sectors
+# loader1 64 8000
+# reserved1 8064 128
+# reserved2 8192 8192
+# loader2 16384 8192
+# atf 24576 8192
+# boot 32768 229376
+# root 262144 -
+#
+
+part loader1 --align 32 --size 4000K --source rawcopy --sourceparams="file=idbloader.img"
+part reserved1 --align 4032 --size 64K
+part reserved2 --align 4096 --size 4096K
+part loader2 --align 8192 --size 4096K --source rawcopy --sourceparams="file=u-boot.bin"
+part atf --align 12288 --size 4096K
+part /boot --align 16384 --size=114688K --active --source bootimg-partition --fstype=vfat --label boot --sourceparams="loader=u-boot"
+
diff --git a/wic/tinker-rk3288.wks b/wic/tinker-rk3288.wks
index 5013aea..c2027bd 100644
--- a/wic/tinker-rk3288.wks
+++ b/wic/tinker-rk3288.wks
@@ -1,26 +1,7 @@
# Copyright (C) 2019 Garmin Ltd. or its subsidiaries
# Released under the MIT license (see COPYING.MIT for the terms)
-#
-# Disk layout
-# Note that the reference documentation refers to 512 byte disk sectors, but
-# wic uses 1KB blocks
-#
-# Partition Start Sector Number of Sectors
-# loader1 64 8000
-# reserved1 8064 128
-# reserved2 8192 8192
-# loader2 16384 8192
-# atf 24576 8192
-# boot 32768 229376
-# root 262144 -
-#
-part loader1 --ondisk mmcblk0 --align 32 --size 4000K --source rawcopy --sourceparams="file=idbloader.img"
-part reserved1 --ondisk mmcblk0 --align 4032 --size 64K
-part reserved2 --ondisk mmcblk0 --align 4096 --size 4096K
-part loader2 --ondisk mmcblk0 --align 8192 --size 4096K --source rawcopy --sourceparams="file=u-boot.bin"
-part atf --ondisk mmcblk0 --align 12288 --size 4096K
-part /boot --ondisk mmcblk0 --align 16384 --size=114688K --active --source bootimg-partition --fstype=vfat --label boot --sourceparams="loader=u-boot"
-part / --ondisk mmcblk0 --align 131072 --source rootfs --fstype=ext4 --label root
+include rk3288-boot.wks
+part / --align 131072 --source rootfs --fstype=ext4 --label root
bootloader --ptable gpt --append="console=tty1 console=ttyS2,115200n8 rw root=/dev/mmcblk0p7 rootfstype=ext4 init=/sbin/init"
diff --git a/wic/vyasa-rk3288.wks b/wic/vyasa-rk3288.wks
index 3fc9a5b..f019e0d 100644
--- a/wic/vyasa-rk3288.wks
+++ b/wic/vyasa-rk3288.wks
@@ -1,27 +1,8 @@
# Copyright (C) 2019 Garmin Ltd. or its subsidiaries
# Released under the MIT license (see COPYING.MIT for the terms)
-#
-# Disk layout
-# Note that the reference documentation refers to 512 byte disk sectors, but
-# wic uses 1KB blocks
-#
-# Partition Start Sector Number of Sectors
-# loader1 64 8000
-# reserved1 8064 128
-# reserved2 8192 8192
-# loader2 16384 8192
-# atf 24576 8192
-# boot 32768 229376
-# root 262144 -
-#
-part loader1 --ondisk mmcblk2 --align 32 --size 4000K --source rawcopy --sourceparams="file=idbloader.img"
-part reserved1 --ondisk mmcblk2 --align 4032 --size 64K
-part reserved2 --ondisk mmcblk2 --align 4096 --size 4096K
-part loader2 --ondisk mmcblk2 --align 8192 --size 4096K --source rawcopy --sourceparams="file=u-boot.bin"
-part atf --ondisk mmcblk2 --align 12288 --size 4096K
-part /boot --ondisk mmcblk2 --align 16384 --size=114688K --active --source bootimg-partition --fstype=vfat --label boot --sourceparams="loader=u-boot"
-part / --ondisk mmcblk2 --align 131072 --source rootfs --fstype=ext4 --label root
+include rk3288-boot.wks
+part / --align 131072 --source rootfs --fstype=ext4 --label root
bootloader --ptable gpt --append="console=tty1 console=ttyS2,115200n8 rw root=/dev/mmcblk2p7 rootfstype=ext4 init=/sbin/init"
-
+