[Buildroot] [PATCH v9 1/2] genimage.sh: fix calling from BR2_ROOTFS_POST_IMAGE

Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed

* [Buildroot] [PATCH v9 1/2] genimage.sh: fix calling from BR2_ROOTFS_POST_IMAGE_SCRIPT
@ 2017-04-21 18:58 Abhimanyu Vishwakarma
  2017-04-21 18:58 ` [Buildroot] [PATCH v9 2/2] Add defconfig for MIPS Creator ci40 Abhimanyu Vishwakarma
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Abhimanyu Vishwakarma @ 2017-04-21 18:58 UTC (permalink / raw)
  To: buildroot

From: Abhimanyu Vishwakarma <Abhimanyu.V@gmail.com>

When called from BR2_ROOTFS_POST_IMAGE_SCRIPT, this script
ends up with following error:

Error: Missing argument

This is because, extra positional argument is also passed
along with BR2_ROOTFS_POST_SCRIPT_ARGS. genimage.sh didnt
had support to parse positional and optional argument
together.

Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.V@gmail.com>
---
 Changes v7->v8
   - New file
 Changes v8->v9
   - Fix indentation
   - Use bash basename as script name instead hardcoding

 support/scripts/genimage.sh | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/support/scripts/genimage.sh b/support/scripts/genimage.sh
index 0ed0e8bcc..a2309e224 100755
--- a/support/scripts/genimage.sh
+++ b/support/scripts/genimage.sh
@@ -1,17 +1,26 @@
 #!/bin/bash
 
 die() {
-  echo "Error: $@" >&2
-  exit 1
+	echo "Error: $@" >&2
+	exit 1
 }
 
+# Parse arguments and put into argument list of the script
+opts="$(getopt -n "${0##*/}" -o c: -- "$@")" || exit $?
+eval set -- "$opts"
+
 GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
 
-while getopts c: OPT ; do
-	case "${OPT}" in
-	c) GENIMAGE_CFG="${OPTARG}";;
-	:) die "option '${OPTARG}' expects a mandatory argument\n";;
-	\?) die "unknown option '${OPTARG}'\n";;
+while true ; do
+	case "$1" in
+		-c)
+			GENIMAGE_CFG="${2}";
+			shift 2 ;;
+		--) # Discard all non-option parameters
+			shift 1;
+			break ;;
+		*)
+			die "unknown option '${1}'" ;;
 	esac
 done
 
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH v9 2/2] Add defconfig for MIPS Creator ci40
  2017-04-21 18:58 [Buildroot] [PATCH v9 1/2] genimage.sh: fix calling from BR2_ROOTFS_POST_IMAGE_SCRIPT Abhimanyu Vishwakarma
@ 2017-04-21 18:58 ` Abhimanyu Vishwakarma
  2017-04-22  7:09   ` Rahul Bedarkar
  2017-04-22  7:14 ` [Buildroot] [PATCH v9 1/2] genimage.sh: fix calling from BR2_ROOTFS_POST_IMAGE_SCRIPT Rahul Bedarkar
  2017-04-23 21:27 ` Arnout Vandecappelle
  2 siblings, 1 reply; 5+ messages in thread
From: Abhimanyu Vishwakarma @ 2017-04-21 18:58 UTC (permalink / raw)
  To: buildroot

From: Abhimanyu Vishwakarma <Abhimanyu.V@gmail.com>

Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.V@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

---
 Changes v1->v2
  - No change
 Changes v2->v3 (Suggested by Arnout)
  - Remove uImage and add fitImage generation
  - Tidy readme.txt
  - Tidy ci40_defconfig, remove custom toolchain and add wifi helper packages
  Some changes are not done:
  - Using git-helper:
    - Custom kernel doesnt provide tar file, so it didnt work for me
 Changes v3->v4 (Suggested by Arnout)
  - Use github helper for getting kernel/u-boot
  - rename fitImage.its -> fitImage.its.in to reflect as template file,
    remove hardcoded dtb filename
  - Find dtb file in output/images directory and use first dtb in fitImage
  - Remove image size from genimage.cfg
  - Tidy readme.txt and add section to explain how to stop u-boot autoboot,
    how to make it persistent, and other grammar
 Changes v4->v5 (Suggested by Thomas)
  - Use fixed kernel entry addr
  - Generate vmlinux.bin.gz from generate vmlinux.bin
  - Remove generating uImage (not required for anything now)
 Changes v5->v6
  - Use kernel generate fitimage
  - bump up u-boot version
  - Change emailid from imgtec.com -> personal id
 Changes v6->v7 (Suggested by Thomas)
  - Use genimage.sh script
  - Improve and fix grammer in readme.txt
 Changes v7->v8 (Suggested by Arnout)
  - Use genimage.sh script from POST_IMAGE_SCRIPT
  - Use uboot kconfig base config
  - Remove dts config from defconfig
  - Some other small cleanup
  - rebase on master
 Changes v8->v9 (Suggested by Arnout)
  - Use sh instead of bash where bash feature is not needed
  - Use sudo for command run on user PC
  - Update bootloader flashing help text in readme.txt

 board/ci40/genimage.cfg  | 12 +++++++++
 board/ci40/post-build.sh |  4 +++
 board/ci40/readme.txt    | 65 ++++++++++++++++++++++++++++++++++++++++++++++++
 configs/ci40_defconfig   | 48 +++++++++++++++++++++++++++++++++++
 4 files changed, 129 insertions(+)
 create mode 100644 board/ci40/genimage.cfg
 create mode 100755 board/ci40/post-build.sh
 create mode 100644 board/ci40/readme.txt
 create mode 100644 configs/ci40_defconfig

diff --git a/board/ci40/genimage.cfg b/board/ci40/genimage.cfg
new file mode 100644
index 000000000..0ffc91ce8
--- /dev/null
+++ b/board/ci40/genimage.cfg
@@ -0,0 +1,12 @@
+# Minimal SD card image
+#
+
+image sdcard.img {
+  hdimage {
+  }
+
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext4"
+  }
+}
diff --git a/board/ci40/post-build.sh b/board/ci40/post-build.sh
new file mode 100755
index 000000000..9af74c7a7
--- /dev/null
+++ b/board/ci40/post-build.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Copy to target
+cp ${BINARIES_DIR}/vmlinux.gz.itb ${TARGET_DIR}/fitImage
diff --git a/board/ci40/readme.txt b/board/ci40/readme.txt
new file mode 100644
index 000000000..ba1eb9388
--- /dev/null
+++ b/board/ci40/readme.txt
@@ -0,0 +1,65 @@
+*********************
+* MIPS Creator CI40 *
+*********************
+
+This document details how to build and run a Buildroot system on the
+MIPS Creator CI40 platform. For more details about the CI40, see
+https://creatordev.io/ci40-iot-hub.html.
+
+How to build
+------------
+
+$ make ci40_defconfig
+$ make
+
+Prepare USB/MMC for boot
+------------------------
+
+On successful build, "sdcard.img" file will be created in 'output/images'
+folder.
+
+Use following command to write image to bootable device
+
+$ sudo dd if=./output/images/sdcard.img of=/dev/<your-microsd-or-usb-device>
+
+Booting from USB/MMC
+--------------------
+
+The boot loader is already present in NOR flash. To boot your newly generated
+Linux and root filesystem, you need to interrupt U-Boot autoboot. Current
+U-Boot is configured with 2 seconds of boot-delay, after expiry of this
+boot-delay timeout U-Boot starts booting the default image. To interrupt
+autoboot, press any key before the boot-delay time expires, U-Boot will
+stop the autoboot process and give a U-Boot prompt. You can now boot to
+your preferred boot method as describe below:
+
+From USB
+  pistachio # run usbboot
+
+From SD-Card
+  pistachio # run mmcboot
+
+Persistent boot command
+-----------------------
+
+To boot automatically to your preferred boot method, use following command to
+make it persistent, for example to automatically boot to usb:
+
+  pistachio # setenv bootcmd run usbboot
+  pistachio # saveenv
+
+Flash new bootloader
+--------------------
+
+The bootloader image will be available in the 'output/images' folder. To flash
+the new bootloader, copy it to the device and use the following command on the
+device:
+
+# flashcp -v u-boot-pistachio_marduk-<version>.img /dev/mtd0
+
+Online docs
+-----------
+
+Mostly for OpenWRT but it is applicable to Buildroot
+https://docs.creatordev.io/ci40/guides/openwrt-platform/#overview
+
diff --git a/configs/ci40_defconfig b/configs/ci40_defconfig
new file mode 100644
index 000000000..2ea3afe47
--- /dev/null
+++ b/configs/ci40_defconfig
@@ -0,0 +1,48 @@
+# architecture
+BR2_mipsel=y
+BR2_mips_32r2=y
+
+# linux header same as custom kernel ie 4.4.x
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+
+# kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,CreatorDev,linux,openwrt-4.4.14)/linux-openwrt-4.4.14.tar.gz"
+BR2_LINUX_KERNEL_DEFCONFIG="pistachio"
+BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
+# vmlinux.gz.itb image includes img/pistachio_marduk device tree
+BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="vmlinux.gz.itb"
+
+# bootloader flash support
+BR2_PACKAGE_MTD=y
+
+# wireless firmware
+BR2_PACKAGE_UCCP420WLAN=y
+
+# wireless package
+BR2_PACKAGE_WIRELESS_TOOLS=y
+BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
+
+# bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pistachio_marduk"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,CreatorDev,u-boot,v1.0.5)/u-boot-CreatorDev-v1.0.5.tar.gz"
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-pistachio_marduk-2015.10-v1.0.5.img"
+
+# fitimage / image generation
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/ci40/post-build.sh"
+
+# image generation
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ci40/genimage.cfg"
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH v9 2/2] Add defconfig for MIPS Creator ci40
  2017-04-21 18:58 ` [Buildroot] [PATCH v9 2/2] Add defconfig for MIPS Creator ci40 Abhimanyu Vishwakarma
@ 2017-04-22  7:09   ` Rahul Bedarkar
  0 siblings, 0 replies; 5+ messages in thread
From: Rahul Bedarkar @ 2017-04-22  7:09 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, Apr 22, 2017 at 12:28 AM, Abhimanyu Vishwakarma
<abhimanyu.v@gmail.com> wrote:
> From: Abhimanyu Vishwakarma <Abhimanyu.V@gmail.com>
>
> Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.V@gmail.com>
> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>
> ---
>  Changes v1->v2
>   - No change
>  Changes v2->v3 (Suggested by Arnout)
>   - Remove uImage and add fitImage generation
>   - Tidy readme.txt
>   - Tidy ci40_defconfig, remove custom toolchain and add wifi helper packages
>   Some changes are not done:
>   - Using git-helper:
>     - Custom kernel doesnt provide tar file, so it didnt work for me
>  Changes v3->v4 (Suggested by Arnout)
>   - Use github helper for getting kernel/u-boot
>   - rename fitImage.its -> fitImage.its.in to reflect as template file,
>     remove hardcoded dtb filename
>   - Find dtb file in output/images directory and use first dtb in fitImage
>   - Remove image size from genimage.cfg
>   - Tidy readme.txt and add section to explain how to stop u-boot autoboot,
>     how to make it persistent, and other grammar
>  Changes v4->v5 (Suggested by Thomas)
>   - Use fixed kernel entry addr
>   - Generate vmlinux.bin.gz from generate vmlinux.bin
>   - Remove generating uImage (not required for anything now)
>  Changes v5->v6
>   - Use kernel generate fitimage
>   - bump up u-boot version
>   - Change emailid from imgtec.com -> personal id
>  Changes v6->v7 (Suggested by Thomas)
>   - Use genimage.sh script
>   - Improve and fix grammer in readme.txt
>  Changes v7->v8 (Suggested by Arnout)
>   - Use genimage.sh script from POST_IMAGE_SCRIPT
>   - Use uboot kconfig base config
>   - Remove dts config from defconfig
>   - Some other small cleanup
>   - rebase on master
>  Changes v8->v9 (Suggested by Arnout)
>   - Use sh instead of bash where bash feature is not needed
>   - Use sudo for command run on user PC
>   - Update bootloader flashing help text in readme.txt
>
>  board/ci40/genimage.cfg  | 12 +++++++++
>  board/ci40/post-build.sh |  4 +++
>  board/ci40/readme.txt    | 65 ++++++++++++++++++++++++++++++++++++++++++++++++
>  configs/ci40_defconfig   | 48 +++++++++++++++++++++++++++++++++++
>  4 files changed, 129 insertions(+)
>  create mode 100644 board/ci40/genimage.cfg
>  create mode 100755 board/ci40/post-build.sh
>  create mode 100644 board/ci40/readme.txt
>  create mode 100644 configs/ci40_defconfig

Tried usbboot, Ci40 successfully booted using generated sdcard.img.

Tested-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>

Thanks,
Rahul

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH v9 1/2] genimage.sh: fix calling from BR2_ROOTFS_POST_IMAGE_SCRIPT
  2017-04-21 18:58 [Buildroot] [PATCH v9 1/2] genimage.sh: fix calling from BR2_ROOTFS_POST_IMAGE_SCRIPT Abhimanyu Vishwakarma
  2017-04-21 18:58 ` [Buildroot] [PATCH v9 2/2] Add defconfig for MIPS Creator ci40 Abhimanyu Vishwakarma
@ 2017-04-22  7:14 ` Rahul Bedarkar
  2017-04-23 21:27 ` Arnout Vandecappelle
  2 siblings, 0 replies; 5+ messages in thread
From: Rahul Bedarkar @ 2017-04-22  7:14 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, Apr 22, 2017 at 12:28 AM, Abhimanyu Vishwakarma
<abhimanyu.v@gmail.com> wrote:
> From: Abhimanyu Vishwakarma <Abhimanyu.V@gmail.com>
>
> When called from BR2_ROOTFS_POST_IMAGE_SCRIPT, this script
> ends up with following error:
>
> Error: Missing argument
>
> This is because, extra positional argument is also passed
> along with BR2_ROOTFS_POST_SCRIPT_ARGS. genimage.sh didnt
> had support to parse positional and optional argument
> together.
>
> Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.V@gmail.com>
> ---
>  Changes v7->v8
>    - New file
>  Changes v8->v9
>    - Fix indentation
>    - Use bash basename as script name instead hardcoding
>
>  support/scripts/genimage.sh | 23 ++++++++++++++++-------
>  1 file changed, 16 insertions(+), 7 deletions(-)
>

genimage.sh generated sdcard.img with Ci40 defconfig without any errors.

Tested-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>

Thanks,
Rahul

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH v9 1/2] genimage.sh: fix calling from BR2_ROOTFS_POST_IMAGE_SCRIPT
  2017-04-21 18:58 [Buildroot] [PATCH v9 1/2] genimage.sh: fix calling from BR2_ROOTFS_POST_IMAGE_SCRIPT Abhimanyu Vishwakarma
  2017-04-21 18:58 ` [Buildroot] [PATCH v9 2/2] Add defconfig for MIPS Creator ci40 Abhimanyu Vishwakarma
  2017-04-22  7:14 ` [Buildroot] [PATCH v9 1/2] genimage.sh: fix calling from BR2_ROOTFS_POST_IMAGE_SCRIPT Rahul Bedarkar
@ 2017-04-23 21:27 ` Arnout Vandecappelle
  2 siblings, 0 replies; 5+ messages in thread
From: Arnout Vandecappelle @ 2017-04-23 21:27 UTC (permalink / raw)
  To: buildroot



On 21-04-17 20:58, Abhimanyu Vishwakarma wrote:
> From: Abhimanyu Vishwakarma <Abhimanyu.V@gmail.com>
> 
> When called from BR2_ROOTFS_POST_IMAGE_SCRIPT, this script
> ends up with following error:
> 
> Error: Missing argument
> 
> This is because, extra positional argument is also passed
                   ^an

> along with BR2_ROOTFS_POST_SCRIPT_ARGS. genimage.sh didnt
                                                          ^'
> had support to parse positional and optional argument
    ^ve                                                ^s

> together.
> 
> Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.V@gmail.com>
> ---
>  Changes v7->v8
>    - New file
>  Changes v8->v9
>    - Fix indentation
>    - Use bash basename as script name instead hardcoding
> 
>  support/scripts/genimage.sh | 23 ++++++++++++++++-------
>  1 file changed, 16 insertions(+), 7 deletions(-)
> 
> diff --git a/support/scripts/genimage.sh b/support/scripts/genimage.sh
> index 0ed0e8bcc..a2309e224 100755
> --- a/support/scripts/genimage.sh
> +++ b/support/scripts/genimage.sh
> @@ -1,17 +1,26 @@
>  #!/bin/bash
>  
>  die() {
> -  echo "Error: $@" >&2
> -  exit 1
> +	echo "Error: $@" >&2
> +	exit 1

 Avoid mixing whitespace fixes with other fixes in the same patch. I.e., split
this up in a  separate patch (fixing indentation all over).

>  }
>  
> +# Parse arguments and put into argument list of the script
> +opts="$(getopt -n "${0##*/}" -o c: -- "$@")" || exit $?
> +eval set -- "$opts"
> +
>  GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
>  
> -while getopts c: OPT ; do
> -	case "${OPT}" in
> -	c) GENIMAGE_CFG="${OPTARG}";;
> -	:) die "option '${OPTARG}' expects a mandatory argument\n";;
> -	\?) die "unknown option '${OPTARG}'\n";;
> +while true ; do
> +	case "$1" in
> +		-c)

 We sometimes do and sometimes don't indent inside a case statement in shell
scripts. Annoying inconsistency. However, this file _didn't_ indent, so stick to
that coding style.

 But all this is just minor things, so

Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

(if you resubmit, make sure you copy the above Reviewed-by, except when you make
changes not mentioned in my review).

 Regards,
 Arnout

> +			GENIMAGE_CFG="${2}";
> +			shift 2 ;;
> +		--) # Discard all non-option parameters
> +			shift 1;
> +			break ;;
> +		*)
> +			die "unknown option '${1}'" ;;
>  	esac
>  done
>  
> 

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2017-04-23 21:27 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-21 18:58 [Buildroot] [PATCH v9 1/2] genimage.sh: fix calling from BR2_ROOTFS_POST_IMAGE_SCRIPT Abhimanyu Vishwakarma
2017-04-21 18:58 ` [Buildroot] [PATCH v9 2/2] Add defconfig for MIPS Creator ci40 Abhimanyu Vishwakarma
2017-04-22  7:09   ` Rahul Bedarkar
2017-04-22  7:14 ` [Buildroot] [PATCH v9 1/2] genimage.sh: fix calling from BR2_ROOTFS_POST_IMAGE_SCRIPT Rahul Bedarkar
2017-04-23 21:27 ` Arnout Vandecappelle

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox