diff for duplicates of <48b30a00.1701d00a.4ee8.ffffa5f7@mx.google.com> diff --git a/a/1.txt b/N1/1.txt index dc71fd7..0be1f11 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,366 +1,3 @@ -Allow building of the newer FIT-image format for U-boot, while keeping -it possible to build the legacy format, for people who do not want to (or can) -upgrade to U-boot 1.3.3 or newer. - -If an older mkimage is detected, or if there is no dtc (Device Tree Compiler) -then automagically the legacy format is created. -There is also a possibility to force the legacy format by means of a Kconfig -option. - -Note: This patch only adapts this for ARM, AVR32, Blackfin and sh architectures. - It does not adapt the PowerPC tree, because PowerPC does not use the - script at scripts/mkuboot.sh - -Signed-off-by: Remy Bohmer <linux@bohmer.net> ---- - arch/arm/Kconfig | 10 ++ - arch/arm/boot/Makefile | 10 ++ - arch/avr32/Kconfig | 14 ++++ - arch/avr32/boot/images/Makefile | 8 ++ - arch/blackfin/Kconfig | 10 ++ - arch/blackfin/boot/Makefile | 8 ++ - arch/sh/Kconfig | 10 ++ - arch/sh/boot/Makefile | 8 ++ - scripts/mkuboot.sh | 140 ++++++++++++++++++++++++++++++++++++++-- - 9 files changed, 209 insertions(+), 9 deletions(-) - -Index: linux-2.6.27-rc4/arch/arm/Kconfig -=================================================================== ---- linux-2.6.27-rc4.orig/arch/arm/Kconfig 2008-08-25 20:58:36.000000000 +0200 -+++ linux-2.6.27-rc4/arch/arm/Kconfig 2008-08-25 20:58:40.000000000 +0200 -@@ -977,6 +977,16 @@ config UNCOMPRESSED_UIMAGE - - If unsure, say N. - -+config LEGACY_UIMAGE -+ bool "Use legacy format for building uImage" -+ default n -+ help -+ Enable this option if you want uImage to be build in the legacy -+ format. If this option is 'N' the uImage will be build in the newer -+ FIT-image format. (Needs at least 'mkimage v1.3.3', and 'dtc v1.2.0') -+ -+ If unsure, say N. -+ - config XIP_PHYS_ADDR - hex "XIP Kernel Physical Location" - depends on XIP_KERNEL -Index: linux-2.6.27-rc4/arch/arm/boot/Makefile -=================================================================== ---- linux-2.6.27-rc4.orig/arch/arm/boot/Makefile 2008-08-25 20:58:36.000000000 +0200 -+++ linux-2.6.27-rc4/arch/arm/boot/Makefile 2008-08-25 20:58:40.000000000 +0200 -@@ -59,10 +59,16 @@ $(obj)/zImage: $(obj)/compressed/vmlinux - - endif - -+ifeq ($(CONFIG_LEGACY_UIMAGE),y) -+UIMAGE_FORMAT=legacy -+else -+UIMAGE_FORMAT=fit -+endif -+ - quiet_cmd_uimage = UIMAGE $@ - cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A arm -O linux -T kernel \ -- -C none -a $(LOADADDR) -e $(LOADADDR) \ -- -n 'Linux-$(KERNELRELEASE)' -d $< $@ -+ -C none -a $(LOADADDR) -e $(LOADADDR) -l $(UIMAGE_FORMAT) \ -+ -n 'Linux-$(KERNELRELEASE)' -d $< -i $@ - - ifeq ($(CONFIG_ZBOOT_ROM),y) - $(obj)/uImage: LOADADDR=$(CONFIG_ZBOOT_ROM_TEXT) -Index: linux-2.6.27-rc4/scripts/mkuboot.sh -=================================================================== ---- linux-2.6.27-rc4.orig/scripts/mkuboot.sh 2008-08-25 20:58:33.000000000 +0200 -+++ linux-2.6.27-rc4/scripts/mkuboot.sh 2008-08-25 21:07:06.000000000 +0200 -@@ -1,19 +1,151 @@ - #!/bin/bash -- - # - # Build U-Boot image when `mkimage' tool is available. -+# Check also if dtc exist and has the right version (at least v 1.2.0) -+# -+# 25 Aug 2008: Remy Bohmer <linux@bohmer.net>, -+# Added support for FIT and legacy uImages - # - - MKIMAGE=$(type -path "${CROSS_COMPILE}mkimage") -+DTC=$(type -path "${CROSS_COMPILE}dtc") -+ -+function usage () { -+ echo "Usage: `basename $0` -A arch -O os -T type -C comp -a addr" -+ echo " -e ep -l <legacy|fit> -n name " -+ echo " -d data_file[:data_file...] -i image" -+ echo " -A ==> set architecture to 'arch'" -+ echo " -O ==> set operating system to 'os'" -+ echo " -T ==> set image type to 'type'" -+ echo " -C ==> set compression type 'comp'" -+ echo " -a ==> set load address to 'addr' (hex)" -+ echo " -e ==> set entry point to 'ep' (hex)" -+ echo " -l ==> uImage format type <legacy|fit>" -+ echo " -n ==> set image name to 'name'" -+ echo " -d ==> use image data from 'datafile'" -+ echo " -i ==> destination image" -+ exit 1 -+} -+ -+OPT_CNT=0 -+OPT_MASK=0 -+function track_opt () { -+ let OPT_CNT=${OPT_CNT}+1 -+ let OPT_MASK=${OPT_MASK}+$1 -+} -+ -+function gen_tmp_specfile () { -+rm -f $1 -+cat > $1 << EOF -+/ { -+ description = "kernel ${NAME}"; -+ #address-cells = <1>; -+ -+ images { -+ kernel@1 { -+ description = "Linux Kernel"; -+ data = /incbin/("$(basename ${DATA})"); -+ type = "${TYPE}"; -+ arch = "${ARCH}"; -+ os = "${OS}"; -+ compression = "${COMPRESS}"; -+ load = <${LOADADDR}>; -+ entry = <${ENTRY}>; -+ hash@1 { -+ algo = "crc32"; -+ }; -+ hash@2 { -+ algo = "sha1"; -+ }; -+ }; -+ }; -+ -+ configurations { -+ default = "config@1"; -+ config@1 { -+ description = "Boot Linux kernel"; -+ kernel = "kernel@1"; -+ }; -+ }; -+}; -+EOF -+} -+ -+# -+# Parse command line -+# -+while getopts ":A:O:T:C:a:e:l:n:d:i:" Option -+do -+ case $Option in -+ A ) track_opt 1 ; ARCH=$OPTARG;; -+ O ) track_opt 2 ; OS=$OPTARG;; -+ T ) track_opt 4 ; TYPE=$OPTARG;; -+ C ) track_opt 8 ; COMPRESS=$OPTARG;; -+ a ) track_opt 16 ; LOADADDR=$OPTARG;; -+ e ) track_opt 32 ; ENTRY=$OPTARG;; -+ l ) track_opt 64 ; UIMAGE_FORMAT=$OPTARG;; -+ n ) track_opt 128; NAME=$OPTARG;; -+ d ) track_opt 256; DATA=$OPTARG;; -+ i ) track_opt 512; IMAGE=$OPTARG;; -+ * ) echo "Invalid option passed to '$0' (options:$@)" -+ usage;; -+ esac -+done -+ -+# strip off the 0x from the LOADADDR and ENTRY (if exists) -+LOADADDR=$(echo "${LOADADDR}" | sed s@'0x'@''@g) -+ENTRY=$(echo "${ENTRY}" | sed s@'0x'@''@g) -+ -+# All arguments available ? -+if [ ${OPT_CNT} -ne 10 -o ${OPT_MASK} -ne 1023 ]; then -+ usage -+fi - - if [ -z "${MKIMAGE}" ]; then - MKIMAGE=$(type -path mkimage) - if [ -z "${MKIMAGE}" ]; then - # Doesn't exist -- echo '"mkimage" command not found - U-Boot images will not be built' >&2 -+ echo '"mkimage" command not found' >&2 -+ echo '--> U-Boot images will not be built' >&2 - exit 0; - fi - fi - --# Call "mkimage" to create U-Boot image --${MKIMAGE} "$@" -+if [ "${UIMAGE_FORMAT}" != "legacy" ]; then -+ if [ "x$(${MKIMAGE} 2>&1 | grep '\-f')" = "x" ]; then -+ echo "'${MKIMAGE}' does not support FIT images" >&2 -+ echo "Building legacy U-Boot image..." >&2 -+ UIMAGE_FORMAT=legacy -+ fi -+fi -+ -+if [ "${UIMAGE_FORMAT}" != "legacy" ]; then -+ # for building FIT images we need the device tree compiler -+ if [ -z "${DTC}" ]; then -+ DTC=$(type -path dtc) -+ if [ -z "${DTC}" ]; then -+ # Doesn't exist -+ echo '"dtc" command not found' >&2 -+ echo '--> Can only built legacy U-Boot images' >&2 -+ UIMAGE_FORMAT=legacy -+ else -+ DTC_VER=$(dtc -v | cut -d' ' -f3 | sed s@'\.'@''@g) -+ if [ ${DTC_VER} -lt 120 ]; then -+ echo '"dtc" must be at least version 1.2.0' >&2 -+ echo '-->Can only built legacy U-Boot images'>&2 -+ UIMAGE_FORMAT=legacy -+ fi -+ fi -+ fi -+fi -+ -+if [ "${UIMAGE_FORMAT}" = "legacy" ]; then -+ # Call "mkimage" in the legacy mode to create U-Boot image -+ ${MKIMAGE} -A ${ARCH} -O ${OS} -T ${TYPE} \ -+ -C ${COMPRESS} -a 0x${LOADADDR} -e 0x${ENTRY} \ -+ -n "${NAME}" -d ${DATA} ${IMAGE} -+else -+ # Call "mkimage" in the FIT mode to create U-Boot image -+ gen_tmp_specfile ${IMAGE}.its -+ ${MKIMAGE} -f ${IMAGE}.its ${IMAGE} -+fi -Index: linux-2.6.27-rc4/arch/blackfin/Kconfig -=================================================================== ---- linux-2.6.27-rc4.orig/arch/blackfin/Kconfig 2008-08-25 20:58:33.000000000 +0200 -+++ linux-2.6.27-rc4/arch/blackfin/Kconfig 2008-08-25 20:58:40.000000000 +0200 -@@ -286,6 +286,16 @@ config BOOT_LOAD - memory region is used to capture NULL pointer references as well - as some core kernel functions. - -+config LEGACY_UIMAGE -+ bool "Use legacy format for building uImage" -+ default n -+ help -+ Enable this option if you want uImage to be build in the legacy -+ format. If this option is 'N' the uImage will be build in the newer -+ FIT-image format. (Needs at least 'mkimage v1.3.3', and 'dtc v1.2.0') -+ -+ If unsure, say N. -+ - comment "Clock/PLL Setup" - - config CLKIN_HZ -Index: linux-2.6.27-rc4/arch/blackfin/boot/Makefile -=================================================================== ---- linux-2.6.27-rc4.orig/arch/blackfin/boot/Makefile 2008-08-25 20:58:33.000000000 +0200 -+++ linux-2.6.27-rc4/arch/blackfin/boot/Makefile 2008-08-25 20:58:40.000000000 +0200 -@@ -11,11 +11,17 @@ MKIMAGE := $(srctree)/scripts/mkuboot.sh - targets := vmImage - extra-y += vmlinux.bin vmlinux.gz - -+ifeq ($(CONFIG_LEGACY_UIMAGE),y) -+UIMAGE_FORMAT=legacy -+else -+UIMAGE_FORMAT=fit -+endif -+ - quiet_cmd_uimage = UIMAGE $@ - cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A $(ARCH) -O linux -T kernel \ - -C gzip -n 'Linux-$(KERNELRELEASE)' -a $(CONFIG_BOOT_LOAD) \ - -e $(shell $(NM) vmlinux | awk '$$NF == "__start" {print $$1}') \ -- -d $< $@ -+ -l $(UIMAGE_FORMAT) -d $< -i $@ - - $(obj)/vmlinux.bin: vmlinux FORCE - $(call if_changed,objcopy) -Index: linux-2.6.27-rc4/arch/avr32/Kconfig -=================================================================== ---- linux-2.6.27-rc4.orig/arch/avr32/Kconfig 2008-08-25 20:58:33.000000000 +0200 -+++ linux-2.6.27-rc4/arch/avr32/Kconfig 2008-08-25 20:58:40.000000000 +0200 -@@ -147,6 +147,20 @@ config PHYS_OFFSET - hex - default 0x10000000 if CPU_AT32AP700X=y - -+if LOADER_U_BOOT -+ -+config LEGACY_UIMAGE -+ bool "Use legacy format for building uImage" -+ default n -+ help -+ Enable this option if you want uImage to be build in the legacy -+ format. If this option is 'N' the uImage will be build in the newer -+ FIT-image format. (Needs at least 'mkimage v1.3.3', and 'dtc v1.2.0') -+ -+ If unsure, say N. -+ -+endif -+ - source "kernel/Kconfig.preempt" - - config QUICKLIST -Index: linux-2.6.27-rc4/arch/avr32/boot/images/Makefile -=================================================================== ---- linux-2.6.27-rc4.orig/arch/avr32/boot/images/Makefile 2008-08-25 20:58:33.000000000 +0200 -+++ linux-2.6.27-rc4/arch/avr32/boot/images/Makefile 2008-08-25 20:58:40.000000000 +0200 -@@ -17,10 +17,16 @@ $(obj)/vmlinux.bin: vmlinux FORCE - $(obj)/vmlinux.gz: $(obj)/vmlinux.bin FORCE - $(call if_changed,gzip) - -+ifeq ($(CONFIG_LEGACY_UIMAGE),y) -+UIMAGE_FORMAT=legacy -+else -+UIMAGE_FORMAT=fit -+endif -+ - quiet_cmd_uimage = UIMAGE $@ - cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A avr32 -O linux -T kernel \ - -C gzip -a $(CONFIG_LOAD_ADDRESS) -e $(CONFIG_ENTRY_ADDRESS) \ -- -n 'Linux-$(KERNELRELEASE)' -d $< $@ -+ -l $(UIMAGE_FORMAT) -n 'Linux-$(KERNELRELEASE)' -d $< -i $@ - - targets += uImage uImage.srec - $(obj)/uImage: $(obj)/vmlinux.gz -Index: linux-2.6.27-rc4/arch/sh/Kconfig -=================================================================== ---- linux-2.6.27-rc4.orig/arch/sh/Kconfig 2008-08-25 20:58:33.000000000 +0200 -+++ linux-2.6.27-rc4/arch/sh/Kconfig 2008-08-25 20:58:40.000000000 +0200 -@@ -607,6 +607,16 @@ config CMDLINE - depends on CMDLINE_BOOL - default "console=ttySC1,115200" - -+config LEGACY_UIMAGE -+ bool "Use legacy format for building uImage" -+ default n -+ help -+ Enable this option if you want uImage to be build in the legacy -+ format. If this option is 'N' the uImage will be build in the newer -+ FIT-image format. (Needs at least 'mkimage v1.3.3', and 'dtc v1.2.0') -+ -+ If unsure, say N. -+ - endmenu - - menu "Bus options" -Index: linux-2.6.27-rc4/arch/sh/boot/Makefile -=================================================================== ---- linux-2.6.27-rc4.orig/arch/sh/boot/Makefile 2008-08-25 20:58:33.000000000 +0200 -+++ linux-2.6.27-rc4/arch/sh/boot/Makefile 2008-08-25 20:58:40.000000000 +0200 -@@ -43,10 +43,16 @@ KERNEL_ENTRY := $(shell /bin/bash -c 'pr - $(CONFIG_MEMORY_START) + \ - $(CONFIG_ZERO_PAGE_OFFSET) + $(CONFIG_ENTRY_OFFSET)]') - -+ifeq ($(CONFIG_LEGACY_UIMAGE),y) -+UIMAGE_FORMAT=legacy -+else -+UIMAGE_FORMAT=fit -+endif -+ - quiet_cmd_uimage = UIMAGE $@ - cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A sh -O linux -T kernel \ - -C gzip -a $(KERNEL_LOAD) -e $(KERNEL_ENTRY) \ -- -n 'Linux-$(KERNELRELEASE)' -d $< $@ -+ -l $(UIMAGE_FORMAT) -n 'Linux-$(KERNELRELEASE)' -d $< -i $@ - - $(obj)/uImage: $(obj)/vmlinux.bin.gz FORCE - $(call if_changed,uimage) - --- +An embedded and charset-unspecified text was scrubbed... +Name: add-u-boot-fit-image-support.patch +Url: http://lists.denx.de/pipermail/u-boot/attachments/20080825/7b7fd6f7/attachment.txt diff --git a/a/content_digest b/N1/content_digest index 0b2b590..a4a4cb5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,380 +1,12 @@ "ref\020080825191427.728251800@bohmer.net\0" "From\0Remy Bohmer <linux@bohmer.net>\0" - "Subject\0[patch 2/2] Add support for building the new U-boot uImage format (FIT-format)\0" + "Subject\0[U-Boot] [patch 2/2] Add support for building the new U-boot uImage format\t(FIT-format)\0" "Date\0Mon, 25 Aug 2008 21:14:29 +0200\0" - "To\0Linux Kernel Mailing List <linux-kernel@vger.kernel.org>" - u-boot@lists.denx.de - " sam@ravnborg.org\0" - "Cc\0Stefan Roese <sr@denx.de>" - " Remy Bohmer <linux@bohmer.net>\0" + "To\0u-boot@lists.denx.de\0" "\00:1\0" - "fn\0add-u-boot-fit-image-support.patch\0" "b\0" - "Allow building of the newer FIT-image format for U-boot, while keeping\n" - "it possible to build the legacy format, for people who do not want to (or can) \n" - "upgrade to U-boot 1.3.3 or newer.\n" - "\n" - "If an older mkimage is detected, or if there is no dtc (Device Tree Compiler)\n" - "then automagically the legacy format is created.\n" - "There is also a possibility to force the legacy format by means of a Kconfig\n" - "option.\n" - "\n" - "Note: This patch only adapts this for ARM, AVR32, Blackfin and sh architectures.\n" - " It does not adapt the PowerPC tree, because PowerPC does not use the\n" - " script at scripts/mkuboot.sh\n" - "\n" - "Signed-off-by: Remy Bohmer <linux@bohmer.net>\n" - "---\n" - " arch/arm/Kconfig | 10 ++\n" - " arch/arm/boot/Makefile | 10 ++\n" - " arch/avr32/Kconfig | 14 ++++\n" - " arch/avr32/boot/images/Makefile | 8 ++\n" - " arch/blackfin/Kconfig | 10 ++\n" - " arch/blackfin/boot/Makefile | 8 ++\n" - " arch/sh/Kconfig | 10 ++\n" - " arch/sh/boot/Makefile | 8 ++\n" - " scripts/mkuboot.sh | 140 ++++++++++++++++++++++++++++++++++++++--\n" - " 9 files changed, 209 insertions(+), 9 deletions(-)\n" - "\n" - "Index: linux-2.6.27-rc4/arch/arm/Kconfig\n" - "===================================================================\n" - "--- linux-2.6.27-rc4.orig/arch/arm/Kconfig\t2008-08-25 20:58:36.000000000 +0200\n" - "+++ linux-2.6.27-rc4/arch/arm/Kconfig\t2008-08-25 20:58:40.000000000 +0200\n" - "@@ -977,6 +977,16 @@ config UNCOMPRESSED_UIMAGE\n" - " \n" - " \t If unsure, say N.\n" - " \n" - "+config LEGACY_UIMAGE\n" - "+\tbool \"Use legacy format for building uImage\"\n" - "+\tdefault n\n" - "+\thelp\n" - "+\t Enable this option if you want uImage to be build in the legacy\n" - "+\t format. If this option is 'N' the uImage will be build in the newer\n" - "+\t FIT-image format. (Needs at least 'mkimage v1.3.3', and 'dtc v1.2.0')\n" - "+\n" - "+\t If unsure, say N.\n" - "+\n" - " config XIP_PHYS_ADDR\n" - " \thex \"XIP Kernel Physical Location\"\n" - " \tdepends on XIP_KERNEL\n" - "Index: linux-2.6.27-rc4/arch/arm/boot/Makefile\n" - "===================================================================\n" - "--- linux-2.6.27-rc4.orig/arch/arm/boot/Makefile\t2008-08-25 20:58:36.000000000 +0200\n" - "+++ linux-2.6.27-rc4/arch/arm/boot/Makefile\t2008-08-25 20:58:40.000000000 +0200\n" - "@@ -59,10 +59,16 @@ $(obj)/zImage:\t$(obj)/compressed/vmlinux\n" - " \n" - " endif\n" - " \n" - "+ifeq ($(CONFIG_LEGACY_UIMAGE),y)\n" - "+UIMAGE_FORMAT=legacy\n" - "+else\n" - "+UIMAGE_FORMAT=fit\n" - "+endif\n" - "+\n" - " quiet_cmd_uimage = UIMAGE $@\n" - " cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A arm -O linux -T kernel \\\n" - "-\t\t -C none -a $(LOADADDR) -e $(LOADADDR) \\\n" - "-\t\t -n 'Linux-$(KERNELRELEASE)' -d $< $@\n" - "+\t\t -C none -a $(LOADADDR) -e $(LOADADDR) -l $(UIMAGE_FORMAT) \\\n" - "+\t\t -n 'Linux-$(KERNELRELEASE)' -d $< -i $@\n" - " \n" - " ifeq ($(CONFIG_ZBOOT_ROM),y)\n" - " $(obj)/uImage: LOADADDR=$(CONFIG_ZBOOT_ROM_TEXT)\n" - "Index: linux-2.6.27-rc4/scripts/mkuboot.sh\n" - "===================================================================\n" - "--- linux-2.6.27-rc4.orig/scripts/mkuboot.sh\t2008-08-25 20:58:33.000000000 +0200\n" - "+++ linux-2.6.27-rc4/scripts/mkuboot.sh\t2008-08-25 21:07:06.000000000 +0200\n" - "@@ -1,19 +1,151 @@\n" - " #!/bin/bash\n" - "-\n" - " #\n" - " # Build U-Boot image when `mkimage' tool is available.\n" - "+# Check also if dtc exist and has the right version (at least v 1.2.0)\n" - "+#\n" - "+# 25 Aug 2008: Remy Bohmer <linux@bohmer.net>,\n" - "+# Added support for FIT and legacy uImages\n" - " #\n" - " \n" - " MKIMAGE=$(type -path \"${CROSS_COMPILE}mkimage\")\n" - "+DTC=$(type -path \"${CROSS_COMPILE}dtc\")\n" - "+\n" - "+function usage () {\n" - "+\techo \"Usage: `basename $0` -A arch -O os -T type -C comp -a addr\"\n" - "+\techo \" -e ep -l <legacy|fit> -n name \"\n" - "+\techo \" -d data_file[:data_file...] -i image\"\n" - "+\techo \" -A ==> set architecture to 'arch'\"\n" - "+\techo \" -O ==> set operating system to 'os'\"\n" - "+\techo \" -T ==> set image type to 'type'\"\n" - "+\techo \" -C ==> set compression type 'comp'\"\n" - "+\techo \" -a ==> set load address to 'addr' (hex)\"\n" - "+\techo \" -e ==> set entry point to 'ep' (hex)\"\n" - "+\techo \" -l ==> uImage format type <legacy|fit>\"\n" - "+\techo \" -n ==> set image name to 'name'\"\n" - "+\techo \" -d ==> use image data from 'datafile'\"\n" - "+\techo \" -i ==> destination image\"\n" - "+\texit 1\n" - "+}\n" - "+\n" - "+OPT_CNT=0\n" - "+OPT_MASK=0\n" - "+function track_opt () {\n" - "+\tlet OPT_CNT=${OPT_CNT}+1\n" - "+\tlet OPT_MASK=${OPT_MASK}+$1\n" - "+}\n" - "+\n" - "+function gen_tmp_specfile () {\n" - "+rm -f $1\n" - "+cat > $1 << EOF\n" - "+/ {\n" - "+ description = \"kernel ${NAME}\";\n" - "+ #address-cells = <1>;\n" - "+\n" - "+ images {\n" - "+ kernel@1 {\n" - "+ description = \"Linux Kernel\";\n" - "+ data = /incbin/(\"$(basename ${DATA})\");\n" - "+ type = \"${TYPE}\";\n" - "+ arch = \"${ARCH}\";\n" - "+ os = \"${OS}\";\n" - "+ compression = \"${COMPRESS}\";\n" - "+ load = <${LOADADDR}>;\n" - "+ entry = <${ENTRY}>;\n" - "+ hash@1 {\n" - "+ algo = \"crc32\";\n" - "+ };\n" - "+ hash@2 {\n" - "+ algo = \"sha1\";\n" - "+ };\n" - "+ };\n" - "+ };\n" - "+\n" - "+ configurations {\n" - "+ default = \"config@1\";\n" - "+ config@1 {\n" - "+ description = \"Boot Linux kernel\";\n" - "+ kernel = \"kernel@1\";\n" - "+ };\n" - "+ };\n" - "+};\n" - "+EOF\n" - "+}\n" - "+\n" - "+#\n" - "+# Parse command line\n" - "+#\n" - "+while getopts \":A:O:T:C:a:e:l:n:d:i:\" Option\n" - "+do\n" - "+\tcase $Option in\n" - "+\t\tA ) track_opt 1 ; ARCH=$OPTARG;;\n" - "+\t\tO ) track_opt 2 ; OS=$OPTARG;;\n" - "+\t\tT ) track_opt 4 ; TYPE=$OPTARG;;\n" - "+\t\tC ) track_opt 8 ; COMPRESS=$OPTARG;;\n" - "+\t\ta ) track_opt 16 ; LOADADDR=$OPTARG;;\n" - "+\t\te ) track_opt 32 ; ENTRY=$OPTARG;;\n" - "+\t\tl ) track_opt 64 ; UIMAGE_FORMAT=$OPTARG;;\n" - "+\t\tn ) track_opt 128; NAME=$OPTARG;;\n" - "+\t\td ) track_opt 256; DATA=$OPTARG;;\n" - "+\t\ti ) track_opt 512; IMAGE=$OPTARG;;\n" - "+\t\t* ) echo \"Invalid option passed to '$0' (options:$@)\"\n" - "+\t\t usage;;\n" - "+\tesac\n" - "+done\n" - "+\n" - "+# strip off the 0x from the LOADADDR and ENTRY (if exists)\n" - "+LOADADDR=$(echo \"${LOADADDR}\" | sed s@'0x'@''@g)\n" - "+ENTRY=$(echo \"${ENTRY}\" | sed s@'0x'@''@g)\n" - "+\n" - "+# All arguments available ?\n" - "+if [ ${OPT_CNT} -ne 10 -o ${OPT_MASK} -ne 1023 ]; then\n" - "+\tusage\n" - "+fi\n" - " \n" - " if [ -z \"${MKIMAGE}\" ]; then\n" - " \tMKIMAGE=$(type -path mkimage)\n" - " \tif [ -z \"${MKIMAGE}\" ]; then\n" - " \t\t# Doesn't exist\n" - "-\t\techo '\"mkimage\" command not found - U-Boot images will not be built' >&2\n" - "+\t\techo '\"mkimage\" command not found' >&2\n" - "+\t\techo '--> U-Boot images will not be built' >&2\n" - " \t\texit 0;\n" - " \tfi\n" - " fi\n" - " \n" - "-# Call \"mkimage\" to create U-Boot image\n" - "-${MKIMAGE} \"$@\"\n" - "+if [ \"${UIMAGE_FORMAT}\" != \"legacy\" ]; then\n" - "+\tif [ \"x$(${MKIMAGE} 2>&1 | grep '\\-f')\" = \"x\" ]; then\n" - "+\t\techo \"'${MKIMAGE}' does not support FIT images\" >&2\n" - "+\t\techo \"Building legacy U-Boot image...\" >&2\n" - "+\t\tUIMAGE_FORMAT=legacy\n" - "+\tfi\n" - "+fi\n" - "+\n" - "+if [ \"${UIMAGE_FORMAT}\" != \"legacy\" ]; then\n" - "+\t# for building FIT images we need the device tree compiler\n" - "+\tif [ -z \"${DTC}\" ]; then\n" - "+\t\tDTC=$(type -path dtc)\n" - "+\t\tif [ -z \"${DTC}\" ]; then\n" - "+\t\t\t# Doesn't exist\n" - "+\t\t\techo '\"dtc\" command not found' >&2\n" - "+\t\t\techo '--> Can only built legacy U-Boot images' >&2\n" - "+\t\t\tUIMAGE_FORMAT=legacy\n" - "+\t\telse\n" - "+\t\t\tDTC_VER=$(dtc -v | cut -d' ' -f3 | sed s@'\\.'@''@g)\n" - "+\t\t\tif [ ${DTC_VER} -lt 120 ]; then\n" - "+\t\t\t\techo '\"dtc\" must be at least version 1.2.0' >&2\n" - "+\t\t\t\techo '-->Can only built legacy U-Boot images'>&2\n" - "+\t\t\t\tUIMAGE_FORMAT=legacy\n" - "+\t\t\tfi\n" - "+\t\tfi\n" - "+\tfi\n" - "+fi\n" - "+\n" - "+if [ \"${UIMAGE_FORMAT}\" = \"legacy\" ]; then\n" - "+\t# Call \"mkimage\" in the legacy mode to create U-Boot image\n" - "+\t${MKIMAGE} -A ${ARCH} -O ${OS} -T ${TYPE} \\\n" - "+\t\t -C ${COMPRESS} -a 0x${LOADADDR} -e 0x${ENTRY} \\\n" - "+\t\t -n \"${NAME}\" -d ${DATA} ${IMAGE}\n" - "+else\n" - "+\t# Call \"mkimage\" in the FIT mode to create U-Boot image\n" - "+\tgen_tmp_specfile ${IMAGE}.its\n" - "+\t${MKIMAGE} -f ${IMAGE}.its ${IMAGE}\n" - "+fi\n" - "Index: linux-2.6.27-rc4/arch/blackfin/Kconfig\n" - "===================================================================\n" - "--- linux-2.6.27-rc4.orig/arch/blackfin/Kconfig\t2008-08-25 20:58:33.000000000 +0200\n" - "+++ linux-2.6.27-rc4/arch/blackfin/Kconfig\t2008-08-25 20:58:40.000000000 +0200\n" - "@@ -286,6 +286,16 @@ config BOOT_LOAD\n" - " \t memory region is used to capture NULL pointer references as well\n" - " \t as some core kernel functions.\n" - " \n" - "+config LEGACY_UIMAGE\n" - "+\tbool \"Use legacy format for building uImage\"\n" - "+\tdefault n\n" - "+\thelp\n" - "+\t Enable this option if you want uImage to be build in the legacy\n" - "+\t format. If this option is 'N' the uImage will be build in the newer\n" - "+\t FIT-image format. (Needs at least 'mkimage v1.3.3', and 'dtc v1.2.0')\n" - "+\n" - "+\t If unsure, say N.\n" - "+\n" - " comment \"Clock/PLL Setup\"\n" - " \n" - " config CLKIN_HZ\n" - "Index: linux-2.6.27-rc4/arch/blackfin/boot/Makefile\n" - "===================================================================\n" - "--- linux-2.6.27-rc4.orig/arch/blackfin/boot/Makefile\t2008-08-25 20:58:33.000000000 +0200\n" - "+++ linux-2.6.27-rc4/arch/blackfin/boot/Makefile\t2008-08-25 20:58:40.000000000 +0200\n" - "@@ -11,11 +11,17 @@ MKIMAGE := $(srctree)/scripts/mkuboot.sh\n" - " targets := vmImage\n" - " extra-y += vmlinux.bin vmlinux.gz\n" - " \n" - "+ifeq ($(CONFIG_LEGACY_UIMAGE),y)\n" - "+UIMAGE_FORMAT=legacy\n" - "+else\n" - "+UIMAGE_FORMAT=fit\n" - "+endif\n" - "+\n" - " quiet_cmd_uimage = UIMAGE $@\n" - " cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A $(ARCH) -O linux -T kernel \\\n" - " -C gzip -n 'Linux-$(KERNELRELEASE)' -a $(CONFIG_BOOT_LOAD) \\\n" - " -e $(shell $(NM) vmlinux | awk '$$NF == \"__start\" {print $$1}') \\\n" - "- -d $< $@\n" - "+ -l $(UIMAGE_FORMAT) -d $< -i $@\n" - " \n" - " $(obj)/vmlinux.bin: vmlinux FORCE\n" - " \t$(call if_changed,objcopy)\n" - "Index: linux-2.6.27-rc4/arch/avr32/Kconfig\n" - "===================================================================\n" - "--- linux-2.6.27-rc4.orig/arch/avr32/Kconfig\t2008-08-25 20:58:33.000000000 +0200\n" - "+++ linux-2.6.27-rc4/arch/avr32/Kconfig\t2008-08-25 20:58:40.000000000 +0200\n" - "@@ -147,6 +147,20 @@ config PHYS_OFFSET\n" - " \thex\n" - " \tdefault 0x10000000 if CPU_AT32AP700X=y\n" - " \n" - "+if LOADER_U_BOOT\n" - "+\n" - "+config LEGACY_UIMAGE\n" - "+\tbool \"Use legacy format for building uImage\"\n" - "+\tdefault n\n" - "+\thelp\n" - "+\t Enable this option if you want uImage to be build in the legacy\n" - "+\t format. If this option is 'N' the uImage will be build in the newer\n" - "+\t FIT-image format. (Needs at least 'mkimage v1.3.3', and 'dtc v1.2.0')\n" - "+\n" - "+\t If unsure, say N.\n" - "+\n" - "+endif\n" - "+\n" - " source \"kernel/Kconfig.preempt\"\n" - " \n" - " config QUICKLIST\n" - "Index: linux-2.6.27-rc4/arch/avr32/boot/images/Makefile\n" - "===================================================================\n" - "--- linux-2.6.27-rc4.orig/arch/avr32/boot/images/Makefile\t2008-08-25 20:58:33.000000000 +0200\n" - "+++ linux-2.6.27-rc4/arch/avr32/boot/images/Makefile\t2008-08-25 20:58:40.000000000 +0200\n" - "@@ -17,10 +17,16 @@ $(obj)/vmlinux.bin: vmlinux FORCE\n" - " $(obj)/vmlinux.gz: $(obj)/vmlinux.bin FORCE\n" - " \t$(call if_changed,gzip)\n" - " \n" - "+ifeq ($(CONFIG_LEGACY_UIMAGE),y)\n" - "+UIMAGE_FORMAT=legacy\n" - "+else\n" - "+UIMAGE_FORMAT=fit\n" - "+endif\n" - "+\n" - " quiet_cmd_uimage = UIMAGE $@\n" - " cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A avr32 -O linux -T kernel\t\\\n" - " \t\t-C gzip -a $(CONFIG_LOAD_ADDRESS) -e $(CONFIG_ENTRY_ADDRESS)\t\\\n" - "-\t\t-n 'Linux-$(KERNELRELEASE)' -d $< $@\n" - "+\t\t-l $(UIMAGE_FORMAT) -n 'Linux-$(KERNELRELEASE)' -d $< -i $@\n" - " \n" - " targets += uImage uImage.srec\n" - " $(obj)/uImage: $(obj)/vmlinux.gz\n" - "Index: linux-2.6.27-rc4/arch/sh/Kconfig\n" - "===================================================================\n" - "--- linux-2.6.27-rc4.orig/arch/sh/Kconfig\t2008-08-25 20:58:33.000000000 +0200\n" - "+++ linux-2.6.27-rc4/arch/sh/Kconfig\t2008-08-25 20:58:40.000000000 +0200\n" - "@@ -607,6 +607,16 @@ config CMDLINE\n" - " \tdepends on CMDLINE_BOOL\n" - " \tdefault \"console=ttySC1,115200\"\n" - " \n" - "+config LEGACY_UIMAGE\n" - "+\tbool \"Use legacy format for building uImage\"\n" - "+\tdefault n\n" - "+\thelp\n" - "+\t Enable this option if you want uImage to be build in the legacy\n" - "+\t format. If this option is 'N' the uImage will be build in the newer\n" - "+\t FIT-image format. (Needs at least 'mkimage v1.3.3', and 'dtc v1.2.0')\n" - "+\n" - "+\t If unsure, say N.\n" - "+\n" - " endmenu\n" - " \n" - " menu \"Bus options\"\n" - "Index: linux-2.6.27-rc4/arch/sh/boot/Makefile\n" - "===================================================================\n" - "--- linux-2.6.27-rc4.orig/arch/sh/boot/Makefile\t2008-08-25 20:58:33.000000000 +0200\n" - "+++ linux-2.6.27-rc4/arch/sh/boot/Makefile\t2008-08-25 20:58:40.000000000 +0200\n" - "@@ -43,10 +43,16 @@ KERNEL_ENTRY\t:= $(shell /bin/bash -c 'pr\n" - " \t\t\t$(CONFIG_MEMORY_START) + \\\n" - " \t\t\t$(CONFIG_ZERO_PAGE_OFFSET) + $(CONFIG_ENTRY_OFFSET)]')\n" - " \n" - "+ifeq ($(CONFIG_LEGACY_UIMAGE),y)\n" - "+UIMAGE_FORMAT=legacy\n" - "+else\n" - "+UIMAGE_FORMAT=fit\n" - "+endif\n" - "+\n" - " quiet_cmd_uimage = UIMAGE $@\n" - " cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A sh -O linux -T kernel \\\n" - " \t\t -C gzip -a $(KERNEL_LOAD) -e $(KERNEL_ENTRY) \\\n" - "-\t\t -n 'Linux-$(KERNELRELEASE)' -d $< $@\n" - "+\t\t -l $(UIMAGE_FORMAT) -n 'Linux-$(KERNELRELEASE)' -d $< -i $@\n" - " \n" - " $(obj)/uImage: $(obj)/vmlinux.bin.gz FORCE\n" - " \t$(call if_changed,uimage)\n" - "\n" - -- + "An embedded and charset-unspecified text was scrubbed...\n" + "Name: add-u-boot-fit-image-support.patch\n" + Url: http://lists.denx.de/pipermail/u-boot/attachments/20080825/7b7fd6f7/attachment.txt -af7faf09fd6e895903f61a7c00dee2cba53fbdfba7406641a27b591528c2711c +021fce101cdddd7b35a795f7de81ced03c653a1a9ab52a13a69087ad1ae3ca7f
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.