From: Fabio Estevam Date: Wed, 14 Dec 2016 15:03:21 +0000 (-0200) Subject: mx6: udoo: Create a mx6qdl directory for consistency X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ba4fabb1ce351f05918cbfcb44eb969e7e741061;p=buildroot.git mx6: udoo: Create a mx6qdl directory for consistency The udoo neo files are currently placed inside udoo/neo directory. Place the mx6qdl udoo related files inside udoo/mx6dl for consistency. [Peter also update path in readme.txt] Suggested-by: Peter Korsgaard Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- diff --git a/board/udoo/genimage.cfg b/board/udoo/genimage.cfg deleted file mode 100644 index 4361d540c7..0000000000 --- a/board/udoo/genimage.cfg +++ /dev/null @@ -1,48 +0,0 @@ -# Minimal microSD card image for Udoo MX6Q/DL boards -# -# We mimic the .sdcard Freescale's image format for i.MX6: -# * the microSD card must have 1 kB free space at the beginning, -# * U-Boot is dumped as is, -# * a FAT partition at offset 16 MB is containing zImage and dtbs, -# * a single root filesystem partition is required (Ext4 in this case). -# - -image boot.vfat { - vfat { - files = { - "imx6q-udoo.dtb", - "imx6dl-udoo.dtb", - "zImage" - } - } - size = 16M -} - -image sdcard.img { - hdimage { - } - - partition SPL { - in-partition-table = "no" - image = "SPL" - offset = 1K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.img" - offset = 69K - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - offset = 16M - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/udoo/linux.fragment b/board/udoo/linux.fragment deleted file mode 100644 index 2acad15757..0000000000 --- a/board/udoo/linux.fragment +++ /dev/null @@ -1 +0,0 @@ -CONFIG_USB=n diff --git a/board/udoo/mx6qdl/genimage.cfg b/board/udoo/mx6qdl/genimage.cfg new file mode 100644 index 0000000000..4361d540c7 --- /dev/null +++ b/board/udoo/mx6qdl/genimage.cfg @@ -0,0 +1,48 @@ +# Minimal microSD card image for Udoo MX6Q/DL boards +# +# We mimic the .sdcard Freescale's image format for i.MX6: +# * the microSD card must have 1 kB free space at the beginning, +# * U-Boot is dumped as is, +# * a FAT partition at offset 16 MB is containing zImage and dtbs, +# * a single root filesystem partition is required (Ext4 in this case). +# + +image boot.vfat { + vfat { + files = { + "imx6q-udoo.dtb", + "imx6dl-udoo.dtb", + "zImage" + } + } + size = 16M +} + +image sdcard.img { + hdimage { + } + + partition SPL { + in-partition-table = "no" + image = "SPL" + offset = 1K + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot.img" + offset = 69K + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + offset = 16M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/udoo/mx6qdl/linux.fragment b/board/udoo/mx6qdl/linux.fragment new file mode 100644 index 0000000000..2acad15757 --- /dev/null +++ b/board/udoo/mx6qdl/linux.fragment @@ -0,0 +1 @@ +CONFIG_USB=n diff --git a/board/udoo/mx6qdl/post-image.sh b/board/udoo/mx6qdl/post-image.sh new file mode 100755 index 0000000000..b4ac4608ff --- /dev/null +++ b/board/udoo/mx6qdl/post-image.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +BOARD_DIR="$(dirname $0)" +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +rm -rf "${GENIMAGE_TMP}" + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" diff --git a/board/udoo/mx6qdl/readme.txt b/board/udoo/mx6qdl/readme.txt new file mode 100644 index 0000000000..cf1a610421 --- /dev/null +++ b/board/udoo/mx6qdl/readme.txt @@ -0,0 +1,17 @@ +Udoo MX6Q/DL board + +For information about MX6 Udoo boards: +http://www.udoo.org/ + +To build a minimal support for these boards: + + $ make mx6udoo_defconfig + $ make + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on a micro SD card: + +dd if=output/images/sdcard.img of=/dev/ + +For details about the medium image layout, see the definition in +board/udoo/mx6qdl/genimage.cfg. diff --git a/board/udoo/post-image.sh b/board/udoo/post-image.sh deleted file mode 100755 index b4ac4608ff..0000000000 --- a/board/udoo/post-image.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" diff --git a/board/udoo/readme.txt b/board/udoo/readme.txt deleted file mode 100644 index acd05f6775..0000000000 --- a/board/udoo/readme.txt +++ /dev/null @@ -1,17 +0,0 @@ -Udoo MX6Q/DL board - -For information about MX6 Udoo boards: -http://www.udoo.org/ - -To build a minimal support for these boards: - - $ make mx6udoo_defconfig - $ make - -Buildroot prepares a bootable "sdcard.img" image in the output/images/ -directory, ready to be dumped on a micro SD card: - -dd if=output/images/sdcard.img of=/dev/ - -For details about the medium image layout, see the definition in -board/udoo/genimage.cfg. diff --git a/configs/mx6udoo_defconfig b/configs/mx6udoo_defconfig index 8c1b28ab5e..394580b820 100644 --- a/configs/mx6udoo_defconfig +++ b/configs/mx6udoo_defconfig @@ -3,7 +3,7 @@ BR2_cortex_a9=y # Linux headers same as kernel, a 4.8 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/udoo/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/udoo/mx6qdl/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y @@ -17,7 +17,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.11" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/udoo/linux.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/udoo/mx6qdl/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-udoo imx6dl-udoo" # required tools to create the SD card image