* [ptxdist] [PATCH / RFC] replace umkimage by u-boot sources
@ 2012-01-21 16:59 Andreas Bießmann
2012-01-21 18:22 ` Michael Olbrich
` (3 more replies)
0 siblings, 4 replies; 22+ messages in thread
From: Andreas Bießmann @ 2012-01-21 16:59 UTC (permalink / raw)
To: PTXdist ML
This patch removes the forked mkimage u-boot tool and uses the mainline
u-boot code to build this tool.
Signed-off-by: Andreas Bießmann <andreas@biessmann.de>
---
Treat this as an RFC, especially the fw_{save|print}env tool is subject to
discuss.
Some additional questions:
* how to handle the situation where only U_BOOT_TOOLS but no
U_BOOT_TOOLS_TOOL_xxx is choosen?
* How to inject a user provided configuration for fw_printenv?
platforms/hosttools.in | 2 +-
platforms/image_uimage.in | 8 ++--
platforms/kernel.in | 2 +-
rules/host-u-boot-tools.in | 8 ++++
rules/host-u-boot-tools.make | 33 +++++++++++++++
rules/host-umkimage.in | 8 ----
rules/host-umkimage.make | 37 -----------------
rules/templates/template-kernel-in | 2 +-
rules/u-boot-tools.in | 27 ++++++++++++
rules/u-boot-tools.make | 78 ++++++++++++++++++++++++++++++++++++
rules/umkimage.in | 8 ----
rules/umkimage.make | 66 ------------------------------
12 files changed, 153 insertions(+), 126 deletions(-)
create mode 100644 rules/host-u-boot-tools.in
create mode 100644 rules/host-u-boot-tools.make
delete mode 100644 rules/host-umkimage.in
delete mode 100644 rules/host-umkimage.make
create mode 100644 rules/u-boot-tools.in
create mode 100644 rules/u-boot-tools.make
delete mode 100644 rules/umkimage.in
delete mode 100644 rules/umkimage.make
diff --git a/platforms/hosttools.in b/platforms/hosttools.in
index 155b30b..e9ce0fc 100644
--- a/platforms/hosttools.in
+++ b/platforms/hosttools.in
@@ -19,7 +19,7 @@ source "rules/host-mtd-utils.in"
source "rules/host-mtools.in"
source "rules/host-openssl.in"
source "rules/host-squashfs-tools.in"
-source "rules/host-umkimage.in"
+source "rules/host-u-boot-tools.in"
source "rules/host-util-linux-ng.in"
source "rules/host-xl-tools.in"
source "rules/host-xz.in"
diff --git a/platforms/image_uimage.in b/platforms/image_uimage.in
index 62119c4..719793d 100644
--- a/platforms/image_uimage.in
+++ b/platforms/image_uimage.in
@@ -3,7 +3,7 @@
menuconfig IMAGE_UIMAGE
bool
prompt "Generate images/uRamdisk "
- select HOST_UMKIMAGE
+ select HOST_U_BOOT_TOOLS
select IMAGE_EXT2
select IMAGE_EXT2_GZIP
help
@@ -21,16 +21,16 @@ config IMAGE_UIMAGE_NAME
config IMAGE_UIMAGE_EXTRA_ARGS
string
default ""
- prompt "extra arguments passed to umkimage"
+ prompt "extra arguments passed to mkimage"
help
- If needed you can add extra arguments for umkimage here
+ If needed you can add extra arguments for mkimage here
(e.g. -a 0xaa00000 -e 0xaa00000 )
# TODO: See comment in rules/post/images.make for this topic
#config IMAGE_UIMAGE_MULTI
# bool
# prompt "Generate a multi image images/muimage"
-# select HOST_UMKIMAGE
+# select HOST_U_BOOT_TOOLS
# select KERNEL
# select IMAGE_CPIO
# help
diff --git a/platforms/kernel.in b/platforms/kernel.in
index b601284..01b31d3 100644
--- a/platforms/kernel.in
+++ b/platforms/kernel.in
@@ -2,7 +2,7 @@ menuconfig KERNEL
bool
default y
select IMAGE_KERNEL
- select HOST_UMKIMAGE if KERNEL_IMAGE_U
+ select HOST_U_BOOT_TOOLS if KERNEL_IMAGE_U
select HOST_XZ if KERNEL_XZ
select HOST_LZOP if KERNEL_LZOP
select CROSS_MODULE_INIT_TOOLS if KERNEL_MODULES
diff --git a/rules/host-u-boot-tools.in b/rules/host-u-boot-tools.in
new file mode 100644
index 0000000..b653430
--- /dev/null
+++ b/rules/host-u-boot-tools.in
@@ -0,0 +1,8 @@
+## SECTION=hosttools_noprompt
+
+config HOST_U_BOOT_TOOLS
+ tristate
+ default ALLYES
+ help
+ the U-Boot tools contains the mkimage command which is used
+ to create boot images for the U-Boot bootloader.
diff --git a/rules/host-u-boot-tools.make b/rules/host-u-boot-tools.make
new file mode 100644
index 0000000..ec804c3
--- /dev/null
+++ b/rules/host-u-boot-tools.make
@@ -0,0 +1,33 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2012 by Andreas Bießmann <andreas@biessmann.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_U_BOOT_TOOLS) += host-u-boot-tools
+
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+HOST_U_BOOT_TOOLS_CONF_TOOL := NO
+HOST_U_BOOT_TOOLS_MAKE_OPT := tools
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/host-u-boot-tools.install:
+ @$(call targetinfo)
+ install $(HOST_U_BOOT_TOOLS_DIR)/tools/mkimage $(PTXCONF_SYSROOT_HOST)/bin/mkimage
+ @$(call touch)
+
+# vim: syntax=make
diff --git a/rules/host-umkimage.in b/rules/host-umkimage.in
deleted file mode 100644
index b2990b8..0000000
--- a/rules/host-umkimage.in
+++ /dev/null
@@ -1,8 +0,0 @@
-## SECTION=hosttools_noprompt
-
-config HOST_UMKIMAGE
- tristate
- default ALLYES
- help
- umkimage is the U-Boot mkimage command. It is used to create
- boot images for the U-Boot bootloader.
diff --git a/rules/host-umkimage.make b/rules/host-umkimage.make
deleted file mode 100644
index 6b66e18..0000000
--- a/rules/host-umkimage.make
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2003-2006 by Pengutronix e.K., Hildesheim, Germany
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-HOST_PACKAGES-$(PTXCONF_HOST_UMKIMAGE) += host-umkimage
-
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-HOST_UMKIMAGE_CONF_TOOL := NO
-HOST_UMKIMAGE_MAKE_OPT := \
- $(HOST_ENV_CPPFLAGS) \
- $(HOST_ENV_LDFLAGS) \
- $(HOST_ENV_CC)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/host-umkimage.install:
- @$(call targetinfo)
- install $(HOST_UMKIMAGE_DIR)/mkimage $(PTXCONF_SYSROOT_HOST)/bin/mkimage
- @$(call touch)
-
-# vim: syntax=make
diff --git a/rules/templates/template-kernel-in b/rules/templates/template-kernel-in
index ae1095b..5019c88 100644
--- a/rules/templates/template-kernel-in
+++ b/rules/templates/template-kernel-in
@@ -4,6 +4,6 @@ config KERNEL_@PACKAGE@
tristate
prompt "Linux kernel (@package@)"
select CROSS_MODULE_INIT_TOOLS
- #select HOST_UMKIMAGE
+ #select HOST_U_BOOT_TOOLS
help
FIXME
diff --git a/rules/u-boot-tools.in b/rules/u-boot-tools.in
new file mode 100644
index 0000000..9119a82
--- /dev/null
+++ b/rules/u-boot-tools.in
@@ -0,0 +1,27 @@
+## SECTION=shell_and_console
+
+menuconfig U_BOOT_TOOLS
+ tristate
+ prompt "u-boot-tools "
+ help
+ some helpful tools from U-Boot project.
+
+if U_BOOT_TOOLS
+
+config U_BOOT_TOOLS_TOOL_MKIMAGE
+ tristate
+ default y
+ prompt "mkimage"
+ help
+ the U-Boot mkimage command is used to create boot images for
+ the U-Boot bootloader.
+
+config U_BOOT_TOOLS_TOOL_ENV
+ tristate
+ default n
+ prompt "fw_{print|save}env"
+ help
+ the U-Boot fw_printenv and fw_saveenv commands are used to
+ read and write environment partitions on target.
+
+endif
diff --git a/rules/u-boot-tools.make b/rules/u-boot-tools.make
new file mode 100644
index 0000000..cd14a0e
--- /dev/null
+++ b/rules/u-boot-tools.make
@@ -0,0 +1,78 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2012 by Andreas Bießmann <andreas@biessmann.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_U_BOOT_TOOLS) += u-boot-tools
+
+#
+# Paths and names
+#
+U_BOOT_TOOLS_VERSION := 2011.12
+U_BOOT_TOOLS_MD5 := 7f29b9f6da44d6e46e988e7561fd1d5f
+U_BOOT_TOOLS := u-boot-$(U_BOOT_TOOLS_VERSION)
+U_BOOT_TOOLS_SUFFIX := tar.bz2
+U_BOOT_TOOLS_URL := http://ftp.denx.de/pub/u-boot/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX)
+U_BOOT_TOOLS_SOURCE := $(SRCDIR)/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX)
+U_BOOT_TOOLS_DIR := $(BUILDDIR)/$(U_BOOT_TOOLS)
+U_BOOT_TOOLS_LICENSE := GPLv2
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+$(U_BOOT_TOOLS_SOURCE):
+ @$(call targetinfo)
+ @$(call get, U_BOOT_TOOLS)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+U_BOOT_TOOLS_CONF_TOOL := NO
+U_BOOT_TOOLS_MAKE_OPT := \
+ HOSTCC="$(CROSS_CC)" \
+ HOSTSTRIP="$(CROSS_STRIP)" \
+ tools
+ifdef PTXCONF_U_BOOT_TOOLS_TOOL_ENV
+U_BOOT_TOOLS_MAKE_OPT += env
+endif
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+$(STATEDIR)/u-boot-tools.install:
+ @$(call targetinfo)
+ @$(call touch)
+
+$(STATEDIR)/u-boot-tools.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, u-boot-tools)
+ @$(call install_fixup, u-boot-tools,PRIORITY,optional)
+ @$(call install_fixup, u-boot-tools,SECTION,base)
+ @$(call install_fixup, u-boot-tools,AUTHOR,"Andreas Bießmann <andreas@biessmann.de>")
+ @$(call install_fixup, u-boot-tools,DESCRIPTION,missing)
+
+ifdef PTXCONF_U_BOOT_TOOLS_TOOL_MKIMAGE
+ @$(call install_copy, u-boot-tools, 0, 0, 0755, $(U_BOOT_TOOLS_DIR)/tools/mkimage, /usr/bin/mkimage)
+endif
+
+ifdef PTXCONF_U_BOOT_TOOLS_TOOL_ENV
+ @$(call install_copy, u-boot-tools, 0, 0, 0755, $(U_BOOT_TOOLS_DIR)/tools/env/fw_printenv, /usr/sbin/fw_printenv)
+ @$(call install_link, u-boot-tools, fw_printenv, /usr/sbin/fw_saveenv)
+endif
+
+ @$(call install_finish, u-boot-tools)
+
+ @$(call touch)
+
+# vim: syntax=make
diff --git a/rules/umkimage.in b/rules/umkimage.in
deleted file mode 100644
index ffff541..0000000
--- a/rules/umkimage.in
+++ /dev/null
@@ -1,8 +0,0 @@
-## SECTION=shell_and_console
-
-config UMKIMAGE
- tristate
- prompt "umkimage"
- help
- umkimage is the U-Boot mkimage command. It is used to create
- boot images for the U-Boot bootloader.
diff --git a/rules/umkimage.make b/rules/umkimage.make
deleted file mode 100644
index ae5f316..0000000
--- a/rules/umkimage.make
+++ /dev/null
@@ -1,66 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2010 by Remy Bohmer <linux@bohmer.net>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_UMKIMAGE) += umkimage
-
-#
-# Paths and names
-#
-UMKIMAGE_VERSION := 2010.03-1
-UMKIMAGE_MD5 := 5e7b4ed03e855a4824317fc4e3917dba
-UMKIMAGE := u-boot-mkimage-$(UMKIMAGE_VERSION)
-UMKIMAGE_SUFFIX := tar.gz
-UMKIMAGE_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(UMKIMAGE).$(UMKIMAGE_SUFFIX)
-UMKIMAGE_SOURCE := $(SRCDIR)/$(UMKIMAGE).$(UMKIMAGE_SUFFIX)
-UMKIMAGE_DIR := $(BUILDDIR)/$(UMKIMAGE)
-UMKIMAGE_LICENSE := GPLv2
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-$(UMKIMAGE_SOURCE):
- @$(call targetinfo)
- @$(call get, UMKIMAGE)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-UMKIMAGE_CONF_TOOL := NO
-UMKIMAGE_MAKE_OPT := \
- $(CROSS_ENV_CFLAGS) \
- $(CROSS_ENV_CPPFLAGS) \
- $(CROSS_ENV_LDFLAGS) \
- $(CROSS_ENV_CC)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/umkimage.targetinstall:
- @$(call targetinfo)
-
- @$(call install_init, umkimage)
- @$(call install_fixup, umkimage,PRIORITY,optional)
- @$(call install_fixup, umkimage,SECTION,base)
- @$(call install_fixup, umkimage,AUTHOR,"Remy Bohmer <linux@bohmer.net>")
- @$(call install_fixup, umkimage,DESCRIPTION,missing)
-
- @$(call install_copy, umkimage, 0, 0, 0755, -, /usr/bin/mkimage)
-
- @$(call install_finish, umkimage)
-
- @$(call touch)
-
-# vim: syntax=make
--
1.7.8.3
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCH / RFC] replace umkimage by u-boot sources
2012-01-21 16:59 [ptxdist] [PATCH / RFC] replace umkimage by u-boot sources Andreas Bießmann
@ 2012-01-21 18:22 ` Michael Olbrich
2012-01-21 20:08 ` Bernhard Walle
2012-01-22 9:58 ` Andreas Bießmann
2012-01-22 14:49 ` [ptxdist] [PATCH v2] " Andreas Bießmann
` (2 subsequent siblings)
3 siblings, 2 replies; 22+ messages in thread
From: Michael Olbrich @ 2012-01-21 18:22 UTC (permalink / raw)
To: ptxdist
On Sat, Jan 21, 2012 at 05:59:01PM +0100, Andreas Bießmann wrote:
> This patch removes the forked mkimage u-boot tool and uses the mainline
> u-boot code to build this tool.
>
> Signed-off-by: Andreas Bießmann <andreas@biessmann.de>
> ---
> Treat this as an RFC, especially the fw_{save|print}env tool is subject to
> discuss.
>
> Some additional questions:
> * how to handle the situation where only U_BOOT_TOOLS but no
> U_BOOT_TOOLS_TOOL_xxx is choosen?
Keep it like it is. We have many other packages like that.
> * How to inject a user provided configuration for fw_printenv?
I don't know fw_printenv. Please elaborate.
> platforms/hosttools.in | 2 +-
> platforms/image_uimage.in | 8 ++--
> platforms/kernel.in | 2 +-
> rules/host-u-boot-tools.in | 8 ++++
> rules/host-u-boot-tools.make | 33 +++++++++++++++
> rules/host-umkimage.in | 8 ----
> rules/host-umkimage.make | 37 -----------------
> rules/templates/template-kernel-in | 2 +-
> rules/u-boot-tools.in | 27 ++++++++++++
> rules/u-boot-tools.make | 78 ++++++++++++++++++++++++++++++++++++
> rules/umkimage.in | 8 ----
> rules/umkimage.make | 66 ------------------------------
> 12 files changed, 153 insertions(+), 126 deletions(-)
> create mode 100644 rules/host-u-boot-tools.in
> create mode 100644 rules/host-u-boot-tools.make
> delete mode 100644 rules/host-umkimage.in
> delete mode 100644 rules/host-umkimage.make
> create mode 100644 rules/u-boot-tools.in
> create mode 100644 rules/u-boot-tools.make
> delete mode 100644 rules/umkimage.in
> delete mode 100644 rules/umkimage.make
>
> diff --git a/platforms/hosttools.in b/platforms/hosttools.in
> index 155b30b..e9ce0fc 100644
> --- a/platforms/hosttools.in
> +++ b/platforms/hosttools.in
> @@ -19,7 +19,7 @@ source "rules/host-mtd-utils.in"
> source "rules/host-mtools.in"
> source "rules/host-openssl.in"
> source "rules/host-squashfs-tools.in"
> -source "rules/host-umkimage.in"
> +source "rules/host-u-boot-tools.in"
> source "rules/host-util-linux-ng.in"
> source "rules/host-xl-tools.in"
> source "rules/host-xz.in"
> diff --git a/platforms/image_uimage.in b/platforms/image_uimage.in
> index 62119c4..719793d 100644
> --- a/platforms/image_uimage.in
> +++ b/platforms/image_uimage.in
> @@ -3,7 +3,7 @@
> menuconfig IMAGE_UIMAGE
> bool
> prompt "Generate images/uRamdisk "
> - select HOST_UMKIMAGE
> + select HOST_U_BOOT_TOOLS
> select IMAGE_EXT2
> select IMAGE_EXT2_GZIP
> help
> @@ -21,16 +21,16 @@ config IMAGE_UIMAGE_NAME
> config IMAGE_UIMAGE_EXTRA_ARGS
> string
> default ""
> - prompt "extra arguments passed to umkimage"
> + prompt "extra arguments passed to mkimage"
> help
> - If needed you can add extra arguments for umkimage here
> + If needed you can add extra arguments for mkimage here
> (e.g. -a 0xaa00000 -e 0xaa00000 )
>
> # TODO: See comment in rules/post/images.make for this topic
> #config IMAGE_UIMAGE_MULTI
> # bool
> # prompt "Generate a multi image images/muimage"
> -# select HOST_UMKIMAGE
> +# select HOST_U_BOOT_TOOLS
> # select KERNEL
> # select IMAGE_CPIO
> # help
> diff --git a/platforms/kernel.in b/platforms/kernel.in
> index b601284..01b31d3 100644
> --- a/platforms/kernel.in
> +++ b/platforms/kernel.in
> @@ -2,7 +2,7 @@ menuconfig KERNEL
> bool
> default y
> select IMAGE_KERNEL
> - select HOST_UMKIMAGE if KERNEL_IMAGE_U
> + select HOST_U_BOOT_TOOLS if KERNEL_IMAGE_U
> select HOST_XZ if KERNEL_XZ
> select HOST_LZOP if KERNEL_LZOP
> select CROSS_MODULE_INIT_TOOLS if KERNEL_MODULES
> diff --git a/rules/host-u-boot-tools.in b/rules/host-u-boot-tools.in
> new file mode 100644
> index 0000000..b653430
> --- /dev/null
> +++ b/rules/host-u-boot-tools.in
> @@ -0,0 +1,8 @@
> +## SECTION=hosttools_noprompt
> +
> +config HOST_U_BOOT_TOOLS
> + tristate
> + default ALLYES
> + help
> + the U-Boot tools contains the mkimage command which is used
> + to create boot images for the U-Boot bootloader.
Can we even see the help for a noprompt option?
> diff --git a/rules/host-u-boot-tools.make b/rules/host-u-boot-tools.make
> new file mode 100644
> index 0000000..ec804c3
> --- /dev/null
> +++ b/rules/host-u-boot-tools.make
> @@ -0,0 +1,33 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2012 by Andreas Bießmann <andreas@biessmann.de>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +HOST_PACKAGES-$(PTXCONF_HOST_U_BOOT_TOOLS) += host-u-boot-tools
> +
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +HOST_U_BOOT_TOOLS_CONF_TOOL := NO
> +HOST_U_BOOT_TOOLS_MAKE_OPT := tools
keep the ':=' aligned
> +
> +# ----------------------------------------------------------------------------
> +# Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/host-u-boot-tools.install:
> + @$(call targetinfo)
> + install $(HOST_U_BOOT_TOOLS_DIR)/tools/mkimage \
$(PTXCONF_SYSROOT_HOST)/bin/mkimage
break
> + @$(call touch)
> +
> +# vim: syntax=make
> diff --git a/rules/host-umkimage.in b/rules/host-umkimage.in
> deleted file mode 100644
> index b2990b8..0000000
> --- a/rules/host-umkimage.in
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -## SECTION=hosttools_noprompt
> -
> -config HOST_UMKIMAGE
> - tristate
> - default ALLYES
> - help
> - umkimage is the U-Boot mkimage command. It is used to create
> - boot images for the U-Boot bootloader.
> diff --git a/rules/host-umkimage.make b/rules/host-umkimage.make
> deleted file mode 100644
> index 6b66e18..0000000
> --- a/rules/host-umkimage.make
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -# -*-makefile-*-
> -#
> -# Copyright (C) 2003-2006 by Pengutronix e.K., Hildesheim, Germany
> -# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
> -#
> -# See CREDITS for details about who has contributed to this project.
> -#
> -# For further information about the PTXdist project and license conditions
> -# see the README file.
> -#
> -
> -#
> -# We provide this package
> -#
> -HOST_PACKAGES-$(PTXCONF_HOST_UMKIMAGE) += host-umkimage
> -
> -
> -# ----------------------------------------------------------------------------
> -# Prepare
> -# ----------------------------------------------------------------------------
> -
> -HOST_UMKIMAGE_CONF_TOOL := NO
> -HOST_UMKIMAGE_MAKE_OPT := \
> - $(HOST_ENV_CPPFLAGS) \
> - $(HOST_ENV_LDFLAGS) \
> - $(HOST_ENV_CC)
> -
> -# ----------------------------------------------------------------------------
> -# Install
> -# ----------------------------------------------------------------------------
> -
> -$(STATEDIR)/host-umkimage.install:
> - @$(call targetinfo)
> - install $(HOST_UMKIMAGE_DIR)/mkimage $(PTXCONF_SYSROOT_HOST)/bin/mkimage
> - @$(call touch)
> -
> -# vim: syntax=make
> diff --git a/rules/templates/template-kernel-in b/rules/templates/template-kernel-in
> index ae1095b..5019c88 100644
> --- a/rules/templates/template-kernel-in
> +++ b/rules/templates/template-kernel-in
> @@ -4,6 +4,6 @@ config KERNEL_@PACKAGE@
> tristate
> prompt "Linux kernel (@package@)"
> select CROSS_MODULE_INIT_TOOLS
> - #select HOST_UMKIMAGE
> + #select HOST_U_BOOT_TOOLS
> help
> FIXME
> diff --git a/rules/u-boot-tools.in b/rules/u-boot-tools.in
> new file mode 100644
> index 0000000..9119a82
> --- /dev/null
> +++ b/rules/u-boot-tools.in
> @@ -0,0 +1,27 @@
> +## SECTION=shell_and_console
> +
> +menuconfig U_BOOT_TOOLS
> + tristate
> + prompt "u-boot-tools "
> + help
> + some helpful tools from U-Boot project.
> +
> +if U_BOOT_TOOLS
> +
> +config U_BOOT_TOOLS_TOOL_MKIMAGE
> + tristate
> + default y
> + prompt "mkimage"
> + help
> + the U-Boot mkimage command is used to create boot images for
> + the U-Boot bootloader.
> +
> +config U_BOOT_TOOLS_TOOL_ENV
> + tristate
> + default n
> + prompt "fw_{print|save}env"
> + help
> + the U-Boot fw_printenv and fw_saveenv commands are used to
> + read and write environment partitions on target.
> +
> +endif
> diff --git a/rules/u-boot-tools.make b/rules/u-boot-tools.make
> new file mode 100644
> index 0000000..cd14a0e
> --- /dev/null
> +++ b/rules/u-boot-tools.make
> @@ -0,0 +1,78 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2012 by Andreas Bießmann <andreas@biessmann.de>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_U_BOOT_TOOLS) += u-boot-tools
> +
> +#
> +# Paths and names
> +#
> +U_BOOT_TOOLS_VERSION := 2011.12
> +U_BOOT_TOOLS_MD5 := 7f29b9f6da44d6e46e988e7561fd1d5f
> +U_BOOT_TOOLS := u-boot-$(U_BOOT_TOOLS_VERSION)
> +U_BOOT_TOOLS_SUFFIX := tar.bz2
> +U_BOOT_TOOLS_URL := http://ftp.denx.de/pub/u-boot/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX)
> +U_BOOT_TOOLS_SOURCE := $(SRCDIR)/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX)
> +U_BOOT_TOOLS_DIR := $(BUILDDIR)/$(U_BOOT_TOOLS)
> +U_BOOT_TOOLS_LICENSE := GPLv2
> +
> +# ----------------------------------------------------------------------------
> +# Get
> +# ----------------------------------------------------------------------------
> +
> +$(U_BOOT_TOOLS_SOURCE):
> + @$(call targetinfo)
> + @$(call get, U_BOOT_TOOLS)
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +U_BOOT_TOOLS_CONF_TOOL := NO
> +U_BOOT_TOOLS_MAKE_OPT := \
> + HOSTCC="$(CROSS_CC)" \
> + HOSTSTRIP="$(CROSS_STRIP)" \
> + tools
indent with just one <tab>
> +ifdef PTXCONF_U_BOOT_TOOLS_TOOL_ENV
> +U_BOOT_TOOLS_MAKE_OPT += env
> +endif
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +$(STATEDIR)/u-boot-tools.install:
> + @$(call targetinfo)
> + @$(call touch)
> +
> +$(STATEDIR)/u-boot-tools.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, u-boot-tools)
> + @$(call install_fixup, u-boot-tools,PRIORITY,optional)
> + @$(call install_fixup, u-boot-tools,SECTION,base)
> + @$(call install_fixup, u-boot-tools,AUTHOR,"Andreas Bießmann <andreas@biessmann.de>")
> + @$(call install_fixup, u-boot-tools,DESCRIPTION,missing)
> +
> +ifdef PTXCONF_U_BOOT_TOOLS_TOOL_MKIMAGE
> + @$(call install_copy, u-boot-tools, 0, 0, 0755, \
$(U_BOOT_TOOLS_DIR)/tools/mkimage, /usr/bin/mkimage)
break
> +endif
> +
> +ifdef PTXCONF_U_BOOT_TOOLS_TOOL_ENV
> + @$(call install_copy, u-boot-tools, 0, 0, 0755, \
$(U_BOOT_TOOLS_DIR)/tools/env/fw_printenv, /usr/sbin/fw_printenv)
break
Michael
> + @$(call install_link, u-boot-tools, fw_printenv, /usr/sbin/fw_saveenv)
> +endif
> +
> + @$(call install_finish, u-boot-tools)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
> diff --git a/rules/umkimage.in b/rules/umkimage.in
> deleted file mode 100644
> index ffff541..0000000
> --- a/rules/umkimage.in
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -## SECTION=shell_and_console
> -
> -config UMKIMAGE
> - tristate
> - prompt "umkimage"
> - help
> - umkimage is the U-Boot mkimage command. It is used to create
> - boot images for the U-Boot bootloader.
> diff --git a/rules/umkimage.make b/rules/umkimage.make
> deleted file mode 100644
> index ae5f316..0000000
> --- a/rules/umkimage.make
> +++ /dev/null
> @@ -1,66 +0,0 @@
> -# -*-makefile-*-
> -#
> -# Copyright (C) 2010 by Remy Bohmer <linux@bohmer.net>
> -#
> -# See CREDITS for details about who has contributed to this project.
> -#
> -# For further information about the PTXdist project and license conditions
> -# see the README file.
> -#
> -
> -#
> -# We provide this package
> -#
> -PACKAGES-$(PTXCONF_UMKIMAGE) += umkimage
> -
> -#
> -# Paths and names
> -#
> -UMKIMAGE_VERSION := 2010.03-1
> -UMKIMAGE_MD5 := 5e7b4ed03e855a4824317fc4e3917dba
> -UMKIMAGE := u-boot-mkimage-$(UMKIMAGE_VERSION)
> -UMKIMAGE_SUFFIX := tar.gz
> -UMKIMAGE_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(UMKIMAGE).$(UMKIMAGE_SUFFIX)
> -UMKIMAGE_SOURCE := $(SRCDIR)/$(UMKIMAGE).$(UMKIMAGE_SUFFIX)
> -UMKIMAGE_DIR := $(BUILDDIR)/$(UMKIMAGE)
> -UMKIMAGE_LICENSE := GPLv2
> -
> -# ----------------------------------------------------------------------------
> -# Get
> -# ----------------------------------------------------------------------------
> -
> -$(UMKIMAGE_SOURCE):
> - @$(call targetinfo)
> - @$(call get, UMKIMAGE)
> -
> -# ----------------------------------------------------------------------------
> -# Prepare
> -# ----------------------------------------------------------------------------
> -
> -UMKIMAGE_CONF_TOOL := NO
> -UMKIMAGE_MAKE_OPT := \
> - $(CROSS_ENV_CFLAGS) \
> - $(CROSS_ENV_CPPFLAGS) \
> - $(CROSS_ENV_LDFLAGS) \
> - $(CROSS_ENV_CC)
> -
> -# ----------------------------------------------------------------------------
> -# Target-Install
> -# ----------------------------------------------------------------------------
> -
> -$(STATEDIR)/umkimage.targetinstall:
> - @$(call targetinfo)
> -
> - @$(call install_init, umkimage)
> - @$(call install_fixup, umkimage,PRIORITY,optional)
> - @$(call install_fixup, umkimage,SECTION,base)
> - @$(call install_fixup, umkimage,AUTHOR,"Remy Bohmer <linux@bohmer.net>")
> - @$(call install_fixup, umkimage,DESCRIPTION,missing)
> -
> - @$(call install_copy, umkimage, 0, 0, 0755, -, /usr/bin/mkimage)
> -
> - @$(call install_finish, umkimage)
> -
> - @$(call touch)
> -
> -# vim: syntax=make
> --
> 1.7.8.3
>
>
> --
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCH / RFC] replace umkimage by u-boot sources
2012-01-21 18:22 ` Michael Olbrich
@ 2012-01-21 20:08 ` Bernhard Walle
2012-01-22 9:17 ` Michael Olbrich
2012-01-22 9:58 ` Andreas Bießmann
1 sibling, 1 reply; 22+ messages in thread
From: Bernhard Walle @ 2012-01-21 20:08 UTC (permalink / raw)
To: ptxdist
Am 21.01.12 19:22, schrieb Michael Olbrich:
> I don't know fw_printenv. Please elaborate.
This is a tool to print the u-boot environment in Linux. fw_setenv can
be used to change the u-boot environment from Linux.
Regards,
Bernhard
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCH / RFC] replace umkimage by u-boot sources
2012-01-21 20:08 ` Bernhard Walle
@ 2012-01-22 9:17 ` Michael Olbrich
0 siblings, 0 replies; 22+ messages in thread
From: Michael Olbrich @ 2012-01-22 9:17 UTC (permalink / raw)
To: ptxdist
On Sat, Jan 21, 2012 at 09:08:06PM +0100, Bernhard Walle wrote:
> Am 21.01.12 19:22, schrieb Michael Olbrich:
> > I don't know fw_printenv. Please elaborate.
>
> This is a tool to print the u-boot environment in Linux. fw_setenv can
> be used to change the u-boot environment from Linux.
Ok. Lets just install the tool here. If someone needs more, they can do it
in an extra package.
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCH / RFC] replace umkimage by u-boot sources
2012-01-21 18:22 ` Michael Olbrich
2012-01-21 20:08 ` Bernhard Walle
@ 2012-01-22 9:58 ` Andreas Bießmann
2012-01-22 10:14 ` Michael Olbrich
1 sibling, 1 reply; 22+ messages in thread
From: Andreas Bießmann @ 2012-01-22 9:58 UTC (permalink / raw)
To: m.olbrich; +Cc: ptxdist
Hi Michael,
On 21.01.12 19:22, Michael Olbrich wrote:
> On Sat, Jan 21, 2012 at 05:59:01PM +0100, Andreas Bießmann wrote:
>> This patch removes the forked mkimage u-boot tool and uses the mainline
>> u-boot code to build this tool.
>>
>> Signed-off-by: Andreas Bießmann <andreas@biessmann.de>
>> ---
>> Treat this as an RFC, especially the fw_{save|print}env tool is subject to
>> discuss.
>>
>> Some additional questions:
>> * how to handle the situation where only U_BOOT_TOOLS but no
>> U_BOOT_TOOLS_TOOL_xxx is choosen?
>
> Keep it like it is. We have many other packages like that.
OK
>
>> * How to inject a user provided configuration for fw_printenv?
>
> I don't know fw_printenv. Please elaborate.
As Bernhard said it is a tool to access u-boot configuration from linux
through /dev/mtdX, but some target specific configuration is required
here. So would be some ToDo comment required or just leave this til
someone stumble over the missing target configuration?
I know we will need the fw_printenv tool in some of our products in near
future but at the moment I just want to have a submenu for U-Boot tools.
A submenu with just one entry would be a bit empty ...
<snip>
>> --- /dev/null
>> +++ b/rules/host-u-boot-tools.in
>> @@ -0,0 +1,8 @@
>> +## SECTION=hosttools_noprompt
>> +
>> +config HOST_U_BOOT_TOOLS
>> + tristate
>> + default ALLYES
>> + help
>> + the U-Boot tools contains the mkimage command which is used
>> + to create boot images for the U-Boot bootloader.
>
> Can we even see the help for a noprompt option?
I don't know ... it was like this before (in host-umkimage.in).
regards
Andreas Bießmann
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCH / RFC] replace umkimage by u-boot sources
2012-01-22 9:58 ` Andreas Bießmann
@ 2012-01-22 10:14 ` Michael Olbrich
0 siblings, 0 replies; 22+ messages in thread
From: Michael Olbrich @ 2012-01-22 10:14 UTC (permalink / raw)
To: ptxdist
On Sun, Jan 22, 2012 at 10:58:59AM +0100, Andreas Bießmann wrote:
> > I don't know fw_printenv. Please elaborate.
>
> As Bernhard said it is a tool to access u-boot configuration from linux
> through /dev/mtdX, but some target specific configuration is required
> here. So would be some ToDo comment required or just leave this til
> someone stumble over the missing target configuration?
Is this a config file, or what? If yes, add an option for it, and use
install_alternative to install it. Then you can add your target specific
file to your BSP. Or always install and add one to generic/ in ptxdist, if
there are some sane default values.
> I know we will need the fw_printenv tool in some of our products in near
> future but at the moment I just want to have a submenu for U-Boot tools.
> A submenu with just one entry would be a bit empty ...
>
> <snip>
>
> >> --- /dev/null
> >> +++ b/rules/host-u-boot-tools.in
> >> @@ -0,0 +1,8 @@
> >> +## SECTION=hosttools_noprompt
> >> +
> >> +config HOST_U_BOOT_TOOLS
> >> + tristate
> >> + default ALLYES
> >> + help
> >> + the U-Boot tools contains the mkimage command which is used
> >> + to create boot images for the U-Boot bootloader.
> >
> > Can we even see the help for a noprompt option?
>
> I don't know ... it was like this before (in host-umkimage.in).
Remove the help. host-umkimage used to have a prompt and the help was not
removed with it.
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* [ptxdist] [PATCH v2] replace umkimage by u-boot sources
2012-01-21 16:59 [ptxdist] [PATCH / RFC] replace umkimage by u-boot sources Andreas Bießmann
2012-01-21 18:22 ` Michael Olbrich
@ 2012-01-22 14:49 ` Andreas Bießmann
2012-01-22 14:57 ` Bernhard Walle
` (2 more replies)
2012-01-27 23:38 ` [ptxdist] [PATCH v3] " Andreas Bießmann
2012-01-31 22:49 ` [ptxdist] [PATCH v4] " Andreas Bießmann
3 siblings, 3 replies; 22+ messages in thread
From: Andreas Bießmann @ 2012-01-22 14:49 UTC (permalink / raw)
To: PTXdist ML
This patch removes the forked mkimage u-boot tool and uses the mainline
u-boot code to build this tool.
Signed-off-by: Andreas Bießmann <andreas@biessmann.de>
---
Changes since v1:
* add ROOTFS_FW_ENV_CONFIG parameter which installes /etc/fw_env.config
* changes requested by Michael
...f8dcdbe5c690c-compiler.h-add-uint-typedef.patch | 26 ------
patches/u-boot-mkimage-2010.03-1/series | 1 -
platforms/hosttools.in | 2 +-
platforms/image_uimage.in | 8 +-
platforms/kernel.in | 2 +-
rules/host-u-boot-tools.in | 5 +
rules/host-u-boot-tools.make | 35 +++++++++
rules/host-umkimage.in | 8 --
rules/host-umkimage.make | 37 ---------
rules/rootfs.in | 10 +++
rules/rootfs.make | 3 +
rules/templates/template-kernel-in | 2 +-
rules/u-boot-tools.in | 31 ++++++++
rules/u-boot-tools.make | 81 ++++++++++++++++++++
rules/umkimage.in | 8 --
rules/umkimage.make | 66 ----------------
16 files changed, 172 insertions(+), 153 deletions(-)
delete mode 100644 patches/u-boot-mkimage-2010.03-1/b050c72d52c4e30d5b978ab6758f8dcdbe5c690c-compiler.h-add-uint-typedef.patch
delete mode 100644 patches/u-boot-mkimage-2010.03-1/series
create mode 100644 rules/host-u-boot-tools.in
create mode 100644 rules/host-u-boot-tools.make
delete mode 100644 rules/host-umkimage.in
delete mode 100644 rules/host-umkimage.make
create mode 100644 rules/u-boot-tools.in
create mode 100644 rules/u-boot-tools.make
delete mode 100644 rules/umkimage.in
delete mode 100644 rules/umkimage.make
diff --git a/patches/u-boot-mkimage-2010.03-1/b050c72d52c4e30d5b978ab6758f8dcdbe5c690c-compiler.h-add-uint-typedef.patch b/patches/u-boot-mkimage-2010.03-1/b050c72d52c4e30d5b978ab6758f8dcdbe5c690c-compiler.h-add-uint-typedef.patch
deleted file mode 100644
index f20a663..0000000
--- a/patches/u-boot-mkimage-2010.03-1/b050c72d52c4e30d5b978ab6758f8dcdbe5c690c-compiler.h-add-uint-typedef.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit b050c72d52c4e30d5b978ab6758f8dcdbe5c690c
-Author: Mike Frysinger <vapier@gentoo.org>
-Date: Tue Apr 20 05:49:30 2010 -0400
-
- compiler.h: add uint typedef
-
- Recent crc changes started using the "uint" type in headers that are used
- on the build system. This subsequently broke mingw targets as they do not
- provide such a type. So add this basic typedef to compiler.h so that we
- do not have to worry about this breaking again in the future.
-
- Signed-off-by: Mike Frysinger <vapier@gentoo.org>
- Signed-off-by: Remy Bohmer <linux@bohmer.net>
-
-diff --git a/include/compiler.h b/include/compiler.h
-index 332618e..8030bf6 100644
---- a/include/compiler.h
-+++ b/include/compiler.h
-@@ -55,6 +55,7 @@ typedef unsigned int uint;
- typedef uint8_t __u8;
- typedef uint16_t __u16;
- typedef uint32_t __u32;
-+typedef unsigned int uint;
-
- #define uswap_16(x) \
- ((((x) & 0xff00) >> 8) | \
diff --git a/patches/u-boot-mkimage-2010.03-1/series b/patches/u-boot-mkimage-2010.03-1/series
deleted file mode 100644
index dbf4bb4..0000000
--- a/patches/u-boot-mkimage-2010.03-1/series
+++ /dev/null
@@ -1 +0,0 @@
-b050c72d52c4e30d5b978ab6758f8dcdbe5c690c-compiler.h-add-uint-typedef.patch
diff --git a/platforms/hosttools.in b/platforms/hosttools.in
index 155b30b..e9ce0fc 100644
--- a/platforms/hosttools.in
+++ b/platforms/hosttools.in
@@ -19,7 +19,7 @@ source "rules/host-mtd-utils.in"
source "rules/host-mtools.in"
source "rules/host-openssl.in"
source "rules/host-squashfs-tools.in"
-source "rules/host-umkimage.in"
+source "rules/host-u-boot-tools.in"
source "rules/host-util-linux-ng.in"
source "rules/host-xl-tools.in"
source "rules/host-xz.in"
diff --git a/platforms/image_uimage.in b/platforms/image_uimage.in
index 62119c4..719793d 100644
--- a/platforms/image_uimage.in
+++ b/platforms/image_uimage.in
@@ -3,7 +3,7 @@
menuconfig IMAGE_UIMAGE
bool
prompt "Generate images/uRamdisk "
- select HOST_UMKIMAGE
+ select HOST_U_BOOT_TOOLS
select IMAGE_EXT2
select IMAGE_EXT2_GZIP
help
@@ -21,16 +21,16 @@ config IMAGE_UIMAGE_NAME
config IMAGE_UIMAGE_EXTRA_ARGS
string
default ""
- prompt "extra arguments passed to umkimage"
+ prompt "extra arguments passed to mkimage"
help
- If needed you can add extra arguments for umkimage here
+ If needed you can add extra arguments for mkimage here
(e.g. -a 0xaa00000 -e 0xaa00000 )
# TODO: See comment in rules/post/images.make for this topic
#config IMAGE_UIMAGE_MULTI
# bool
# prompt "Generate a multi image images/muimage"
-# select HOST_UMKIMAGE
+# select HOST_U_BOOT_TOOLS
# select KERNEL
# select IMAGE_CPIO
# help
diff --git a/platforms/kernel.in b/platforms/kernel.in
index b601284..01b31d3 100644
--- a/platforms/kernel.in
+++ b/platforms/kernel.in
@@ -2,7 +2,7 @@ menuconfig KERNEL
bool
default y
select IMAGE_KERNEL
- select HOST_UMKIMAGE if KERNEL_IMAGE_U
+ select HOST_U_BOOT_TOOLS if KERNEL_IMAGE_U
select HOST_XZ if KERNEL_XZ
select HOST_LZOP if KERNEL_LZOP
select CROSS_MODULE_INIT_TOOLS if KERNEL_MODULES
diff --git a/rules/host-u-boot-tools.in b/rules/host-u-boot-tools.in
new file mode 100644
index 0000000..c89c04d
--- /dev/null
+++ b/rules/host-u-boot-tools.in
@@ -0,0 +1,5 @@
+## SECTION=hosttools_noprompt
+
+config HOST_U_BOOT_TOOLS
+ tristate
+ default ALLYES
diff --git a/rules/host-u-boot-tools.make b/rules/host-u-boot-tools.make
new file mode 100644
index 0000000..5b7a765
--- /dev/null
+++ b/rules/host-u-boot-tools.make
@@ -0,0 +1,35 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2012 by Andreas Bießmann <andreas@biessmann.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_U_BOOT_TOOLS) += host-u-boot-tools
+
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+HOST_U_BOOT_TOOLS_CONF_TOOL := NO
+HOST_U_BOOT_TOOLS_MAKE_OPT := tools
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/host-u-boot-tools.install:
+ @$(call targetinfo)
+ install $(HOST_U_BOOT_TOOLS_DIR)/tools/mkimage \
+ $(PTXCONF_SYSROOT_HOST)/bin/mkimage
+
+ @$(call touch)
+
+# vim: syntax=make
diff --git a/rules/host-umkimage.in b/rules/host-umkimage.in
deleted file mode 100644
index b2990b8..0000000
--- a/rules/host-umkimage.in
+++ /dev/null
@@ -1,8 +0,0 @@
-## SECTION=hosttools_noprompt
-
-config HOST_UMKIMAGE
- tristate
- default ALLYES
- help
- umkimage is the U-Boot mkimage command. It is used to create
- boot images for the U-Boot bootloader.
diff --git a/rules/host-umkimage.make b/rules/host-umkimage.make
deleted file mode 100644
index 6b66e18..0000000
--- a/rules/host-umkimage.make
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2003-2006 by Pengutronix e.K., Hildesheim, Germany
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-HOST_PACKAGES-$(PTXCONF_HOST_UMKIMAGE) += host-umkimage
-
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-HOST_UMKIMAGE_CONF_TOOL := NO
-HOST_UMKIMAGE_MAKE_OPT := \
- $(HOST_ENV_CPPFLAGS) \
- $(HOST_ENV_LDFLAGS) \
- $(HOST_ENV_CC)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/host-umkimage.install:
- @$(call targetinfo)
- install $(HOST_UMKIMAGE_DIR)/mkimage $(PTXCONF_SYSROOT_HOST)/bin/mkimage
- @$(call touch)
-
-# vim: syntax=make
diff --git a/rules/rootfs.in b/rules/rootfs.in
index ae65187..0240555 100644
--- a/rules/rootfs.in
+++ b/rules/rootfs.in
@@ -333,6 +333,16 @@ config ROOTFS_MTAB_LINK_VAR_FAKE_OVERLAYFS
select FAKE_OVERLAYFS_VAR_TMP
prompt "use fake-overlayfs to create /var/tmp/mtab"
+config ROOTFS_FW_ENV_CONFIG
+ bool
+ prompt "install /etc/fw_env.config"
+ default y
+ depends on U_BOOT_TOOLS_TOOL_ENV
+ help
+ If enabled, it installs "./projectroot/etc/fw_env.config" file
+ if present.
+ Read <U-Boot source>/tools/env/README for file content.
+
config ROOTFS_HOSTNAME
bool
prompt "install /etc/hostname"
diff --git a/rules/rootfs.make b/rules/rootfs.make
index 13a5f2c..d470823 100644
--- a/rules/rootfs.make
+++ b/rules/rootfs.make
@@ -156,6 +156,9 @@ ifdef PTXCONF_ROOTFS_MTAB_LINK_VAR
$(PTXDIST_TOPDIR)/generic/etc/mtab, /var/tmp/mtab)
@$(call install_link, rootfs, /var/tmp/mtab, /etc/mtab)
endif
+ifdef PTXCONF_ROOTFS_FW_ENV_CONFIG
+ @$(call install_alternative, rootfs, 0, 0, 0644, /etc/fw_env.config)
+endif
ifdef PTXCONF_ROOTFS_HOSTNAME
@$(call install_alternative, rootfs, 0, 0, 0644, /etc/hostname)
@$(call install_replace, rootfs, /etc/hostname, \
diff --git a/rules/templates/template-kernel-in b/rules/templates/template-kernel-in
index ae1095b..5019c88 100644
--- a/rules/templates/template-kernel-in
+++ b/rules/templates/template-kernel-in
@@ -4,6 +4,6 @@ config KERNEL_@PACKAGE@
tristate
prompt "Linux kernel (@package@)"
select CROSS_MODULE_INIT_TOOLS
- #select HOST_UMKIMAGE
+ #select HOST_U_BOOT_TOOLS
help
FIXME
diff --git a/rules/u-boot-tools.in b/rules/u-boot-tools.in
new file mode 100644
index 0000000..55b04b4
--- /dev/null
+++ b/rules/u-boot-tools.in
@@ -0,0 +1,31 @@
+## SECTION=shell_and_console
+
+menuconfig U_BOOT_TOOLS
+ tristate
+ prompt "u-boot-tools "
+ help
+ some helpful tools from U-Boot project. Most important tool in
+ this section is mkimage to generate U-Boot boot images.
+
+if U_BOOT_TOOLS
+
+config U_BOOT_TOOLS_TOOL_MKIMAGE
+ tristate
+ default y
+ prompt "mkimage"
+ help
+ the U-Boot mkimage command is used to create boot images for
+ the U-Boot bootloader.
+
+config U_BOOT_TOOLS_TOOL_ENV
+ tristate
+ default n
+ prompt "fw_{print|save}env"
+ help
+ the U-Boot fw_printenv and fw_saveenv commands are used to
+ read and write U-Boot environment /dev/mtdX partitions on
+ target through linux.
+ The tool will require a configuration on target named
+ /etc/fw_env.config.
+
+endif
diff --git a/rules/u-boot-tools.make b/rules/u-boot-tools.make
new file mode 100644
index 0000000..3c9fa7b
--- /dev/null
+++ b/rules/u-boot-tools.make
@@ -0,0 +1,81 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2012 by Andreas Bießmann <andreas@biessmann.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_U_BOOT_TOOLS) += u-boot-tools
+
+#
+# Paths and names
+#
+U_BOOT_TOOLS_VERSION := 2011.12
+U_BOOT_TOOLS_MD5 := 7f29b9f6da44d6e46e988e7561fd1d5f
+U_BOOT_TOOLS := u-boot-$(U_BOOT_TOOLS_VERSION)
+U_BOOT_TOOLS_SUFFIX := tar.bz2
+U_BOOT_TOOLS_URL := http://ftp.denx.de/pub/u-boot/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX)
+U_BOOT_TOOLS_SOURCE := $(SRCDIR)/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX)
+U_BOOT_TOOLS_DIR := $(BUILDDIR)/$(U_BOOT_TOOLS)
+U_BOOT_TOOLS_LICENSE := GPLv2
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+$(U_BOOT_TOOLS_SOURCE):
+ @$(call targetinfo)
+ @$(call get, U_BOOT_TOOLS)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+U_BOOT_TOOLS_CONF_TOOL := NO
+U_BOOT_TOOLS_MAKE_OPT := \
+ HOSTCC="$(CROSS_CC)" \
+ HOSTSTRIP="$(CROSS_STRIP)" \
+ tools
+
+ifdef PTXCONF_U_BOOT_TOOLS_TOOL_ENV
+U_BOOT_TOOLS_MAKE_OPT += env
+endif
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+$(STATEDIR)/u-boot-tools.install:
+ @$(call targetinfo)
+ @$(call touch)
+
+$(STATEDIR)/u-boot-tools.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, u-boot-tools)
+ @$(call install_fixup, u-boot-tools,PRIORITY,optional)
+ @$(call install_fixup, u-boot-tools,SECTION,base)
+ @$(call install_fixup, u-boot-tools,AUTHOR,"Andreas Bießmann <andreas@biessmann.de>")
+ @$(call install_fixup, u-boot-tools,DESCRIPTION,missing)
+
+ifdef PTXCONF_U_BOOT_TOOLS_TOOL_MKIMAGE
+ @$(call install_copy, u-boot-tools, 0, 0, 0755, \
+ $(U_BOOT_TOOLS_DIR)/tools/mkimage, /usr/bin/mkimage)
+endif
+
+ifdef PTXCONF_U_BOOT_TOOLS_TOOL_ENV
+ @$(call install_copy, u-boot-tools, 0, 0, 0755, \
+ $(U_BOOT_TOOLS_DIR)/tools/env/fw_printenv, /usr/sbin/fw_printenv)
+ @$(call install_link, u-boot-tools, fw_printenv, /usr/sbin/fw_saveenv)
+endif
+
+ @$(call install_finish, u-boot-tools)
+
+ @$(call touch)
+
+# vim: syntax=make
diff --git a/rules/umkimage.in b/rules/umkimage.in
deleted file mode 100644
index ffff541..0000000
--- a/rules/umkimage.in
+++ /dev/null
@@ -1,8 +0,0 @@
-## SECTION=shell_and_console
-
-config UMKIMAGE
- tristate
- prompt "umkimage"
- help
- umkimage is the U-Boot mkimage command. It is used to create
- boot images for the U-Boot bootloader.
diff --git a/rules/umkimage.make b/rules/umkimage.make
deleted file mode 100644
index ae5f316..0000000
--- a/rules/umkimage.make
+++ /dev/null
@@ -1,66 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2010 by Remy Bohmer <linux@bohmer.net>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_UMKIMAGE) += umkimage
-
-#
-# Paths and names
-#
-UMKIMAGE_VERSION := 2010.03-1
-UMKIMAGE_MD5 := 5e7b4ed03e855a4824317fc4e3917dba
-UMKIMAGE := u-boot-mkimage-$(UMKIMAGE_VERSION)
-UMKIMAGE_SUFFIX := tar.gz
-UMKIMAGE_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(UMKIMAGE).$(UMKIMAGE_SUFFIX)
-UMKIMAGE_SOURCE := $(SRCDIR)/$(UMKIMAGE).$(UMKIMAGE_SUFFIX)
-UMKIMAGE_DIR := $(BUILDDIR)/$(UMKIMAGE)
-UMKIMAGE_LICENSE := GPLv2
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-$(UMKIMAGE_SOURCE):
- @$(call targetinfo)
- @$(call get, UMKIMAGE)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-UMKIMAGE_CONF_TOOL := NO
-UMKIMAGE_MAKE_OPT := \
- $(CROSS_ENV_CFLAGS) \
- $(CROSS_ENV_CPPFLAGS) \
- $(CROSS_ENV_LDFLAGS) \
- $(CROSS_ENV_CC)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/umkimage.targetinstall:
- @$(call targetinfo)
-
- @$(call install_init, umkimage)
- @$(call install_fixup, umkimage,PRIORITY,optional)
- @$(call install_fixup, umkimage,SECTION,base)
- @$(call install_fixup, umkimage,AUTHOR,"Remy Bohmer <linux@bohmer.net>")
- @$(call install_fixup, umkimage,DESCRIPTION,missing)
-
- @$(call install_copy, umkimage, 0, 0, 0755, -, /usr/bin/mkimage)
-
- @$(call install_finish, umkimage)
-
- @$(call touch)
-
-# vim: syntax=make
--
1.7.8.3
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCH v2] replace umkimage by u-boot sources
2012-01-22 14:49 ` [ptxdist] [PATCH v2] " Andreas Bießmann
@ 2012-01-22 14:57 ` Bernhard Walle
2012-01-23 12:37 ` Andreas Bießmann
2012-01-23 12:40 ` Andreas Bießmann
2012-01-27 7:17 ` Andreas Bießmann
2 siblings, 1 reply; 22+ messages in thread
From: Bernhard Walle @ 2012-01-22 14:57 UTC (permalink / raw)
To: ptxdist
* Andreas Bießmann <andreas@biessmann.de> [2012-01-22 15:49]:
>
> +config ROOTFS_FW_ENV_CONFIG
> + bool
> + prompt "install /etc/fw_env.config"
> + default y
Shouldn't this default to "n" if there's no generic fallback file
(in the generic/ directory)?
Regards,
Bernhard
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCH v2] replace umkimage by u-boot sources
2012-01-22 14:57 ` Bernhard Walle
@ 2012-01-23 12:37 ` Andreas Bießmann
2012-01-26 15:06 ` Michael Olbrich
0 siblings, 1 reply; 22+ messages in thread
From: Andreas Bießmann @ 2012-01-23 12:37 UTC (permalink / raw)
To: ptxdist; +Cc: Bernhard Walle
Hi Bernhard,
On 22.01.2012 15:57, Bernhard Walle wrote:
> * Andreas Bießmann <andreas@biessmann.de> [2012-01-22 15:49]:
>>
>> +config ROOTFS_FW_ENV_CONFIG
>> + bool
>> + prompt "install /etc/fw_env.config"
>> + default y
>
> Shouldn't this default to "n" if there's no generic fallback file
> (in the generic/ directory)?
you may be right here. But fw_printenv will not work without
configuration, therefore I want to force the user to provide one.
best regards
Andreas Bießmann
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCH v2] replace umkimage by u-boot sources
2012-01-22 14:49 ` [ptxdist] [PATCH v2] " Andreas Bießmann
2012-01-22 14:57 ` Bernhard Walle
@ 2012-01-23 12:40 ` Andreas Bießmann
2012-01-23 13:07 ` Bernhard Walle
2012-01-27 7:17 ` Andreas Bießmann
2 siblings, 1 reply; 22+ messages in thread
From: Andreas Bießmann @ 2012-01-23 12:40 UTC (permalink / raw)
To: ptxdist; +Cc: Andreas Bießmann
Hi all,
On 22.01.2012 15:49, Andreas Bießmann wrote:
> This patch removes the forked mkimage u-boot tool and uses the mainline
> u-boot code to build this tool.
>
> Signed-off-by: Andreas Bießmann <andreas@biessmann.de>
> ---
<snip>
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +$(STATEDIR)/u-boot-tools.install:
> + @$(call targetinfo)
> + @$(call touch)
> +
> +$(STATEDIR)/u-boot-tools.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, u-boot-tools)
> + @$(call install_fixup, u-boot-tools,PRIORITY,optional)
> + @$(call install_fixup, u-boot-tools,SECTION,base)
> + @$(call install_fixup, u-boot-tools,AUTHOR,"Andreas Bießmann <andreas@biessmann.de>")
> + @$(call install_fixup, u-boot-tools,DESCRIPTION,missing)
> +
> +ifdef PTXCONF_U_BOOT_TOOLS_TOOL_MKIMAGE
> + @$(call install_copy, u-boot-tools, 0, 0, 0755, \
> + $(U_BOOT_TOOLS_DIR)/tools/mkimage, /usr/bin/mkimage)
> +endif
> +
> +ifdef PTXCONF_U_BOOT_TOOLS_TOOL_ENV
> + @$(call install_copy, u-boot-tools, 0, 0, 0755, \
> + $(U_BOOT_TOOLS_DIR)/tools/env/fw_printenv, /usr/sbin/fw_printenv)
> + @$(call install_link, u-boot-tools, fw_printenv, /usr/sbin/fw_saveenv)
> +endif
shouldn't we build two different packages (u-boot-tool-mkimage,
u-boot-tool-env) here?
best regards
Andreas Bießmann
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCH v2] replace umkimage by u-boot sources
2012-01-23 12:40 ` Andreas Bießmann
@ 2012-01-23 13:07 ` Bernhard Walle
2012-01-23 13:16 ` Andreas Bießmann
0 siblings, 1 reply; 22+ messages in thread
From: Bernhard Walle @ 2012-01-23 13:07 UTC (permalink / raw)
To: ptxdist
* Andreas Bießmann <biessmann@corscience.de> [2012-01-23 13:40]:
>
> shouldn't we build two different packages (u-boot-tool-mkimage,
> u-boot-tool-env) here?
I would add that tools as part of the u-boot package.
Mixing a host tool with target tools don't sound like a good idea.
Regards,
Bernhard
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCH v2] replace umkimage by u-boot sources
2012-01-23 13:07 ` Bernhard Walle
@ 2012-01-23 13:16 ` Andreas Bießmann
2012-01-23 13:44 ` Bernhard Walle
0 siblings, 1 reply; 22+ messages in thread
From: Andreas Bießmann @ 2012-01-23 13:16 UTC (permalink / raw)
To: ptxdist; +Cc: Bernhard Walle
Hi Bernhard,
On 23.01.2012 14:07, Bernhard Walle wrote:
> * Andreas Bießmann <biessmann@corscience.de> [2012-01-23 13:40]:
>>
>> shouldn't we build two different packages (u-boot-tool-mkimage,
>> u-boot-tool-env) here?
>
> I would add that tools as part of the u-boot package.
>
> Mixing a host tool with target tools don't sound like a good idea.
no, you got me wrong here. We have a host-u-boot-tools package which
have the mkimage build for the host (currently only that tool, but maybe
sometimes mkenvimage too?). Here we have the target package build for
the specified target architecture (yes some want to run mkimage ion the
target ;)
My question here is, should we provide a u-boot-tool-mkimage-<target
arch>.ipkg and u-boot-tool-env-<target arch>.ipkg here rather than a
u-boot-tools-<target arch>.ipkg which includes mkimage/fw_printenv
depending on the configuration.
best regards
Andreas Bießmann
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCH v2] replace umkimage by u-boot sources
2012-01-23 13:16 ` Andreas Bießmann
@ 2012-01-23 13:44 ` Bernhard Walle
0 siblings, 0 replies; 22+ messages in thread
From: Bernhard Walle @ 2012-01-23 13:44 UTC (permalink / raw)
To: ptxdist
* Andreas Bießmann <biessmann@corscience.de> [2012-01-23 14:16]:
>
> no, you got me wrong here. We have a host-u-boot-tools package which
> have the mkimage build for the host (currently only that tool, but maybe
> sometimes mkenvimage too?). Here we have the target package build for
> the specified target architecture (yes some want to run mkimage ion the
> target ;)
Yes, sorry. Should have read the whole mail.
Regards,
Bernhard
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCH v2] replace umkimage by u-boot sources
2012-01-23 12:37 ` Andreas Bießmann
@ 2012-01-26 15:06 ` Michael Olbrich
2012-01-26 16:05 ` Andreas Bießmann
0 siblings, 1 reply; 22+ messages in thread
From: Michael Olbrich @ 2012-01-26 15:06 UTC (permalink / raw)
To: ptxdist
On Mon, Jan 23, 2012 at 01:37:54PM +0100, Andreas Bießmann wrote:
> On 22.01.2012 15:57, Bernhard Walle wrote:
> > * Andreas Bießmann <andreas@biessmann.de> [2012-01-22 15:49]:
> >>
> >> +config ROOTFS_FW_ENV_CONFIG
> >> + bool
> >> + prompt "install /etc/fw_env.config"
> >> + default y
> >
> > Shouldn't this default to "n" if there's no generic fallback file
> > (in the generic/ directory)?
>
> you may be right here. But fw_printenv will not work without
> configuration, therefore I want to force the user to provide one.
Hmmm, can you send an example config file?
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCH v2] replace umkimage by u-boot sources
2012-01-26 15:06 ` Michael Olbrich
@ 2012-01-26 16:05 ` Andreas Bießmann
0 siblings, 0 replies; 22+ messages in thread
From: Andreas Bießmann @ 2012-01-26 16:05 UTC (permalink / raw)
To: ptxdist
Hi Michael,
On Thu, 26 Jan 2012 16:06:20 +0100, Michael Olbrich wrote:
> On Mon, Jan 23, 2012 at 01:37:54PM +0100, Andreas Bießmann wrote:
>> On 22.01.2012 15:57, Bernhard Walle wrote:
>> > * Andreas Bießmann <andreas@biessmann.de> [2012-01-22 15:49]:
>> >>
>> >> +config ROOTFS_FW_ENV_CONFIG
>> >> + bool
>> >> + prompt "install /etc/fw_env.config"
>> >> + default y
>> >
>> > Shouldn't this default to "n" if there's no generic fallback file
>> > (in the generic/ directory)?
>>
>> you may be right here. But fw_printenv will not work without
>> configuration, therefore I want to force the user to provide one.
>
> Hmmm, can you send an example config file?
see
http://git.denx.de/?p=u-boot.git;a=blob;f=tools/env/fw_env.config;h=8e21d5a5ab3e35b7d81ea9f9f714acbc15716cfc;hb=137703b811502dfea364650fb3e17f20b4c21333
regards
Andreas Bießmann
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCH v2] replace umkimage by u-boot sources
2012-01-22 14:49 ` [ptxdist] [PATCH v2] " Andreas Bießmann
2012-01-22 14:57 ` Bernhard Walle
2012-01-23 12:40 ` Andreas Bießmann
@ 2012-01-27 7:17 ` Andreas Bießmann
2 siblings, 0 replies; 22+ messages in thread
From: Andreas Bießmann @ 2012-01-27 7:17 UTC (permalink / raw)
To: ptxdist
On Sun, 22 Jan 2012 15:49:22 +0100, Andreas Bießmann wrote:
> This patch removes the forked mkimage u-boot tool and uses the
> mainline
> u-boot code to build this tool.
>
> Signed-off-by: Andreas Bießmann <andreas@biessmann.de>
> ---
> Changes since v1:
> * add ROOTFS_FW_ENV_CONFIG parameter which installes
> /etc/fw_env.config
> * changes requested by Michael
>
<snip>
> +ifdef PTXCONF_U_BOOT_TOOLS_TOOL_ENV
> + @$(call install_copy, u-boot-tools, 0, 0, 0755, \
> + $(U_BOOT_TOOLS_DIR)/tools/env/fw_printenv, /usr/sbin/fw_printenv)
> + @$(call install_link, u-boot-tools, fw_printenv,
> /usr/sbin/fw_saveenv)
> +endif
Ouch ... there is anyway an error ;( Second NAme of the tool is _not_
fw_saveenv but fw_setenv. Will send a v3 this weekenend!
best regards
Andreas Bießmann
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* [ptxdist] [PATCH v3] replace umkimage by u-boot sources
2012-01-21 16:59 [ptxdist] [PATCH / RFC] replace umkimage by u-boot sources Andreas Bießmann
2012-01-21 18:22 ` Michael Olbrich
2012-01-22 14:49 ` [ptxdist] [PATCH v2] " Andreas Bießmann
@ 2012-01-27 23:38 ` Andreas Bießmann
2012-01-31 14:50 ` Michael Olbrich
2012-01-31 22:49 ` [ptxdist] [PATCH v4] " Andreas Bießmann
3 siblings, 1 reply; 22+ messages in thread
From: Andreas Bießmann @ 2012-01-27 23:38 UTC (permalink / raw)
To: PTXdist ML
This patch removes the forked mkimage u-boot tool and uses the mainline
u-boot code to build this tool.
Signed-off-by: Andreas Bießmann <andreas@biessmann.de>
---
Changes since v1:
* add ROOTFS_FW_ENV_CONFIG parameter which installes /etc/fw_env.config
* changes requested by Michael
Changes since v2:
* fix wrong 'fw_saveenv' command -> use correct 'fw_setenv'
...f8dcdbe5c690c-compiler.h-add-uint-typedef.patch | 26 ------
patches/u-boot-mkimage-2010.03-1/series | 1 -
platforms/hosttools.in | 2 +-
platforms/image_uimage.in | 8 +-
platforms/kernel.in | 2 +-
rules/host-u-boot-tools.in | 5 +
rules/host-u-boot-tools.make | 35 +++++++++
rules/host-umkimage.in | 8 --
rules/host-umkimage.make | 37 ---------
rules/rootfs.in | 9 ++
rules/rootfs.make | 3 +
rules/templates/template-kernel-in | 2 +-
rules/u-boot-tools.in | 32 ++++++++
rules/u-boot-tools.make | 81 ++++++++++++++++++++
rules/umkimage.in | 8 --
rules/umkimage.make | 66 ----------------
16 files changed, 172 insertions(+), 153 deletions(-)
delete mode 100644 patches/u-boot-mkimage-2010.03-1/b050c72d52c4e30d5b978ab6758f8dcdbe5c690c-compiler.h-add-uint-typedef.patch
delete mode 100644 patches/u-boot-mkimage-2010.03-1/series
create mode 100644 rules/host-u-boot-tools.in
create mode 100644 rules/host-u-boot-tools.make
delete mode 100644 rules/host-umkimage.in
delete mode 100644 rules/host-umkimage.make
create mode 100644 rules/u-boot-tools.in
create mode 100644 rules/u-boot-tools.make
delete mode 100644 rules/umkimage.in
delete mode 100644 rules/umkimage.make
diff --git a/patches/u-boot-mkimage-2010.03-1/b050c72d52c4e30d5b978ab6758f8dcdbe5c690c-compiler.h-add-uint-typedef.patch b/patches/u-boot-mkimage-2010.03-1/b050c72d52c4e30d5b978ab6758f8dcdbe5c690c-compiler.h-add-uint-typedef.patch
deleted file mode 100644
index f20a663..0000000
--- a/patches/u-boot-mkimage-2010.03-1/b050c72d52c4e30d5b978ab6758f8dcdbe5c690c-compiler.h-add-uint-typedef.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit b050c72d52c4e30d5b978ab6758f8dcdbe5c690c
-Author: Mike Frysinger <vapier@gentoo.org>
-Date: Tue Apr 20 05:49:30 2010 -0400
-
- compiler.h: add uint typedef
-
- Recent crc changes started using the "uint" type in headers that are used
- on the build system. This subsequently broke mingw targets as they do not
- provide such a type. So add this basic typedef to compiler.h so that we
- do not have to worry about this breaking again in the future.
-
- Signed-off-by: Mike Frysinger <vapier@gentoo.org>
- Signed-off-by: Remy Bohmer <linux@bohmer.net>
-
-diff --git a/include/compiler.h b/include/compiler.h
-index 332618e..8030bf6 100644
---- a/include/compiler.h
-+++ b/include/compiler.h
-@@ -55,6 +55,7 @@ typedef unsigned int uint;
- typedef uint8_t __u8;
- typedef uint16_t __u16;
- typedef uint32_t __u32;
-+typedef unsigned int uint;
-
- #define uswap_16(x) \
- ((((x) & 0xff00) >> 8) | \
diff --git a/patches/u-boot-mkimage-2010.03-1/series b/patches/u-boot-mkimage-2010.03-1/series
deleted file mode 100644
index dbf4bb4..0000000
--- a/patches/u-boot-mkimage-2010.03-1/series
+++ /dev/null
@@ -1 +0,0 @@
-b050c72d52c4e30d5b978ab6758f8dcdbe5c690c-compiler.h-add-uint-typedef.patch
diff --git a/platforms/hosttools.in b/platforms/hosttools.in
index 155b30b..e9ce0fc 100644
--- a/platforms/hosttools.in
+++ b/platforms/hosttools.in
@@ -19,7 +19,7 @@ source "rules/host-mtd-utils.in"
source "rules/host-mtools.in"
source "rules/host-openssl.in"
source "rules/host-squashfs-tools.in"
-source "rules/host-umkimage.in"
+source "rules/host-u-boot-tools.in"
source "rules/host-util-linux-ng.in"
source "rules/host-xl-tools.in"
source "rules/host-xz.in"
diff --git a/platforms/image_uimage.in b/platforms/image_uimage.in
index 62119c4..719793d 100644
--- a/platforms/image_uimage.in
+++ b/platforms/image_uimage.in
@@ -3,7 +3,7 @@
menuconfig IMAGE_UIMAGE
bool
prompt "Generate images/uRamdisk "
- select HOST_UMKIMAGE
+ select HOST_U_BOOT_TOOLS
select IMAGE_EXT2
select IMAGE_EXT2_GZIP
help
@@ -21,16 +21,16 @@ config IMAGE_UIMAGE_NAME
config IMAGE_UIMAGE_EXTRA_ARGS
string
default ""
- prompt "extra arguments passed to umkimage"
+ prompt "extra arguments passed to mkimage"
help
- If needed you can add extra arguments for umkimage here
+ If needed you can add extra arguments for mkimage here
(e.g. -a 0xaa00000 -e 0xaa00000 )
# TODO: See comment in rules/post/images.make for this topic
#config IMAGE_UIMAGE_MULTI
# bool
# prompt "Generate a multi image images/muimage"
-# select HOST_UMKIMAGE
+# select HOST_U_BOOT_TOOLS
# select KERNEL
# select IMAGE_CPIO
# help
diff --git a/platforms/kernel.in b/platforms/kernel.in
index b601284..01b31d3 100644
--- a/platforms/kernel.in
+++ b/platforms/kernel.in
@@ -2,7 +2,7 @@ menuconfig KERNEL
bool
default y
select IMAGE_KERNEL
- select HOST_UMKIMAGE if KERNEL_IMAGE_U
+ select HOST_U_BOOT_TOOLS if KERNEL_IMAGE_U
select HOST_XZ if KERNEL_XZ
select HOST_LZOP if KERNEL_LZOP
select CROSS_MODULE_INIT_TOOLS if KERNEL_MODULES
diff --git a/rules/host-u-boot-tools.in b/rules/host-u-boot-tools.in
new file mode 100644
index 0000000..c89c04d
--- /dev/null
+++ b/rules/host-u-boot-tools.in
@@ -0,0 +1,5 @@
+## SECTION=hosttools_noprompt
+
+config HOST_U_BOOT_TOOLS
+ tristate
+ default ALLYES
diff --git a/rules/host-u-boot-tools.make b/rules/host-u-boot-tools.make
new file mode 100644
index 0000000..5b7a765
--- /dev/null
+++ b/rules/host-u-boot-tools.make
@@ -0,0 +1,35 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2012 by Andreas Bießmann <andreas@biessmann.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_U_BOOT_TOOLS) += host-u-boot-tools
+
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+HOST_U_BOOT_TOOLS_CONF_TOOL := NO
+HOST_U_BOOT_TOOLS_MAKE_OPT := tools
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/host-u-boot-tools.install:
+ @$(call targetinfo)
+ install $(HOST_U_BOOT_TOOLS_DIR)/tools/mkimage \
+ $(PTXCONF_SYSROOT_HOST)/bin/mkimage
+
+ @$(call touch)
+
+# vim: syntax=make
diff --git a/rules/host-umkimage.in b/rules/host-umkimage.in
deleted file mode 100644
index b2990b8..0000000
--- a/rules/host-umkimage.in
+++ /dev/null
@@ -1,8 +0,0 @@
-## SECTION=hosttools_noprompt
-
-config HOST_UMKIMAGE
- tristate
- default ALLYES
- help
- umkimage is the U-Boot mkimage command. It is used to create
- boot images for the U-Boot bootloader.
diff --git a/rules/host-umkimage.make b/rules/host-umkimage.make
deleted file mode 100644
index 6b66e18..0000000
--- a/rules/host-umkimage.make
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2003-2006 by Pengutronix e.K., Hildesheim, Germany
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-HOST_PACKAGES-$(PTXCONF_HOST_UMKIMAGE) += host-umkimage
-
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-HOST_UMKIMAGE_CONF_TOOL := NO
-HOST_UMKIMAGE_MAKE_OPT := \
- $(HOST_ENV_CPPFLAGS) \
- $(HOST_ENV_LDFLAGS) \
- $(HOST_ENV_CC)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/host-umkimage.install:
- @$(call targetinfo)
- install $(HOST_UMKIMAGE_DIR)/mkimage $(PTXCONF_SYSROOT_HOST)/bin/mkimage
- @$(call touch)
-
-# vim: syntax=make
diff --git a/rules/rootfs.in b/rules/rootfs.in
index 350f0c2..95cf0a4 100644
--- a/rules/rootfs.in
+++ b/rules/rootfs.in
@@ -333,6 +333,15 @@ config ROOTFS_MTAB_LINK_VAR_FAKE_OVERLAYFS
select FAKE_OVERLAYFS_VAR_TMP
prompt "use fake-overlayfs to create /var/tmp/mtab"
+config ROOTFS_FW_ENV_CONFIG
+ bool
+ prompt "install /etc/fw_env.config"
+ depends on U_BOOT_TOOLS_TOOL_ENV
+ help
+ If enabled, it installs "./projectroot/etc/fw_env.config" file
+ if present.
+ Read <U-Boot source>/tools/env/README for file content.
+
config ROOTFS_HOSTNAME
bool
prompt "install /etc/hostname"
diff --git a/rules/rootfs.make b/rules/rootfs.make
index 13a5f2c..d470823 100644
--- a/rules/rootfs.make
+++ b/rules/rootfs.make
@@ -156,6 +156,9 @@ ifdef PTXCONF_ROOTFS_MTAB_LINK_VAR
$(PTXDIST_TOPDIR)/generic/etc/mtab, /var/tmp/mtab)
@$(call install_link, rootfs, /var/tmp/mtab, /etc/mtab)
endif
+ifdef PTXCONF_ROOTFS_FW_ENV_CONFIG
+ @$(call install_alternative, rootfs, 0, 0, 0644, /etc/fw_env.config)
+endif
ifdef PTXCONF_ROOTFS_HOSTNAME
@$(call install_alternative, rootfs, 0, 0, 0644, /etc/hostname)
@$(call install_replace, rootfs, /etc/hostname, \
diff --git a/rules/templates/template-kernel-in b/rules/templates/template-kernel-in
index ae1095b..5019c88 100644
--- a/rules/templates/template-kernel-in
+++ b/rules/templates/template-kernel-in
@@ -4,6 +4,6 @@ config KERNEL_@PACKAGE@
tristate
prompt "Linux kernel (@package@)"
select CROSS_MODULE_INIT_TOOLS
- #select HOST_UMKIMAGE
+ #select HOST_U_BOOT_TOOLS
help
FIXME
diff --git a/rules/u-boot-tools.in b/rules/u-boot-tools.in
new file mode 100644
index 0000000..c8bc928
--- /dev/null
+++ b/rules/u-boot-tools.in
@@ -0,0 +1,32 @@
+## SECTION=shell_and_console
+
+menuconfig U_BOOT_TOOLS
+ tristate
+ prompt "u-boot-tools "
+ help
+ some helpful tools from U-Boot project. Most important tool in
+ this section is mkimage to generate U-Boot boot images.
+
+if U_BOOT_TOOLS
+
+config U_BOOT_TOOLS_TOOL_MKIMAGE
+ tristate
+ default y
+ prompt "mkimage"
+ help
+ the U-Boot mkimage command is used to create boot images for
+ the U-Boot bootloader.
+
+config U_BOOT_TOOLS_TOOL_ENV
+ tristate
+ default n
+ prompt "fw_{print|set}env"
+ help
+ the U-Boot fw_printenv and fw_setenv commands are used to
+ read and write U-Boot environment /dev/mtdX partitions on
+ target through linux.
+ The tool will require a configuration on target named
+ /etc/fw_env.config. See U-Boot source directory tools/env
+ for detailed description.
+
+endif
diff --git a/rules/u-boot-tools.make b/rules/u-boot-tools.make
new file mode 100644
index 0000000..d6db1b3
--- /dev/null
+++ b/rules/u-boot-tools.make
@@ -0,0 +1,81 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2012 by Andreas Bießmann <andreas@biessmann.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_U_BOOT_TOOLS) += u-boot-tools
+
+#
+# Paths and names
+#
+U_BOOT_TOOLS_VERSION := 2011.12
+U_BOOT_TOOLS_MD5 := 7f29b9f6da44d6e46e988e7561fd1d5f
+U_BOOT_TOOLS := u-boot-$(U_BOOT_TOOLS_VERSION)
+U_BOOT_TOOLS_SUFFIX := tar.bz2
+U_BOOT_TOOLS_URL := http://ftp.denx.de/pub/u-boot/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX)
+U_BOOT_TOOLS_SOURCE := $(SRCDIR)/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX)
+U_BOOT_TOOLS_DIR := $(BUILDDIR)/$(U_BOOT_TOOLS)
+U_BOOT_TOOLS_LICENSE := GPLv2
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+$(U_BOOT_TOOLS_SOURCE):
+ @$(call targetinfo)
+ @$(call get, U_BOOT_TOOLS)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+U_BOOT_TOOLS_CONF_TOOL := NO
+U_BOOT_TOOLS_MAKE_OPT := \
+ HOSTCC="$(CROSS_CC)" \
+ HOSTSTRIP="$(CROSS_STRIP)" \
+ tools
+
+ifdef PTXCONF_U_BOOT_TOOLS_TOOL_ENV
+U_BOOT_TOOLS_MAKE_OPT += env
+endif
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+$(STATEDIR)/u-boot-tools.install:
+ @$(call targetinfo)
+ @$(call touch)
+
+$(STATEDIR)/u-boot-tools.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, u-boot-tools)
+ @$(call install_fixup, u-boot-tools,PRIORITY,optional)
+ @$(call install_fixup, u-boot-tools,SECTION,base)
+ @$(call install_fixup, u-boot-tools,AUTHOR,"Andreas Bießmann <andreas@biessmann.de>")
+ @$(call install_fixup, u-boot-tools,DESCRIPTION,missing)
+
+ifdef PTXCONF_U_BOOT_TOOLS_TOOL_MKIMAGE
+ @$(call install_copy, u-boot-tools, 0, 0, 0755, \
+ $(U_BOOT_TOOLS_DIR)/tools/mkimage, /usr/bin/mkimage)
+endif
+
+ifdef PTXCONF_U_BOOT_TOOLS_TOOL_ENV
+ @$(call install_copy, u-boot-tools, 0, 0, 0755, \
+ $(U_BOOT_TOOLS_DIR)/tools/env/fw_printenv, /usr/sbin/fw_printenv)
+ @$(call install_link, u-boot-tools, fw_printenv, /usr/sbin/fw_setenv)
+endif
+
+ @$(call install_finish, u-boot-tools)
+
+ @$(call touch)
+
+# vim: syntax=make
diff --git a/rules/umkimage.in b/rules/umkimage.in
deleted file mode 100644
index ffff541..0000000
--- a/rules/umkimage.in
+++ /dev/null
@@ -1,8 +0,0 @@
-## SECTION=shell_and_console
-
-config UMKIMAGE
- tristate
- prompt "umkimage"
- help
- umkimage is the U-Boot mkimage command. It is used to create
- boot images for the U-Boot bootloader.
diff --git a/rules/umkimage.make b/rules/umkimage.make
deleted file mode 100644
index ae5f316..0000000
--- a/rules/umkimage.make
+++ /dev/null
@@ -1,66 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2010 by Remy Bohmer <linux@bohmer.net>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_UMKIMAGE) += umkimage
-
-#
-# Paths and names
-#
-UMKIMAGE_VERSION := 2010.03-1
-UMKIMAGE_MD5 := 5e7b4ed03e855a4824317fc4e3917dba
-UMKIMAGE := u-boot-mkimage-$(UMKIMAGE_VERSION)
-UMKIMAGE_SUFFIX := tar.gz
-UMKIMAGE_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(UMKIMAGE).$(UMKIMAGE_SUFFIX)
-UMKIMAGE_SOURCE := $(SRCDIR)/$(UMKIMAGE).$(UMKIMAGE_SUFFIX)
-UMKIMAGE_DIR := $(BUILDDIR)/$(UMKIMAGE)
-UMKIMAGE_LICENSE := GPLv2
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-$(UMKIMAGE_SOURCE):
- @$(call targetinfo)
- @$(call get, UMKIMAGE)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-UMKIMAGE_CONF_TOOL := NO
-UMKIMAGE_MAKE_OPT := \
- $(CROSS_ENV_CFLAGS) \
- $(CROSS_ENV_CPPFLAGS) \
- $(CROSS_ENV_LDFLAGS) \
- $(CROSS_ENV_CC)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/umkimage.targetinstall:
- @$(call targetinfo)
-
- @$(call install_init, umkimage)
- @$(call install_fixup, umkimage,PRIORITY,optional)
- @$(call install_fixup, umkimage,SECTION,base)
- @$(call install_fixup, umkimage,AUTHOR,"Remy Bohmer <linux@bohmer.net>")
- @$(call install_fixup, umkimage,DESCRIPTION,missing)
-
- @$(call install_copy, umkimage, 0, 0, 0755, -, /usr/bin/mkimage)
-
- @$(call install_finish, umkimage)
-
- @$(call touch)
-
-# vim: syntax=make
--
1.7.8.4
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCH v3] replace umkimage by u-boot sources
2012-01-27 23:38 ` [ptxdist] [PATCH v3] " Andreas Bießmann
@ 2012-01-31 14:50 ` Michael Olbrich
0 siblings, 0 replies; 22+ messages in thread
From: Michael Olbrich @ 2012-01-31 14:50 UTC (permalink / raw)
To: ptxdist
On Sat, Jan 28, 2012 at 12:38:08AM +0100, Andreas Bießmann wrote:
> This patch removes the forked mkimage u-boot tool and uses the mainline
> u-boot code to build this tool.
>
> Signed-off-by: Andreas Bießmann <andreas@biessmann.de>
> ---
> Changes since v1:
> * add ROOTFS_FW_ENV_CONFIG parameter which installes /etc/fw_env.config
> * changes requested by Michael
>
> Changes since v2:
> * fix wrong 'fw_saveenv' command -> use correct 'fw_setenv'
>
> ...f8dcdbe5c690c-compiler.h-add-uint-typedef.patch | 26 ------
> patches/u-boot-mkimage-2010.03-1/series | 1 -
> platforms/hosttools.in | 2 +-
> platforms/image_uimage.in | 8 +-
> platforms/kernel.in | 2 +-
> rules/host-u-boot-tools.in | 5 +
> rules/host-u-boot-tools.make | 35 +++++++++
> rules/host-umkimage.in | 8 --
> rules/host-umkimage.make | 37 ---------
> rules/rootfs.in | 9 ++
> rules/rootfs.make | 3 +
> rules/templates/template-kernel-in | 2 +-
> rules/u-boot-tools.in | 32 ++++++++
> rules/u-boot-tools.make | 81 ++++++++++++++++++++
> rules/umkimage.in | 8 --
> rules/umkimage.make | 66 ----------------
> 16 files changed, 172 insertions(+), 153 deletions(-)
> delete mode 100644 patches/u-boot-mkimage-2010.03-1/b050c72d52c4e30d5b978ab6758f8dcdbe5c690c-compiler.h-add-uint-typedef.patch
> delete mode 100644 patches/u-boot-mkimage-2010.03-1/series
> create mode 100644 rules/host-u-boot-tools.in
> create mode 100644 rules/host-u-boot-tools.make
> delete mode 100644 rules/host-umkimage.in
> delete mode 100644 rules/host-umkimage.make
> create mode 100644 rules/u-boot-tools.in
> create mode 100644 rules/u-boot-tools.make
> delete mode 100644 rules/umkimage.in
> delete mode 100644 rules/umkimage.make
>
> diff --git a/patches/u-boot-mkimage-2010.03-1/b050c72d52c4e30d5b978ab6758f8dcdbe5c690c-compiler.h-add-uint-typedef.patch b/patches/u-boot-mkimage-2010.03-1/b050c72d52c4e30d5b978ab6758f8dcdbe5c690c-compiler.h-add-uint-typedef.patch
> deleted file mode 100644
> index f20a663..0000000
> --- a/patches/u-boot-mkimage-2010.03-1/b050c72d52c4e30d5b978ab6758f8dcdbe5c690c-compiler.h-add-uint-typedef.patch
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -commit b050c72d52c4e30d5b978ab6758f8dcdbe5c690c
> -Author: Mike Frysinger <vapier@gentoo.org>
> -Date: Tue Apr 20 05:49:30 2010 -0400
> -
> - compiler.h: add uint typedef
> -
> - Recent crc changes started using the "uint" type in headers that are used
> - on the build system. This subsequently broke mingw targets as they do not
> - provide such a type. So add this basic typedef to compiler.h so that we
> - do not have to worry about this breaking again in the future.
> -
> - Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> - Signed-off-by: Remy Bohmer <linux@bohmer.net>
> -
> -diff --git a/include/compiler.h b/include/compiler.h
> -index 332618e..8030bf6 100644
> ---- a/include/compiler.h
> -+++ b/include/compiler.h
> -@@ -55,6 +55,7 @@ typedef unsigned int uint;
> - typedef uint8_t __u8;
> - typedef uint16_t __u16;
> - typedef uint32_t __u32;
> -+typedef unsigned int uint;
> -
> - #define uswap_16(x) \
> - ((((x) & 0xff00) >> 8) | \
> diff --git a/patches/u-boot-mkimage-2010.03-1/series b/patches/u-boot-mkimage-2010.03-1/series
> deleted file mode 100644
> index dbf4bb4..0000000
> --- a/patches/u-boot-mkimage-2010.03-1/series
> +++ /dev/null
> @@ -1 +0,0 @@
> -b050c72d52c4e30d5b978ab6758f8dcdbe5c690c-compiler.h-add-uint-typedef.patch
> diff --git a/platforms/hosttools.in b/platforms/hosttools.in
> index 155b30b..e9ce0fc 100644
> --- a/platforms/hosttools.in
> +++ b/platforms/hosttools.in
> @@ -19,7 +19,7 @@ source "rules/host-mtd-utils.in"
> source "rules/host-mtools.in"
> source "rules/host-openssl.in"
> source "rules/host-squashfs-tools.in"
> -source "rules/host-umkimage.in"
> +source "rules/host-u-boot-tools.in"
> source "rules/host-util-linux-ng.in"
> source "rules/host-xl-tools.in"
> source "rules/host-xz.in"
> diff --git a/platforms/image_uimage.in b/platforms/image_uimage.in
> index 62119c4..719793d 100644
> --- a/platforms/image_uimage.in
> +++ b/platforms/image_uimage.in
> @@ -3,7 +3,7 @@
> menuconfig IMAGE_UIMAGE
> bool
> prompt "Generate images/uRamdisk "
> - select HOST_UMKIMAGE
> + select HOST_U_BOOT_TOOLS
> select IMAGE_EXT2
> select IMAGE_EXT2_GZIP
> help
> @@ -21,16 +21,16 @@ config IMAGE_UIMAGE_NAME
> config IMAGE_UIMAGE_EXTRA_ARGS
> string
> default ""
> - prompt "extra arguments passed to umkimage"
> + prompt "extra arguments passed to mkimage"
> help
> - If needed you can add extra arguments for umkimage here
> + If needed you can add extra arguments for mkimage here
> (e.g. -a 0xaa00000 -e 0xaa00000 )
>
> # TODO: See comment in rules/post/images.make for this topic
> #config IMAGE_UIMAGE_MULTI
> # bool
> # prompt "Generate a multi image images/muimage"
> -# select HOST_UMKIMAGE
> +# select HOST_U_BOOT_TOOLS
> # select KERNEL
> # select IMAGE_CPIO
> # help
> diff --git a/platforms/kernel.in b/platforms/kernel.in
> index b601284..01b31d3 100644
> --- a/platforms/kernel.in
> +++ b/platforms/kernel.in
> @@ -2,7 +2,7 @@ menuconfig KERNEL
> bool
> default y
> select IMAGE_KERNEL
> - select HOST_UMKIMAGE if KERNEL_IMAGE_U
> + select HOST_U_BOOT_TOOLS if KERNEL_IMAGE_U
> select HOST_XZ if KERNEL_XZ
> select HOST_LZOP if KERNEL_LZOP
> select CROSS_MODULE_INIT_TOOLS if KERNEL_MODULES
> diff --git a/rules/host-u-boot-tools.in b/rules/host-u-boot-tools.in
> new file mode 100644
> index 0000000..c89c04d
> --- /dev/null
> +++ b/rules/host-u-boot-tools.in
> @@ -0,0 +1,5 @@
> +## SECTION=hosttools_noprompt
> +
> +config HOST_U_BOOT_TOOLS
> + tristate
> + default ALLYES
> diff --git a/rules/host-u-boot-tools.make b/rules/host-u-boot-tools.make
> new file mode 100644
> index 0000000..5b7a765
> --- /dev/null
> +++ b/rules/host-u-boot-tools.make
> @@ -0,0 +1,35 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2012 by Andreas Bießmann <andreas@biessmann.de>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +HOST_PACKAGES-$(PTXCONF_HOST_U_BOOT_TOOLS) += host-u-boot-tools
> +
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +HOST_U_BOOT_TOOLS_CONF_TOOL := NO
> +HOST_U_BOOT_TOOLS_MAKE_OPT := tools
> +
> +# ----------------------------------------------------------------------------
> +# Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/host-u-boot-tools.install:
> + @$(call targetinfo)
> + install $(HOST_U_BOOT_TOOLS_DIR)/tools/mkimage \
> + $(PTXCONF_SYSROOT_HOST)/bin/mkimage
use this as install target:
$(HOST_U_BOOT_TOOLS_PKGDIR)/bin/mkimage
> +
> + @$(call touch)
> +
> +# vim: syntax=make
> diff --git a/rules/host-umkimage.in b/rules/host-umkimage.in
> deleted file mode 100644
> index b2990b8..0000000
> --- a/rules/host-umkimage.in
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -## SECTION=hosttools_noprompt
> -
> -config HOST_UMKIMAGE
> - tristate
> - default ALLYES
> - help
> - umkimage is the U-Boot mkimage command. It is used to create
> - boot images for the U-Boot bootloader.
> diff --git a/rules/host-umkimage.make b/rules/host-umkimage.make
> deleted file mode 100644
> index 6b66e18..0000000
> --- a/rules/host-umkimage.make
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -# -*-makefile-*-
> -#
> -# Copyright (C) 2003-2006 by Pengutronix e.K., Hildesheim, Germany
> -# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
> -#
> -# See CREDITS for details about who has contributed to this project.
> -#
> -# For further information about the PTXdist project and license conditions
> -# see the README file.
> -#
> -
> -#
> -# We provide this package
> -#
> -HOST_PACKAGES-$(PTXCONF_HOST_UMKIMAGE) += host-umkimage
> -
> -
> -# ----------------------------------------------------------------------------
> -# Prepare
> -# ----------------------------------------------------------------------------
> -
> -HOST_UMKIMAGE_CONF_TOOL := NO
> -HOST_UMKIMAGE_MAKE_OPT := \
> - $(HOST_ENV_CPPFLAGS) \
> - $(HOST_ENV_LDFLAGS) \
> - $(HOST_ENV_CC)
> -
> -# ----------------------------------------------------------------------------
> -# Install
> -# ----------------------------------------------------------------------------
> -
> -$(STATEDIR)/host-umkimage.install:
> - @$(call targetinfo)
> - install $(HOST_UMKIMAGE_DIR)/mkimage $(PTXCONF_SYSROOT_HOST)/bin/mkimage
> - @$(call touch)
> -
> -# vim: syntax=make
> diff --git a/rules/rootfs.in b/rules/rootfs.in
> index 350f0c2..95cf0a4 100644
> --- a/rules/rootfs.in
> +++ b/rules/rootfs.in
> @@ -333,6 +333,15 @@ config ROOTFS_MTAB_LINK_VAR_FAKE_OVERLAYFS
> select FAKE_OVERLAYFS_VAR_TMP
> prompt "use fake-overlayfs to create /var/tmp/mtab"
>
> +config ROOTFS_FW_ENV_CONFIG
> + bool
> + prompt "install /etc/fw_env.config"
> + depends on U_BOOT_TOOLS_TOOL_ENV
> + help
> + If enabled, it installs "./projectroot/etc/fw_env.config" file
> + if present.
> + Read <U-Boot source>/tools/env/README for file content.
no option for this.
> +
> config ROOTFS_HOSTNAME
> bool
> prompt "install /etc/hostname"
> diff --git a/rules/rootfs.make b/rules/rootfs.make
> index 13a5f2c..d470823 100644
> --- a/rules/rootfs.make
> +++ b/rules/rootfs.make
> @@ -156,6 +156,9 @@ ifdef PTXCONF_ROOTFS_MTAB_LINK_VAR
> $(PTXDIST_TOPDIR)/generic/etc/mtab, /var/tmp/mtab)
> @$(call install_link, rootfs, /var/tmp/mtab, /etc/mtab)
> endif
> +ifdef PTXCONF_ROOTFS_FW_ENV_CONFIG
> + @$(call install_alternative, rootfs, 0, 0, 0644, /etc/fw_env.config)
install with fw_printenv in u-boot-tools.
> +endif
> ifdef PTXCONF_ROOTFS_HOSTNAME
> @$(call install_alternative, rootfs, 0, 0, 0644, /etc/hostname)
> @$(call install_replace, rootfs, /etc/hostname, \
> diff --git a/rules/templates/template-kernel-in b/rules/templates/template-kernel-in
> index ae1095b..5019c88 100644
> --- a/rules/templates/template-kernel-in
> +++ b/rules/templates/template-kernel-in
> @@ -4,6 +4,6 @@ config KERNEL_@PACKAGE@
> tristate
> prompt "Linux kernel (@package@)"
> select CROSS_MODULE_INIT_TOOLS
> - #select HOST_UMKIMAGE
> + #select HOST_U_BOOT_TOOLS
> help
> FIXME
> diff --git a/rules/u-boot-tools.in b/rules/u-boot-tools.in
> new file mode 100644
> index 0000000..c8bc928
> --- /dev/null
> +++ b/rules/u-boot-tools.in
> @@ -0,0 +1,32 @@
> +## SECTION=shell_and_console
> +
> +menuconfig U_BOOT_TOOLS
> + tristate
> + prompt "u-boot-tools "
> + help
> + some helpful tools from U-Boot project. Most important tool in
> + this section is mkimage to generate U-Boot boot images.
> +
> +if U_BOOT_TOOLS
> +
> +config U_BOOT_TOOLS_TOOL_MKIMAGE
> + tristate
> + default y
> + prompt "mkimage"
> + help
> + the U-Boot mkimage command is used to create boot images for
> + the U-Boot bootloader.
> +
> +config U_BOOT_TOOLS_TOOL_ENV
> + tristate
> + default n
> + prompt "fw_{print|set}env"
I think it's not long to write "fw_printenv/fw_setenv" here
> + help
> + the U-Boot fw_printenv and fw_setenv commands are used to
> + read and write U-Boot environment /dev/mtdX partitions on
> + target through linux.
> + The tool will require a configuration on target named
> + /etc/fw_env.config. See U-Boot source directory tools/env
> + for detailed description.
> +
> +endif
> diff --git a/rules/u-boot-tools.make b/rules/u-boot-tools.make
> new file mode 100644
> index 0000000..d6db1b3
> --- /dev/null
> +++ b/rules/u-boot-tools.make
> @@ -0,0 +1,81 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2012 by Andreas Bießmann <andreas@biessmann.de>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_U_BOOT_TOOLS) += u-boot-tools
> +
> +#
> +# Paths and names
> +#
> +U_BOOT_TOOLS_VERSION := 2011.12
> +U_BOOT_TOOLS_MD5 := 7f29b9f6da44d6e46e988e7561fd1d5f
> +U_BOOT_TOOLS := u-boot-$(U_BOOT_TOOLS_VERSION)
> +U_BOOT_TOOLS_SUFFIX := tar.bz2
> +U_BOOT_TOOLS_URL := http://ftp.denx.de/pub/u-boot/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX)
> +U_BOOT_TOOLS_SOURCE := $(SRCDIR)/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX)
> +U_BOOT_TOOLS_DIR := $(BUILDDIR)/$(U_BOOT_TOOLS)
> +U_BOOT_TOOLS_LICENSE := GPLv2
> +
> +# ----------------------------------------------------------------------------
> +# Get
> +# ----------------------------------------------------------------------------
> +
> +$(U_BOOT_TOOLS_SOURCE):
> + @$(call targetinfo)
> + @$(call get, U_BOOT_TOOLS)
remove
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +U_BOOT_TOOLS_CONF_TOOL := NO
> +U_BOOT_TOOLS_MAKE_OPT := \
> + HOSTCC="$(CROSS_CC)" \
> + HOSTSTRIP="$(CROSS_STRIP)" \
> + tools
> +
> +ifdef PTXCONF_U_BOOT_TOOLS_TOOL_ENV
> +U_BOOT_TOOLS_MAKE_OPT += env
> +endif
> +
# ----------------------------------------------------------------------------
# Install
# ----------------------------------------------------------------------------
> +$(STATEDIR)/u-boot-tools.install:
> + @$(call targetinfo)
install mkimage and fw_printenv to /usr/sbin in $(U_BOOT_TOOLS_PKGDIR)
> + @$(call touch)
> +
# ----------------------------------------------------------------------------
# Target-Install
# ----------------------------------------------------------------------------
> +$(STATEDIR)/u-boot-tools.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, u-boot-tools)
> + @$(call install_fixup, u-boot-tools,PRIORITY,optional)
> + @$(call install_fixup, u-boot-tools,SECTION,base)
> + @$(call install_fixup, u-boot-tools,AUTHOR,"Andreas Bießmann <andreas@biessmann.de>")
> + @$(call install_fixup, u-boot-tools,DESCRIPTION,missing)
> +
> +ifdef PTXCONF_U_BOOT_TOOLS_TOOL_MKIMAGE
> + @$(call install_copy, u-boot-tools, 0, 0, 0755, \
> + $(U_BOOT_TOOLS_DIR)/tools/mkimage, /usr/bin/mkimage)
-, /usr/bin/mkimage)
should work now.
> +endif
> +
> +ifdef PTXCONF_U_BOOT_TOOLS_TOOL_ENV
> + @$(call install_copy, u-boot-tools, 0, 0, 0755, \
> + $(U_BOOT_TOOLS_DIR)/tools/env/fw_printenv, /usr/sbin/fw_printenv)
> + @$(call install_link, u-boot-tools, fw_printenv, /usr/sbin/fw_setenv)
same here.
install the config here and add a default config file in generic/. Use the
one from u-boot but with all comments, to avoid a wrong configuration.
Michael
> +endif
> +
> + @$(call install_finish, u-boot-tools)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
> diff --git a/rules/umkimage.in b/rules/umkimage.in
> deleted file mode 100644
> index ffff541..0000000
> --- a/rules/umkimage.in
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -## SECTION=shell_and_console
> -
> -config UMKIMAGE
> - tristate
> - prompt "umkimage"
> - help
> - umkimage is the U-Boot mkimage command. It is used to create
> - boot images for the U-Boot bootloader.
> diff --git a/rules/umkimage.make b/rules/umkimage.make
> deleted file mode 100644
> index ae5f316..0000000
> --- a/rules/umkimage.make
> +++ /dev/null
> @@ -1,66 +0,0 @@
> -# -*-makefile-*-
> -#
> -# Copyright (C) 2010 by Remy Bohmer <linux@bohmer.net>
> -#
> -# See CREDITS for details about who has contributed to this project.
> -#
> -# For further information about the PTXdist project and license conditions
> -# see the README file.
> -#
> -
> -#
> -# We provide this package
> -#
> -PACKAGES-$(PTXCONF_UMKIMAGE) += umkimage
> -
> -#
> -# Paths and names
> -#
> -UMKIMAGE_VERSION := 2010.03-1
> -UMKIMAGE_MD5 := 5e7b4ed03e855a4824317fc4e3917dba
> -UMKIMAGE := u-boot-mkimage-$(UMKIMAGE_VERSION)
> -UMKIMAGE_SUFFIX := tar.gz
> -UMKIMAGE_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(UMKIMAGE).$(UMKIMAGE_SUFFIX)
> -UMKIMAGE_SOURCE := $(SRCDIR)/$(UMKIMAGE).$(UMKIMAGE_SUFFIX)
> -UMKIMAGE_DIR := $(BUILDDIR)/$(UMKIMAGE)
> -UMKIMAGE_LICENSE := GPLv2
> -
> -# ----------------------------------------------------------------------------
> -# Get
> -# ----------------------------------------------------------------------------
> -
> -$(UMKIMAGE_SOURCE):
> - @$(call targetinfo)
> - @$(call get, UMKIMAGE)
> -
> -# ----------------------------------------------------------------------------
> -# Prepare
> -# ----------------------------------------------------------------------------
> -
> -UMKIMAGE_CONF_TOOL := NO
> -UMKIMAGE_MAKE_OPT := \
> - $(CROSS_ENV_CFLAGS) \
> - $(CROSS_ENV_CPPFLAGS) \
> - $(CROSS_ENV_LDFLAGS) \
> - $(CROSS_ENV_CC)
> -
> -# ----------------------------------------------------------------------------
> -# Target-Install
> -# ----------------------------------------------------------------------------
> -
> -$(STATEDIR)/umkimage.targetinstall:
> - @$(call targetinfo)
> -
> - @$(call install_init, umkimage)
> - @$(call install_fixup, umkimage,PRIORITY,optional)
> - @$(call install_fixup, umkimage,SECTION,base)
> - @$(call install_fixup, umkimage,AUTHOR,"Remy Bohmer <linux@bohmer.net>")
> - @$(call install_fixup, umkimage,DESCRIPTION,missing)
> -
> - @$(call install_copy, umkimage, 0, 0, 0755, -, /usr/bin/mkimage)
> -
> - @$(call install_finish, umkimage)
> -
> - @$(call touch)
> -
> -# vim: syntax=make
> --
> 1.7.8.4
>
>
> --
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* [ptxdist] [PATCH v4] replace umkimage by u-boot sources
2012-01-21 16:59 [ptxdist] [PATCH / RFC] replace umkimage by u-boot sources Andreas Bießmann
` (2 preceding siblings ...)
2012-01-27 23:38 ` [ptxdist] [PATCH v3] " Andreas Bießmann
@ 2012-01-31 22:49 ` Andreas Bießmann
2012-02-01 8:55 ` Michael Olbrich
3 siblings, 1 reply; 22+ messages in thread
From: Andreas Bießmann @ 2012-01-31 22:49 UTC (permalink / raw)
To: PTXdist ML
This patch removes the forked mkimage u-boot tool and uses the mainline
u-boot code to build this tool.
Signed-off-by: Andreas Bießmann <andreas@biessmann.de>
---
Changes since v1:
* add ROOTFS_FW_ENV_CONFIG parameter which installes /etc/fw_env.config
* changes requested by Michael
Changes since v2:
* fix wrong 'fw_saveenv' command -> use correct 'fw_setenv'
Changes since v3:
* install host-u-boot-tools into $(HOST_U_BOOT_TOOLS_PKGDIR) rather than
into $(PTXCONF_SYSROOT_HOST)
* remove /etc/fw_env.config from rootfs.{in|make} and install with
u-boot-tools
* remove get for u-boot-tools
* install u-boot-tools into $(U_BOOT_TOOLS_PKGDIR) before packaging
.. but use /usr/bin/mkimage and /usr/sbin/fw_printenv cause mkimage
may be used by normal users (Michael requested to install both into
/usr/sbin, but most distros use /usr/bin for mkimage)
* add a generic/etc/fw_env.config with all comments but no function
additionally give some hints in help text for CONFIG_U_BOOT_TOOLS_TOOL_ENV
generic/etc/fw_env.config | 19 +++++
...f8dcdbe5c690c-compiler.h-add-uint-typedef.patch | 26 ------
patches/u-boot-mkimage-2010.03-1/series | 1 -
platforms/hosttools.in | 2 +-
platforms/image_uimage.in | 8 +-
platforms/kernel.in | 2 +-
rules/host-u-boot-tools.in | 5 +
rules/host-u-boot-tools.make | 35 ++++++++
rules/host-umkimage.in | 8 --
rules/host-umkimage.make | 37 ---------
rules/templates/template-kernel-in | 2 +-
rules/u-boot-tools.in | 36 +++++++++
rules/u-boot-tools.make | 82 ++++++++++++++++++++
rules/umkimage.in | 8 --
rules/umkimage.make | 66 ----------------
15 files changed, 184 insertions(+), 153 deletions(-)
create mode 100644 generic/etc/fw_env.config
delete mode 100644 patches/u-boot-mkimage-2010.03-1/b050c72d52c4e30d5b978ab6758f8dcdbe5c690c-compiler.h-add-uint-typedef.patch
delete mode 100644 patches/u-boot-mkimage-2010.03-1/series
create mode 100644 rules/host-u-boot-tools.in
create mode 100644 rules/host-u-boot-tools.make
delete mode 100644 rules/host-umkimage.in
delete mode 100644 rules/host-umkimage.make
create mode 100644 rules/u-boot-tools.in
create mode 100644 rules/u-boot-tools.make
delete mode 100644 rules/umkimage.in
delete mode 100644 rules/umkimage.make
diff --git a/generic/etc/fw_env.config b/generic/etc/fw_env.config
new file mode 100644
index 0000000..bc6890d
--- /dev/null
+++ b/generic/etc/fw_env.config
@@ -0,0 +1,19 @@
+# Configuration file for fw_(printenv/saveenv) utility.
+# Up to two entries are valid, in this case the redundant
+# environment sector is assumed present.
+# Notice, that the "Number of sectors" is ignored on NOR and SPI-dataflash.
+# Futhermore, if the Flash sector size is ommitted, this value is assumed to
+# be the same as the Environment size, which is valid for NOR and SPI-dataflash
+
+# NOR example
+# MTD device name Device offset Env. size Flash sector size Number of sectors
+#/dev/mtd1 0x0000 0x4000 0x4000
+#/dev/mtd2 0x0000 0x4000 0x4000
+
+# MTD SPI-dataflash example
+# MTD device name Device offset Env. size Flash sector size Number of sectors
+#/dev/mtd5 0x4200 0x4200
+#/dev/mtd6 0x4200 0x4200
+
+# NAND example
+#/dev/mtd0 0x4000 0x4000 0x20000 2
diff --git a/patches/u-boot-mkimage-2010.03-1/b050c72d52c4e30d5b978ab6758f8dcdbe5c690c-compiler.h-add-uint-typedef.patch b/patches/u-boot-mkimage-2010.03-1/b050c72d52c4e30d5b978ab6758f8dcdbe5c690c-compiler.h-add-uint-typedef.patch
deleted file mode 100644
index f20a663..0000000
--- a/patches/u-boot-mkimage-2010.03-1/b050c72d52c4e30d5b978ab6758f8dcdbe5c690c-compiler.h-add-uint-typedef.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit b050c72d52c4e30d5b978ab6758f8dcdbe5c690c
-Author: Mike Frysinger <vapier@gentoo.org>
-Date: Tue Apr 20 05:49:30 2010 -0400
-
- compiler.h: add uint typedef
-
- Recent crc changes started using the "uint" type in headers that are used
- on the build system. This subsequently broke mingw targets as they do not
- provide such a type. So add this basic typedef to compiler.h so that we
- do not have to worry about this breaking again in the future.
-
- Signed-off-by: Mike Frysinger <vapier@gentoo.org>
- Signed-off-by: Remy Bohmer <linux@bohmer.net>
-
-diff --git a/include/compiler.h b/include/compiler.h
-index 332618e..8030bf6 100644
---- a/include/compiler.h
-+++ b/include/compiler.h
-@@ -55,6 +55,7 @@ typedef unsigned int uint;
- typedef uint8_t __u8;
- typedef uint16_t __u16;
- typedef uint32_t __u32;
-+typedef unsigned int uint;
-
- #define uswap_16(x) \
- ((((x) & 0xff00) >> 8) | \
diff --git a/patches/u-boot-mkimage-2010.03-1/series b/patches/u-boot-mkimage-2010.03-1/series
deleted file mode 100644
index dbf4bb4..0000000
--- a/patches/u-boot-mkimage-2010.03-1/series
+++ /dev/null
@@ -1 +0,0 @@
-b050c72d52c4e30d5b978ab6758f8dcdbe5c690c-compiler.h-add-uint-typedef.patch
diff --git a/platforms/hosttools.in b/platforms/hosttools.in
index 155b30b..e9ce0fc 100644
--- a/platforms/hosttools.in
+++ b/platforms/hosttools.in
@@ -19,7 +19,7 @@ source "rules/host-mtd-utils.in"
source "rules/host-mtools.in"
source "rules/host-openssl.in"
source "rules/host-squashfs-tools.in"
-source "rules/host-umkimage.in"
+source "rules/host-u-boot-tools.in"
source "rules/host-util-linux-ng.in"
source "rules/host-xl-tools.in"
source "rules/host-xz.in"
diff --git a/platforms/image_uimage.in b/platforms/image_uimage.in
index 62119c4..719793d 100644
--- a/platforms/image_uimage.in
+++ b/platforms/image_uimage.in
@@ -3,7 +3,7 @@
menuconfig IMAGE_UIMAGE
bool
prompt "Generate images/uRamdisk "
- select HOST_UMKIMAGE
+ select HOST_U_BOOT_TOOLS
select IMAGE_EXT2
select IMAGE_EXT2_GZIP
help
@@ -21,16 +21,16 @@ config IMAGE_UIMAGE_NAME
config IMAGE_UIMAGE_EXTRA_ARGS
string
default ""
- prompt "extra arguments passed to umkimage"
+ prompt "extra arguments passed to mkimage"
help
- If needed you can add extra arguments for umkimage here
+ If needed you can add extra arguments for mkimage here
(e.g. -a 0xaa00000 -e 0xaa00000 )
# TODO: See comment in rules/post/images.make for this topic
#config IMAGE_UIMAGE_MULTI
# bool
# prompt "Generate a multi image images/muimage"
-# select HOST_UMKIMAGE
+# select HOST_U_BOOT_TOOLS
# select KERNEL
# select IMAGE_CPIO
# help
diff --git a/platforms/kernel.in b/platforms/kernel.in
index b601284..01b31d3 100644
--- a/platforms/kernel.in
+++ b/platforms/kernel.in
@@ -2,7 +2,7 @@ menuconfig KERNEL
bool
default y
select IMAGE_KERNEL
- select HOST_UMKIMAGE if KERNEL_IMAGE_U
+ select HOST_U_BOOT_TOOLS if KERNEL_IMAGE_U
select HOST_XZ if KERNEL_XZ
select HOST_LZOP if KERNEL_LZOP
select CROSS_MODULE_INIT_TOOLS if KERNEL_MODULES
diff --git a/rules/host-u-boot-tools.in b/rules/host-u-boot-tools.in
new file mode 100644
index 0000000..c89c04d
--- /dev/null
+++ b/rules/host-u-boot-tools.in
@@ -0,0 +1,5 @@
+## SECTION=hosttools_noprompt
+
+config HOST_U_BOOT_TOOLS
+ tristate
+ default ALLYES
diff --git a/rules/host-u-boot-tools.make b/rules/host-u-boot-tools.make
new file mode 100644
index 0000000..27543f9
--- /dev/null
+++ b/rules/host-u-boot-tools.make
@@ -0,0 +1,35 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2012 by Andreas Bießmann <andreas@biessmann.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_U_BOOT_TOOLS) += host-u-boot-tools
+
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+HOST_U_BOOT_TOOLS_CONF_TOOL := NO
+HOST_U_BOOT_TOOLS_MAKE_OPT := tools
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/host-u-boot-tools.install:
+ @$(call targetinfo)
+ install -D $(HOST_U_BOOT_TOOLS_DIR)/tools/mkimage \
+ $(HOST_U_BOOT_TOOLS_PKGDIR)/bin/mkimage
+
+ @$(call touch)
+
+# vim: syntax=make
diff --git a/rules/host-umkimage.in b/rules/host-umkimage.in
deleted file mode 100644
index b2990b8..0000000
--- a/rules/host-umkimage.in
+++ /dev/null
@@ -1,8 +0,0 @@
-## SECTION=hosttools_noprompt
-
-config HOST_UMKIMAGE
- tristate
- default ALLYES
- help
- umkimage is the U-Boot mkimage command. It is used to create
- boot images for the U-Boot bootloader.
diff --git a/rules/host-umkimage.make b/rules/host-umkimage.make
deleted file mode 100644
index 6b66e18..0000000
--- a/rules/host-umkimage.make
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2003-2006 by Pengutronix e.K., Hildesheim, Germany
-# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-HOST_PACKAGES-$(PTXCONF_HOST_UMKIMAGE) += host-umkimage
-
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-HOST_UMKIMAGE_CONF_TOOL := NO
-HOST_UMKIMAGE_MAKE_OPT := \
- $(HOST_ENV_CPPFLAGS) \
- $(HOST_ENV_LDFLAGS) \
- $(HOST_ENV_CC)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/host-umkimage.install:
- @$(call targetinfo)
- install $(HOST_UMKIMAGE_DIR)/mkimage $(PTXCONF_SYSROOT_HOST)/bin/mkimage
- @$(call touch)
-
-# vim: syntax=make
diff --git a/rules/templates/template-kernel-in b/rules/templates/template-kernel-in
index ae1095b..5019c88 100644
--- a/rules/templates/template-kernel-in
+++ b/rules/templates/template-kernel-in
@@ -4,6 +4,6 @@ config KERNEL_@PACKAGE@
tristate
prompt "Linux kernel (@package@)"
select CROSS_MODULE_INIT_TOOLS
- #select HOST_UMKIMAGE
+ #select HOST_U_BOOT_TOOLS
help
FIXME
diff --git a/rules/u-boot-tools.in b/rules/u-boot-tools.in
new file mode 100644
index 0000000..b02ded5
--- /dev/null
+++ b/rules/u-boot-tools.in
@@ -0,0 +1,36 @@
+## SECTION=shell_and_console
+
+menuconfig U_BOOT_TOOLS
+ tristate
+ prompt "u-boot-tools "
+ help
+ some helpful tools from U-Boot project. Most important tool in
+ this section is mkimage to generate U-Boot boot images.
+
+if U_BOOT_TOOLS
+
+config U_BOOT_TOOLS_TOOL_MKIMAGE
+ tristate
+ default y
+ prompt "mkimage"
+ help
+ the U-Boot mkimage command is used to create boot images for
+ the U-Boot bootloader.
+
+config U_BOOT_TOOLS_TOOL_ENV
+ tristate
+ default n
+ prompt "fw_printenv/fw_setenv"
+ help
+ the U-Boot fw_printenv and fw_setenv commands are used to
+ read and write U-Boot environment /dev/mtdX partitions on
+ target through linux.
+ The tool will require a configuration on target named
+ /etc/fw_env.config. See U-Boot source directory tools/env
+ for detailed description.
+ Choosing this option will install a /etc/fw_env.config to
+ target-fs either from your BSP or a generic one which is
+ likely to not work with your board. Please read the
+ comments in that generic configuration.
+
+endif
diff --git a/rules/u-boot-tools.make b/rules/u-boot-tools.make
new file mode 100644
index 0000000..937a49d
--- /dev/null
+++ b/rules/u-boot-tools.make
@@ -0,0 +1,82 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2012 by Andreas Bießmann <andreas@biessmann.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_U_BOOT_TOOLS) += u-boot-tools
+
+#
+# Paths and names
+#
+U_BOOT_TOOLS_VERSION := 2011.12
+U_BOOT_TOOLS_MD5 := 7f29b9f6da44d6e46e988e7561fd1d5f
+U_BOOT_TOOLS := u-boot-$(U_BOOT_TOOLS_VERSION)
+U_BOOT_TOOLS_SUFFIX := tar.bz2
+U_BOOT_TOOLS_URL := http://ftp.denx.de/pub/u-boot/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX)
+U_BOOT_TOOLS_SOURCE := $(SRCDIR)/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX)
+U_BOOT_TOOLS_DIR := $(BUILDDIR)/$(U_BOOT_TOOLS)
+U_BOOT_TOOLS_LICENSE := GPLv2
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+U_BOOT_TOOLS_CONF_TOOL := NO
+U_BOOT_TOOLS_MAKE_OPT := \
+ HOSTCC="$(CROSS_CC)" \
+ HOSTSTRIP="$(CROSS_STRIP)" \
+ tools
+
+ifdef PTXCONF_U_BOOT_TOOLS_TOOL_ENV
+U_BOOT_TOOLS_MAKE_OPT += env
+endif
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/u-boot-tools.install:
+ @$(call targetinfo)
+ install -D $(U_BOOT_TOOLS_DIR)/tools/mkimage \
+ $(U_BOOT_TOOLS_PKGDIR)/usr/bin/mkimage
+ install -D $(U_BOOT_TOOLS_DIR)/tools/env/fw_printenv \
+ $(U_BOOT_TOOLS_PKGDIR)/usr/sbin/fw_printenv
+ @$(call touch)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/u-boot-tools.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, u-boot-tools)
+ @$(call install_fixup, u-boot-tools,PRIORITY,optional)
+ @$(call install_fixup, u-boot-tools,SECTION,base)
+ @$(call install_fixup, u-boot-tools,AUTHOR,\
+ "Andreas Bießmann <andreas@biessmann.de>")
+ @$(call install_fixup, u-boot-tools,DESCRIPTION,missing)
+
+ifdef PTXCONF_U_BOOT_TOOLS_TOOL_MKIMAGE
+ @$(call install_copy, u-boot-tools, 0, 0, 0755, -, /usr/bin/mkimage)
+endif
+
+ifdef PTXCONF_U_BOOT_TOOLS_TOOL_ENV
+ @$(call install_copy, u-boot-tools, 0, 0, 0755, -, /usr/sbin/fw_printenv)
+ @$(call install_link, u-boot-tools, fw_printenv, /usr/sbin/fw_setenv)
+ @$(call install_alternative, u-boot-tools, 0, 0, 0644, /etc/fw_env.config)
+endif
+
+ @$(call install_finish, u-boot-tools)
+
+ @$(call touch)
+
+# vim: syntax=make
diff --git a/rules/umkimage.in b/rules/umkimage.in
deleted file mode 100644
index ffff541..0000000
--- a/rules/umkimage.in
+++ /dev/null
@@ -1,8 +0,0 @@
-## SECTION=shell_and_console
-
-config UMKIMAGE
- tristate
- prompt "umkimage"
- help
- umkimage is the U-Boot mkimage command. It is used to create
- boot images for the U-Boot bootloader.
diff --git a/rules/umkimage.make b/rules/umkimage.make
deleted file mode 100644
index ae5f316..0000000
--- a/rules/umkimage.make
+++ /dev/null
@@ -1,66 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2010 by Remy Bohmer <linux@bohmer.net>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_UMKIMAGE) += umkimage
-
-#
-# Paths and names
-#
-UMKIMAGE_VERSION := 2010.03-1
-UMKIMAGE_MD5 := 5e7b4ed03e855a4824317fc4e3917dba
-UMKIMAGE := u-boot-mkimage-$(UMKIMAGE_VERSION)
-UMKIMAGE_SUFFIX := tar.gz
-UMKIMAGE_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(UMKIMAGE).$(UMKIMAGE_SUFFIX)
-UMKIMAGE_SOURCE := $(SRCDIR)/$(UMKIMAGE).$(UMKIMAGE_SUFFIX)
-UMKIMAGE_DIR := $(BUILDDIR)/$(UMKIMAGE)
-UMKIMAGE_LICENSE := GPLv2
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-$(UMKIMAGE_SOURCE):
- @$(call targetinfo)
- @$(call get, UMKIMAGE)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-UMKIMAGE_CONF_TOOL := NO
-UMKIMAGE_MAKE_OPT := \
- $(CROSS_ENV_CFLAGS) \
- $(CROSS_ENV_CPPFLAGS) \
- $(CROSS_ENV_LDFLAGS) \
- $(CROSS_ENV_CC)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/umkimage.targetinstall:
- @$(call targetinfo)
-
- @$(call install_init, umkimage)
- @$(call install_fixup, umkimage,PRIORITY,optional)
- @$(call install_fixup, umkimage,SECTION,base)
- @$(call install_fixup, umkimage,AUTHOR,"Remy Bohmer <linux@bohmer.net>")
- @$(call install_fixup, umkimage,DESCRIPTION,missing)
-
- @$(call install_copy, umkimage, 0, 0, 0755, -, /usr/bin/mkimage)
-
- @$(call install_finish, umkimage)
-
- @$(call touch)
-
-# vim: syntax=make
--
1.7.8.4
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCH v4] replace umkimage by u-boot sources
2012-01-31 22:49 ` [ptxdist] [PATCH v4] " Andreas Bießmann
@ 2012-02-01 8:55 ` Michael Olbrich
2012-03-12 9:00 ` Andreas Bießmann
0 siblings, 1 reply; 22+ messages in thread
From: Michael Olbrich @ 2012-02-01 8:55 UTC (permalink / raw)
To: ptxdist
On Tue, Jan 31, 2012 at 11:49:05PM +0100, Andreas Bießmann wrote:
> This patch removes the forked mkimage u-boot tool and uses the mainline
> u-boot code to build this tool.
Looks good now. I'll apply it once the 2012.02 release is out.
Michael
> Signed-off-by: Andreas Bießmann <andreas@biessmann.de>
> ---
> Changes since v1:
> * add ROOTFS_FW_ENV_CONFIG parameter which installes /etc/fw_env.config
> * changes requested by Michael
>
> Changes since v2:
> * fix wrong 'fw_saveenv' command -> use correct 'fw_setenv'
>
> Changes since v3:
> * install host-u-boot-tools into $(HOST_U_BOOT_TOOLS_PKGDIR) rather than
> into $(PTXCONF_SYSROOT_HOST)
> * remove /etc/fw_env.config from rootfs.{in|make} and install with
> u-boot-tools
> * remove get for u-boot-tools
> * install u-boot-tools into $(U_BOOT_TOOLS_PKGDIR) before packaging
> .. but use /usr/bin/mkimage and /usr/sbin/fw_printenv cause mkimage
> may be used by normal users (Michael requested to install both into
> /usr/sbin, but most distros use /usr/bin for mkimage)
> * add a generic/etc/fw_env.config with all comments but no function
> additionally give some hints in help text for CONFIG_U_BOOT_TOOLS_TOOL_ENV
>
> generic/etc/fw_env.config | 19 +++++
> ...f8dcdbe5c690c-compiler.h-add-uint-typedef.patch | 26 ------
> patches/u-boot-mkimage-2010.03-1/series | 1 -
> platforms/hosttools.in | 2 +-
> platforms/image_uimage.in | 8 +-
> platforms/kernel.in | 2 +-
> rules/host-u-boot-tools.in | 5 +
> rules/host-u-boot-tools.make | 35 ++++++++
> rules/host-umkimage.in | 8 --
> rules/host-umkimage.make | 37 ---------
> rules/templates/template-kernel-in | 2 +-
> rules/u-boot-tools.in | 36 +++++++++
> rules/u-boot-tools.make | 82 ++++++++++++++++++++
> rules/umkimage.in | 8 --
> rules/umkimage.make | 66 ----------------
> 15 files changed, 184 insertions(+), 153 deletions(-)
> create mode 100644 generic/etc/fw_env.config
> delete mode 100644 patches/u-boot-mkimage-2010.03-1/b050c72d52c4e30d5b978ab6758f8dcdbe5c690c-compiler.h-add-uint-typedef.patch
> delete mode 100644 patches/u-boot-mkimage-2010.03-1/series
> create mode 100644 rules/host-u-boot-tools.in
> create mode 100644 rules/host-u-boot-tools.make
> delete mode 100644 rules/host-umkimage.in
> delete mode 100644 rules/host-umkimage.make
> create mode 100644 rules/u-boot-tools.in
> create mode 100644 rules/u-boot-tools.make
> delete mode 100644 rules/umkimage.in
> delete mode 100644 rules/umkimage.make
>
> diff --git a/generic/etc/fw_env.config b/generic/etc/fw_env.config
> new file mode 100644
> index 0000000..bc6890d
> --- /dev/null
> +++ b/generic/etc/fw_env.config
> @@ -0,0 +1,19 @@
> +# Configuration file for fw_(printenv/saveenv) utility.
> +# Up to two entries are valid, in this case the redundant
> +# environment sector is assumed present.
> +# Notice, that the "Number of sectors" is ignored on NOR and SPI-dataflash.
> +# Futhermore, if the Flash sector size is ommitted, this value is assumed to
> +# be the same as the Environment size, which is valid for NOR and SPI-dataflash
> +
> +# NOR example
> +# MTD device name Device offset Env. size Flash sector size Number of sectors
> +#/dev/mtd1 0x0000 0x4000 0x4000
> +#/dev/mtd2 0x0000 0x4000 0x4000
> +
> +# MTD SPI-dataflash example
> +# MTD device name Device offset Env. size Flash sector size Number of sectors
> +#/dev/mtd5 0x4200 0x4200
> +#/dev/mtd6 0x4200 0x4200
> +
> +# NAND example
> +#/dev/mtd0 0x4000 0x4000 0x20000 2
> diff --git a/patches/u-boot-mkimage-2010.03-1/b050c72d52c4e30d5b978ab6758f8dcdbe5c690c-compiler.h-add-uint-typedef.patch b/patches/u-boot-mkimage-2010.03-1/b050c72d52c4e30d5b978ab6758f8dcdbe5c690c-compiler.h-add-uint-typedef.patch
> deleted file mode 100644
> index f20a663..0000000
> --- a/patches/u-boot-mkimage-2010.03-1/b050c72d52c4e30d5b978ab6758f8dcdbe5c690c-compiler.h-add-uint-typedef.patch
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -commit b050c72d52c4e30d5b978ab6758f8dcdbe5c690c
> -Author: Mike Frysinger <vapier@gentoo.org>
> -Date: Tue Apr 20 05:49:30 2010 -0400
> -
> - compiler.h: add uint typedef
> -
> - Recent crc changes started using the "uint" type in headers that are used
> - on the build system. This subsequently broke mingw targets as they do not
> - provide such a type. So add this basic typedef to compiler.h so that we
> - do not have to worry about this breaking again in the future.
> -
> - Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> - Signed-off-by: Remy Bohmer <linux@bohmer.net>
> -
> -diff --git a/include/compiler.h b/include/compiler.h
> -index 332618e..8030bf6 100644
> ---- a/include/compiler.h
> -+++ b/include/compiler.h
> -@@ -55,6 +55,7 @@ typedef unsigned int uint;
> - typedef uint8_t __u8;
> - typedef uint16_t __u16;
> - typedef uint32_t __u32;
> -+typedef unsigned int uint;
> -
> - #define uswap_16(x) \
> - ((((x) & 0xff00) >> 8) | \
> diff --git a/patches/u-boot-mkimage-2010.03-1/series b/patches/u-boot-mkimage-2010.03-1/series
> deleted file mode 100644
> index dbf4bb4..0000000
> --- a/patches/u-boot-mkimage-2010.03-1/series
> +++ /dev/null
> @@ -1 +0,0 @@
> -b050c72d52c4e30d5b978ab6758f8dcdbe5c690c-compiler.h-add-uint-typedef.patch
> diff --git a/platforms/hosttools.in b/platforms/hosttools.in
> index 155b30b..e9ce0fc 100644
> --- a/platforms/hosttools.in
> +++ b/platforms/hosttools.in
> @@ -19,7 +19,7 @@ source "rules/host-mtd-utils.in"
> source "rules/host-mtools.in"
> source "rules/host-openssl.in"
> source "rules/host-squashfs-tools.in"
> -source "rules/host-umkimage.in"
> +source "rules/host-u-boot-tools.in"
> source "rules/host-util-linux-ng.in"
> source "rules/host-xl-tools.in"
> source "rules/host-xz.in"
> diff --git a/platforms/image_uimage.in b/platforms/image_uimage.in
> index 62119c4..719793d 100644
> --- a/platforms/image_uimage.in
> +++ b/platforms/image_uimage.in
> @@ -3,7 +3,7 @@
> menuconfig IMAGE_UIMAGE
> bool
> prompt "Generate images/uRamdisk "
> - select HOST_UMKIMAGE
> + select HOST_U_BOOT_TOOLS
> select IMAGE_EXT2
> select IMAGE_EXT2_GZIP
> help
> @@ -21,16 +21,16 @@ config IMAGE_UIMAGE_NAME
> config IMAGE_UIMAGE_EXTRA_ARGS
> string
> default ""
> - prompt "extra arguments passed to umkimage"
> + prompt "extra arguments passed to mkimage"
> help
> - If needed you can add extra arguments for umkimage here
> + If needed you can add extra arguments for mkimage here
> (e.g. -a 0xaa00000 -e 0xaa00000 )
>
> # TODO: See comment in rules/post/images.make for this topic
> #config IMAGE_UIMAGE_MULTI
> # bool
> # prompt "Generate a multi image images/muimage"
> -# select HOST_UMKIMAGE
> +# select HOST_U_BOOT_TOOLS
> # select KERNEL
> # select IMAGE_CPIO
> # help
> diff --git a/platforms/kernel.in b/platforms/kernel.in
> index b601284..01b31d3 100644
> --- a/platforms/kernel.in
> +++ b/platforms/kernel.in
> @@ -2,7 +2,7 @@ menuconfig KERNEL
> bool
> default y
> select IMAGE_KERNEL
> - select HOST_UMKIMAGE if KERNEL_IMAGE_U
> + select HOST_U_BOOT_TOOLS if KERNEL_IMAGE_U
> select HOST_XZ if KERNEL_XZ
> select HOST_LZOP if KERNEL_LZOP
> select CROSS_MODULE_INIT_TOOLS if KERNEL_MODULES
> diff --git a/rules/host-u-boot-tools.in b/rules/host-u-boot-tools.in
> new file mode 100644
> index 0000000..c89c04d
> --- /dev/null
> +++ b/rules/host-u-boot-tools.in
> @@ -0,0 +1,5 @@
> +## SECTION=hosttools_noprompt
> +
> +config HOST_U_BOOT_TOOLS
> + tristate
> + default ALLYES
> diff --git a/rules/host-u-boot-tools.make b/rules/host-u-boot-tools.make
> new file mode 100644
> index 0000000..27543f9
> --- /dev/null
> +++ b/rules/host-u-boot-tools.make
> @@ -0,0 +1,35 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2012 by Andreas Bießmann <andreas@biessmann.de>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +HOST_PACKAGES-$(PTXCONF_HOST_U_BOOT_TOOLS) += host-u-boot-tools
> +
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +HOST_U_BOOT_TOOLS_CONF_TOOL := NO
> +HOST_U_BOOT_TOOLS_MAKE_OPT := tools
> +
> +# ----------------------------------------------------------------------------
> +# Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/host-u-boot-tools.install:
> + @$(call targetinfo)
> + install -D $(HOST_U_BOOT_TOOLS_DIR)/tools/mkimage \
> + $(HOST_U_BOOT_TOOLS_PKGDIR)/bin/mkimage
> +
> + @$(call touch)
> +
> +# vim: syntax=make
> diff --git a/rules/host-umkimage.in b/rules/host-umkimage.in
> deleted file mode 100644
> index b2990b8..0000000
> --- a/rules/host-umkimage.in
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -## SECTION=hosttools_noprompt
> -
> -config HOST_UMKIMAGE
> - tristate
> - default ALLYES
> - help
> - umkimage is the U-Boot mkimage command. It is used to create
> - boot images for the U-Boot bootloader.
> diff --git a/rules/host-umkimage.make b/rules/host-umkimage.make
> deleted file mode 100644
> index 6b66e18..0000000
> --- a/rules/host-umkimage.make
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -# -*-makefile-*-
> -#
> -# Copyright (C) 2003-2006 by Pengutronix e.K., Hildesheim, Germany
> -# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
> -#
> -# See CREDITS for details about who has contributed to this project.
> -#
> -# For further information about the PTXdist project and license conditions
> -# see the README file.
> -#
> -
> -#
> -# We provide this package
> -#
> -HOST_PACKAGES-$(PTXCONF_HOST_UMKIMAGE) += host-umkimage
> -
> -
> -# ----------------------------------------------------------------------------
> -# Prepare
> -# ----------------------------------------------------------------------------
> -
> -HOST_UMKIMAGE_CONF_TOOL := NO
> -HOST_UMKIMAGE_MAKE_OPT := \
> - $(HOST_ENV_CPPFLAGS) \
> - $(HOST_ENV_LDFLAGS) \
> - $(HOST_ENV_CC)
> -
> -# ----------------------------------------------------------------------------
> -# Install
> -# ----------------------------------------------------------------------------
> -
> -$(STATEDIR)/host-umkimage.install:
> - @$(call targetinfo)
> - install $(HOST_UMKIMAGE_DIR)/mkimage $(PTXCONF_SYSROOT_HOST)/bin/mkimage
> - @$(call touch)
> -
> -# vim: syntax=make
> diff --git a/rules/templates/template-kernel-in b/rules/templates/template-kernel-in
> index ae1095b..5019c88 100644
> --- a/rules/templates/template-kernel-in
> +++ b/rules/templates/template-kernel-in
> @@ -4,6 +4,6 @@ config KERNEL_@PACKAGE@
> tristate
> prompt "Linux kernel (@package@)"
> select CROSS_MODULE_INIT_TOOLS
> - #select HOST_UMKIMAGE
> + #select HOST_U_BOOT_TOOLS
> help
> FIXME
> diff --git a/rules/u-boot-tools.in b/rules/u-boot-tools.in
> new file mode 100644
> index 0000000..b02ded5
> --- /dev/null
> +++ b/rules/u-boot-tools.in
> @@ -0,0 +1,36 @@
> +## SECTION=shell_and_console
> +
> +menuconfig U_BOOT_TOOLS
> + tristate
> + prompt "u-boot-tools "
> + help
> + some helpful tools from U-Boot project. Most important tool in
> + this section is mkimage to generate U-Boot boot images.
> +
> +if U_BOOT_TOOLS
> +
> +config U_BOOT_TOOLS_TOOL_MKIMAGE
> + tristate
> + default y
> + prompt "mkimage"
> + help
> + the U-Boot mkimage command is used to create boot images for
> + the U-Boot bootloader.
> +
> +config U_BOOT_TOOLS_TOOL_ENV
> + tristate
> + default n
> + prompt "fw_printenv/fw_setenv"
> + help
> + the U-Boot fw_printenv and fw_setenv commands are used to
> + read and write U-Boot environment /dev/mtdX partitions on
> + target through linux.
> + The tool will require a configuration on target named
> + /etc/fw_env.config. See U-Boot source directory tools/env
> + for detailed description.
> + Choosing this option will install a /etc/fw_env.config to
> + target-fs either from your BSP or a generic one which is
> + likely to not work with your board. Please read the
> + comments in that generic configuration.
> +
> +endif
> diff --git a/rules/u-boot-tools.make b/rules/u-boot-tools.make
> new file mode 100644
> index 0000000..937a49d
> --- /dev/null
> +++ b/rules/u-boot-tools.make
> @@ -0,0 +1,82 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2012 by Andreas Bießmann <andreas@biessmann.de>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_U_BOOT_TOOLS) += u-boot-tools
> +
> +#
> +# Paths and names
> +#
> +U_BOOT_TOOLS_VERSION := 2011.12
> +U_BOOT_TOOLS_MD5 := 7f29b9f6da44d6e46e988e7561fd1d5f
> +U_BOOT_TOOLS := u-boot-$(U_BOOT_TOOLS_VERSION)
> +U_BOOT_TOOLS_SUFFIX := tar.bz2
> +U_BOOT_TOOLS_URL := http://ftp.denx.de/pub/u-boot/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX)
> +U_BOOT_TOOLS_SOURCE := $(SRCDIR)/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX)
> +U_BOOT_TOOLS_DIR := $(BUILDDIR)/$(U_BOOT_TOOLS)
> +U_BOOT_TOOLS_LICENSE := GPLv2
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +U_BOOT_TOOLS_CONF_TOOL := NO
> +U_BOOT_TOOLS_MAKE_OPT := \
> + HOSTCC="$(CROSS_CC)" \
> + HOSTSTRIP="$(CROSS_STRIP)" \
> + tools
> +
> +ifdef PTXCONF_U_BOOT_TOOLS_TOOL_ENV
> +U_BOOT_TOOLS_MAKE_OPT += env
> +endif
> +
> +# ----------------------------------------------------------------------------
> +# Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/u-boot-tools.install:
> + @$(call targetinfo)
> + install -D $(U_BOOT_TOOLS_DIR)/tools/mkimage \
> + $(U_BOOT_TOOLS_PKGDIR)/usr/bin/mkimage
> + install -D $(U_BOOT_TOOLS_DIR)/tools/env/fw_printenv \
> + $(U_BOOT_TOOLS_PKGDIR)/usr/sbin/fw_printenv
> + @$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/u-boot-tools.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, u-boot-tools)
> + @$(call install_fixup, u-boot-tools,PRIORITY,optional)
> + @$(call install_fixup, u-boot-tools,SECTION,base)
> + @$(call install_fixup, u-boot-tools,AUTHOR,\
> + "Andreas Bießmann <andreas@biessmann.de>")
> + @$(call install_fixup, u-boot-tools,DESCRIPTION,missing)
> +
> +ifdef PTXCONF_U_BOOT_TOOLS_TOOL_MKIMAGE
> + @$(call install_copy, u-boot-tools, 0, 0, 0755, -, /usr/bin/mkimage)
> +endif
> +
> +ifdef PTXCONF_U_BOOT_TOOLS_TOOL_ENV
> + @$(call install_copy, u-boot-tools, 0, 0, 0755, -, /usr/sbin/fw_printenv)
> + @$(call install_link, u-boot-tools, fw_printenv, /usr/sbin/fw_setenv)
> + @$(call install_alternative, u-boot-tools, 0, 0, 0644, /etc/fw_env.config)
> +endif
> +
> + @$(call install_finish, u-boot-tools)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
> diff --git a/rules/umkimage.in b/rules/umkimage.in
> deleted file mode 100644
> index ffff541..0000000
> --- a/rules/umkimage.in
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -## SECTION=shell_and_console
> -
> -config UMKIMAGE
> - tristate
> - prompt "umkimage"
> - help
> - umkimage is the U-Boot mkimage command. It is used to create
> - boot images for the U-Boot bootloader.
> diff --git a/rules/umkimage.make b/rules/umkimage.make
> deleted file mode 100644
> index ae5f316..0000000
> --- a/rules/umkimage.make
> +++ /dev/null
> @@ -1,66 +0,0 @@
> -# -*-makefile-*-
> -#
> -# Copyright (C) 2010 by Remy Bohmer <linux@bohmer.net>
> -#
> -# See CREDITS for details about who has contributed to this project.
> -#
> -# For further information about the PTXdist project and license conditions
> -# see the README file.
> -#
> -
> -#
> -# We provide this package
> -#
> -PACKAGES-$(PTXCONF_UMKIMAGE) += umkimage
> -
> -#
> -# Paths and names
> -#
> -UMKIMAGE_VERSION := 2010.03-1
> -UMKIMAGE_MD5 := 5e7b4ed03e855a4824317fc4e3917dba
> -UMKIMAGE := u-boot-mkimage-$(UMKIMAGE_VERSION)
> -UMKIMAGE_SUFFIX := tar.gz
> -UMKIMAGE_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(UMKIMAGE).$(UMKIMAGE_SUFFIX)
> -UMKIMAGE_SOURCE := $(SRCDIR)/$(UMKIMAGE).$(UMKIMAGE_SUFFIX)
> -UMKIMAGE_DIR := $(BUILDDIR)/$(UMKIMAGE)
> -UMKIMAGE_LICENSE := GPLv2
> -
> -# ----------------------------------------------------------------------------
> -# Get
> -# ----------------------------------------------------------------------------
> -
> -$(UMKIMAGE_SOURCE):
> - @$(call targetinfo)
> - @$(call get, UMKIMAGE)
> -
> -# ----------------------------------------------------------------------------
> -# Prepare
> -# ----------------------------------------------------------------------------
> -
> -UMKIMAGE_CONF_TOOL := NO
> -UMKIMAGE_MAKE_OPT := \
> - $(CROSS_ENV_CFLAGS) \
> - $(CROSS_ENV_CPPFLAGS) \
> - $(CROSS_ENV_LDFLAGS) \
> - $(CROSS_ENV_CC)
> -
> -# ----------------------------------------------------------------------------
> -# Target-Install
> -# ----------------------------------------------------------------------------
> -
> -$(STATEDIR)/umkimage.targetinstall:
> - @$(call targetinfo)
> -
> - @$(call install_init, umkimage)
> - @$(call install_fixup, umkimage,PRIORITY,optional)
> - @$(call install_fixup, umkimage,SECTION,base)
> - @$(call install_fixup, umkimage,AUTHOR,"Remy Bohmer <linux@bohmer.net>")
> - @$(call install_fixup, umkimage,DESCRIPTION,missing)
> -
> - @$(call install_copy, umkimage, 0, 0, 0755, -, /usr/bin/mkimage)
> -
> - @$(call install_finish, umkimage)
> -
> - @$(call touch)
> -
> -# vim: syntax=make
> --
> 1.7.8.4
>
>
> --
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCH v4] replace umkimage by u-boot sources
2012-02-01 8:55 ` Michael Olbrich
@ 2012-03-12 9:00 ` Andreas Bießmann
2012-03-12 10:46 ` Michael Olbrich
0 siblings, 1 reply; 22+ messages in thread
From: Andreas Bießmann @ 2012-03-12 9:00 UTC (permalink / raw)
To: ptxdist
Dear Michael,
On 01.02.2012 09:55, Michael Olbrich wrote:
> On Tue, Jan 31, 2012 at 11:49:05PM +0100, Andreas Bießmann wrote:
>> This patch removes the forked mkimage u-boot tool and uses the mainline
>> u-boot code to build this tool.
>
> Looks good now. I'll apply it once the 2012.02 release is out.
how about this patch?
regards
Andreas Bießmann
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ptxdist] [PATCH v4] replace umkimage by u-boot sources
2012-03-12 9:00 ` Andreas Bießmann
@ 2012-03-12 10:46 ` Michael Olbrich
0 siblings, 0 replies; 22+ messages in thread
From: Michael Olbrich @ 2012-03-12 10:46 UTC (permalink / raw)
To: ptxdist
On Mon, Mar 12, 2012 at 10:00:55AM +0100, Andreas Bießmann wrote:
> On 01.02.2012 09:55, Michael Olbrich wrote:
> > On Tue, Jan 31, 2012 at 11:49:05PM +0100, Andreas Bießmann wrote:
> >> This patch removes the forked mkimage u-boot tool and uses the mainline
> >> u-boot code to build this tool.
> >
> > Looks good now. I'll apply it once the 2012.02 release is out.
>
> how about this patch?
Sorry. I forgot about that. Applied now.
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2012-03-12 10:46 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-21 16:59 [ptxdist] [PATCH / RFC] replace umkimage by u-boot sources Andreas Bießmann
2012-01-21 18:22 ` Michael Olbrich
2012-01-21 20:08 ` Bernhard Walle
2012-01-22 9:17 ` Michael Olbrich
2012-01-22 9:58 ` Andreas Bießmann
2012-01-22 10:14 ` Michael Olbrich
2012-01-22 14:49 ` [ptxdist] [PATCH v2] " Andreas Bießmann
2012-01-22 14:57 ` Bernhard Walle
2012-01-23 12:37 ` Andreas Bießmann
2012-01-26 15:06 ` Michael Olbrich
2012-01-26 16:05 ` Andreas Bießmann
2012-01-23 12:40 ` Andreas Bießmann
2012-01-23 13:07 ` Bernhard Walle
2012-01-23 13:16 ` Andreas Bießmann
2012-01-23 13:44 ` Bernhard Walle
2012-01-27 7:17 ` Andreas Bießmann
2012-01-27 23:38 ` [ptxdist] [PATCH v3] " Andreas Bießmann
2012-01-31 14:50 ` Michael Olbrich
2012-01-31 22:49 ` [ptxdist] [PATCH v4] " Andreas Bießmann
2012-02-01 8:55 ` Michael Olbrich
2012-03-12 9:00 ` Andreas Bießmann
2012-03-12 10:46 ` Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox