From 5812ca1e629ea66b9a27a074be9a70f1ef313807 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 29 Sep 2017 16:27:02 -0300 Subject: wic: Move all wks files to root layer directory The wic looks for wks files in many places. The root layer directory is one of those and makes much easier to find the wks files for reference and use. Signed-off-by: Otavio Salvador --- scripts/lib/wic/canned-wks/imx-barebox.wks | 17 ----------------- scripts/lib/wic/canned-wks/imx-uboot-spl.wks | 17 ----------------- scripts/lib/wic/canned-wks/imx-uboot.wks | 16 ---------------- wic/imx-barebox.wks | 17 +++++++++++++++++ wic/imx-uboot-spl.wks | 17 +++++++++++++++++ wic/imx-uboot.wks | 16 ++++++++++++++++ 6 files changed, 50 insertions(+), 50 deletions(-) delete mode 100644 scripts/lib/wic/canned-wks/imx-barebox.wks delete mode 100644 scripts/lib/wic/canned-wks/imx-uboot-spl.wks delete mode 100644 scripts/lib/wic/canned-wks/imx-uboot.wks create mode 100644 wic/imx-barebox.wks create mode 100644 wic/imx-uboot-spl.wks create mode 100644 wic/imx-uboot.wks diff --git a/scripts/lib/wic/canned-wks/imx-barebox.wks b/scripts/lib/wic/canned-wks/imx-barebox.wks deleted file mode 100644 index 0672cbb27..000000000 --- a/scripts/lib/wic/canned-wks/imx-barebox.wks +++ /dev/null @@ -1,17 +0,0 @@ -# short-description: Create SD card image with a boot partition -# long-description: -# Create an image that can be written onto a SD card using dd for use -# with i.MX SoC family -# It uses barebox -# -# The disk layout used is: -# - --------- ------------ -------------- -# | | barebox | bareboxenv | rootfs | -# - --------- ------------ -------------- -# ^ ^ ^ ^ ^ -# | | | | | -# 0 512B 512kiB 4MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB) -# -part barebox --source rawcopy --sourceparams="file=barebox.bin,skip=512" --ondisk mmcblk --no-table -part bareboxenv --source rawcopy --sourceparams="file=bareboxenv.bin" --ondisk mmcblk --no-table --align 512 -part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096 diff --git a/scripts/lib/wic/canned-wks/imx-uboot-spl.wks b/scripts/lib/wic/canned-wks/imx-uboot-spl.wks deleted file mode 100644 index d32afc908..000000000 --- a/scripts/lib/wic/canned-wks/imx-uboot-spl.wks +++ /dev/null @@ -1,17 +0,0 @@ -# short-description: Create SD card image with a boot partition -# long-description: -# Create an image that can be written onto a SD card using dd for use -# with i.MX SoC family. -# It uses SPL and u-boot -# -# The disk layout used is: -# - ----- --------- -------------- -# | | SPL | u-boot | rootfs | -# - ----- --------- -------------- -# ^ ^ ^ ^ ^ -# | | | | | -# 0 1kiB 69kiB 4MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB) -# -part SPL --source rawcopy --sourceparams="file=SPL" --ondisk mmcblk --no-table --align 1 -part u-boot --source rawcopy --sourceparams="file=u-boot.img" --ondisk mmcblk --no-table --align 69 -part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096 diff --git a/scripts/lib/wic/canned-wks/imx-uboot.wks b/scripts/lib/wic/canned-wks/imx-uboot.wks deleted file mode 100644 index d3609771e..000000000 --- a/scripts/lib/wic/canned-wks/imx-uboot.wks +++ /dev/null @@ -1,16 +0,0 @@ -# short-description: Create SD card image with a boot partition -# long-description: -# Create an image that can be written onto a SD card using dd for use -# with i.MX SoC family -# It uses u-boot -# -# The disk layout used is: -# - --------- -------------- -# | | u-boot | rootfs | -# - --------- -------------- -# ^ ^ ^ ^ -# | | | | -# 0 1kiB 4MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB) -# -part u-boot --source rawcopy --sourceparams="file=u-boot.imx" --ondisk mmcblk --no-table --align 1 -part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096 diff --git a/wic/imx-barebox.wks b/wic/imx-barebox.wks new file mode 100644 index 000000000..0672cbb27 --- /dev/null +++ b/wic/imx-barebox.wks @@ -0,0 +1,17 @@ +# short-description: Create SD card image with a boot partition +# long-description: +# Create an image that can be written onto a SD card using dd for use +# with i.MX SoC family +# It uses barebox +# +# The disk layout used is: +# - --------- ------------ -------------- +# | | barebox | bareboxenv | rootfs | +# - --------- ------------ -------------- +# ^ ^ ^ ^ ^ +# | | | | | +# 0 512B 512kiB 4MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB) +# +part barebox --source rawcopy --sourceparams="file=barebox.bin,skip=512" --ondisk mmcblk --no-table +part bareboxenv --source rawcopy --sourceparams="file=bareboxenv.bin" --ondisk mmcblk --no-table --align 512 +part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096 diff --git a/wic/imx-uboot-spl.wks b/wic/imx-uboot-spl.wks new file mode 100644 index 000000000..d32afc908 --- /dev/null +++ b/wic/imx-uboot-spl.wks @@ -0,0 +1,17 @@ +# short-description: Create SD card image with a boot partition +# long-description: +# Create an image that can be written onto a SD card using dd for use +# with i.MX SoC family. +# It uses SPL and u-boot +# +# The disk layout used is: +# - ----- --------- -------------- +# | | SPL | u-boot | rootfs | +# - ----- --------- -------------- +# ^ ^ ^ ^ ^ +# | | | | | +# 0 1kiB 69kiB 4MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB) +# +part SPL --source rawcopy --sourceparams="file=SPL" --ondisk mmcblk --no-table --align 1 +part u-boot --source rawcopy --sourceparams="file=u-boot.img" --ondisk mmcblk --no-table --align 69 +part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096 diff --git a/wic/imx-uboot.wks b/wic/imx-uboot.wks new file mode 100644 index 000000000..d3609771e --- /dev/null +++ b/wic/imx-uboot.wks @@ -0,0 +1,16 @@ +# short-description: Create SD card image with a boot partition +# long-description: +# Create an image that can be written onto a SD card using dd for use +# with i.MX SoC family +# It uses u-boot +# +# The disk layout used is: +# - --------- -------------- +# | | u-boot | rootfs | +# - --------- -------------- +# ^ ^ ^ ^ +# | | | | +# 0 1kiB 4MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB) +# +part u-boot --source rawcopy --sourceparams="file=u-boot.imx" --ondisk mmcblk --no-table --align 1 +part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096 -- cgit v1.2.3-54-g00ecf